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);