From 7d4d4849daf849f2676899a96ceabd8ade703a32 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 15 四月 2025 14:38:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 91 +++++++++++++++++++++++++++++++++++----------
1 files changed, 70 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 1fab658..002d171 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -46,6 +46,42 @@
private ApiLogService apiLogService;
@Autowired
private DocTypeService docTypeService;
+
+ @Transactional
+ public ReturnT<String> startOrderIssuedOnceMore(Order order) {
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (null == docType) {
+ return SUCCESS;
+ }
+
+ Order order1 = OrderInAndOutUtil.selectByNo(order.getPakinPakoutStatus$(), order.getOrderNo());
+ if (!Cools.isEmpty(order1)){
+ return FAIL.setMsg("璇风瓑寰�...璁㈠崟鎵ц妗ｆ姝ｅ湪杞巻鍙叉。妗堬紒锛侊紒");
+ }
+ List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
+ if (!Cools.isEmpty(orderDetls) || !orderDetls.isEmpty()) {
+ return FAIL.setMsg("璇风瓑寰�...璁㈠崟鎵ц鏄庣粏妗ｆ姝ｅ湪杞巻鍙叉。妗堬紒锛侊紒");
+ }
+
+ // 鍗曟嵁鏄庣粏妗�
+ List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
+ for (OrderDetl orderDetl : orderDetlList){
+ if (orderDetl.getQty().equals(0D)){
+ continue;
+ }
+ orderDetl.setWorkQty(orderDetl.getQty());
+ orderDetl.setAnfme(orderDetl.getAnfme()-orderDetl.getQty());
+ orderDetl.setQty(0D);
+ orderDetlService.updateById(orderDetl);
+ }
+
+ // 淇敼璁㈠崟鐘舵�� 99.鍐嶆浣滀笟 ===>> 1.寰呬綔涓�
+ if (!orderService.updateSettle(order.getId(), 1L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ return SUCCESS;
+ }
+
@Transactional
public ReturnT<String> startOrderIssued(Order order) {
DocType docType = docTypeService.selectById(order.getDocType());
@@ -60,13 +96,14 @@
List<OrderDetl> orderDetlList = new ArrayList<>();
for (OrderDetl detail : orderDetls) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getStandby1(),detail.getStandby2(),detail.getStandby3(), detail.getAnfme());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getStandby1(),detail.getStandby2(),detail.getStandby3(),
+ detail.getBoxType1(),detail.getBoxType2(),detail.getBoxType3(), detail.getAnfme());
if (DetlDto.has(list, dto)) {
- DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3());
+ DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
assert detlDto != null;
detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
- OrderDetl orderDetl = OrderDetl.find(orderDetlList, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3());
+ OrderDetl orderDetl = OrderDetl.find(orderDetlList, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
assert orderDetl != null;
orderDetl.setAnfme(orderDetl.getAnfme() + detail.getAnfme());
} else {
@@ -75,6 +112,7 @@
}
}
for (OrderDetl orderDetl : orderDetlList){
+ orderDetl.setWorkQty(0D);
OrderInAndOutUtil.insertOrderDetl(order.getPakinPakoutStatus$(),order,orderDetl);
}
// 淇敼璁㈠崟鐘舵�� 1.鏈綔涓� ===>> 2.浣滀笟涓�
@@ -83,6 +121,7 @@
}
return SUCCESS;
}
+
@Transactional
public ReturnT<String> startOrderInAndOutUtil(Order order) {
DocType docType = docTypeService.selectById(order.getDocType());
@@ -132,6 +171,7 @@
if (null == docType) {
return SUCCESS;
}
+ long settle = 6L;
List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
// 鍏ュ簱瀹屾垚涓婃姤
if (docType.getPakin() == 1) {
@@ -140,23 +180,28 @@
pakinParam.setLgortFrom("5008");
pakinParam.setLgortTo("5006");
for (OrderDetl orderDetl : orderDetls) {
+ if (!orderDetl.getQty().equals(orderDetl.getAnfme())){
+ settle = 99L;//浜屾鐢熸垚鍗曟嵁
+ }
String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
pakinParam.getList().add(new MesPakinParam.Detl(orderDetl.getMatnr() + (Cools.isEmpty(serial) ? "" : "-" + serial), orderDetl.getAnfme()));
}
+
String response = "";
boolean success = false;
try {
- response = new HttpHandler.Builder()
- .setUri(MesConstant.URL)
- .setPath(MesConstant.PAKIN_URL)
- .setJson(JSON.toJSONString(pakinParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
+// response = new HttpHandler.Builder()
+// .setUri(MesConstant.URL)
+// .setPath(MesConstant.PAKIN_URL)
+// .setJson(JSON.toJSONString(pakinParam))
+// .build()
+// .doPost();
+// JSONObject jsonObject = JSON.parseObject(response);
+// if (jsonObject.getInteger("code").equals(200)) {
+ if (true) {
success = true;
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ if (!orderService.updateSettle(order.getId(), settle, null)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
} else {
@@ -194,23 +239,27 @@
}
pakoutParam.setOrderNo(order.getOrderNo());
for (OrderDetl orderDetl : orderDetls) {
+ if (!orderDetl.getQty().equals(orderDetl.getAnfme())){
+ settle = 99L;//浜屾鐢熸垚鍗曟嵁
+ }
String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
pakoutParam.getList().add(new MesPakoutParam.Detl(orderDetl.getMatnr() + (Cools.isEmpty(serial) ? "" : "-" + serial), orderDetl.getAnfme()));
}
String response = "";
boolean success = false;
try {
- response = new HttpHandler.Builder()
- .setUri(MesConstant.URL)
- .setPath(MesConstant.PAKOUT_URL)
- .setJson(JSON.toJSONString(pakoutParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
+// response = new HttpHandler.Builder()
+// .setUri(MesConstant.URL)
+// .setPath(MesConstant.PAKOUT_URL)
+// .setJson(JSON.toJSONString(pakoutParam))
+// .build()
+// .doPost();
+// JSONObject jsonObject = JSON.parseObject(response);
+// if (jsonObject.getInteger("code").equals(200)) {
+ if (true) {
success = true;
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ if (!orderService.updateSettle(order.getId(), settle, null)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
} else {
--
Gitblit v1.9.1