From d416f783f852c10c3bb2e0bfb8a7b0d4e6fe0e3d Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 25 二月 2026 13:15:29 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/OrderOutGeneralParam.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
index 89faf4c..a8d6f84 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
@@ -175,6 +175,8 @@
List<OutStockToTaskParams> tasks = new ArrayList<>();
OutStockToTaskParams outStockToTaskParams = new OutStockToTaskParams(orderItem);
outStockToTaskParams.setLocCode(loc.getCode());
+ outStockToTaskParams.setId(locItem.getId());
+ outStockToTaskParams.setBarcode(loc.getBarcode());
outStockToTaskParams.setSiteNo(param.getOutSta().toString());
tasks.add(outStockToTaskParams);
return outStockService.genOutStockTask(tasks,getLoginUserId(), orderItem.getOrderId());
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/OrderOutGeneralParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/OrderOutGeneralParam.java
index b4465d3..c4d7eec 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/OrderOutGeneralParam.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/OrderOutGeneralParam.java
@@ -23,7 +23,7 @@
private Long outQty;//鍑哄簱鏁伴噺
- private Long outSta;//鍑哄簱绔欑偣
+ private String outSta;//鍑哄簱绔欑偣
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
index ddb8c49..c4a7d0c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
@@ -517,7 +517,7 @@
WkOrderItem orderItem = outStockItemService.getOne(new LambdaQueryWrapper<WkOrderItem>()
.eq(WkOrderItem::getOrderId, outId)
- .eq(StringUtils.isNotBlank(locItem.getBatch()), WkOrderItem::getSplrBatch, locItem.getBatch())
+// .eq(StringUtils.isNotBlank(locItem.getBatch()), WkOrderItem::getSplrBatch, locItem.getBatch())
.eq(WkOrderItem::getMatnrId, locItem.getMatnrId()));
// .eq(StringUtils.isNotBlank(locItem.getFieldsIndex()), WkOrderItem::getFieldsIndex, locItem.getFieldsIndex())
--
Gitblit v1.9.1