From 5fe972a08728f6c92972a067867271de374d0c5f Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Wed, 4 Sep 2024 17:59:58 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/func/purchasebill/PurchaseBillService.java | 13 +++++++++++++ .../WarehouseAnsBillDetailDto.java | 6 ++++++ 2 files changed, 19 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 8815a73..eb83bca 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 @@ -32,6 +32,7 @@ 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.basegoodsspu.BaseGoodsSpuVo; import com.yxt.oms.biz.func.commonmethod.CommonMethod; import com.yxt.oms.biz.func.commonmethod.DataRule; import com.yxt.oms.biz.func.purchaseappendix.PurchaseAppendixUrl; @@ -40,7 +41,10 @@ import com.yxt.oms.biz.func.purchasebilldetail.PurchaseBillDetailDto; import com.yxt.oms.biz.func.sysorganization.SysOrganizationVo; import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsBillDto; import com.yxt.oms.biz.func.warehouseansbilldetail.WarehouseAnsBillDetailDto; +import com.yxt.oms.feign.goods.basebrandinfo.BaseBrandInfoFeign; import com.yxt.oms.feign.goods.basegoodssku.BaseGoodsSkuFeign; +import com.yxt.oms.feign.goods.basegoodsspu.BaseGoodsSpuFeign; +import com.yxt.oms.feign.goods.basegoodstype.BaseGoodsTypeFeign; import com.yxt.oms.feign.portal.privilege.PrivilegeQuery; import com.yxt.oms.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.oms.feign.portal.sysstafforg.SysStaffOrgFeign; @@ -74,6 +78,8 @@ public class PurchaseBillService { private CommonMethod commonMethod; @Autowired private FileUploadComponent fileUploadComponent; + @Autowired + private BaseGoodsSpuFeign baseGoodsSpuFeign; public ResultBean> listPageVo(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); @@ -211,7 +217,14 @@ public class PurchaseBillService { wmsAnsBillDetailDto.setTotalPrice(purchaseBillDetailDto.getCost().doubleValue()*purchaseBillDetailDto.getCount().doubleValue()); wmsAnsBillDetailDto.setBatch(purchaseBillDetailDto.getBatchNumber()); BaseGoodsSkuVo vo=goodsSkuFeign.initialization(purchaseBillDetailDto.getGoodsSkuSid()).getData(); + BaseGoodsSpuVo v=baseGoodsSpuFeign.initialization(vo.getGoodsSpuSid()).getData(); wmsAnsBillDetailDto.setGoodsSpuSid(vo.getGoodsSpuSid()); + wmsAnsBillDetailDto.setGoodsBrandSid(v.getBrandSid()); + wmsAnsBillDetailDto.setGoodsBrandName(v.getBrandName()); + wmsAnsBillDetailDto.setGoodsTypeSid(v.getGoodsTypeSid()); + wmsAnsBillDetailDto.setGoodsTypeName(v.getTypeName()); + wmsAnsBillDetailDto.setManufacturerName(v.getManufacturerName()); + wmsAnsBillDetailDto.setManufacturerSid(v.getManufacturerSid()); 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 3915ba9..fec153a 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 @@ -35,4 +35,10 @@ public class WarehouseAnsBillDetailDto { private double price; private double totalPrice; private String batch; + private String goodsBrandSid; + private String goodsBrandName; + private String goodsTypeSid; + private String goodsTypeName; + private String manufacturerSid; + private String manufacturerName; }