Merge remote-tracking branch 'origin/master'

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

@@ -746,11 +746,11 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
             qcCheckTaskIncomeDTO.setOrderType("bc");
             qcCheckTaskIncomeDTO.setUnit(order1.getUnit());
             qcCheckTaskIncomeDTO.setFactoryCode(odsProcureOrder.getFactoryCode());
-            qcCheckTaskIncomeDTO.setQuality(order.getPlanNumber());
-            qcCheckTaskIncomeDTO.setMaterialCode(order.getMaterialCode());
-            qcCheckTaskIncomeDTO.setMaterialName(order.getMaterialDesc());
+            qcCheckTaskIncomeDTO.setQuality(order1.getPlanNumber());
+            qcCheckTaskIncomeDTO.setMaterialCode(order1.getMaterialCode());
+            qcCheckTaskIncomeDTO.setMaterialName(order1.getMaterialDesc());
            // qcCheckTaskIncomeDTO.setIncomeBatchNo(order.getUserDefined2());
-            qcCheckTaskIncomeDTO.setOrderNo(order.getProcureCode());
+            qcCheckTaskIncomeDTO.setOrderNo(order1.getProcureCode());
             qcCheckTaskIncomeDTO.setIncomeTime(new Date());
             remoteQualityService.createIncomeTask(qcCheckTaskIncomeDTO);
         }