From 1152ebba5d4e557c26b7726e39b536e7257aefd9 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 08 五月 2025 13:02:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/domain/param/CreateInTaskParam.java | 3 +++
src/main/java/com/zy/asrs/domain/param/CreateOutTaskParam.java | 3 +++
src/main/resources/docs/四向车货叉式提升机WCS接口V1.4.docx | 0
src/main/java/com/zy/common/service/CommonService.java | 21 ++++++++++++++++++---
src/main/java/com/zy/asrs/domain/param/CreateLocMoveTaskParam.java | 3 +++
5 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/domain/param/CreateInTaskParam.java b/src/main/java/com/zy/asrs/domain/param/CreateInTaskParam.java
index b1fadc2..8ff1677 100644
--- a/src/main/java/com/zy/asrs/domain/param/CreateInTaskParam.java
+++ b/src/main/java/com/zy/asrs/domain/param/CreateInTaskParam.java
@@ -17,4 +17,7 @@
//鐩爣搴撲綅
private String locNo;
+ //浠诲姟浼樺厛绾�
+ private Integer taskPri;
+
}
diff --git a/src/main/java/com/zy/asrs/domain/param/CreateLocMoveTaskParam.java b/src/main/java/com/zy/asrs/domain/param/CreateLocMoveTaskParam.java
index ffab168..fbf9138 100644
--- a/src/main/java/com/zy/asrs/domain/param/CreateLocMoveTaskParam.java
+++ b/src/main/java/com/zy/asrs/domain/param/CreateLocMoveTaskParam.java
@@ -14,4 +14,7 @@
//鐩爣搴撲綅
private String locNo;
+ //浠诲姟浼樺厛绾�
+ private Integer taskPri;
+
}
diff --git a/src/main/java/com/zy/asrs/domain/param/CreateOutTaskParam.java b/src/main/java/com/zy/asrs/domain/param/CreateOutTaskParam.java
index 4e16ca1..9288763 100644
--- a/src/main/java/com/zy/asrs/domain/param/CreateOutTaskParam.java
+++ b/src/main/java/com/zy/asrs/domain/param/CreateOutTaskParam.java
@@ -14,4 +14,7 @@
//婧愬簱浣�
private String sourceLocNo;
+ //浠诲姟浼樺厛绾�
+ private Integer taskPri;
+
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index fd32480..19be8f0 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.getTaskNo()!=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());
@@ -193,6 +198,11 @@
throw new CoolException("鐩爣搴撲綅涓嶅浜庣┖搴撶姸鎬�");
}
+ double ioPri = 100D;
+ if(param.getTaskNo()!=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());//鐩爣绔�
@@ -233,6 +243,11 @@
throw new CoolException("婧愬簱浣嶄笉澶勪簬鍦ㄥ簱鐘舵��");
}
+ double ioPri = 100D;
+ if(param.getTaskNo()!=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());
diff --git "a/src/main/resources/docs/\345\233\233\345\220\221\350\275\246\350\264\247\345\217\211\345\274\217\346\217\220\345\215\207\346\234\272WCS\346\216\245\345\217\243V1.4.docx" "b/src/main/resources/docs/\345\233\233\345\220\221\350\275\246\350\264\247\345\217\211\345\274\217\346\217\220\345\215\207\346\234\272WCS\346\216\245\345\217\243V1.4.docx"
new file mode 100644
index 0000000..2cc3046
--- /dev/null
+++ "b/src/main/resources/docs/\345\233\233\345\220\221\350\275\246\350\264\247\345\217\211\345\274\217\346\217\220\345\215\207\346\234\272WCS\346\216\245\345\217\243V1.4.docx"
Binary files differ
--
Gitblit v1.9.1