From 3d8242c78bde80d129aff622c20e0e2412aaf6c4 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 14 一月 2026 09:53:35 +0800
Subject: [PATCH] 出库流程优化
---
src/main/webapp/views/wrkMast/wrkMast.html | 4 +-
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 60 +++++++++++++++--------------
src/main/webapp/static/js/wrkMast/wrkMast.js | 2
src/main/java/com/zy/common/model/LocDto.java | 2 +
4 files changed, 36 insertions(+), 32 deletions(-)
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 2120202..8ecbbfc 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -418,11 +418,9 @@
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
String wrkCode = null;
- //TODO 濡傛灉鏈哄彴鍙蜂笉涓虹┖锛屽垽鏂綋鍓嶆満鍙颁笌褰撳墠鍑哄簱搴撲綅鏄惁鍦ㄥ悓涓�搴撳尯鎴栧悓涓�鍙板爢鍨涙満锛堢浉鍚岀珯鐐癸級
- //TODO 1. 濡傛灉鏄悓涓�鍙板爢鍨涙満锛岀敓鎴愮Щ搴擄紙鍑哄簱锛変换鍔� 2. 濡傛灉涓嶆槸锛岀敓鎴愬嚭搴撲换鍔★紝鍐嶇敓鎴愬叆搴撲换鍔�
- //TODO 鍙︿竴绉嶆柟妗堬紝涓嶇鏄惁褰撳墠宸烽亾锛岀粺涓�鍑哄簱锛屽啀鍏ュ簱
if (!Objects.isNull(deviceNo)) {
wrkCode = workNo + "-1";
+ ioType = 101;
generateOutStock(taskDto, userId, workNo, wrkCode, now, ioType, locMast, staDesc, deviceNo);
} else {
generateOutStock(taskDto, userId, workNo, wrkCode, now, ioType, locMast, staDesc, null);
@@ -541,7 +539,16 @@
wrkDetl.setStandby1(locDto.getStandby1());
wrkDetl.setBatch(locDto.getBatch());
wrkDetl.setOrderNo(locDto.getOrderNo());
- wrkDetl.setAnfme(locDto.getAnfme()); // 鏁伴噺
+// wrkDetl.setAnfme(locDto.getAnfme()); // 鏁伴噺
+ LocDetl locDel = locDetlService.selectOne(new EntityWrapper<LocDetl>()
+ .eq("loc_no", locDto.getLocNo())
+ .eq("batch", locDto.getBatch())
+ .eq(!Objects.isNull(locDto.getBarcode()), "barcode", locDto.getBarcode())
+ .eq("matnr", locDto.getMatnr()));
+ if (Objects.isNull(locDel)) {
+ throw new CoolException("鏁版嵁閿欒锛屽簱瀛樻槑缁嗕笉瀛樺湪锛侊紒");
+ }
+ wrkDetl.setAnfme(locDel.getAnfme());
wrkDetl.setAppeTime(now);
wrkDetl.setAppeUser(userId);
wrkDetl.setModiTime(now);
@@ -1324,34 +1331,22 @@
throw new CoolException(workNo + "宸ヤ綔妗ｄ笉瀛樺湪");
}
Integer ioType = wrkMast.getIoType() - 50;
-// int wokNo = wrkMast.getWrkNo();
+ int wokNo = wrkMast.getWrkNo();
// 鍏ュ嚭搴撶被鍨嬪垽鏂�
-// if (Objects.isNull(wrkMast.getWrkCode())) {
- if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107) {
- throw new CoolException("褰撳墠鍏ュ嚭搴撶被鍨嬫棤娉曡繘琛屾搷浣�");
+ if (Objects.isNull(wrkMast.getWrkCode())) {
+ if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107) {
+ throw new CoolException("褰撳墠鍏ュ嚭搴撶被鍨嬫棤娉曡繘琛屾搷浣�");
+ }
+ // 宸ヤ綔鐘舵�佸垽鏂�
+ if (wrkMast.getWrkSts() < 11 || wrkMast.getWrkSts() == 15) {
+ throw new CoolException("褰撳墠宸ヤ綔鐘舵�佹棤娉曡繘琛屾搷浣�");
+ }
+ } else {
+ if (wrkMast.getIoType() == 103) {
+ ioType = 1;
+ }
}
- // 宸ヤ綔鐘舵�佸垽鏂�
- if (wrkMast.getWrkSts() < 11 || wrkMast.getWrkSts() == 15) {
- throw new CoolException("褰撳墠宸ヤ綔鐘舵�佹棤娉曡繘琛屾搷浣�");
- }
-// }
-// else {
-// if (wrkMast.getIoType() == 103) {
-// ioType = 1;
-// } else if (wrkMast.getIoType() == 101) {
-// ioType = 10;
-// }
-// wokNo = commonService.getWorkNo(0);
-// }
- // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
-// if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
-// throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。澶辫触");
-//// }
-// // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
-// if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
-// throw new CoolException("淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
-// }
// 鑾峰彇鐩爣绔�
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", ioType)
@@ -1458,6 +1453,13 @@
if (!locMastService.updateById(locMast)) {
throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
}
+
+ wrkMast.setWrkCode(null);
+
+ if (!wrkMastService.updateById(wrkMast)) {
+ throw new CoolException("浠诲姟妗ｆ洿鏂板け璐ワ紒锛�");
+ }
+
}
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index 29c7e36..f0c591c 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -24,6 +24,8 @@
private String unit;
+ private String barcode;
+
private String batch;
private String brand = "";
private String standby1 = "";
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index c8c35a1..89dce56 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -293,7 +293,7 @@
break;
//绌烘澘鍥炲簱
case 'empty':
- layer.confirm('鎷ｆ枡鍏ュ簱璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+ layer.confirm('绌烘澘鍏ュ簱璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:4}, function (res) {
$(".layui-laypage-btn")[0].click();
layer.msg(data.wrkNo + res.msg);
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index 8128480..b27d6c8 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -124,11 +124,11 @@
<a class="layui-btn layui-btn-primary layui-btn-xs btn-cancel" lay-event="cancel">鍙栨秷</a>
<a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="priWrkMast">缁存姢鐘舵��</a>
{{#if (d.ioType === 101) { }}
- <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">绌�</a>
+ <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="empty">绌�</a>
<a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">浣�</a>
{{# } }}
{{#if (d.ioType === 103) { }}
- <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">绌�</a>
+ <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="empty">绌�</a>
<a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">浣�</a>
{{# } }}
{{#if (d.ioType === 107) { }}
--
Gitblit v1.9.1