From 15bebd1398993db87e72f501d1dc64cc018e46ca Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 17 十一月 2025 13:13:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 25 ++++++++++++++++++++-----
1 files changed, 20 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 fd32480..11af86c 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -150,6 +150,11 @@
throw new CoolException("鐩爣搴撲綅涓嶅浜庣┖搴撶姸鎬�");
}
+ double ioPri = 800D;
+ if (param.getTaskPri() != null) {
+ ioPri = param.getTaskPri().doubleValue();
+ }
+
// 鑾峰彇宸ヤ綔鍙�
int workNo = getWorkNo(WrkIoType.LOC_MOVE.id);
// 淇濆瓨宸ヤ綔妗�
@@ -158,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());
@@ -182,7 +187,7 @@
}
//鍏ュ簱浠诲姟
- public boolean createInTask(CreateInTaskParam param) {
+ public synchronized boolean createInTask(CreateInTaskParam param) {
Date now = new Date();
LocMast locMast = locMastService.queryByLoc(param.getLocNo());
if (null == locMast) {
@@ -193,6 +198,11 @@
throw new CoolException("鐩爣搴撲綅涓嶅浜庣┖搴撶姸鎬�");
}
+ double ioPri = 100D;
+ if (param.getTaskPri() != null) {
+ ioPri = param.getTaskPri().doubleValue();
+ }
+
// 鑾峰彇宸ヤ綔鍙�
int workNo = getWorkNo(WrkIoType.IN.id);
// 淇濆瓨宸ヤ綔妗�
@@ -201,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());//鐩爣绔�
@@ -222,7 +232,7 @@
}
//鍑哄簱浠诲姟
- public boolean createOutTask(CreateOutTaskParam param) {
+ public synchronized boolean createOutTask(CreateOutTaskParam param) {
Date now = new Date();
LocMast locMast = locMastService.queryByLoc(param.getSourceLocNo());
if (null == locMast) {
@@ -233,6 +243,11 @@
throw new CoolException("婧愬簱浣嶄笉澶勪簬鍦ㄥ簱鐘舵��");
}
+ double ioPri = 100D;
+ if (param.getTaskPri() != null) {
+ ioPri = param.getTaskPri().doubleValue();
+ }
+
// 鑾峰彇宸ヤ綔鍙�
int workNo = getWorkNo(WrkIoType.OUT.id);
// 淇濆瓨宸ヤ綔妗�
@@ -241,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