Merge remote-tracking branch 'origin/master'

op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java

@@ -242,6 +242,8 @@ public class QcCheckTaskIncomeController extends BaseController {
     @PostMapping("/createIncomeTask")
     public AjaxResult createIncomeTask(@RequestBody QcCheckTaskIncomeDTO qcCheckTaskIncome) {
 
+        logger.info("创建检验任务接收参数："+JSONObject.toJSONString(qcCheckTaskIncome));
+
         if (StringUtils.isBlank(qcCheckTaskIncome.getOrderNo())) {
             return error("[orderNo]不能为空");
         }

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java

@@ -146,7 +146,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 	 */
 	@Override
 	public int insertQcCheckTaskIncome(QcCheckTaskIncome qcCheckTaskIncome) {
-		logger.info("创建检验任务接收参数："+JSONObject.toJSONString(qcCheckTaskIncome));
+		logger.info("impl创建检验任务接收参数："+JSONObject.toJSONString(qcCheckTaskIncome));
 		DynamicDataSourceContextHolder.push("ds_" + qcCheckTaskIncome.getFactoryCode());
 		String bpDD = DateUtils.parseDateToStr(DateUtils.YYYYMMDD, DateUtils.getNowDate());
 		int liushuiNum = qcCheckTaskIncomeMapper.getTodayMaxNum(qcCheckTaskIncome);

op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java

@@ -155,8 +155,8 @@ public class SapItemSyncImpl implements SapItemSyncService {
                 String MVGR3_NM = maraTable.getString("MVGR3_NM");
                 String MVGR4 = maraTable.getString("MVGR4");
                 String MVGR4_NM = maraTable.getString("MVGR4_NM");
-                String MVGR5 = maraTable.getString("MVGR5");
-                String MVGR5_NM = maraTable.getString("MVGR5_NM");
+//                String MVGR5 = maraTable.getString("MVGR5");//标准占用
+//                String MVGR5_NM = maraTable.getString("MVGR5_NM");//批次最大数量占用
                 String LAEDA = maraTable.getString("LAEDA");
                 String ERSDA = maraTable.getString("LAEDA");
                 log.info(i+"物料基础数据同步数据输出----" +