From 777c97ee586b728c58633b12bc599e7460c95661 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Wed, 4 Sep 2024 15:51:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=8C=85=E8=A3=85?=
 =?UTF-8?q?=E8=BE=93=E9=80=81=E7=BA=BF=E6=89=8B=E6=8C=81=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/wms/pda/service/impl/PdaServiceImpl.java    | 5 ++++-
 .../workorder/service/dao/mapper/PdmBdWorkorderMapper.xml   | 1 +
 .../workorder/service/impl/PdmBdWorkorderServiceImpl.java   | 6 ++++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
index 25171c1..18c3729 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
@@ -517,7 +517,10 @@ public class PdaServiceImpl implements PdaService {
                 .set(PdmBdWorkorder::getUpdate_name, SecurityUtils.getCurrentNickName())
                 .set(PdmBdWorkorder::getUpdate_time, DateUtil.now())
                 .eq(PdmBdWorkorder::getWorkorder_id, workorderId);
-        workorderService.update(lam);
+        boolean update = workorderService.update(lam);
+        if (!update) {
+            throw new BadRequestException("工单完工失败");
+        }
         return PdaResponseVo.pdaResultOk("工单完工成功");
     }
 
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 8e7ce89..bebe0fd 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
@@ -178,6 +178,7 @@
             <foreach collection="devices" item="code" separator="," open="(" close=")">
                 #{code}
             </foreach>
+            AND wo.workorder_status <![CDATA[<>]]> '5'
         </where>
         ORDER BY wo.create_time DESC
     </select>
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 a8d3561..08762ba 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
@@ -95,6 +95,7 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl<PdmBdWorkorderMapper,
         String nickName = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         String today = DateUtil.format(DateUtil.date(), "yyyyMMdd");
+        SchBasePoint point = pointService.getById(entity.getPoint_code());
         // 点位编码和点位名称为父点位
         entity.setWorkorder_id(IdUtil.getSnowflake(1, 1).nextIdStr());
         entity.setWorkorder_code(CodeUtil.getNewCode("PDM_SHIFTORDER"));
@@ -106,8 +107,9 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl<PdmBdWorkorderMapper,
         entity.setUpdate_id(currentUserId);
         entity.setUpdate_name(nickName);
         entity.setUpdate_time(now);
-        // 如果是分拣，就特殊处理
-        if (GeneralDefinition.AREA_FJ.equals(entity.getRegion_code())) {
+        // 如果是分拣(并且点位不是分拣输送线)，就特殊处理
+        if (GeneralDefinition.AREA_FJ.equals(entity.getRegion_code())
+                && !"6".equals(point.getPoint_type())) {
             toCalculatePlannedQuantity(entity);
         }
         pdmBdWorkorderMapper.insert(entity);