From 82de5a307466894bbb0258f8a63a26a7bb96d80d Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期四, 16 十月 2025 09:55:35 +0800 Subject: [PATCH] 13 --- src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 13 ++++++------- 1 files changed, 6 insertions(+), 7 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 9046a26..2e0425f 100644 --- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java @@ -7,7 +7,6 @@ import com.core.exception.CoolException; import com.zy.asrs.entity.DocType; import com.zy.asrs.entity.Order; -import com.zy.asrs.entity.OrderDetl; import com.zy.asrs.entity.OrderDetlReport; import com.zy.asrs.service.*; import com.zy.asrs.task.AbstractHandler; @@ -69,7 +68,7 @@ MesPakinParam.Detl detl = new MesPakinParam.Detl(); detl.setQty(orderDetl.getAnfme()); detl.setBarcode(orderDetl.getThreeCode()); - detl.setPalletBarcode(orderDetl.getBarcode()); + detl.setPalletBarcode(orderDetl.getZpallet()); detl.setProductionCode(orderDetl.getMatnr()); pakinParam.getBarcodeList().add(detl); } @@ -120,7 +119,7 @@ } } // 鍑哄簱瀹屾垚涓婃姤 -// if (docType.getPakout() == 1) { + if (docType.getPakout() == 1) { // MesPakoutParam pakoutParam = new MesPakoutParam(); // pakoutParam.setTag(!order.getDocType$().equalsIgnoreCase("鎵嬪姩鍑哄簱鍗�")); // pakoutParam.setPakoutTime(DateUtils.convert(order.getUpdateTime())); @@ -147,9 +146,9 @@ // if (jsonObject.getInteger("code").equals(200)) { // success = true; // // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶� -// if (!orderService.updateSettle(order.getId(), 6L, null)) { -// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳"); -// } + if (!orderService.updateSettle(order.getId(), 6L, null)) { + throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳"); + } // } else { // log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKOUT_URL, JSON.toJSONString(pakoutParam), response); // throw new CoolException("涓婃姤mes绯荤粺澶辫触"); @@ -172,7 +171,7 @@ // ); // } catch (Exception e) { log.error("", e); } // } -// } + } return SUCCESS; } -- Gitblit v1.9.1