From b6d08f53a643ea4d2a4d80ec7404c1e3d2b23caf Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Fri, 28 Nov 2025 14:56:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=89=8B=E6=8C=81=E7=A9=BA=E8=BD=BD?=
 =?UTF-8?q?=E5=85=B7=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PdaCommonController.java              |  6 ++++++
 .../general_management/service/PdaCommonService.java |  7 +++++++
 .../service/impl/PdaCommonServiceImpl.java           | 12 +++++++++++-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaCommonController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaCommonController.java
index 8a43601..25f0894 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaCommonController.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaCommonController.java
@@ -43,6 +43,12 @@ public class PdaCommonController {
     public ResponseEntity<Object> getSectList(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(pdaCommonService.getSectList(whereJson), HttpStatus.OK);
     }
+    @PostMapping("/inEmptyVehicle")
+    @Log("空载具入库-呼叫入库")
+    @SaIgnore
+    public ResponseEntity<Object> inEmptyVehicle(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(pdaCommonService.inEmptyVehicle(whereJson), HttpStatus.OK);
+    }
     @PostMapping("/confirmBagAssembly")
     @Log("物料组袋-确认组袋")
     @SaIgnore
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaCommonService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaCommonService.java
index f5d4a52..a545363 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaCommonService.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaCommonService.java
@@ -34,4 +34,11 @@ public interface PdaCommonService {
      * @return
      */
     PdaResponse confirmPalletAssembly(AssemblyPalletParam param);
+
+    /**
+     * 空托盘入库
+     * @param param
+     * @return
+     */
+    PdaResponse inEmptyVehicle(JSONObject param);
 }
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java
index c4e3eff..aa1f4f7 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java
@@ -23,6 +23,7 @@ import org.nl.wms.sch_manage.service.dao.SchBaseTask;
 import org.nl.wms.sch_manage.service.util.tasks.EmpVehicleOutTask;
 import org.nl.wms.warehouse_management.enums.IOSEnum;
 import org.nl.wms.warehouse_management.service.IMdPbGroupplateService;
+import org.nl.wms.warehouse_management.service.VehicleInService;
 import org.nl.wms.warehouse_management.service.VehicleOutService;
 import org.nl.wms.warehouse_management.service.dao.GroupPlate;
 import org.redisson.api.RLock;
@@ -44,6 +45,8 @@ public class PdaCommonServiceImpl implements PdaCommonService {
     @Resource
     private VehicleOutService vehicleOutService;
     @Resource
+    private VehicleInService vehicleInService;
+    @Resource
     private IStructattrService iStructattrService;
     @Resource
     private ISchBaseTaskService taskService;
@@ -156,7 +159,7 @@ public class PdaCommonServiceImpl implements PdaCommonService {
 
     @Override
     public PdaResponse confirmPalletAssembly(AssemblyPalletParam param) {
-//        storagevehicleinfoService.getByCode(param.getVehicle_code());
+        storagevehicleinfoService.getByCode(param.getVehicle_code());
         List<GroupPlate> groupPlates = param.getGroup_plates();
         for (GroupPlate groupPlate : groupPlates) {
             groupPlate.setVehicle_code(param.getVehicle_code());
@@ -165,4 +168,11 @@ public class PdaCommonServiceImpl implements PdaCommonService {
         groupplateService.updateBatchById(groupPlates);
         return PdaResponse.requestOk("组盘成功!");
     }
+
+    @Override
+    public PdaResponse inEmptyVehicle(JSONObject param) {
+        log.info("手持请求空托盘入库：{}", param);
+        vehicleInService.create(param);
+        return PdaResponse.requestOk();
+    }
 }