From 64b311970e71b2b9822c87f1ff12382176088ea0 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期六, 27 一月 2024 18:10:42 +0800
Subject: [PATCH] #
---
src/main/webapp/views/report/locDetl.html | 8 ++--
src/main/webapp/static/js/wrkMastLog/wrkMastLog.js | 2 +
src/main/java/com/zy/asrs/entity/WrkMast.java | 20 ++++++++++
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 14 +++++++
src/main/resources/mapper/WrkMastMapper.xml | 2
src/main/java/com/zy/asrs/entity/WrkMastLog.java | 20 ++++++++++
src/main/webapp/static/js/wrkMast/wrkMast.js | 1
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 11 ++++-
src/main/webapp/static/js/common.js | 2
9 files changed, 71 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 6144d7f..e00a33a 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -499,6 +499,26 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
}
+ public String getSheetNo$(){
+ if (null == this.sheetNo){ return "鏈煡"; }
+ switch (this.sheetNo){
+ case "0":
+ return "榛樿";
+ case "1":
+ return "鏈烘鑷傛姄鍙栦腑";
+ case "2":
+ return "鎶撳彇瀹屾垚";
+ case "3":
+ return "浠诲姟瀹屾垚";
+ case "4":
+ return "鏈烘鑷傛姄鍙栦腑";
+ case "5":
+ return "鐮佸灈瀹屾垚";
+ default:
+ return this.sheetNo;
+ }
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index 77b7e24..134ccc4 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -505,5 +505,25 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
}
+ public String getSheetNo$(){
+ if (null == this.sheetNo){ return "鏈煡"; }
+ switch (this.sheetNo){
+ case "0":
+ return "榛樿";
+ case "1":
+ return "鏈烘鑷傛姄鍙栦腑";
+ case "2":
+ return "鎶撳彇瀹屾垚";
+ case "3":
+ return "浠诲姟瀹屾垚";
+ case "4":
+ return "鏈烘鑷傛姄鍙栦腑";
+ case "5":
+ return "鐮佸灈瀹屾垚";
+ default:
+ return this.sheetNo;
+ }
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index ab89d72..ef62596 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -1,7 +1,10 @@
package com.zy.asrs.task;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkMastHandler;
@@ -26,6 +29,8 @@
private WrkMastService wrkMastService;
@Autowired
private WorkMastHandler workMastHandler;
+ @Autowired
+ private BasDevpService basDevpService;
@Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
@@ -53,6 +58,15 @@
@Scheduled(cron = "0/3 * * * * ? ")
private void execute202(){
+ BasDevp basDevp = basDevpService.selectById(144);
+ if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y")){
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("wrk_no", basDevp.getWrkNo()).eq("io_type", 202).eq("wrk_sts", 52L));
+ if (!Cools.isEmpty(wrkMast)){
+ wrkMast.setWrkSts(56L);
+ wrkMastService.updateById(wrkMast);
+ }
+ }
List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData202();
if (wrkMasts.isEmpty()) {
return;
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index d01a8f9..3eabe70 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -106,14 +106,19 @@
if (!wrkMastService.deleteById(wrkMast)) {
exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMast.getWrkNo());
}
- if ((wrkMast.getIoType()<200 || wrkMast.getWrkSts().equals(57L)) && !Cools.isEmpty(wrkDetls)){
+ List<WrkDetl> wrkDetls2 = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ if ((wrkMast.getIoType()<200 || wrkMast.getWrkSts().equals(57L)) && !Cools.isEmpty(wrkDetls2)){
// 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
- exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+// exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+ log.error("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={"+wrkMast.getWrkNo()+"}]澶辫触");
+
}
// 鍒犻櫎宸ヤ綔鏄庣粏妗�
if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
- exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+// exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+ log.error("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={"+wrkMast.getWrkNo()+"}]澶辫触");
+
}
}
} catch (Exception e) {
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index de08a18..7834e3a 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -67,7 +67,7 @@
</select>
<select id="selectToBeCompleteData202" resultMap="BaseResultMap">
- select * from asr_wrk_mast where wrk_sts = 52 and io_type = 202 and (wrk_no not in (select wrk_no from asr_bas_devp)) order by upd_mk,error_time,io_time,wrk_no
+ select * from asr_wrk_mast where wrk_sts = 56 and io_type = 202 and (wrk_no not in (select wrk_no from asr_bas_devp)) order by upd_mk,error_time,io_time,wrk_no
</select>
<select id="selectToBeHistoryData" resultMap="BaseResultMap">
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index b1397cd..7018df0 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -231,7 +231,7 @@
,{field: 'brand', align: 'center',title: '鏈ㄧ绫诲瀷', hide: true, sort:true}
,{field: 'brand$', align: 'center',title: '鏈ㄧ绫诲瀷', hide: false, sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: false, sort:true}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: true}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: false}
,{field: 'specs', align: 'center',title: '鎺ュご', hide: false}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index 49c3c28..8565ac7 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -31,6 +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: '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 e637bfa..2169f18 100644
--- a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
+++ b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
@@ -55,6 +55,8 @@
// ,{field: 'crnStrTime$', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
// ,{field: 'crnEndTime$', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
// ,{field: 'plcStrTime$', align: 'center',title: '鎷ｆ枡鏃堕棿'}
+ ,{field: 'sheetNo$', align: 'center',title: '鏈烘鑷�', hide: false}
+
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
// ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'cursor:pointer'}
diff --git a/src/main/webapp/views/report/locDetl.html b/src/main/webapp/views/report/locDetl.html
index 3ad4136..e7f2d00 100644
--- a/src/main/webapp/views/report/locDetl.html
+++ b/src/main/webapp/views/report/locDetl.html
@@ -24,9 +24,9 @@
</div>
<table class="layui-hide" id="locDetlByMap" lay-filter="locDetlByMap"></table>
-<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-xs loc-detl" lay-event="locDetlRullUp">鏌ョ湅鍗蜂俊鎭�</a>
-</script>
+<!--<script type="text/html" id="operate">-->
+<!-- <a class="layui-btn layui-btn-xs loc-detl" lay-event="locDetlRullUp">鏌ョ湅鍗蜂俊鎭�</a>-->
+<!--</script>-->
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
@@ -41,7 +41,7 @@
{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
];
cols.push.apply(cols, detlCols);
- cols.push.apply(cols, [{ fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate'}]);
+ // cols.push.apply(cols, [{ fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate'}]);
return cols;
}
--
Gitblit v1.9.1