From 003f9d3b07b3a4f71a7e13baaf06561cc646d2b6 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 16 一月 2026 15:41:20 +0800
Subject: [PATCH] 入库任务档添加称重校验
---
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 24 +++++++++++++++++++++---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 1 +
src/main/webapp/static/js/wrkMast/wrkMast.js | 1 +
src/main/webapp/static/js/common.js | 2 +-
4 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
index f6b79d0..02922fa 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -214,12 +214,21 @@
if (params.getNotifyType().equals("task")) {
//浠诲姟
if (params.getMsgType().equals("task_complete")) {
- mast.setWrkSts(4L);
+ if (!Objects.isNull(mast.getWrkCode())) {
+ if (mast.getOveMk().equals("N") && mast.getIoType() == 1) {
+ throw new CoolException("浠诲姟鏈笂鎶ラ噸閲忥紝鏃犳硶瀹岀粨浠诲姟锛侊紒");
+ }
+ }
+ if (mast.getIoType() == 1) {
+ mast.setWrkSts(4L);
+ } else if (mast.getIoType() == 101) {
+ mast.setWrkSts(14L);
+ }
if (!wrkMastService.updateById(mast)) {
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
} else if (params.getMsgType().equals("task_cancel")) {
-
+ //todo 鍙栨秷浠诲姟
}
} else if (params.getNotifyType().equals("weight")) {
//绉伴噸
@@ -244,6 +253,7 @@
//浣欐枡闀垮害
wrkDetl.setRealQty(val * matnr.getVolume());
mast.setIoType(1);
+ mast.setOveMk("Y");
mast.setIsSuplus(1);
if (!wrkMastService.updateById(mast)) {
throw new CoolException("涓绘。鐘舵�佷慨鏀瑰け璐�");
@@ -262,6 +272,7 @@
throw new CoolException("鐗╂枡鍩虹淇℃伅涓嶅瓨鍦紒锛�");
}
Double val = Math.round((params.getWeight() - matnr.getSafeQty()) * 10000) / 10000.0;
+ //绉伴噸鍚庯紝璁＄畻鍑虹湡瀹為暱搴�
Double realQty = val * matnr.getVolume();
// if (val.compareTo(0.0) > 0) {
// //浣欐枡闀垮害
@@ -283,12 +294,19 @@
if (Objects.isNull(orgWrk)) {
throw new CoolException("鏁版嵁閿欒锛屼富浠诲姟妗ｄ笉瀛樺湪鎴栧凡鍒犻櫎锛侊紒");
}
+ orgWrk.setOveMk("Y");
+ if (!wrkMastService.updateById(orgWrk)) {
+ throw new CoolException("浠诲姟妗ｄ慨鏀瑰け璐ワ紒锛�");
+ }
WrkDetl detl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo));
if (Objects.isNull(detl)) {
throw new CoolException("瀛愪换鍔℃。鏄庣粏涓嶅瓨鍦紒锛�");
}
+ //搴撳瓨鍑忓幓绉伴噸闀垮害
Double v = Math.round((wrkDetl.getStockQty() - realQty) * 10000) / 10000.0;
- detl.setRealQty(v);
+ //鍘熷嚭涓烘暟閲忎笌鐪熷疄鏁伴噺浜掓崲锛屼繚鎸佷竴鑷存��
+ detl.setRealQty(detl.getAnfme());
+ detl.setAnfme(v);
detl.setWeight(params.getWeight());
if (!wrkDetlService.update(detl, new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo).eq("matnr", detl.getMatnr()).eq("barcode", detl.getBarcode()))) {
throw new CoolException("鍘熶换鍔℃。鏄庣粏淇敼澶辫触锛侊紒");
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 1cd52c0..421f8e0 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1523,6 +1523,7 @@
wrkDetls.forEach(wrkDetl -> {
WrkDetl wrkDetl1 = new WrkDetl();
BeanUtils.copyProperties(wrkDetl, wrkDetl1);
+ wrkDetl1.setAnfme(wrkDetl.getStockQty() - wrkDetl.getAnfme());
wrkDetl1.setWrkNo(wokNo);
if (!wrkDetlService.insert(wrkDetl1)) {
throw new CoolException("浠诲姟妗ｆ槑缁嗕繚瀛樺け璐ワ紒锛�");
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 6afd506..9455563 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -277,7 +277,7 @@
}
}
, {
- field: 'realQty', align: 'center', title: '瀹為檯鏁伴噺', hide: false, templet: function (d) {
+ field: 'realQty', align: 'center', title: '鍗曟嵁鏁伴噺', hide: true, templet: function (d) {
var raw = d.realQty;
// var ioType = d.ioType;
// console.log(ioType)
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index a89f1fd..c1e41cb 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -32,6 +32,7 @@
,{field: 'staNo$', align: 'center',title: '鐩爣绔�', width: 95}
,{field: 'sourceLocNo', align: 'center',title: '婧愬簱浣�', width: 120}
,{field: 'locNo', align: 'center',title: '鐩爣搴撲綅', width: 120}
+ ,{field: 'oveMk', align: 'center',title: '鏄惁绉伴噸', width: 120}
,{field: 'preHave', align: 'center',title: '鍏堝叆鍝�', hide: true}
,{field: 'takeNone', align: 'center',title: '绌烘搷浣�', hide: true}
,{field: 'isSuplus$', align: 'center', title: '鍥炲簱绫诲瀷', hide: false, width: 120}
--
Gitblit v1.9.1