From 764a81ab7a3be8048a887605df9a26dc7789eace Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Tue, 16 Jun 2026 18:29:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8E=A5=E6=94=B6?=
 =?UTF-8?q?=E5=8F=AA=E6=8E=A5=E6=94=B6=E6=8C=87=E5=AE=9A=E9=9B=B6=E4=BB=B6?=
 =?UTF-8?q?=E5=8F=B7=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/springblade/desk/produce/feign/ApsProduceClient.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/feign/ApsProduceClient.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/feign/ApsProduceClient.java
index 4c7640014..db233cd64 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/feign/ApsProduceClient.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/feign/ApsProduceClient.java
@@ -49,7 +49,10 @@ public class ApsProduceClient implements IApsProduceClient {
         // 获取上1小时开始、结束时间
         Date startTime = Date.from(LocalDateTime.now().minusHours(1).withMinute(0).withSecond(0).withNano(0).atZone(ZoneId.systemDefault()).toInstant());
         Date endTime = Date.from(LocalDateTime.now().minusHours(1).withMinute(59).withSecond(59).withNano(999_999_999).atZone(ZoneId.systemDefault()).toInstant());
-        List<YieldOrder> orders = yieldOrderService.list(Wrappers.<YieldOrder>lambdaQuery().eq(YieldOrder::getValidationResult, YieldOrderEnum.VALIDATION_RESULT_PASS.getCode()).between(YieldOrder::getValidationTime, startTime, endTime));
+        List<String> strings = List.of("21E8-570-3278-L17", "21E8-571-164-L58", "21E8-570-1222-L16", "21E8-571-163-L58");
+        List<YieldOrder> orders = yieldOrderService.list(Wrappers.<YieldOrder>lambdaQuery().eq(YieldOrder::getValidationResult, YieldOrderEnum.VALIDATION_RESULT_PASS.getCode())
+                .in(YieldOrder::getPartCode, strings)
+                .between(YieldOrder::getValidationTime, startTime, endTime));
         log.info("待自动接收订单数量:{}", orders.size());
         for (YieldOrder yieldOrder : orders) {
             try {

From 534186d4466012eba96476de328e60ddb677a9b4 Mon Sep 17 00:00:00 2001
From: wusiyu <2015098864@qq.com>
Date: Tue, 16 Jun 2026 18:33:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/service/impl/StOtherOutRecordServiceImpl.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java
index 6a259f087..7cc9f69d7 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java
@@ -255,10 +255,10 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl<StOtherOutRecor
 				}
 				detail.setDeptId(mainInout.getDeptId());
 				detail.setCreateUser(mainInout.getCreateUser());
+				detail.setUserId(stOtherOutRecord.getPicker());
 				if (stOtherOutRecord.getPicker() == null) {
 					detail.setUserId(stock.getPicker());
 				}
-				detail.setUserId(stOtherOutRecord.getPicker());
 				String pickerTeamSet = stStockInoutRecordService.getTeamSetByUserId(stOtherOutRecord.getPicker());
 				detail.setPickerTeamSet(pickerTeamSet);
 				// 明细独有属性