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/api/service/impl/WcsApiServiceImpl.java | 217 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 151 insertions(+), 66 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 a6cc1f8..f6b79d0 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -8,20 +8,20 @@
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.service.BasDeviceService;
-import com.zy.asrs.service.LocAroundBindService;
-import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.LocDetlServiceImpl;
+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.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
+import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.Set;
@@ -38,13 +38,22 @@
private LocMastService locMastService;
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private WorkService workService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
+ private MatService matService;
+ @Autowired
+ private LocDetlService locDetlService;
/**
* 閫氱煡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)
@@ -59,7 +68,7 @@
if (Objects.isNull(binds) || binds.isEmpty()) {
throw new CoolException("鏈哄彴鏈粦瀹氬伐浣滅珯鍙帮紒锛�");
}
- Set<String> locs = binds.stream().map(LocAroundBind::getBLocNo).collect(Collectors.toSet());
+ Set<String> locs = binds.stream().map(LocAroundBind::getBlocNo).collect(Collectors.toSet());
reportLockLocs(locs, "lock");
@@ -68,44 +77,48 @@
/**
* 浣欐枡鍥炲簱 锛堟惉杩愪綑鏂欏洖搴擄級
- * @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)
public R backLocs(WorkTaskParams params) {
- if (Objects.isNull(params.getTaskNo())) {
+ if (Objects.isNull(params.getWrkNo())) {
throw new CoolException("宸ヤ綔鍙蜂笉鑳戒负绌猴紒锛�");
}
- String wrkCode = params.getTaskNo();
- if (wrkCode.contains("-1")) {
- throw new CoolException("閰嶅浠诲姟缂栫爜閿欒锛岃妫�鏌ュ悗閲嶆柊涓婁紶锛侊紒");
- }
+// String wrkCode = params.getTaskNo();
+// if (wrkCode.contains("-1")) {
+// throw new CoolException("閰嶅浠诲姟缂栫爜閿欒锛岃妫�鏌ュ悗閲嶆柊涓婁紶锛侊紒");
+// }
+ WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", params.getWrkNo()));
+ if (Objects.isNull(mast)) {
+ throw new CoolException("浠诲姟涓嶅瓨鍦紒锛�");
+ }
+// if (!mast.getWrkSts().equals(103L)) {
+// throw new CoolException("褰撳墠浠诲姟骞堕潪浣欐枡鍑哄簱浠诲姟锛侊紒");
+// }
+// if (params.getIsSuplus() == 1) {
+// mast.setIsSuplus(1);
+// }
+//
+// if (!wrkMastService.updateById(mast)) {
+// throw new CoolException("浠诲姟鐘舵�佹洿鏂板け璐ワ紒锛�");
+// }
+ workService.backLocOperation(mast.getWrkNo() + "", mast.getAppeUser());
- WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_code", params.getTaskNo()));
-
- if (Objects.isNull(mast)) {
- throw new CoolException("浠诲姟涓嶅瓨鍦紒锛�");
- }
- if (!mast.getWrkSts().equals(103L)) {
- throw new CoolException("褰撳墠浠诲姟骞堕潪浣欐枡鍑哄簱浠诲姟锛侊紒");
- }
- mast.setWrkSts(53L);
- if (!wrkMastService.updateById(mast)) {
- throw new CoolException("浠诲姟鐘舵�佹洿鏂板け璐ワ紒锛�");
- }
-
- 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) {
@@ -124,7 +137,7 @@
}
String response;
try {
- response = new HttpHandler.Builder()
+ response = new HttpHandler.Builder()
.setUri(MesConstant.URL)
.setPath(url)
.setJson(JSON.toJSONString(params))
@@ -144,9 +157,10 @@
/**
* 涓婃姤閿佸畾/閲婃斁搴撲綅淇℃伅
+ *
+ * @param locs
* @author Ryan
* @date 2026/1/10 12:50
- * @param locs
*/
@Override
@Transactional(rollbackFor = Exception.class)
@@ -159,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);
}
@@ -178,44 +192,115 @@
/**
* 鍫嗗灈鏈烘墽琛岀姸鎬佷笂鎶�
- * @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)
public R receviceTaskFromWcs(ReceviceTaskParams params) {
- if (Objects.isNull(params.getDevice())) {
- throw new CoolException("璁惧鍙蜂笉鑳戒负绌猴紒锛�");
- }
- if (Objects.isNull(params.getSuperTaskNo())) {
+ 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_code", params.getSuperTaskNo()));
+ 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")) {
- throw new CoolException("娑堟伅涓嶈兘涓虹┖锛侊紒");
- }
+ 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")) {
- 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.getNotifyType().equals("weight")) {
+ //绉伴噸
+ if (mast.getWrkSts() == 2) {
+ if (mast.getIoType() == 10) {
+ //绌烘澘鍏ュ簱浠诲姟妗�
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", mast.getSourceLocNo()));
+ if (Objects.isNull(locDetl)) {
+ throw new CoolException("鏄庣粏鏁版嵁涓嶅瓨鍦紒锛�");
+ }
+ Mat matnr = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", locDetl.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 wrkDetl = new WrkDetl();
+ BeanUtils.copyProperties(locDetl, wrkDetl);
+ wrkDetl.setWrkNo(mast.getWrkNo());
+ wrkDetl.setIoTime(new Date());
+ wrkDetl.setWeight(params.getWeight());
+ //浣欐枡闀垮害
+ wrkDetl.setRealQty(val * matnr.getVolume());
+ mast.setIoType(1);
+ mast.setIsSuplus(1);
+ if (!wrkMastService.updateById(mast)) {
+ throw new CoolException("涓绘。鐘舵�佷慨鏀瑰け璐�");
+ }
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+ }
+ } else {
+ 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;
+ 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("鏁版嵁閿欒锛屽綋鍓嶄换鍔＄姸鎬佹湁璇� 锛�");
+ }
}
-
-// if (!wrkMastService.updateById(mast)) {
-// throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
-// }
-
return R.ok();
}
}
--
Gitblit v1.9.1