Merge branch 'master' of http://121.40.234.130:8899/root/rl_mg

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSaveGdyInfo.java

@@ -2,6 +2,7 @@ package org.nl.wms.ext.mes.autotask;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.system.service.notice.ISysNoticeService;
@@ -46,6 +47,9 @@ public class AutoSaveGdyInfo {
             mesGdyInfoDto.setDEVICE("1");
             mesGdyInfoDto.setCREATE_TM(DateUtil.now());
             mesGdyInfoDto.setOP_FLAG(GeneralDefinition.NO);
+            if (ObjectUtil.isEmpty(mesGdyInfoDto.getBATCHNO())) {
+                mesGdyInfoDto.setBATCHNO("-");
+            }
             try {
                 mesRequestMapper.insertGdyMaterial(mesGdyInfoDto);
                 successNum.incrementAndGet();

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSaveProductionInfo.java

@@ -46,6 +46,9 @@ public class AutoSaveProductionInfo {
             if (ObjectUtil.isEmpty(mi.getBATCHNO())) {
                 mi.setBATCHNO("-");
             }
+            if (ObjectUtil.isEmpty(mi.getORDER_NO())) {
+                mi.setORDER_NO("-");
+            }
             // 3、批量插入MES数据库
             try {
                 wmsToMesService.saveSemiProductionBatchToMes(mi);

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml

@@ -234,7 +234,7 @@
             mm.material_name AS FPRODUCT_MATERIAL_NAME,
             mm.material_spec AS FMATSPEC,
             mm.material_model AS FMATMODEL,
-            pw.batch_no AS BATCHNO,
+            IF(LENGTH(pw.batch_no) > 0,pw.batch_no,'-') AS BATCHNO,
             p2.ext_point_code AS PRESSUNIT,
             vg.material_qty AS PRO_SUBNUM
         FROM

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java

@@ -308,7 +308,7 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl<PdmBdWorkorderMapper,
         this.updateById(bdWorkorder);
         try {
             // todo: 统计当前设备的不合格位置的数量作为不合格数，并上报给mes
-//            wmsToMesService.reportPressUnusedMaterial(bdWorkorder);
+            wmsToMesService.reportPressUnusedMaterial(bdWorkorder);
         } catch (Exception e) {
             log.info("调用mes异常:{}", e.getMessage());
         }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java

@@ -193,10 +193,6 @@ public class FJMKTask extends AbstractTask {
         task.setTask_status(TaskStatus.CREATED.getCode());
         task.setRemark("");
         taskService.save(task);
-        // 包装线上锁
-        packagePoint.setIng_task_code(task.getTask_code());
-        PointUtils.setUpdateByAcs(packagePoint);
-        pointService.updateById(packagePoint);
 
     }
 

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java

@@ -115,10 +115,6 @@ public class FJQZRKTask extends AbstractTask {
         task.setTask_status(TaskStatus.CREATED.getCode());
         task.setRemark("");
         taskService.save(task);
-
-        point.setIng_task_code(task.getTask_code());
-        PointUtils.setUpdateByAcs(point);
-        pointService.updateById(point);
     }
 
     /**