From b6aece51dd963be4daf6090a9a9f6af0717a2832 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 13 十月 2025 09:21:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 57 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 20 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..aaf62cd 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);
}
@@ -459,28 +459,32 @@
}
//绌烘墭鐩樼紦鍐插尯 灏忥細E8 澶э細E9
String rStaNo ="E8";
+ String type ="ZONE"; //鍖哄煙
if(barcode.substring(0,1).equals("9")){
rStaNo = "E9";
- }
- String type ="ZONE"; //鍖哄煙
- Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "autoE").eq("status", "1"));
- if (config != null) {
- type ="STACK"; //宸烽亾
- if (Cools.isEmpty(config.getValue())) {
- rStaNo = rStaNo + "01";
- config.setValue("2");
- }else if (config.getValue().equals("1")) {
- rStaNo = rStaNo + "01";
- config.setValue("2");
- }else if (config.getValue().equals("2")) {
- rStaNo = rStaNo + "02";
- config.setValue("3");
- }else if (config.getValue().equals("3")) {
- rStaNo = rStaNo + "03";
- config.setValue("1");
+ }else{
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "autoE").eq("status", "1"));
+
+ if (config != null) {
+ type ="STACK"; //宸烽亾
+ if (Cools.isEmpty(config.getValue())) {
+ rStaNo = rStaNo + "01";
+ config.setValue("2");
+ }else if (config.getValue().equals("1")) {
+ rStaNo = rStaNo + "01";
+ config.setValue("2");
+ }else if (config.getValue().equals("2")) {
+ rStaNo = rStaNo + "02";
+ config.setValue("3");
+ }else if (config.getValue().equals("3")) {
+ rStaNo = rStaNo + "03";
+ config.setValue("1");
+ }
+ configService.updateById(config);
}
- configService.updateById(config);
}
+
+
LinkedHashMap<String,Object> rcsParam=new LinkedHashMap<>();
rcsParam.put("taskType", "PF-FMR-COMMON");
@@ -839,8 +843,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 +928,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