From 6c849f904bdd33a799e6382557bd32bb69359951 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 06 三月 2026 15:25:08 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 60 +++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 45 insertions(+), 15 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 599d58b..167e77e 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -52,6 +52,8 @@
private LocDetlService locDetlService;
@Autowired
private RowLastnoService rowLastnoService;
+ @Autowired
+ private OrderDetlPakoutService orderDetlPakoutService ;
/**
* 閫氱煡WCS閿佸畾搴撲綅锛屽強绂佹褰撳墠搴撲綅鐨勪竴鍒囨搷浣�
@@ -127,22 +129,15 @@
* @date 2026/1/10 13:58
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public R pubWrkToWcs(WorkTaskParams params) {
if (Objects.isNull(params.getTaskNo())) {
return R.error("浠诲姟鍙蜂笉鑳戒负绌猴紒锛�");
}
-// if (params.getType().equals("in"))
-// if (Objects.isNull(params.getBarcode())) {
-// return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
-// }
-// if (Objects.isNull(params.getLocNo())) {
-// return R.error("鐩爣搴撲綅涓嶈兘涓虹┖锛侊紒");
-// }
String url = MesConstant.PUB_TASK_IN;
if (!Objects.isNull(params.getType()) && params.getType().equals("out")) {
url = MesConstant.PUB_TASK_OUT;
}
-
log.info("鍑哄簱浠诲姟涓嬪彂鍙傛暟锛歿}", JSON.toJSONString(params));
String response;
try {
@@ -154,13 +149,16 @@
.doPost();
Map<String, Object> result = JSON.parseObject(response, Map.class);
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", params.getTaskNo()));
+ wrkMast.setWrkSts(12L);
+ if (!wrkMastService.updateById(wrkMast)) {
+ throw new CoolException("鏇存柊澶辫触锛侊紒");
+ }
if (result.get("code").equals(200)) {
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", params.getTaskNo()));
- wrkMast.setWrkSts(12L);
- wrkMastService.updateById(wrkMast);
//TODO 涓婃姤鏄惁鎴愬姛
} else {
- return R.error().add(result);
+ throw new CoolException("鍑哄簱涓嬪彂浠诲姟涓嬪彂澶辫触锛侊紒");
+// return R.error().add(result);
}
} catch (IOException e) {
throw new RuntimeException(e);
@@ -192,10 +190,42 @@
log.info("浠诲姟鎵ц鍙傛暟鍥炲啓:{}", JSON.toJSONString(params));
if (params.getNotifyType().equals("task")) {
//浠诲姟
- if (params.getMsgType().equals("task_complete")) {
- if (mast.getIoType() == 1 || mast.getIoType() == 10 || mast.getIoType() == 53 || mast.getIoType() == 54 || mast.getIoType() == 57) {
+ if (params.getMsgType().equals("task_complete") || params.getMsgType().equals("station_out_task_run")) {
+ if (mast.getIoType() == 1 || mast.getIoType() == 11 || mast.getIoType() == 10 || mast.getIoType() == 53 || mast.getIoType() == 54 || mast.getIoType() == 57) {
+
mast.setWrkSts(4L);
- } else if (mast.getIoType() == 101 || mast.getIoType() == 110 || mast.getIoType() == 103 || mast.getIoType() == 104 || mast.getIoType() == 107) {
+ } else if (mast.getIoType() == 101 || mast.getIoType() == 110 || mast.getIoType() == 103 || mast.getIoType() == 104 || mast.getIoType() == 107) {
+ //TODO 鎭㈠姝ｅ父鍚庯紝杩欓噷浠ｇ爜瑕佹敞閲婃帀
+ if (mast.getIoType() == 103 || mast.getIoType() == 107) {
+ List<WrkDetl> wrkDetls103 = wrkDetlService
+ .selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()));
+ if (wrkDetls103.isEmpty()) {
+ throw new CoolException("鎷ｆ枡鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + mast.getWrkNo());
+ }
+ for (WrkDetl wrkDetl : wrkDetls103) {
+ // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
+ OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(),
+ wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
+ wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+ wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
+ if (orderDetlPakout == null) {
+ orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(),
+ wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
+ wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+ wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
+ }
+ if (!Cools.isEmpty(orderDetlPakout)) {
+ if (!orderDetlPakoutService.increaseQtyByOrderNo(wrkDetl.getOrderNo(),
+ wrkDetl.getMatnr(),
+ orderDetlPakout.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
+ wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+ wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(),
+ wrkDetl.getAnfme())) {
+ throw new CoolException("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + mast.getWrkNo());
+ }
+ }
+ }
+ }
mast.setWrkSts(14L);
}
if (!wrkMastService.updateById(mast)) {
--
Gitblit v1.9.1