Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr

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 {

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);
 				// 明细独有属性