From 80cd1569120416b096d28ebbe9a8e6e1d867f6e0 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 19 九月 2024 14:19:45 +0800
Subject: [PATCH] 盘点异常处理
---
src/main/java/com/zy/asrs/task/handler/GhjtHandler.java | 74 ++++++++++--------------------------
1 files changed, 21 insertions(+), 53 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java b/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java
index 9b9ebf1..60150c6 100644
--- a/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java
@@ -4,9 +4,9 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.mapper.OrderMapper;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.ApiLogService;
@@ -19,6 +19,7 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -44,6 +45,9 @@
@Resource
private WrkDetlService wrkDetlService;
+
+ @Resource
+ private OrderDetlMapper orderDetlMapper;
@Transactional
public void startCkrwPushGwcs(WrkMast wrkMast) {
@@ -76,8 +80,12 @@
.doPost();
if (!Cools.isEmpty(response)) {
wrkMast.setWrkSts(2L); // 鏇存柊涓鸿澶囦笂璧�
- if (wrkMast.getIoType() == 110 || wrkMast.getIoType() == 3) { // 绌烘墭鐩樺嚭搴撶洿鎺ュ畬鎴愪换鍔�
+ if (wrkMast.getIoType() == 110) { // 绌烘墭鐩樺嚭搴撶洿鎺ュ畬鎴愪换鍔�
wrkMast.setWrkSts(14L);
+ } else if (wrkMast.getIoType() == 3) {
+ // 淇敼宸ヤ綔涓绘。鐘舵��
+ wrkMast.setWrkSts(15L);
+ wrkMast.setModiTime(new Date());
}
wrkMastMapper.updateById(wrkMast);
success = true;
@@ -125,8 +133,18 @@
}
} else if(collect.size() == 2) { // 涓ょ鍘昏创鏍囨墦甯�
- // todo 鍚屽瀷鍙�(鏈ㄧ鍨嬪彿+绠¤姱+鎴愬搧瑙勬牸)鍘昏创鏍囷紝鎵撳甫锛屼笉鍚屽瀷鍙疯创鏍囧嚭搴� 鍙傛暟涓嶇‘瀹�
+
+ // 涓ょ鑲畾閮芥槸鍗曞嵎鎯呭喌 鍚屽瀷鍙�(鏈ㄧ鍨嬪彿-绠¤姱绫诲瀷-瀹炴祴瀹藉箙-鐢熺當鍘氬害-鍒嗗垏涓嬫枡鏃堕棿)鍘昏创鏍囷紝鎵撳甫锛屼笉鍚屽瀷鍙疯创鏍囧嚭搴�
+ WrkDetl wrkDetl1 = wrkDetls.get(0);
+ WrkDetl wrkDetl2 = wrkDetls.get(1);
+ if (wrkDetl1.getColor().equals(wrkDetl2.getColor())&&
+ wrkDetl1.getSku().equals(wrkDetl2.getSku())&&
+ wrkDetl1.getManu().equals(wrkDetl2.getManu())&&
+ wrkDetl1.getItemNum().equals(wrkDetl2.getItemNum())) {
flag = 3;
+ } else {
+ flag = 4;
+ }
}
} else if (wrkMast.getIoType() == 103 && (wrkMast.getStaNo() == 3077 || wrkMast.getStaNo() == 3106)) { // 涓ょ鍑轰竴绠憋紝闇�妗佹灦鐞嗚揣
// 閮借鍏堝幓鐞嗚揣
@@ -140,54 +158,4 @@
return flag;
}
- @Transactional
- public void OutBoundCompleteReport(Order order) {
-
- // 鑾峰彇璇锋眰澶�
- Map<String, Object> headers = new HashMap<>();
- headers.put("Content-Type", "application/json;charset=UTF-8");
-
- // 鏋勯�犺姹備綋
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("orderNo", order.getOrderNo());
- jsonObject.put("complete", 1); // 璁㈠崟瀹屾垚涓�1锛屽叾浠�...
- String body = jsonObject.toJSONString();
-
- boolean success = false;
- String response = "";
- try {
- response = new HttpHandler.Builder()
- .setUri(MesConstant.URL)
- .setPath(MesConstant.PAKIN_URL)
- .setHeaders(headers)
- .setJson(body)
- .build()
- .doPost();
- if (!Cools.isEmpty(response)) {
- order.setSettle(6L);
- orderMapper.updateById(order);
- success = true;
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL + MesConstant.PAKIN_URL, body, response);
- throw new CoolException("涓嬪彂鍑哄簱浠诲姟缁橤WCS(浠庡嚭搴撶爜澶村埌鍑哄簱鍙�)澶辫触");
- }
- } catch (Exception e) {
- log.error("鍑哄簱璁㈠崟瀹屾垚涓婃姤MES寮傚父锛屽伐浣滃彿锛歿}锛寋}", order.getOrderNo(), e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "鍑哄簱璁㈠崟瀹屾垚涓婃姤MES",
- MesConstant.URL + MesConstant.PAKIN_URL,
- null,
- "127.0.0.1",
- jsonObject.toJSONString(),
- response,
- success
- );
- } catch (Exception e) {
- log.error("鎺ュ彛鏃ュ織淇濆瓨寮傚父", e);
- }
- }
- }
}
--
Gitblit v1.9.1