From 072e9fbd7854ce30cf4bcfadad10cc817c8441d9 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 17 八月 2024 13:06:55 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/wrkMastLog/wrkMastLog.js | 2 +-
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 10 +++++++---
src/main/java/com/zy/asrs/entity/WrkMast.java | 3 ++-
src/main/java/com/zy/asrs/entity/WrkMastLog.java | 3 ++-
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 8 +++++---
src/main/java/com/zy/asrs/task/WorkLogScheduler.java | 2 +-
src/main/webapp/static/js/wrkMast/wrkMast.js | 2 +-
src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java | 2 +-
8 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 776f92a..0a66856 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -515,7 +515,8 @@
case "1":
return "鏈烘鑷傛姄鍙栦腑";
case "2":
- return "鎶撳彇瀹屾垚";
+ return "瀹屾垚";
+// return "鎶撳彇瀹屾垚";
case "3":
return "浠诲姟瀹屾垚";
case "4":
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index 72d8b36..757681d 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -520,7 +520,8 @@
case "1":
return "鏈烘鑷傛姄鍙栦腑";
case "2":
- return "鎶撳彇瀹屾垚";
+ return "瀹屾垚";
+// return "鎶撳彇瀹屾垚";
case "3":
return "浠诲姟瀹屾垚";
case "4":
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 22c5437..edfa3be 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -40,7 +40,9 @@
@Service
public class MobileServiceImpl implements MobileService {
-
+ public static final List<Integer> OVER_TORN_STA_NO_LIST = new ArrayList<Integer>() {{
+ add(126);add(131);add(310);add(312);
+ }};
@Autowired
private MatService matService;
@@ -1126,8 +1128,8 @@
wrkMast.setLinkMis("N");
wrkMast.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setSheetNo("0"); //寰愬伐姹変簯鎷嗗灈鏍囪锛�0: 鍒濆 1: 鏈媶 2:宸叉媶 3锛氬凡澶勭悊鍙笅涓�姝ワ紙杞巻鍙叉。锛�
- if (wrkMast.getStaNo()<118 || wrkMast.getStaNo()>121){
- wrkMast.setSheetNo("3");
+ if (!OVER_TORN_STA_NO_LIST.contains(staDesc.getStnNo())){
+ wrkMast.setSheetNo("2");
}
wrkMast.setAppeTime(now);
wrkMast.setModiUser(userId);
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 344ba76..b8542e2 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -39,6 +39,10 @@
// 搴撲綅鎺掑彿鍒嗛厤榛樿绫诲埆
private static final int DEFAULT_ROW_NO_TYPE = 1;
+ public static final List<Integer> OVER_TORN_STA_NO_LIST = new ArrayList<Integer>() {{
+ add(126);add(131);add(310);add(312);
+ }};
+
@Autowired
private MatService matService;
@Autowired
@@ -560,8 +564,8 @@
wrkMast.setEmptyMk("N"); // 绌烘澘
wrkMast.setLinkMis("N");
wrkMast.setSheetNo("0");
- if (staDesc.getStnNo()<118 || staDesc.getStnNo()>121){
- wrkMast.setSheetNo("3");
+ if (!OVER_TORN_STA_NO_LIST.contains(staDesc.getStnNo())){
+ wrkMast.setSheetNo("2");
}
wrkMast.setBarcode(locMast.getBarcode());
wrkMast.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
@@ -1263,7 +1267,7 @@
wrkMast.setCrnEndTime(now);
wrkMast.setModiTime(now);
wrkMast.setModiUser(userId);
- wrkMast.setSheetNo("3");
+ wrkMast.setSheetNo("2");
// 瀹屾垚鎿嶄綔浜哄憳璁板綍
wrkMast.setManuType("鎵嬪姩瀹屾垚");
if (!wrkMastService.updateById(wrkMast)) {
diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index f398965..8d30ebf 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -44,7 +44,7 @@
return;
}
for (WrkMast wrkMast : wrkMasts) {
- if (wrkMast.getIoType()>100 && (Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("2"))){
+ if (wrkMast.getIoType()==101 && (Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("2"))){
continue;
}
try{
diff --git a/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java
index 67cb80c..12b4fe4 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java
@@ -104,7 +104,7 @@
.orderBy("io_pri",false));
for (WrkMast wrkMast:wrkMasts){
if (wrkMast.getIoType()==101){
- BasDevp basDevp = basDevpService.selectById(115);
+ BasDevp basDevp = basDevpService.selectById(119);
if (basDevp.getLoading().equals("Y")
|| !basDevp.getAutoing().equals("Y")
|| (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()!=0) ){
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index 8565ac7..3e69eca 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -31,7 +31,7 @@
,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�'}
,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'}
,{field: 'barcode', align: 'center',title: '鏉＄爜'}
- ,{field: 'sheetNo$', align: 'center',title: '鏈烘鑷�', hide: false}
+ ,{field: 'sheetNo$', align: 'center',title: '缈昏浆', hide: false}
,{field: 'preHave', align: 'center',title: '鍏堝叆鍝�', hide: true}
,{field: 'takeNone', align: 'center',title: '绌烘搷浣�', hide: true}
// ,{field: 'picking', align: 'center',title: '鎷ｆ枡', templet:function(row){
diff --git a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
index 2169f18..52ff60d 100644
--- a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
+++ b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
@@ -55,7 +55,7 @@
// ,{field: 'crnStrTime$', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
// ,{field: 'crnEndTime$', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
// ,{field: 'plcStrTime$', align: 'center',title: '鎷ｆ枡鏃堕棿'}
- ,{field: 'sheetNo$', align: 'center',title: '鏈烘鑷�', hide: false}
+ ,{field: 'sheetNo$', align: 'center',title: '缈昏浆', hide: false}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
--
Gitblit v1.9.1