From 41666a22ca47d11d2be19a0d700e08a27878f0d6 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Thu, 2 Nov 2023 17:18:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=87=AA=E5=8A=A8=E4=B8=8B=E5=8F=91?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/cockpit/service/mapper/CockPitMapper.xml  |  2 +-
 .../wms/ext/acs/autotask/AutoIssueWorkOrder.java  |  5 ++++-
 .../workorder/service/IPdmBdWorkorderService.java |  2 ++
 .../service/dao/mapper/PdmBdWorkorderMapper.java  |  2 ++
 .../service/dao/mapper/PdmBdWorkorderMapper.xml   | 15 ++++++++++++---
 .../service/impl/PdmBdWorkorderServiceImpl.java   |  5 +++++
 .../sch/task_manage/task/tasks/fj/FJQLTask.java   |  2 +-
 .../src/views/wms/pdm/workerorder/index.vue       |  1 +
 .../src/views/wms/sch/group/MaterialDialog.vue    |  1 +
 9 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.xml
index ebaf51b..588900a 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.xml
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.xml
@@ -15,7 +15,7 @@
     <select id="getShiftProductionList" resultType="org.nl.wms.cockpit.service.dao.ShiftProductionVo">
         SELECT
             w.point_name AS column_name,
-            SUM(IFNULL(w.qualified_qty, 0)) AS qualified_qty,
+            SUM(IFNULL(w.qualified_qty, IFNULL(w.real_qty,0))) AS qualified_qty,
             SUM(IFNULL(w.unqualified_qty, 0)) AS unqualified_qty,
             SUM(IFNULL(w.plan_qty, 0) - IFNULL(w.qualified_qty, 0) - IFNULL(w.unqualified_qty, 0)) AS total_difference
         FROM
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/autotask/AutoIssueWorkOrder.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/autotask/AutoIssueWorkOrder.java
index 2acc19b..e8b999b 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/autotask/AutoIssueWorkOrder.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/autotask/AutoIssueWorkOrder.java
@@ -36,10 +36,13 @@ public class AutoIssueWorkOrder {
     private ISysNoticeService noticeService;
     @SneakyThrows
     public void run() {
-        // 获取未有生产中的设备号
+        // 获取所有设备号
         List<String> deviceCodes = workorderService.getTheDayUnProducedDevice();
         // 查找该设备未生产的工单去下发
         deviceCodes.forEach(s -> {
+            // 判断是否有工单
+            List<PdmBdWorkorder> lists = workorderService.getTheDayProducedWorkOrderByDevice(s);
+            if (lists.size() > 0) return;
             List<AcsWorkOrderVo> acsWorkOrderVoList = workorderService.getAcsWorkOrderVos(s);
             if (acsWorkOrderVoList.size() == 0) return;
             AcsWorkOrderVo acsWorkOrderVo = acsWorkOrderVoList.get(0);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/IPdmBdWorkorderService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/IPdmBdWorkorderService.java
index 7ba5997..e9592a0 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/IPdmBdWorkorderService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/IPdmBdWorkorderService.java
@@ -106,4 +106,6 @@ public interface IPdmBdWorkorderService extends IService<PdmBdWorkorder> {
      * @return
      */
     List<AcsWorkOrderVo> getAcsWorkOrderVos(String s);
+
+    List<PdmBdWorkorder> getTheDayProducedWorkOrderByDevice(String s);
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.java
index 0413f58..76c1628 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.java
@@ -47,4 +47,6 @@ public interface PdmBdWorkorderMapper extends BaseMapper<PdmBdWorkorder> {
      * @return
      */
     List<AcsWorkOrderVo> getAcsWorkOrderVos(String device);
+
+    List<PdmBdWorkorder> getTheDayProducedWorkOrderByDevice(String s);
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml
index 2826ce7..75d2713 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml
@@ -82,10 +82,10 @@
             p.point_code
         FROM
             `sch_base_point` p
-                LEFT JOIN pdm_bd_workorder w ON w.point_code = p.point_code AND w.workorder_status = '3' AND w.workorder_status = '2'
         WHERE
-            p.region_code = 'YZ' AND p.point_type = '1' AND p.is_has_workder = '1'
-          AND w.workorder_id IS NULL
+            p.region_code = 'YZ'
+          AND p.point_type = '1'
+          AND p.is_has_workder = '1'
     </select>
     <select id="getAcsWorkOrderVos" resultType="org.nl.wms.pdm.workorder.service.dao.vo.AcsWorkOrderVo">
         SELECT
@@ -117,4 +117,13 @@
           AND w.point_code = #{device}
         ORDER BY w.planproducestart_date
     </select>
+    <select id="getTheDayProducedWorkOrderByDevice"
+            resultType="org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder">
+        SELECT
+        *
+        FROM
+        `pdm_bd_workorder` w
+        WHERE w.point_code = #{s}
+        AND w.workorder_status != '5' AND w.workorder_status != '1'
+    </select>
 </mapper>
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 41745ba..f391823 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
@@ -270,4 +270,9 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl<PdmBdWorkorderMapper,
     public List<AcsWorkOrderVo> getAcsWorkOrderVos(String s) {
         return pdmBdWorkorderMapper.getAcsWorkOrderVos(s);
     }
+
+    @Override
+    public List<PdmBdWorkorder> getTheDayProducedWorkOrderByDevice(String s) {
+        return pdmBdWorkorderMapper.getTheDayProducedWorkOrderByDevice(s);
+    }
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java
index a146724..20e0997 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java
@@ -247,7 +247,7 @@ public class FJQLTask extends AbstractTask {
     }
 
     public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-        String startPoint = taskObj.getPoint_code2(); // 获取终点
+        String startPoint = taskObj.getPoint_code1(); // 获取终点
         SchBasePoint startPointObj = pointService.getById(startPoint);
         // 终点解锁
         if (ObjectUtil.isNotEmpty(startPointObj)) {
diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
index 7030426..08081d5 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
@@ -617,6 +617,7 @@ export default {
         this.form.raw_material_code = row.material_code
       }
       this.form.pack_method = row.pack_method
+      this.form.vehicle_type = row.pack_palletspec
     },
     clearRecordMesOrder() {
       this.form.order_no = null
diff --git a/lms/nladmin-ui/src/views/wms/sch/group/MaterialDialog.vue b/lms/nladmin-ui/src/views/wms/sch/group/MaterialDialog.vue
index 58ae604..65e36ec 100644
--- a/lms/nladmin-ui/src/views/wms/sch/group/MaterialDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/group/MaterialDialog.vue
@@ -74,6 +74,7 @@
       <el-table-column prop="material_spec" label="物料规格" width="140" />
       <el-table-column prop="material_model" label="物料型号" width="140" />
       <el-table-column prop="pack_method" label="包装方式" width="140" />
+      <el-table-column prop="pack_palletspec" label="包装规则" width="140" />
       <el-table-column v-if="queryInfo === '库存顺序'" prop="total_material_qty" label="物料总数/块" width="140" />
       <el-table-column prop="standing_time" label="静置时间（分钟）" width="130px" />
       <el-table-column prop="update_name" label="修改人" />