From a9b24c9cffba1e22770ed4f9c20ed40bef5fc08a Mon Sep 17 00:00:00 2001
From: zhaoyf <1783123481@qq.com>
Date: Mon, 15 Jun 2026 17:25:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=87=87=E8=B4=AD=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=AE=8C=E6=88=90=E5=86=8D=E8=A7=A6=E5=8F=91=E5=9B=9E?=
 =?UTF-8?q?=E4=BC=A0=E5=92=8C=E7=94=9F=E6=88=90=E5=9B=9E=E4=BC=A0=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchaseFormListenerHandler.java          | 57 ++++++++++---------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/purchase/ListenerHandler/PurchaseFormListenerHandler.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/purchase/ListenerHandler/PurchaseFormListenerHandler.java
index 1cb51e6..20ea832 100644
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/purchase/ListenerHandler/PurchaseFormListenerHandler.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/purchase/ListenerHandler/PurchaseFormListenerHandler.java
@@ -72,6 +72,35 @@ public class PurchaseFormListenerHandler extends BaseFormListenerHandler<Purchas
                     .set(Purchasemst::getModify_date, DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"))
                     .eq(Purchasemst::getBill_id, params.getBillId())
                     .update();
+            // 保存回传单
+            EasAuditRequestDto easAuditRequestDto = new EasAuditRequestDto();
+            easAuditRequestDto.setType("WMS");
+            easAuditRequestDto.setMethod("DealBill");
+            EasAuditRequestDto.EasAuditDataDto easAuditDataDto = new EasAuditRequestDto.EasAuditDataDto();
+            easAuditDataDto.setBillType(purchasemst.getOrder_type());
+            easAuditDataDto.setBillNo(purchasemst.getOrder_no());
+            easAuditDataDto.setEntrys(entryList);
+            easAuditRequestDto.setData(easAuditDataDto);
+
+            final PmStockReturn stockReturn = new PmStockReturn();
+            String stringId = IdUtil.getStringId();
+            stockReturn.setRequest_Id(stringId);
+            stockReturn.setCreate_time(DateUtil.now());
+            stockReturn.setRequest_type(IOSEnum.BILL_TYPE.code("采购入库"));
+            stockReturn.setStatus(StockReturnStatusEnum.TODO.getCode());
+            stockReturn.setRequest_data(JSON.toJSONString(easAuditRequestDto));
+            pmStockReturnService.save(stockReturn);
+            //回传
+            try {
+                wmsToErpService.uploadErp(new JSONObject((JSONObject)JSON.toJSON(easAuditRequestDto)));
+                pmStockReturnService.lambdaUpdate()
+                        .set(PmStockReturn::getStatus,StockReturnStatusEnum.SUCESS.getCode())
+                        .eq(PmStockReturn::getRequest_Id, stringId);
+            } catch (Exception e) {
+                pmStockReturnService.lambdaUpdate()
+                        .set(PmStockReturn::getStatus,StockReturnStatusEnum.FAIL.getCode())
+                        .eq(PmStockReturn::getRequest_Id, stringId);
+            }
         }else {
             //更新单据状态执行中
             purchaseService.lambdaUpdate()
@@ -80,35 +109,7 @@ public class PurchaseFormListenerHandler extends BaseFormListenerHandler<Purchas
                     .set(Purchasemst::getBill_status, PurchaseBillStatus.EXECUTING.getCode())
                     .update();
         }
-        // 保存回传单
-        EasAuditRequestDto easAuditRequestDto = new EasAuditRequestDto();
-        easAuditRequestDto.setType("WMS");
-        easAuditRequestDto.setMethod("DealBill");
-        EasAuditRequestDto.EasAuditDataDto easAuditDataDto = new EasAuditRequestDto.EasAuditDataDto();
-        easAuditDataDto.setBillType(purchasemst.getOrder_type());
-        easAuditDataDto.setBillNo(purchasemst.getOrder_no());
-        easAuditDataDto.setEntrys(entryList);
-        easAuditRequestDto.setData(easAuditDataDto);
 
-        final PmStockReturn stockReturn = new PmStockReturn();
-        String stringId = IdUtil.getStringId();
-        stockReturn.setRequest_Id(stringId);
-        stockReturn.setCreate_time(DateUtil.now());
-        stockReturn.setRequest_type(IOSEnum.BILL_TYPE.code("采购入库"));
-        stockReturn.setStatus(StockReturnStatusEnum.TODO.getCode());
-        stockReturn.setRequest_data(JSON.toJSONString(easAuditRequestDto));
-        pmStockReturnService.save(stockReturn);
-        //回传
-        try {
-            wmsToErpService.uploadErp(new JSONObject((JSONObject)JSON.toJSON(easAuditRequestDto)));
-            pmStockReturnService.lambdaUpdate()
-                    .set(PmStockReturn::getStatus,StockReturnStatusEnum.SUCESS.getCode())
-                    .eq(PmStockReturn::getRequest_Id, stringId);
-        } catch (Exception e) {
-            pmStockReturnService.lambdaUpdate()
-                    .set(PmStockReturn::getStatus,StockReturnStatusEnum.FAIL.getCode())
-                    .eq(PmStockReturn::getRequest_Id, stringId);
-        }
 
     }
 }