From 8896a0841940bac10c17b9a02f8d1cd76dd52084 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 16 一月 2026 14:19:51 +0800
Subject: [PATCH] 出库查询及任务档流程优化
---
src/main/java/com/zy/asrs/utils/MatExcelListener.java | 2
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 33 +++++++++--
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 94 ++++++++++++++++++++-----------
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 15 +++--
src/main/resources/mapper/OrderDetlPakoutMapper.xml | 15 +++--
5 files changed, 106 insertions(+), 53 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 0a51e9e..f6b79d0 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -49,10 +49,11 @@
/**
* 閫氱煡WCS閿佸畾搴撲綅锛屽強绂佹褰撳墠搴撲綅鐨勪竴鍒囨搷浣�
- * @author Ryan
- * @date 2026/1/10 11:18
+ *
* @param params
* @return com.core.common.R
+ * @author Ryan
+ * @date 2026/1/10 11:18
*/
@Override
@Transactional(rollbackFor = Exception.class)
@@ -76,10 +77,11 @@
/**
* 浣欐枡鍥炲簱 锛堟惉杩愪綑鏂欏洖搴擄級
- * @author Ryan
- * @date 2026/1/10 13:19
+ *
* @param params
* @return com.core.common.R
+ * @author Ryan
+ * @date 2026/1/10 13:19
*/
@Override
@Transactional(rollbackFor = Exception.class)
@@ -92,9 +94,9 @@
// 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(mast)) {
+ throw new CoolException("浠诲姟涓嶅瓨鍦紒锛�");
+ }
// if (!mast.getWrkSts().equals(103L)) {
// throw new CoolException("褰撳墠浠诲姟骞堕潪浣欐枡鍑哄簱浠诲姟锛侊紒");
// }
@@ -107,15 +109,16 @@
// }
workService.backLocOperation(mast.getWrkNo() + "", mast.getAppeUser());
- return R.ok("鎺ユ敹鎴愬姛锛屾墽琛屽洖搴撲腑...");
+ return R.ok("鎺ユ敹鎴愬姛锛屾墽琛屽洖搴撲腑...");
}
/**
* 涓嬪彂浠诲姟鑷砏CS
- * @author Ryan
- * @date 2026/1/10 13:58
+ *
* @param params
* @return com.core.common.R
+ * @author Ryan
+ * @date 2026/1/10 13:58
*/
@Override
public R pubWrkToWcs(WorkTaskParams params) {
@@ -134,7 +137,7 @@
}
String response;
try {
- response = new HttpHandler.Builder()
+ response = new HttpHandler.Builder()
.setUri(MesConstant.URL)
.setPath(url)
.setJson(JSON.toJSONString(params))
@@ -154,9 +157,10 @@
/**
* 涓婃姤閿佸畾/閲婃斁搴撲綅淇℃伅
+ *
+ * @param locs
* @author Ryan
* @date 2026/1/10 12:50
- * @param locs
*/
@Override
@Transactional(rollbackFor = Exception.class)
@@ -169,17 +173,17 @@
}
String response;
try {
- response = new HttpHandler.Builder()
- .setUri(MesConstant.URL)
- .setPath(url)
- .setJson(JSON.toJSONString(locs))
- .build()
- .doPost();
- R result = JSON.parseObject(response, R.class);
+ response = new HttpHandler.Builder()
+ .setUri(MesConstant.URL)
+ .setPath(url)
+ .setJson(JSON.toJSONString(locs))
+ .build()
+ .doPost();
+ R result = JSON.parseObject(response, R.class);
- if (result.get("code").equals("200")) {
+ if (result.get("code").equals("200")) {
//TODO 涓婃姤鏄惁鎴愬姛
- }
+ }
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -188,10 +192,11 @@
/**
* 鍫嗗灈鏈烘墽琛岀姸鎬佷笂鎶�
- * @author Ryan
- * @date 2026/1/10 16:30
+ *
* @param params
* @return com.core.common.R
+ * @author Ryan
+ * @date 2026/1/10 16:30
*/
@Override
@Transactional(rollbackFor = Exception.class)
@@ -206,14 +211,14 @@
if (Objects.isNull(mast)) {
throw new CoolException("浠诲姟妗ｄ笉瀛樺湪锛侊紒");
}
- if ( params.getNotifyType().equals("task")) {
+ if (params.getNotifyType().equals("task")) {
//浠诲姟
if (params.getMsgType().equals("task_complete")) {
mast.setWrkSts(4L);
if (!wrkMastService.updateById(mast)) {
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
- } else if (params.getMsgType().equals("task_cancel")){
+ } else if (params.getMsgType().equals("task_cancel")) {
}
} else if (params.getNotifyType().equals("weight")) {
@@ -257,19 +262,40 @@
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);
- }
-
+ Double realQty = val * matnr.getVolume();
+// if (val.compareTo(0.0) > 0) {
+// //浣欐枡闀垮害
+// wrkDetl.setRealQty(realQty);
+// } else {
+// //绌烘澘
+// wrkDetl.setRealQty(0.0);
+// }
+ wrkDetl.setAnfme(realQty);
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("浠诲姟妗ｆ槑缁嗕慨鏀瑰け璐ワ紒锛�");
}
+ // 鏇存柊鍘熷嚭搴撳崟
+ int indexOf = mast.getWrkCode().indexOf("-1");
+ if (indexOf != -1) {
+ String wrkNo = mast.getWrkCode().substring(0, indexOf);
+ WrkMast orgWrk = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkNo));
+ if (Objects.isNull(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.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("鍘熶换鍔℃。鏄庣粏淇敼澶辫触锛侊紒");
+ }
+ } else {
+ throw new CoolException("浠诲姟鍙锋埅鍙栧け璐ワ紝璇锋鏌ヤ富浠诲姟妗ｄ换妗rkCode瀛楁");
+ }
}
} else {
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 91df095..1cd52c0 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -564,7 +564,10 @@
wrkDetl.setUnit(locDel.getUnit());
wrkDetl.setSpecs(locDel.getSpecs());
wrkDetl.setBatch(locDel.getBatch());
- wrkDetl.setAnfme(locDel.getAnfme());
+ //搴撳瓨鏁伴噺
+ wrkDetl.setStockQty(locDel.getAnfme());
+ //鍗曟嵁鏁伴噺
+ wrkDetl.setAnfme(locDto.getAnfme());
wrkDetl.setAppeTime(now);
wrkDetl.setAppeUser(userId);
wrkDetl.setModiTime(now);
@@ -1536,11 +1539,11 @@
throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
}
- wrkMast.setWrkCode(null);
-
- if (!wrkMastService.updateById(wrkMast)) {
- throw new CoolException("浠诲姟妗ｆ洿鏂板け璐ワ紒锛�");
- }
+// wrkMast.setWrkCode(null);
+//
+// if (!wrkMastService.updateById(wrkMast)) {
+// throw new CoolException("浠诲姟妗ｆ洿鏂板け璐ワ紒锛�");
+// }
}
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 f76c634..003e018 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -127,11 +127,7 @@
locDetl = new LocDetl();
locDetl.sync(wrkDetl);
locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
- if (!Objects.isNull(wrkMast.getWrkCode())) {
- locDetl.setAnfme(wrkDetl.getRealQty());
- } else {
- locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
- }
+ locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
@@ -144,8 +140,33 @@
//鍒ゆ柇鍖归厤缂栫爜涓嶄负绌猴紝涓斾换鍔＄紪鐮佸寘鍚�-2锛岀‘璁や负鏈変笂缁勪换鍔�
if (!Objects.isNull(wrkMast.getWrkCode())) {
- //涓嶉渶瑕佹洿鏂板崟鎹俊鎭紙瀛愪换鍔℃棤鍗曟嵁
+ //TODO 鑾峰彇101鍑哄簱 涓讳换鍔℃。鎬绘暟閲� - 瀛愪换鍔℃。鐨勫疄闄呮暟閲� = 褰撳墠浣滀笟瀹屾垚鏁伴噺
+ WrkDetl selectOne = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+ Double v = Math.round((selectOne.getStockQty() - selectOne.getAnfme()) * 10000) / 10000.0;
+
+ OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), null, null, null, null,
+ null, null, null);
+
+ if (!Objects.isNull(orderDetlPakout)) {
+ orderDetlPakout.setQty(v);
+ if (!orderDetlPakoutService.updateById(orderDetlPakout)) {
+ throw new CoolException("鍗曟嵁瀹屾垚鏁伴噺淇敼澶辫触锛侊紒");
+ }
+ }
+ int indexOf = wrkMast.getWrkCode().indexOf("-1");
+ if (indexOf != -1) {
+ String wrkNo = wrkMast.getWrkCode().substring(0, indexOf);
+ WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkNo));
+ if (Objects.isNull(mast)) {
+
+ throw new CoolException("鏁版嵁閿欒锛屼富浠诲姟妗ｄ笉瀛樺湪鎴栧凡鍒犻櫎锛侊紒");
+ }
+ mast.setWrkCode(null);
+ if (!wrkMastService.updateById(mast)) {
+ throw new CoolException("鍘熶换鍔℃。鍒犻櫎澶辫触锛侊紒");
+ }
+ }
} else {
//姝ｅ父鍗曟嵁鎵嶅瓨瀛樺叆搴撳崟锛屼綔鍏ュ簱鍗曟嵁淇℃伅鏇存柊
// 鏇存柊璁㈠崟瀹屾垚鏁伴噺
diff --git a/src/main/java/com/zy/asrs/utils/MatExcelListener.java b/src/main/java/com/zy/asrs/utils/MatExcelListener.java
index cd399be..7327157 100644
--- a/src/main/java/com/zy/asrs/utils/MatExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/MatExcelListener.java
@@ -133,7 +133,7 @@
throw new CoolException("姣忓叕鏂ら暱搴︿笉鑳戒负绌猴紒锛�");
}
if (Objects.isNull(mat.getSafeQty())) {
- throw new CoolException("褰掗浂闃�鍊间笉鑳戒负绌猴紒锛�");
+ throw new CoolException("褰掗浂闃堝�间笉鑳戒负绌猴紒锛�");
}
if (!matService.insert(mat)) {
throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛屽晢鍝佺紪鐮侊細" + excel.getMatnr());
diff --git a/src/main/resources/mapper/OrderDetlPakoutMapper.xml b/src/main/resources/mapper/OrderDetlPakoutMapper.xml
index 78c72e1..96844e9 100644
--- a/src/main/resources/mapper/OrderDetlPakoutMapper.xml
+++ b/src/main/resources/mapper/OrderDetlPakoutMapper.xml
@@ -60,12 +60,15 @@
<if test="brand != null and brand != ''">
and brand = #{brand}
</if>
- and standby1 = #{standby1}
- and standby2 = #{standby2}
- and standby3 = #{standby3}
- and box_type1 = #{boxType1}
- and box_type2 = #{boxType2}
- and box_type3 = #{boxType3}
+<!-- <if test="standby1 != null and standby1 != ''">-->
+<!-- and standby1 = #{standby1}-->
+<!-- </if>-->
+ <if test="standby2 != null and standby2 != ''">
+ and standby2 = #{standby2}
+ </if>
+ <if test="standby3 != null and standby3 != ''">
+ and standby3 = #{standby3}
+ </if>
</sql>
<sql id="standbyAllMemo">
-- and line_number = #{lineNumber}
--
Gitblit v1.9.1