From 26493fe5a12ce09bd3cc489421b6e2872e6542c0 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 12 十一月 2025 14:33:02 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/WorkService.java | 1 +
src/main/webapp/views/wrkMast/wrkMast.html | 3 +++
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 3 +++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 11 +++++++++++
src/main/resources/mapper/WrkMastMapper.xml | 17 +++++++++++------
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 2 +-
src/main/webapp/static/js/wrkMast/wrkMast.js | 11 +++++++++++
src/main/java/com/zy/common/web/WcsController.java | 6 ++++++
src/main/java/com/zy/asrs/controller/WorkController.java | 3 +++
9 files changed, 50 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 7417d1d..1424269 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -194,6 +194,9 @@
} else if (type == 3) {
workService.pickWrkMast(workNo, getUserId());
return R.ok("宸ヤ綔妗ｅ凡鎷ｆ枡");
+ } else if (type == 6) {
+ workService.mesLogMkWrkMast(workNo, getUserId());
+ return R.ok("宸ヤ綔妗ｅ凡鎷ｆ枡");
}
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java
index 71687dd..e8ba58a 100644
--- a/src/main/java/com/zy/asrs/service/WorkService.java
+++ b/src/main/java/com/zy/asrs/service/WorkService.java
@@ -78,6 +78,7 @@
* 鎵嬪姩瀹屾垚宸ヤ綔妗�
*/
void completeWrkMast(String workNo, Long userId);
+ void mesLogMkWrkMast(String workNo, Long 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 b46c6e9..47cfe33 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1102,6 +1102,16 @@
@Override
@Transactional
+ public void mesLogMkWrkMast(String workNo, Long userId) {
+ WrkMast wrkMast = wrkMastService.selectById(workNo);
+ wrkMast.setLogMk("Y");
+ if (!wrkMastService.updateById(wrkMast)) {
+ throw new CoolException("淇敼宸ヤ綔妗ｅけ璐�");
+ }
+ }
+
+ @Override
+ @Transactional
public void completeWrkMast(String workNo, Long userId) {
WrkMast wrkMast = wrkMastService.selectById(workNo);
if (Cools.isEmpty(wrkMast)){
@@ -1125,6 +1135,7 @@
wrkMast.setModiTime(now);
wrkMast.setModiUser(userId);
wrkMast.setSheetNo("3");
+ wrkMast.setLogMk("N");
// 瀹屾垚鎿嶄綔浜哄憳璁板綍
wrkMast.setManuType("鎵嬪姩瀹屾垚");
if (!wrkMastService.updateById(wrkMast)) {
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index dc1c627..4b2d3ec 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -276,7 +276,7 @@
try {
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
- "鎴愬搧搴撳叆搴撲笂鎶�",
+ "鎴愬搧搴撳叆搴撲笂鎶ES",
productInventoryUrl+"/"+productInventory,
null,
"127.0.0.1",
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 386cd70..f51f811 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -60,6 +60,7 @@
switch (wrkMast.getIoType()) {
// 绌烘澘鍏ュ簱
case 10:
+ wrkMast.setLogMk("Y");
// 淇敼搴撲綅鐘舵��=D
if (locMast.getLocSts().equals("S") || locMast.getLocSts().equals("Q")) {
if (!Cools.isEmpty(wrkMast.getBarcode())) {
@@ -271,6 +272,7 @@
break;
// 搴撲綅绉昏浆
case 11:
+ wrkMast.setLogMk("Y");
// 榛樿鐩爣搴撲綅鏄┖鏉�
String locSts = "D";
// 搴撲綅绉昏浆鍒ゆ柇鏄惁涓虹┖鏉跨Щ杞�
@@ -393,6 +395,7 @@
break;
// 绌烘澘鍑哄簱
case 110:
+ wrkMast.setLogMk("Y");
// 淇敼搴撲綅鐘舵�� R ===>> O
if (locMast.getLocSts().equals("R")) {
locMast.setLocSts("O");
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 2962d0d..e7d96d9 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -189,6 +189,11 @@
Date now = new Date();
if (param.getIoType() == 107 || param.getIoType() == 103) {//鐩樼偣鍐嶅叆搴�
+ if (param.getIoType() == 107){
+ if (!wrkMast.getLogMk().equals("Y")){
+ return R.error("绛夊緟涓婃姤MES");
+ }
+ }
try{
// 妫�绱㈠簱浣�
try{
@@ -240,6 +245,7 @@
wrkMast.setModiTime(now);
wrkMast.setLocNo(dto.getLocNo());
wrkMast.setCrnNo(dto.getCrnNo());
+ wrkMast.setLogMk("N");
if (!wrkMastService.updateById(wrkMast)) {
log.error(" stnToCrnStnPick --- 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐ワ紒" + wrkMast.getWrkNo());
throw new CoolException("鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 9ec8669..9a7ddfe 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -73,14 +73,19 @@
<select id="selectToBeHistoryData" resultMap="BaseResultMap">
select * from asr_wrk_mast
where 1=1
- and (wrk_sts=5
- or wrk_sts=44
+ and (
+ (
+ wrk_sts=5
+ or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
+ or (wrk_sts=15 and dateadd(mi,15,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
+ or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
+ )
+ and log_mk = 'Y'
+ ) or (
+ wrk_sts=44
or wrk_sts=64
or (wrk_sts=57 and wrk_no not in (select wrk_no from asr_bas_devp))
- or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
- or (wrk_sts=15 and dateadd(mi,15,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
- or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp)))
- and log_mk = 'Y'
+ )
order by io_time,wrk_no asc
</select>
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index 7bf1dfc..6fb0aae 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -32,6 +32,7 @@
,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'}
,{field: 'barcode', align: 'center',title: '鏉＄爜'}
,{field: 'sheetNo$', align: 'center',title: '鏈烘鑷�', hide: false}
+ ,{field: 'logMk', align: 'center',title: 'MES', hide: false}
,{field: 'preHave', align: 'center',title: '鍏堝叆鍝�', hide: true}
,{field: 'takeNone', align: 'center',title: '绌烘搷浣�', hide: true}
// ,{field: 'picking', align: 'center',title: '鎷ｆ枡', templet:function(row){
@@ -292,6 +293,16 @@
}
});
break;
+ case 'mesLogMk':
+ layer.confirm('鏄惁璺宠繃涓婃姤MES杞负涓婃姤瀹屾垚锛�', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+ http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:6}, function (res) {
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(data.wrkNo + res.msg);
+ })
+ layer.closeAll();
+
+ });
+ break;
// 鏄庣粏灞曠ず
case 'detlShow':
wrkNo = data.wrkNo;
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index 5ca936e..5f41f00 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -121,6 +121,9 @@
<a class="layui-btn layui-btn-danger layui-btn-xs btn-error" lay-event="takeNone">绌烘搷浣�</a>
{{# } }}
<a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="upSheetNo">arm</a>
+ {{#if (d.logMk === null || d.logMk === 'N') { }}
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-complete" lay-event="mesLogMk">璺宠繃MES</a>
+ {{# } }}
<a class="layui-btn layui-btn-xs btn-detlShow" lay-event="detlShow">鏄庣粏</a>
<a class="layui-btn layui-btn-danger layui-btn-xs btn-complete" lay-event="complete">瀹屾垚</a>
<a class="layui-btn layui-btn-primary layui-btn-xs btn-cancel" lay-event="cancel">鍙栨秷</a>
--
Gitblit v1.9.1