From a412fb692f1ff4a5b18e64ac1bdb5788fd55d4d0 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 15 一月 2026 15:05:59 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 24 +++++++++++-
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 54 +++++++++++++++++----------
src/main/webapp/static/js/common.js | 2
3 files changed, 57 insertions(+), 23 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 50e3947..7bbff68 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -8,10 +8,10 @@
import com.zy.api.controller.params.ReceviceTaskParams;
import com.zy.api.controller.params.WorkTaskParams;
import com.zy.api.service.WcsApiService;
-import com.zy.asrs.entity.BasDevice;
-import com.zy.asrs.entity.LocAroundBind;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.MatServiceImpl;
+import com.zy.asrs.service.impl.WrkDetlServiceImpl;
import com.zy.common.constant.MesConstant;
import com.zy.common.utils.HttpHandler;
import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +37,10 @@
private WrkMastService wrkMastService;
@Autowired
private WorkService workService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
+ private MatService matService;
/**
* 閫氱煡WCS閿佸畾搴撲綅锛屽強绂佹褰撳墠搴撲綅鐨勪竴鍒囨搷浣�
@@ -187,20 +191,17 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R receviceTaskFromWcs(ReceviceTaskParams params) {
- if (Objects.isNull(params.getDevice())) {
- throw new CoolException("璁惧鍙蜂笉鑳戒负绌猴紒锛�");
- }
if (Objects.isNull(params.getWrkNo())) {
throw new CoolException("WMS浠诲姟鍙蜂笉鑳戒负绌猴紒锛�");
}
- if (Objects.isNull(params.getMsgType())) {
+ if (Objects.isNull(params.getNotifyType())) {
throw new CoolException("鍔ㄤ綔绫诲瀷涓嶈兘涓虹┖锛侊紒");
}
WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", params.getWrkNo()));
if (Objects.isNull(mast)) {
throw new CoolException("浠诲姟妗ｄ笉瀛樺湪锛侊紒");
}
- if (!Objects.isNull(params.getMsgType()) && params.getMsgType().equals("task")) {
+ if ( params.getNotifyType().equals("task")) {
//浠诲姟
if (params.getMsgType().equals("task_complete")) {
mast.setWrkSts(4L);
@@ -210,20 +211,33 @@
} else if (params.getMsgType().equals("task_cancel")){
}
- } else if (Objects.isNull(params.getMsgType()) && params.getMsgType().equals("weight")) {
+ } else if (params.getNotifyType().equals("weight")) {
//绉伴噸
-
-
+ if (mast.getWrkSts() == 2) {
+ WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()));
+ if (Objects.isNull(wrkDetl)) {
+ throw new CoolException("鏁版嵁閿欒锛屼换鍔℃槑缁嗕笉瀛樺湪锛侊紒");
+ }
+ Mat matnr = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", wrkDetl.getMatnr()));
+ if (Objects.isNull(matnr)) {
+ throw new CoolException("鐗╂枡鍩虹淇℃伅涓嶅瓨鍦紒锛�");
+ }
+ Double val = Math.round((params.getWeight() - matnr.getSafeQty()) * 10000) / 10000.0;
+ if (val.compareTo(0.0) > 0) {
+ //浣欐枡闀垮害
+ wrkDetl.setRealQty(val * matnr.getVolume());
+ } else {
+ //绌烘澘
+ wrkDetl.setRealQty(0.0);
+ }
+ wrkDetl.setWeight(params.getWeight());
+ if (!wrkDetlService.update(wrkDetl, new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()).eq("matnr", wrkDetl.getMatnr()).eq("barcode", wrkDetl.getBarcode()))) {
+ throw new CoolException("浠诲姟妗ｆ槑缁嗕慨鏀瑰け璐ワ紒锛�");
+ }
+ } else {
+ throw new CoolException("鏁版嵁閿欒锛屽綋鍓嶄换鍔＄姸鎬佹湁璇� 锛�");
+ }
}
-
-
-
-
-
-// if (!wrkMastService.updateById(mast)) {
-// throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
-// }
-
return R.ok();
}
}
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 f722e01..bb1db08 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -97,6 +97,11 @@
return FAIL.setMsg("绌烘澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
}
+
+
+
+
+
break;
// 鍏ㄦ澘鍏ュ簱
case 1:
@@ -114,7 +119,6 @@
}
// 閬嶅巻宸ヤ綔鏄庣粏锛屾洿鏂板簱瀛樻槑缁嗗拰鍏ュ簱閫氱煡妗�
for (WrkDetl wrkDetl : wrkDetls) {
-
LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand()
, wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
if (null != locDetl) {
@@ -128,7 +132,11 @@
locDetl = new LocDetl();
locDetl.sync(wrkDetl);
locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
- locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
+ if (!Objects.isNull(wrkMast.getWrkCode())) {
+ locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
+ } else {
+ locDetl.setAnfme(wrkDetl.getRealQty());
+ }
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
@@ -443,6 +451,18 @@
return FAIL.setMsg(e.getMessage());
}
+ /***/
+ if (Objects.isNull(wrkMast.getWrkCode())) {
+ LocMast lcmst = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()));
+ lcmst.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
+ if (!locMastService.updateById(lcmst)) {
+ throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+
+
+
+ }
+
return SUCCESS;
}
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index f8faea8..2344abf 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -286,6 +286,7 @@
return num.toFixed(2);
}
}
+ , {field: 'weight', align: 'center', title: '瀹為檯閲嶉噺锛堝叕鏂わ級', hide: false, width: 120}
, {field: 'zpallet', align: 'center', title: 'SN', hide: false}
, {field: 'specs', align: 'center', title: '瑙勬牸', hide: false}
, {
@@ -320,7 +321,6 @@
, {field: 'manu', align: 'center', title: '鍘傚', hide: true}
, {field: 'manuDate', align: 'center', title: '鐢熶骇鏃ユ湡', hide: true}
, {field: 'itemNum', align: 'center', title: '鍝侀」鏁�', hide: true}
- , {field: 'weight', align: 'center', title: '鍗曠鍑�閲�', hide: true}
, {field: 'length', align: 'center', title: '鍗曠姣涢噸', hide: true}
, {field: 'threeCode', align: 'center', title: '绠卞瓙灏哄', hide: true}
, {field: 'supp', align: 'center', title: '渚涘簲鍟�', hide: true}
--
Gitblit v1.9.1