From d45fd7768ac59fb44e65ce574aaf9fda1489488b Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 23 六月 2025 14:03:48 +0800
Subject: [PATCH] #订单导入上限增加
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index d285f24..7322481 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -2006,6 +2006,15 @@
materialDetail.setRollNo(wrkDetl.getModel());
materialDetail.setBoxNo(wrkDetl.getUnit());
materialDetail.setSpecs(wrkDetl.getMatnr());
+ materialDetail.setBoxType(wrkDetl.getColor());
+ materialDetail.setCoreType(wrkDetl.getManu());
+ materialDetail.setWidth(wrkDetl.getSku());
+ materialDetail.setThickness(wrkDetl.getItemNum());
+ materialDetail.setWeight(wrkDetl.getWeight());
+ materialDetail.setLength(wrkDetl.getLength());
+ materialDetail.setVolume(wrkDetl.getVolume());
+ materialDetail.setCustomerName(wrkDetl.getSupp());
+ materialDetail.setMemo(wrkDetl.getMemo());
material.setBoxPos(wrkDetl.getOrigin()); // 鎵樼洏涓婃湪绠变綅缃�
materialDetailList.add(materialDetail);
}
@@ -2015,14 +2024,15 @@
Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", wrkDetl.getOrderNo()));
if (order != null) {
material.setOrderNo(order.getOrderNo());
- material.setMemo(order.getMemo());
- material.setCustomerName(order.getCstmrName());
+// material.setMemo(order.getMemo());
+// material.setCustomerName(order.getCstmrName());
List<OrderStatisticsDto> unfulfilledOrders = orderMapper.getUnfulfilledOrders(order.getOrderNo());
if (unfulfilledOrders.size() == 1) {
OrderStatisticsDto orderStatisticsDto = unfulfilledOrders.get(0);
material.setSum(orderStatisticsDto.getSum());
material.setToShipQuantity(orderStatisticsDto.getToShipQuantity());
material.setWorkQuantity(orderStatisticsDto.getWorkQuantity());
+ material.setCompleteQuantity(orderStatisticsDto.getCompletedQuantity());
}
}
}
@@ -2088,7 +2098,7 @@
public boolean pushStaNoToGwcs(Integer palletizingNo, Integer staNo, Integer workNo, String barcode, String message) {
int maxRetry = 3; // 鏈�澶氶噸璇� 3 娆�
- long retryDelay = 3000; // 閲嶈瘯闂撮殧 3 绉�
+ long retryDelay = 10000; // 閲嶈瘯闂撮殧 10 绉�
boolean finalSuccess = false;
Map<String, Object> headers = getHeaders();
@@ -2110,7 +2120,7 @@
.setPath(MesConstant.GWCS_FPKW_URL)
.setHeaders(headers)
.setJson(body)
- .setTimeout(15, TimeUnit.SECONDS) // 璁剧疆杩炴帴 + 璇诲彇瓒呮椂涓�15绉�
+ .setTimeout(30, TimeUnit.SECONDS) // 璁剧疆杩炴帴 + 璇诲彇瓒呮椂涓�30绉�
.build()
.doPost();
@@ -2119,7 +2129,7 @@
try {
JSONObject resJson = JSON.parseObject(response);
int code = resJson.getIntValue("code"); // 瑙嗗叿浣撴帴鍙ｈ�屽畾
- if (code == 0) {
+ if (code == 200) {
success = true;
finalSuccess = true;
log.info("{} 鎴愬姛锛屽搷搴旓細{}", attemptMsg, response);
--
Gitblit v1.9.1