From 84d40c848a1b21a7d89ae2aed81852d0ed110968 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Thu, 22 Aug 2024 09:06:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleDto.java | 1 + 1 file changed, 1 insertion(+) diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleDto.java b/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleDto.java index 4242928..88bc14e 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleDto.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleDto.java @@ -29,4 +29,5 @@ public class SysUserRoleDto implements Dto { @ApiModelProperty("角色sid") private String roleSid; + private String orgSid; } \ No newline at end of file From c02967f0f7f76fa94e106451a8a498415e30cb97 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Fri, 23 Aug 2024 18:00:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/oms/biz/func/purchasebill/PurchaseBillService.java | 3 +++ .../warehouseansbilldetail/WarehouseAnsBillDetailDto.java | 1 + .../yxt/oms/feign/goods/basegoodssku/BaseGoodsSkuFeign.java | 5 +++++ .../feign/goods/basegoodssku/BaseGoodsSkuFeignFallback.java | 5 +++++ 4 files changed, 14 insertions(+) diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java index 1f3797c..8815a73 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java @@ -31,6 +31,7 @@ import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.basegoodssku.BaseGoodsSkuVo; import com.yxt.oms.biz.func.commonmethod.CommonMethod; import com.yxt.oms.biz.func.commonmethod.DataRule; import com.yxt.oms.biz.func.purchaseappendix.PurchaseAppendixUrl; @@ -209,6 +210,8 @@ public class PurchaseBillService { wmsAnsBillDetailDto.setPrice(purchaseBillDetailDto.getCost().doubleValue()); wmsAnsBillDetailDto.setTotalPrice(purchaseBillDetailDto.getCost().doubleValue()*purchaseBillDetailDto.getCount().doubleValue()); wmsAnsBillDetailDto.setBatch(purchaseBillDetailDto.getBatchNumber()); + BaseGoodsSkuVo vo=goodsSkuFeign.initialization(purchaseBillDetailDto.getGoodsSkuSid()).getData(); + wmsAnsBillDetailDto.setGoodsSpuSid(vo.getGoodsSpuSid()); wmsAnsBillDetailDtos.add(wmsAnsBillDetailDto); } wmsAnsBillDto.setStorageAnsBillDetailList(wmsAnsBillDetailDtos); diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetailDto.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetailDto.java index 54e0eb3..3915ba9 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetailDto.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetailDto.java @@ -15,6 +15,7 @@ public class WarehouseAnsBillDetailDto { private String sourceBillSid; @ApiModelProperty("图示") private String illustration; + private String goodsSpuSid; @ApiModelProperty("商品Skusid") private String goodsSkuSid; @ApiModelProperty("商品名称") diff --git a/oms/src/main/java/com/yxt/oms/feign/goods/basegoodssku/BaseGoodsSkuFeign.java b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodssku/BaseGoodsSkuFeign.java index 5ce97e2..2872890 100644 --- a/oms/src/main/java/com/yxt/oms/feign/goods/basegoodssku/BaseGoodsSkuFeign.java +++ b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodssku/BaseGoodsSkuFeign.java @@ -9,6 +9,8 @@ import com.yxt.oms.biz.func.purchasebill.GoodsSkuPurSelectQuery; import com.yxt.oms.utils.OrgPathQuery; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -31,4 +33,7 @@ public interface BaseGoodsSkuFeign { @ApiOperation("采购单选择商品") @PostMapping("/purGoodsListPage") public ResultBean> purGoodsListPage(@RequestBody PagerQuery pq); + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid); } diff --git a/oms/src/main/java/com/yxt/oms/feign/goods/basegoodssku/BaseGoodsSkuFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodssku/BaseGoodsSkuFeignFallback.java index 6416bae..ecb53fc 100644 --- a/oms/src/main/java/com/yxt/oms/feign/goods/basegoodssku/BaseGoodsSkuFeignFallback.java +++ b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodssku/BaseGoodsSkuFeignFallback.java @@ -27,6 +27,11 @@ public class BaseGoodsSkuFeignFallback implements BaseGoodsSkuFeign{ return null; } + @Override + public ResultBean initialization(String sid) { + return null; + } + @Override public ResultBean> listAllByOrg(OrgPathQuery query) { return null;