From 4e4ce188c1af51b6f2d52a04692ae72232ce62e8 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Thu, 29 Jan 2026 15:36:55 +0800
Subject: [PATCH] =?UTF-8?q?opt=EF=BC=9A=20=E6=8E=A5=E5=8F=A3=E6=94=B9?=
 =?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PdaProductionController.java            | 10 ++++++++++
 .../service/impl/SecondaryPackagingServiceImpl.java    |  6 +++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaProductionController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaProductionController.java
index e88d32b..b32ea2c 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaProductionController.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaProductionController.java
@@ -6,6 +6,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.logging.annotation.Log;
 import org.nl.wms.pda.general_management.service.PdaProductionService;
+import org.nl.wms.pda.util.PdaResponse;
+import org.nl.wms.sch_manage.service.SecondaryPackagingService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -28,6 +30,8 @@ public class PdaProductionController {
 
     @Resource
     private PdaProductionService pdaProductionService;
+    @Resource
+    private SecondaryPackagingService secondaryPackagingService;
 
     @PostMapping("/getStockGroupInfo")
     @Log("托盘叫料-获取物料库存信息")
@@ -142,4 +146,10 @@ public class PdaProductionController {
     public ResponseEntity<Object> manualOutbound(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(pdaProductionService.manualOutbound(whereJson), HttpStatus.OK);
     }
+    @PostMapping("/palletizingDown")
+    @SaIgnore
+    public ResponseEntity<Object> palletizingDown(@RequestBody JSONObject whereJson) {
+        secondaryPackagingService.palletizingDown(whereJson);
+        return new ResponseEntity<>(PdaResponse.requestOk(), HttpStatus.OK);
+    }
 }
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SecondaryPackagingServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SecondaryPackagingServiceImpl.java
index 0fd7b10..60d6f62 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SecondaryPackagingServiceImpl.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SecondaryPackagingServiceImpl.java
@@ -72,7 +72,11 @@ public class SecondaryPackagingServiceImpl implements SecondaryPackagingService
         // ....待定
         groupplateService.save(groupPlate);
 
-        // todo: 校验任务
+        // 校验任务
+        Integer num = taskService.haveTaskAll(param.getString("device_code"));
+        if (num > 0) {
+            throw new BadRequestException("该点位已存在任务！");
+        }
         param.put("config_code", "PalletizingDownTask");
         param.put("group_id", groupPlate.getGroup_id());
         param.put("material_id", materialCode.getMaterial_id());