From da92f60f961b0c6ee5c509de1ca603edaaa85d06 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 06 六月 2024 10:00:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WrkMastCrnHandler.java | 52 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WrkMastCrnHandler.java b/src/main/java/com/zy/asrs/task/handler/WrkMastCrnHandler.java
index 25b3e41..dbd8100 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastCrnHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastCrnHandler.java
@@ -65,7 +65,7 @@
return FAIL;
}
String[] strings = staNoOther(locMast1.getLocNo());
- if (Cools.isEmpty(strings)){
+ if (Cools.isEmpty(strings) || Cools.isEmpty(strings[0]) || Cools.isEmpty(strings[1])){
return FAIL;
}
wrkMast.setLocNo(strings[0]);
@@ -109,6 +109,30 @@
return SUCCESS;
}
+ public ReturnT<String> start(WrkMast wrkMast) {
+ try {
+ Date now = new Date();
+ LocTypeDto locTypeDto = new LocTypeDto();
+ locTypeDto.setLocType1((short)1);
+
+ String deepLocOther = getDeepLoc2(wrkMast.getSourceLocNo(), Utils.getRow(wrkMast.getSourceLocNo()));
+ if (Cools.isEmpty(deepLocOther)){
+ return FAIL;
+ }
+ WrkMast wrkMastOther = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_loc_no", deepLocOther));
+ if (!Cools.isEmpty(wrkMastOther)){
+ WrkMastCrn wrkMastCrn = new WrkMastCrn(wrkMast,wrkMastOther,now);
+ wrkMastCrnService.insert(wrkMastCrn);
+ }else {
+ return FAIL;
+ }
+ }catch (Exception e){
+ log.error("寮傚父锛侊紒锛�"+e);
+ return FAIL;
+ }
+ return SUCCESS;
+ }
+
public String[] staNoOther(String locNo){
String[] strings = new String[2];
int row = Utils.getRow(locNo);
@@ -125,18 +149,18 @@
}
}
- /**
- * 鑾峰彇 娴呭簱浣嶅搴旂殑娣卞簱浣嶅彿
- */
- public static String getDeepLoc(String shallowLoc,int row) {
- if (row == 2 || row == 6) {
- return Utils.zerofill(String.valueOf(row-1), 2) + shallowLoc.substring(2);
- } else if (row == 3 || row == 7) {
- return Utils.zerofill(String.valueOf(row+1), 2) + shallowLoc.substring(2);
- }else {
- return shallowLoc;
- }
- }
+// /**
+// * 鑾峰彇 娴呭簱浣嶅搴旂殑娣卞簱浣嶅彿
+// */
+// public static String getDeepLoc(String shallowLoc,int row) {
+// if (row == 2 || row == 6) {
+// return Utils.zerofill(String.valueOf(row-1), 2) + shallowLoc.substring(2);
+// } else if (row == 3 || row == 7) {
+// return Utils.zerofill(String.valueOf(row+1), 2) + shallowLoc.substring(2);
+// }else {
+// return shallowLoc;
+// }
+// }
/**
* 鑾峰彇 娣卞簱浣嶅搴旂殑娴呭簱浣嶅彿
@@ -147,7 +171,7 @@
} else if (row == 4 || row == 8) {
return Utils.zerofill(String.valueOf(row-1), 2) + shallowLoc.substring(2);
}else {
- return shallowLoc;
+ return null;
}
}
--
Gitblit v1.9.1