From c27d3ae9d5130a230e1dcb59abd4e8851dceb9d6 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 24 四月 2025 14:22:20 +0800
Subject: [PATCH] #新增盘点单号，页面修改
---
src/main/java/com/zy/asrs/task/handler/OrderReportHander.java | 70 ++++++++++++++++++----------------
1 files changed, 37 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderReportHander.java b/src/main/java/com/zy/asrs/task/handler/OrderReportHander.java
index f0be871..8f8d70c 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderReportHander.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderReportHander.java
@@ -33,11 +33,11 @@
//绔彛
private String URL;
- @Value("${erp.address.inaddressSave}")
- //涓婃姤鍏ュ簱鍦板潃
- private String inaddressSave;
+// @Value("${erp.address.inaddressSave}")
+// //涓婃姤鍏ュ簱鍦板潃
+// private String inaddressSave;
@Value("${erp.address.outaddressSave}")
- //涓婃姤鍑哄簱鍦板潃
+ //涓婃姤鍑哄叆搴撳湴鍧�
private String outaddressSave;
@Autowired
private OrderService orderService;
@@ -51,16 +51,16 @@
private LoginAuthenticationHandler loginAuthenticationHandler;
public ReturnT<String> startPakIn() {
- // 鍏堟煡鍑� memo 涓� null 鐨勬墍鏈夋暟鎹叆搴撳崟
+ // 鏌ュ嚭鎵�鏈夋暟鎹叆搴撳崟
List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("doc_type", 34));
for(Order order : orderList){
List<OrderDetl> orderMemoList = orderDetlService.selectList(new EntityWrapper<OrderDetl>()
.isNull("memo")
- .eq("order_No", order.getOrderNo()));
+ .eq("order_No", order.getOrderNo()));//memo涓虹┖琛ㄧず浠嶆湭涓婃姤
List<OrderDetl> toReportList = new ArrayList<>();
- // 寰幆鍒ゆ柇 anfme 鍜� qty 鏄惁鐩哥瓑
+ // 寰幆鍒ゆ柇 anfme 鍜� qty 鏄惁鐩哥瓑锛岀浉绛夊垯琛ㄧず宸插畬鎴愬叆搴�
for (OrderDetl orderDetl : orderMemoList) {
if (orderDetl.getAnfme() != null && orderDetl.getQty() != null
&& orderDetl.getAnfme().doubleValue() == orderDetl.getQty().doubleValue()) {
@@ -70,12 +70,15 @@
// 濡傛灉鏈夌鍚堟潯浠剁殑鏁版嵁锛屾墽琛屼笂鎶�
if (!toReportList.isEmpty()) {
- reportPakIn(toReportList);
-
- for (OrderDetl detl : toReportList) {
- detl.setMemo("1");
- orderDetlService.updateById(detl);
- log.info("宸插畬鎴愬崟鎹笂鎶� =====> " + detl);
+ boolean flag = reportPakIn(toReportList);
+ if(flag){
+ for (OrderDetl detl : toReportList) {
+ detl.setMemo("1");
+ orderDetlService.updateById(detl);
+ log.info("宸插畬鎴愬崟鎹笂鎶� =====> " + detl);
+ }
+ } else {
+ log.warn("鍏ュ簱涓婃姤澶辫触锛屾湭鏇存柊鏄庣粏 memo涓婃姤 鏍囧織");
}
}
}
@@ -83,10 +86,8 @@
return SUCCESS;
}
- private void reportPakIn(List<OrderDetl> orderDetls) {
+ private boolean reportPakIn(List<OrderDetl> orderDetls) {
- ReturnT<String> start = loginAuthenticationHandler.start();
- KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get("鍏ュ簱鍗�");
Date now = new Date();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -94,7 +95,7 @@
JSONObject requestBody = new JSONObject();
requestBody.put("billType", "鍏ュ簱鍗�");
- // 浠庣涓�涓槑缁嗕腑鎻愬彇璁㈠崟鍙风瓑淇℃伅锛堜綘鍙互鏍规嵁瀹為檯鎯呭喌璋冩暣锛�
+ // 浠庣涓�涓槑缁嗕腑鎻愬彇璁㈠崟鍙风瓑淇℃伅
if (!orderDetls.isEmpty()) {
OrderDetl first = orderDetls.get(0);
requestBody.put("orderNo", first.getOrderNo());
@@ -122,13 +123,13 @@
boolean success = false;
try {
HashMap<String, Object> headers = new HashMap<>();
- // 鍋囪浣犲凡缁忔彁鍓嶇櫥褰曞苟鑾峰彇浜� cookie
+ // cookie
headers.put("Cookie", loginAuthenticationHandler.start().getContent());
response = new HttpHandler.Builder()
.setHeaders(headers)
.setUri(URL)
- .setPath(inaddressSave) // 璁剧疆浣犵殑鎺ュ彛璺緞
+ .setPath(outaddressSave) // 璁剧疆浣犵殑鎺ュ彛璺緞
.setJson(requestBody.toJSONString())
.build()
.doPost();
@@ -146,7 +147,7 @@
try {
apiLogService.save(
"鍏ュ簱涓婃姤",
- URL + inaddressSave,
+ URL + outaddressSave,
null,
"127.0.0.1",
requestBody.toJSONString(),
@@ -157,10 +158,11 @@
log.error("鏃ュ織淇濆瓨澶辫触", e);
}
}
+ return success;
}
public ReturnT<String> startPakOut() {
- // 鍏堟煡鍑� memo 涓� null 鐨勬墍鏈夋暟鎹嚭搴撳崟
+ // 鎵�鏈夋暟鎹嚭搴撳崟
List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("doc_type", 33));
for(Order order : orderList){
List<OrderDetl> orderMemoList = orderDetlService.selectList(new EntityWrapper<OrderDetl>()
@@ -179,12 +181,15 @@
// 濡傛灉鏈夌鍚堟潯浠剁殑鏁版嵁锛屾墽琛屼笂鎶�
if (!toReportList.isEmpty()) {
- reportPakOut(toReportList);
-
- for (OrderDetl detl : toReportList) {
- detl.setMemo("1");
- orderDetlService.updateById(detl);
- log.info("宸插畬鎴愬崟鎹笂鎶� =====> " + detl);
+ boolean flag = reportPakOut(toReportList);
+ if(flag){
+ for (OrderDetl detl : toReportList) {
+ detl.setMemo("1");
+ orderDetlService.updateById(detl);
+ log.info("宸插畬鎴愬崟鎹笂鎶� =====> " + detl);
+ }
+ } else {
+ log.warn("鍑哄簱涓婃姤澶辫触锛屾湭鏇存柊鏄庣粏 memo 鏍囧織");
}
}
}
@@ -192,10 +197,8 @@
return SUCCESS;
}
- private void reportPakOut(List<OrderDetl> orderDetls) {
+ private boolean reportPakOut(List<OrderDetl> orderDetls) {
- ReturnT<String> start = loginAuthenticationHandler.start();
- KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get("鍑哄簱鍗�");
Date now = new Date();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -203,7 +206,7 @@
JSONObject requestBody = new JSONObject();
requestBody.put("billType", "鍑哄簱鍗�");
- // 浠庣涓�涓槑缁嗕腑鎻愬彇璁㈠崟鍙风瓑淇℃伅锛堜綘鍙互鏍规嵁瀹為檯鎯呭喌璋冩暣锛�
+ // 浠庣涓�涓槑缁嗕腑鎻愬彇璁㈠崟鍙风瓑淇℃伅
if (!orderDetls.isEmpty()) {
OrderDetl first = orderDetls.get(0);
requestBody.put("orderNo", first.getOrderNo());
@@ -231,13 +234,13 @@
boolean success = false;
try {
HashMap<String, Object> headers = new HashMap<>();
- // 鍋囪浣犲凡缁忔彁鍓嶇櫥褰曞苟鑾峰彇浜� cookie
+ //cookie
headers.put("Cookie", loginAuthenticationHandler.start().getContent());
response = new HttpHandler.Builder()
.setHeaders(headers)
.setUri(URL)
- .setPath(inaddressSave) // 璁剧疆浣犵殑鎺ュ彛璺緞
+ .setPath(outaddressSave) // 璁剧疆浣犵殑鎺ュ彛璺緞
.setJson(requestBody.toJSONString())
.build()
.doPost();
@@ -266,6 +269,7 @@
log.error("鏃ュ織淇濆瓨澶辫触", e);
}
}
+ return success;
}
public static Object findValueByKey(JSONObject json, String key) {
--
Gitblit v1.9.1