From 4e5108cf18b4f1aa003563694f2aa4ea81792b00 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 22 九月 2025 13:35:13 +0800
Subject: [PATCH] 双数据源；同时解决忽略第二数据源的报错
---
src/main/java/com/zy/asrs/controller/MobileController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 1377de8..4b661c5 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -280,7 +280,7 @@
wrkDetlService.updateInspect(wrkDetl.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
}
if(wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107) {
- wrkMast.setWrkSts(16L);//涓嬫灦瀹屾垚绛夊緟鍥炲簱
+ wrkMast.setWrkSts(34L);//涓嬫灦瀹屾垚绛夊緟鍥炲簱
}else {
wrkMast.setWrkSts(15L);
}
@@ -839,8 +839,17 @@
rcsParam.put("slotCode", sourceStaNo);
rcsParam.put("carrierCategory", "PALLET");
rcsParam.put("carrierType", barcodeType);//11涓哄皬鎵樼洏 21涓哄ぇ鎵樼洏
+if(sourceStaNo.equals("101")){
+ rcsParam.put("carrierDir","0");
+}else if(sourceStaNo.equals("R01")||sourceStaNo.equals("R03")){
+ rcsParam.put("carrierDir","-90");
- rcsParam.put("carrierDir",sourceStaNo.equals("101")? "0":"180");
+ }else if(sourceStaNo.equals("R02")){
+ rcsParam.put("carrierDir","90");
+}else {
+ rcsParam.put("carrierDir","180");
+}
+
rcsParam.put("temporary", "");
rcsParam.put("invoke", invoke);
@@ -915,6 +924,10 @@
if (wrkMast.getWrkSts()>30){
return R.error("璇ユ墭鐩�={},娌℃湁涓嬫灦锛岃涓嬫灦鍚庡啀鍥炲簱锛侊紒锛�");
}
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).in("io_type",101,103,105,107).lt("wrk_sts", 33));
+ if (!Cools.isEmpty(wrkMasts)){
+ return R.error(wrkMast.getCrnNo()+"鍫嗗灈鏈�,鏈夊嚭搴撲换鍔★紝绂佹鍥炲簱锛侊紒锛�");
+ }
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
String format = sdf.format(new Date());
String s = format+"-" + wrkMast.getWrkNo() + "-" + wrkMast.getBarcode();
--
Gitblit v1.9.1