From 5bdc8f610ba29762ea5cc7071aa75bddac8ec877 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Mon, 6 Nov 2023 12:02:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=86=E6=8B=A3=E5=8C=85=E8=A3=85?=
 =?UTF-8?q?=E4=B8=8D=E9=94=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/wms/ext/mes/autotask/AutoSaveGdyInfo.java     | 4 ++++
 .../org/nl/wms/ext/mes/autotask/AutoSaveProductionInfo.java   | 3 +++
 .../nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml    | 2 +-
 .../pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java | 2 +-
 .../org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java    | 4 ----
 .../org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java  | 4 ----
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSaveGdyInfo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSaveGdyInfo.java
index f1cb4f3..375a618 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSaveGdyInfo.java
+++ b/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();
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSaveProductionInfo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSaveProductionInfo.java
index 438d055..64ffad7 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSaveProductionInfo.java
+++ b/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);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml
index c2a5872..62b3f2e 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml
+++ b/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
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java
index 4d9ec81..7c7d474 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java
+++ b/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());
         }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java
index 4ed3a0f..dc34432 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java
+++ b/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);
 
     }
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java
index 01454bd..6b13b03 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java
+++ b/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);
     }
 
     /**