采购

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<PagerVo<PurchaseBillVo>> listPageVo(PagerQuery<PurchaseBillQuery> 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);

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;
 }