From e72f4946b1696a570022d6ae715fa07656ab89f7 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 27 九月 2023 13:07:43 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 43bee06..0f56ff6 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -51,6 +51,10 @@
private ErpService erpService;
@Autowired
private ApiLogService apiLogService;
+ @Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private ManPakOutService manPakOutService;
@Value("${u8.url}")
private String url;
@@ -96,9 +100,15 @@
}
}
// 濡傛灉 浣滀笟鏁伴噺绛変簬鍗曟嵁鎬绘暟閲� && 宸ヤ綔鏄庣粏妗ｄ腑鏃犺鍗曟嵁鐨勬暟鎹� && AGV宸ヤ綔鏄庣粏妗ｄ腑鏃犺鍗曟嵁鐨勬暟鎹�
- if (complete
- && wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().like("order_no", orderNo)) < 1
- && agvWrkDetlService.selectCount(new EntityWrapper<AgvWrkDetl>().like("order_no",orderNo)) < 1) {
+ boolean wrkDeltExist = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", orderNo)) < 1;
+ boolean agvWrkDetlExist = agvWrkDetlService.selectCount(new EntityWrapper<AgvWrkDetl>().eq("order_no",orderNo)) < 1;
+ boolean waitPakinExist = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("order_no",orderNo)) < 1;
+
+ ManPakOut manPakOut = manPakOutService.selectByOrderWithName(orderNo);
+
+ boolean manPakoutExist = Cools.isEmpty(manPakOut) || manPakOut.getPayment() == 1;
+ if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist) {
+
// 鍑哄簱璁㈠崟閲嶆柊鏁寸悊鏄庣粏
// DocType docType = docTypeService.selectById(order.getDocType());
// if (null != docType && docType.getPakout() == 1) {
@@ -123,7 +133,6 @@
// }
// }
// }
-
if (!this.updateSettle(order.getId(), 4L, null)) {
throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
}
@@ -259,9 +268,13 @@
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- int code = (int) jsonObject.get("code");
- if(code != 200){
- throw new CoolException(jsonObject.get("msg").toString());
+ if(Cools.isEmpty(jsonObject.get("errCode"))){
+ throw new CoolException(jsonObject.get("Message").toString());
+ }
+
+ int code = (int) jsonObject.get("errCode");
+ if(code != 0){
+ throw new CoolException(jsonObject.get("errMsg").toString());
}
success = true;
return code;
--
Gitblit v1.9.1