Merge remote-tracking branch 'origin/master'

op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java

@@ -911,7 +911,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
         qcCheckTaskIncomeDTO.setQuality(odsProcureOrder.getCzNumber());//操作数量
         qcCheckTaskIncomeDTO.setMaterialCode(order1.getMaterialCode());
         qcCheckTaskIncomeDTO.setMaterialName(order1.getMaterialDesc());
-        // qcCheckTaskIncomeDTO.setIncomeBatchNo(order.getUserDefined2());
+        //qcCheckTaskIncomeDTO.setIncomeBatchNo(order1.getUserDefined7());//批次号
         qcCheckTaskIncomeDTO.setOrderNo(order1.getProcureCode()+order1.getUserDefined7());
         qcCheckTaskIncomeDTO.setIncomeTime(new Date());
         R   ruslt=   remoteQualityService.createIncomeTask(qcCheckTaskIncomeDTO);
@@ -1589,7 +1589,10 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
                 paramMap.put("COSTCENTER", order.getUserDefined3());//成本中心
                 paramMap.put("GR_RCPT", order.getUserDefined4());//收货方/运达方
                 paramMap.put("PLANT", order.getSiteCode());//工厂
-                paramMap.put("LGORT", order.getLocCode());//库存地点
+                SapBackflushMPQuery sapBackflushMPQuery = new SapBackflushMPQuery();
+                sapBackflushMPQuery.setPlant(order.getSiteCode());     //工厂
+                String lgort = baseWarehouseMapper.selectByCode(order.getLocCode());
+                paramMap.put("LGORT",lgort );//库存地点
                 paramMap.put("MATNR", order.getMaterialCode());//物料号
                 paramMap.put("QUANTITY", order.getPlanNumber());//数量
                 paramMap.put("MEINS", order.getUnit());//条目单位
@@ -1646,7 +1649,10 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
                 paramMap.put("GL_ACCOUNT", order.getUserDefined2());//
                 paramMap.put("GR_RCPT", order.getUserDefined4());//收货方/运达方
                 paramMap.put("PLANT", order.getSiteCode());//工厂
-                paramMap.put("LGORT", order.getLocCode());//库存地点
+                SapBackflushMPQuery sapBackflushMPQuery = new SapBackflushMPQuery();
+                sapBackflushMPQuery.setPlant(order.getSiteCode());     //工厂
+                String lgort = baseWarehouseMapper.selectByCode(order.getLocCode());
+                paramMap.put("LGORT",lgort );//库存地点
                 paramMap.put("MATNR", order.getMaterialCode());//
                 paramMap.put("QUANTITY", order.getPlanNumber());//
                 paramMap.put("MEINS", order.getUnit());//

op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java

@@ -13,6 +13,7 @@ import com.op.system.api.RemoteSapService;
 import com.op.system.api.domain.sap.SapBackflushMPQuery;
 import com.op.system.api.domain.sap.SapMaterialPosting;
 import com.op.wms.domain.*;
+import com.op.wms.mapper.BaseWarehouseMapper;
 import com.op.wms.mapper.WmsOdsMateStorageNewsSnMapper;
 import com.op.wms.mapper.WmsSellOutEmbryoMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +41,9 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService
     private RemoteSapService remoteSapService;
     @Autowired
     private WmsSellOutEmbryoMapper wmsSellOutEmbryoMapper;
+
+    @Autowired
+    private BaseWarehouseMapper baseWarehouseMapper;
     /**
      * 查询包材出库单
      *
@@ -497,7 +501,10 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService
                 paramMap.put("COSTCENTER", order.getUserDefined3());//成本中心
                 paramMap.put("GR_RCPT", order.getUserDefined4());//收货方/运达方
                 paramMap.put("PLANT", order.getSiteCode());//工厂
-                paramMap.put("LGORT", order.getLocCode());//库存地点
+                SapBackflushMPQuery sapBackflushMPQuery = new SapBackflushMPQuery();
+                sapBackflushMPQuery.setPlant(order.getSiteCode());     //工厂
+                String lgort = baseWarehouseMapper.selectByCode(order.getLocCode());
+                paramMap.put("LGORT",lgort );//库存地点
                 paramMap.put("MATNR", order.getMaterialCode());//物料号
                 paramMap.put("QUANTITY", order.getPlanNumber());//数量
                 paramMap.put("MEINS", order.getUnit());//条目单位
@@ -554,7 +561,10 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService
                 paramMap.put("GL_ACCOUNT", order.getUserDefined2());//
                 paramMap.put("GR_RCPT", order.getUserDefined4());//收货方/运达方
                 paramMap.put("PLANT", order.getSiteCode());//工厂
-                paramMap.put("LGORT", order.getLocCode());//库存地点
+                SapBackflushMPQuery sapBackflushMPQuery = new SapBackflushMPQuery();
+                sapBackflushMPQuery.setPlant(order.getSiteCode());     //工厂
+                String lgort = baseWarehouseMapper.selectByCode(order.getLocCode());
+                paramMap.put("LGORT",lgort );//库存地点
                 paramMap.put("MATNR", order.getMaterialCode());//
                 paramMap.put("QUANTITY", order.getPlanNumber());//
                 paramMap.put("MEINS", order.getUnit());//