From c791f86e8483665ac28b536420caef6223567167 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Wed, 27 Nov 2024 13:14:03 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E5=90=88=E6=A0=BC?=
 =?UTF-8?q?=E8=AF=81=E5=AD=97=E6=AE=B5=E5=8F=8A=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/pda_manage/iostorage/PdaInController.java |  2 +-
 .../iostorage/sevice/PdaInIOService.java          | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/PdaInController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/PdaInController.java
index fa977b8e..7a97187b 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/PdaInController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/PdaInController.java
@@ -50,7 +50,7 @@ public class PdaInController {
     @Log("单据入库组盘确认")
     public ResponseEntity<TableDataInfo> confirm(@RequestBody PdaFormInMst pdaFormInMst) {
         RedissonUtils.lock(() -> {
-
+            pdaInIOService.pdaInIostorUseCode(pdaFormInMst);
         }, pdaFormInMst.getBillNo(), null);
         return new ResponseEntity<>(TableDataInfo.build(), HttpStatus.OK);
     }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/sevice/PdaInIOService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/sevice/PdaInIOService.java
index cd3da931..6b2b1329 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/sevice/PdaInIOService.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/sevice/PdaInIOService.java
@@ -14,6 +14,7 @@ import org.nl.wms.config_manage.form_struc.service.IBmFormStrucService;
 import org.nl.wms.config_manage.form_struc.service.dao.BmFormStruc;
 import org.nl.wms.external_system.erp.dto.ErpQuery;
 import org.nl.wms.external_system.erp.dto.ErpSec;
+import org.nl.wms.pda_manage.iostorage.server.dto.PdaFormInMst;
 import org.nl.wms.pda_manage.iostorage.server.dto.PdaFormOutDtl;
 import org.nl.wms.pda_manage.iostorage.server.dto.PdaFormOutMst;
 import org.nl.wms.pm_manage.form_data.service.dao.PmFormData;
@@ -45,13 +46,13 @@ public class PdaInIOService {
     IStIvtIostorinvdtlService iStIvtIostorinvdtlService;
 
 
-    public void pdaInIostorUseCode(PdaFormOutMst pdaFormOutMst) {
-        PdaInIOService ioService = SpringContextHolder.getBean(PdaInIOService.class);
-        //创建单据分配货位
-        StIvtIostorinv ivtIostorinv = ioService.createPadIvtAndoutDispense(pdaFormOutMst);
-        StIvtIostorinv byId = iStIvtIostorinvService.getById(ivtIostorinv.getId());
-        //生成流程
-        this.pdaTaskOpen(byId);
+    public void pdaInIostorUseCode(PdaFormInMst pdaFormInMst) {
+//        PdaInIOService ioService = SpringContextHolder.getBean(PdaInIOService.class);
+//        //创建单据分配货位
+//        StIvtIostorinv ivtIostorinv = ioService.createPadIvtAndoutDispense(pdaFormOutMst);
+//        StIvtIostorinv byId = iStIvtIostorinvService.getById(ivtIostorinv.getId());
+//        //生成流程
+//        this.pdaTaskOpen(byId);
     }
 
     @Transactional