From 8e2a5905563af05284495e23bc10ba8d4b741ba9 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期一, 11 十一月 2024 16:52:56 +0800
Subject: [PATCH] 批次前端显示
---
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 5 ++
src/main/resources/application-loc.yml | 1
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 8 ++--
src/main/resources/application-dev.yml | 1
src/main/resources/application-prod.yml | 1
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 45 ++++++++--------------
src/main/resources/application.yml | 1
7 files changed, 30 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 13fd364..78f6ef6 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -72,10 +72,10 @@
continue;
}
}
-// ReturnT<String> result = orderSyncHandler.start(order);
-// if (!result.isSuccess()) {
-// log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
-// }
+ ReturnT<String> result = orderSyncHandler.start(order);
+ if (!result.isSuccess()) {
+ //log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ }
}
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
index 15b23ec..88a8d08 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -59,6 +59,8 @@
@Value("${agvBasDev.maxWorkNum}")
private int maxWrokNum;
+ @Value("${mes.report}")
+ private Boolean flag;
@Value("${mes.url}")
private String url;
@Value("${mes.getTokenUrl}")
@@ -688,6 +690,9 @@
}
private void reportMes(AgvWrkMast agvWrkMast, List<AgvWrkDetl> agvWrkDetls) {
+ if (!flag){
+ return;
+ }
if (Cools.isEmpty(agvWrkDetls)) {
return;
}
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 630d1dd..62cd843 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -54,43 +54,31 @@
@Transactional
public ReturnT<String> start(Order order) {
- //List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�", "閾跺骇濮斿鏉愭枡鍑哄簱鍗�", "閾跺骇濮斿鍏ュ簱鍗�", "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�"));
- List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇濮斿鍏ュ簱鍗�", "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�"));
+ List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�", "閾跺骇濮斿鏉愭枡鍑哄簱鍗�", "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�"));
DocType docType = docTypeService.selectById(order.getDocType());
if (!docNames.contains(docType.getDocName())) {
order.setSettle(8L);
orderService.updateById(order);
return SUCCESS;
- }
-// if("鎵嬪姩鍑哄簱鍗�".equals(docType.getDocName())
-// || "鎵嬪姩鍏ュ簱鍗�".equals(docType.getDocName())
-// || "鑷姩琛ヨ揣鍗�".equals(docType.getDocName())
-// || "浜哄伐琛ヨ揣鍗�".equals(docType.getDocName())){
-// order.setSettle(8L);
-// orderService.updateById(order);
-// return SUCCESS;
-// }
+ } else {
+ boolean flag = true;
+ List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
+ List<OrderDetl> report = new ArrayList<>();
+ for (OrderDetl orderDetl : orderDetlList) {
+ if (orderDetl.getReportQty() == null || orderDetl.getQty() > orderDetl.getReportQty() || orderDetl.getQty() < orderDetl.getAnfme()) {
+ flag = false;
+ }
+ }
+ if (flag) {
+ log.info("鍗曟嵁瀹岀粨,{}", order);
+ order.setSettle(6L);
+ orderService.updateById(order);
+ }
- List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
-
- ReportErpParam param = new ReportErpParam();
- mappingParam(order, param);
- mappingParamChildren(orderDetlList, param);
- if (Cools.isEmpty(order.getPltType())) {
return SUCCESS;
}
-
- int code = doHttpRequest(param, "鍗曟嵁瀹℃牳", url, orderReportPath, null, "127.0.0.1");
- if (code == 0) {
- log.info("鍗曟嵁瀹℃牳,{}", order);
- order.setSettle(6L);
- orderService.updateById(order);
- }
-
- return SUCCESS;
}
-
@Transactional
public void timelyStart(Order order) {
@@ -181,7 +169,8 @@
}
- private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip) {
+ private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String
+ ip) {
String response = "";
boolean success = false;
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 6d9c552..9804b7a 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -91,6 +91,7 @@
# url: http://39.184.149.30:8877
# orderReportPath: /DBMS/U8/CM/add
mes:
+ report: false
url: https://v3-ali.blacklake.cn/api/openapi/domain/web/v1/route
orderReportPath: /inventory/open/v2/transfer_order/ordinary/_execute
pakinReportPath: /inventory/open/v2/inbound_order/execute/_inbound
diff --git a/src/main/resources/application-loc.yml b/src/main/resources/application-loc.yml
index 77f141b..bf99810 100644
--- a/src/main/resources/application-loc.yml
+++ b/src/main/resources/application-loc.yml
@@ -91,6 +91,7 @@
# url: http://39.184.149.30:8877
# orderReportPath: /DBMS/U8/CM/add
mes:
+ report: false
url: https://v3-ali.blacklake.cn/api/openapi/domain/web/v1/route
orderReportPath: /inventory/open/v2/transfer_order/ordinary/_execute
pakinReportPath: /inventory/open/v2/inbound_order/execute/_inbound
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index bb025ae..60f2b03 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -91,6 +91,7 @@
# url: http://39.184.149.30:8877
# orderReportPath: /DBMS/U8/CM/add
mes:
+ report: true
url: https://v3-ali.blacklake.cn/api/openapi/domain/web/v1/route
orderReportPath: /inventory/open/v2/transfer_order/ordinary/_execute
pakinReportPath: /inventory/open/v2/inbound_order/execute/_inbound
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index caf4dfc..0e0e3f2 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,3 +1,4 @@
spring:
profiles:
+ #dev loc prod
active: dev
\ No newline at end of file
--
Gitblit v1.9.1