From a850446e3a2d8c0eb09e2a4985186dd454155005 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Tue, 28 Jul 2026 15:34:09 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E6=97=B6=E5=85=B3=E8=81=94=E5=8D=95=E6=8D=AE=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ios_manage/service/impl/PdaIosOutServiceImpl.java       | 2 +-
 .../receiveOutRetur/service/IReceiveOutReturnService.java   | 2 +-
 .../service/impl/ReceiveOutReturnServiceImpl.java           | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java
index 2c0d75f..29386c1 100644
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java
@@ -355,7 +355,7 @@ public class PdaIosOutServiceImpl implements PdaIosOutService {
         receiveOutRequest.setDeptno("01.09.14.02");
         receiveOutRequest.setEntrys(entrys);
         ReceiveOutReturn entity = receiveOutReturnService.saveFromRequest(
-                receiveOutRequest, StockReturnStatusEnum.TODO.getCode(), null);
+                receiveOutRequest, StockReturnStatusEnum.TODO.getCode(), null,param.getWorkOrder());
         return PdaResponse.requestOk();
     }
 
diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/service/IReceiveOutReturnService.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/service/IReceiveOutReturnService.java
index 36ca0c2..86168cd 100644
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/service/IReceiveOutReturnService.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/service/IReceiveOutReturnService.java
@@ -25,7 +25,7 @@ public interface IReceiveOutReturnService extends IService<ReceiveOutReturn> {
 
     void delete(Set<Long> ids);
 
-    ReceiveOutReturn saveFromRequest(ReceiveOutRequest request, String status, String remark);
+    ReceiveOutReturn saveFromRequest(ReceiveOutRequest request, String status, String remark, String workOrder);
 
     void updateUploadResult(Long id, String status, String remark);
 
diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/service/impl/ReceiveOutReturnServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/service/impl/ReceiveOutReturnServiceImpl.java
index 1823676..25d8ee6 100644
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/service/impl/ReceiveOutReturnServiceImpl.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/service/impl/ReceiveOutReturnServiceImpl.java
@@ -138,7 +138,7 @@ public class ReceiveOutReturnServiceImpl extends ServiceImpl<ReceiveOutReturnMap
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ReceiveOutReturn saveFromRequest(ReceiveOutRequest request, String status, String remark) {
+    public ReceiveOutReturn saveFromRequest(ReceiveOutRequest request, String status, String remark, String workOrder) {
         ReceiveOutReturn entity = new ReceiveOutReturn();
         entity.setOrgno(request.getOrgno());
         entity.setBillno(request.getBillno());
@@ -154,7 +154,7 @@ public class ReceiveOutReturnServiceImpl extends ServiceImpl<ReceiveOutReturnMap
         entity.setCreateTime(DateUtil.now());
         entity.setRemark(limitText(remark, 1000));
         entity.setStatus(status);
-        entity.setRequestId(request.getBillno());
+        entity.setRequestId(workOrder);
         entity.setCreatedBy(SecurityUtils.getCurrentUsername());
         this.save(entity);
         saveRequestDetails(entity.getId(), request.getEntrys(), status, remark);
@@ -392,7 +392,7 @@ public class ReceiveOutReturnServiceImpl extends ServiceImpl<ReceiveOutReturnMap
     private ReceiveOutRequest buildRequest(ReceiveOutReturn entity, List<ReceiveOutReturnDetail> details) {
         ReceiveOutRequest request = new ReceiveOutRequest();
         request.setOrgno(entity.getOrgno());
-        request.setBillno("");
+        request.setBillno(entity.getBillno());
         request.setBiztype(entity.getBiztype());
         request.setInvscheme(entity.getInvscheme());
         request.setTranstype(entity.getTranstype());