添加供应商

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProduceOrderServiceImpl.java

@@ -44,6 +44,7 @@ import com.fjhx.sale.service.contract.ContractProductService;
 import com.fjhx.sale.service.contract.ContractService;
 import com.fjhx.socket.core.PushTypeEnum;
 import com.fjhx.socket.core.WebSocketPush;
+import com.fjhx.supply.service.supplier.SupplierInfoService;
 import com.fjhx.tenant.utils.DeptUstil;
 import com.fjhx.wms.entity.stock.emums.JournalType;
 import com.fjhx.wms.entity.stock.po.StockJournalDetails;
@@ -112,6 +113,8 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
     private StockWaitDetailsService stockWaitDetailsService;
     @Autowired
     private ArrivalDetailMapper arrivalDetailMapper;
+    @Autowired
+    private SupplierInfoService supplierInfoService;
 
     @Override
     public Page<ProductionOrderVo> getPage(ProduceOrderSelectDto dto) {
@@ -598,6 +601,10 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
         List<EhsdPurchaseProductVo> ehsdPurchaseProductVos = ehsdPurchaseProductMapper.getList(IWrapper.<EhsdPurchaseProduct>getWrapper()
                 .eq("epp", EhsdPurchaseProduct::getContractId, productionOrder.getContractId())
         );
+        //赋值卖方信息
+        supplierInfoService.attributeAssign(ehsdPurchaseProductVos, EhsdPurchaseProductVo::getSellCorporationId, (item, supplier) -> {
+            item.setSellCorporationName(supplier.getName());
+        });
         //赋值产品信息
         productInfoService.attributeAssign(ehsdPurchaseProductVos, EhsdPurchaseProductVo::getProductId, (detail, product) -> {
             detail.setProductCode(product.getCustomCode());

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/vo/EhsdPurchaseProductVo.java

@@ -88,4 +88,13 @@ public class EhsdPurchaseProductVo extends EhsdPurchaseProduct {
     private String productColor;
 
     private BigDecimal arrivalQuantity;
+
+    /**
+     * 供应商id
+     */
+    private Long sellCorporationId;
+    /**
+     * 供应商名称
+     */
+    private String sellCorporationName;
 }

hx-sale/src/main/resources/mapper/purchase/EhsdPurchaseProductMapper.xml

@@ -132,7 +132,8 @@
                      epp.old_purchase_product_id,
                      (SELECT IFNULL(sum(swd.receipt_quantity), 0)
                       FROM stock_wait_details swd
-                      WHERE swd.purchase_detail_id = epp.id) AS arrivalQuantity
+                      WHERE swd.purchase_detail_id = epp.id) AS arrivalQuantity,
+                     ep.sell_corporation_id
               FROM ehsd_purchase_product epp
                        LEFT JOIN ehsd_purchase ep ON epp.purchase_id = ep.id) epp
             ${ew.customSqlSegment}