From 314e894c0d6ce2739344dcd1c94ae7770868a0f1 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 28 五月 2025 14:51:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index c9df23c..fd01bf3 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -21,8 +21,6 @@
@Autowired
private WrkMastService wrkMastService;
@Autowired
- private WrkMastLogService wrkMastLogService;
- @Autowired
private WrkLastnoService wrkLastnoService;
@Autowired
private LocMastService locMastService;
@@ -63,6 +61,21 @@
}
}
return workNo;
+ }
+
+ //妫�娴嬪伐浣滃彿鏄惁鍦ㄦ寚瀹氱被鍨嬪伐浣滆寖鍥村唴
+ public synchronized boolean checkWorkNoContainMk(Integer workNo, Integer wrkMk) {
+ WrkLastno wrkLastno = wrkLastnoService.selectById(wrkMk);
+ if (Cools.isEmpty(wrkLastno)) {
+ throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ }
+
+ int sNo = wrkLastno.getSNo();
+ int eNo = wrkLastno.getENo();
+ if (workNo >= sNo && workNo <= eNo) {
+ return true;
+ }
+ return false;
}
public static String zerofill(String msg, Integer count) {
@@ -137,6 +150,11 @@
throw new CoolException("鐩爣搴撲綅涓嶅浜庣┖搴撶姸鎬�");
}
+ double ioPri = 800D;
+ if (param.getTaskPri() != null) {
+ ioPri = param.getTaskPri().doubleValue();
+ }
+
// 鑾峰彇宸ヤ綔鍙�
int workNo = getWorkNo(WrkIoType.LOC_MOVE.id);
// 淇濆瓨宸ヤ綔妗�
@@ -145,7 +163,7 @@
wrkMast.setIoTime(now);
wrkMast.setWrkSts(WrkStsType.NEW_LOC_MOVE.sts); // 宸ヤ綔鐘舵�侊細501.鐢熸垚绉诲簱浠诲姟
wrkMast.setIoType(WrkIoType.LOC_MOVE.id); // 鍏ュ嚭搴撶姸鎬侊細 201.绉诲簱浠诲姟
- wrkMast.setIoPri(800D);
+ wrkMast.setIoPri(ioPri);
wrkMast.setSourceLocNo(param.getSourceLocNo());
wrkMast.setLocNo(param.getLocNo()); // 鐩爣搴撲綅
wrkMast.setWmsWrkNo(param.getTaskNo());
@@ -180,6 +198,11 @@
throw new CoolException("鐩爣搴撲綅涓嶅浜庣┖搴撶姸鎬�");
}
+ double ioPri = 100D;
+ if (param.getTaskPri() != null) {
+ ioPri = param.getTaskPri().doubleValue();
+ }
+
// 鑾峰彇宸ヤ綔鍙�
int workNo = getWorkNo(WrkIoType.IN.id);
// 淇濆瓨宸ヤ綔妗�
@@ -188,7 +211,7 @@
wrkMast.setIoTime(now);
wrkMast.setWrkSts(WrkStsType.NEW_INBOUND.sts); // 宸ヤ綔鐘舵�侊細1.鐢熸垚鍏ュ簱浠诲姟
wrkMast.setIoType(WrkIoType.IN.id); // 鍏ュ嚭搴撶姸鎬侊細 1.鍏ュ簱
- wrkMast.setIoPri(100D);
+ wrkMast.setIoPri(ioPri);
wrkMast.setLocNo(param.getLocNo()); // 鐩爣搴撲綅
wrkMast.setSourceStaNo(param.getSourceStaNo());//婧愮珯
wrkMast.setStaNo(param.getStaNo());//鐩爣绔�
@@ -220,6 +243,11 @@
throw new CoolException("婧愬簱浣嶄笉澶勪簬鍦ㄥ簱鐘舵��");
}
+ double ioPri = 100D;
+ if (param.getTaskPri() != null) {
+ ioPri = param.getTaskPri().doubleValue();
+ }
+
// 鑾峰彇宸ヤ綔鍙�
int workNo = getWorkNo(WrkIoType.OUT.id);
// 淇濆瓨宸ヤ綔妗�
@@ -228,7 +256,7 @@
wrkMast.setIoTime(now);
wrkMast.setWrkSts(WrkStsType.NEW_OUTBOUND.sts); // 宸ヤ綔鐘舵�侊細101.鐢熸垚鍑哄簱浠诲姟
wrkMast.setIoType(WrkIoType.OUT.id); // 鍏ュ嚭搴撶姸鎬侊細 101.鍑哄簱
- wrkMast.setIoPri(100D);
+ wrkMast.setIoPri(ioPri);
wrkMast.setSourceLocNo(param.getSourceLocNo()); // 婧愬簱浣�
wrkMast.setStaNo(param.getStaNo());//鐩爣绔�
wrkMast.setWmsWrkNo(param.getTaskNo());
--
Gitblit v1.9.1