From 5ec18e799f11c021f343e7593701e54f920a6072 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 06 十一月 2025 19:07:52 +0800
Subject: [PATCH] #新增 1. 整单上传修改即时上传
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java | 144 +++++------------------------------------------
1 files changed, 17 insertions(+), 127 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
index 6fa6c31..5cd2a94 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
@@ -49,18 +49,15 @@
private AsnOrderLogService asnOrderLogService;
@Autowired
private AsnOrderItemLogService asnOrderItemLogService;
- @Autowired
- private TransferOrderService transferOrderService;
+
@Autowired
private TransferService transferService;
- @Autowired
- private UserService userService;
+
@Autowired
private ReportMsgService reportMsgService;
- @Autowired
- private StockItemService stockItemService;
- @Autowired
- private StockService stockService;
+
+
+
/**
* @param
@@ -87,7 +84,6 @@
}
}
-
/**
* @param
* @return
@@ -113,109 +109,7 @@
}
}
- /**
- * @author Ryan
- * @date 2025/10/28
- * @description: 涓婁紶宸插畬鎴愯鍗曡嚦ERP骞冲彴
- * @version 1.0
- */
- public void reportOrders(WkOrder order) {
- ReportParams params = new ReportParams();
- List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
- if (orderItems.isEmpty()) {
- throw new CoolException("璁㈡嵁鏄庣粏涓嶅瓨鍦紒锛�");
- }
- List<ReportDataParam> reportData = new ArrayList<>();
- orderItems.forEach(orderItem -> {
- ReportDataParam param = new ReportDataParam();
- User user = userService.getById(order.getUpdateBy());
- String nickName = null;
- if (!Objects.isNull(user)) {
- nickName = user.getNickname();
- }
- //鑾峰彇鍏ュ簱搴撲綅淇℃伅
- if (order.getType().equals(OrderType.ORDER_IN.type)) {
- //绛涢�夊綋鍓嶅敮涓�瀛楁鎵�鏈夊嚭鍏ュ簱淇℃伅
- List<StockItem> stockItems = stockItemService.list(new LambdaQueryWrapper<StockItem>()
- .eq(StockItem::getFieldsIndex, orderItem.getFieldsIndex()));
- //鑾峰彇搴撳瓨涓鍗曞簱浣�
- if (!stockItems.isEmpty()) {
- Set<Long> stockIds = stockItems.stream().map(StockItem::getStockId).collect(Collectors.toSet());
- //鑾峰彇搴撳瓨搴撲綅淇℃伅
- List<Stock> stocks = stockService.list(new LambdaQueryWrapper<Stock>()
- .in(Stock::getId, stockIds)
- .eq(Stock::getType, OrderType.ORDER_IN.type)
- .eq(Stock::getSourceCode, order.getCode()));
- Set<String> locs = stocks.stream().map(Stock::getLocCode).collect(Collectors.toSet());
- String locCode = StringUtils.join(locs.toArray(), ",");
- param.setZone(locCode);
- }
- }
- //鑾峰彇绱㈠紩鍐呭
- Map<String, String> fields = FieldsUtils.getFields(orderItem.getFieldsIndex());
- //璁剧疆閫氱敤鍙傛暟
- param.setWMSNO(order.getCode())
- .setPONO(order.getPoCode())
- .setOrderNO(order.getPoCode())
- .setOrderDate(order.getCreateTime())
- .setItemCode(orderItem.getMatnrCode())
- .setEditUser(nickName)
- .setEditDate(order.getUpdateTime())
- .setGoodsNO(fields.get("crushNo"))
- .setMemoDtl(order.getMemo());
-
- if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_DONE_IN.type)) {
- //閲囪喘鍏ュ簱鍗�
- params.setOrderType("PO_Instock").setAction("Update");
- //鑾峰彇鎸囧畾鏌ヨ瀛楁CrushNo 绁ㄥ彿
- param.setInQty(orderItem.getQty());
- } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE_RETURN.type)) {
- //閲囪喘閫�璐�
- params.setOrderType("PR_Outstock").setAction("Update");
- param.setOutQty(orderItem.getQty());
- } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PROD.type)) {
- //鐢熶骇鍏ュ簱鍗�
-// params.setOrderType("WO_Outstock").setAction("Update");
- } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE.type)) {
- //鐢熶骇閫�鏂�
- params.setOrderType("WR_Instock").setAction("Update");
- param.setInQty(orderItem.getQty());
- } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_RETURN_ORDER.type)) {
- //鐢熶骇棰嗘枡
- params.setOrderType("WO_Outstock").setAction("Update");
- param.setOutQty(orderItem.getQty());
-
- } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PROD_ADDITION.type)) {
- //鐢熶骇琛ユ枡
- params.setOrderType("WR_Instock_BL").setAction("Update");
- param.setOutQty(orderItem.getQty());
- } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_FIX_OUT.type)) {
- params.setOrderType("WO_Outstock_WR").setAction("Update");
- param.setOutQty(orderItem.getQty());
- } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type)) {
- //鍏跺畠鍏ュ簱鍗�/鎵嬪姩鍏ュ簱鍗�
- params.setOrderType("In_Instock").setAction("Update");
- param.setInQty(orderItem.getQty());
-
- } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER.type)) {
- //鍏跺畠鍑哄簱鍗�/鎵嬪姩鍑哄簱鍗�
- params.setOrderType("Io_Outstock").setAction("Update");
- param.setOutQty(orderItem.getQty());
- }
- reportData.add(param);
- });
- params.setData(reportData);
- try {
- R reported = reportMsgService.uploadReportOrders(params);
- if (reported.get("code").equals("200")) {
- order.setNtyStatus(OrderReportStatus.ORDER_REPORT_STATUS_ALL.val);
- asnOrderService.updateById(order);
- }
- } catch (Exception e) {
- log.error("<UNK>", e);
- }
- }
/**
@@ -236,18 +130,20 @@
}
for (WkOrder order : wkOrders) {
- try {
- //涓婃姤娆℃暟闄愬畾
- if (order.getReportOnce() < 4) {
- //涓婃姤宸插畬鎴愯鍗曡嚦ERP銆丮ES绛変笁鏂圭郴缁�
- reportOrders(order);
- order.setReportOnce(order.getReportOnce() + 1);
- if (!asnOrderService.updateById(order)) {
- log.error(order.getCode() + "锛屽崟鎹笂浼犳鏁颁慨鏀瑰け璐ワ紒锛�");
+ if (order.getType().equals(OrderType.ORDER_OUT.type)) {
+ try {
+ //涓婃姤娆℃暟闄愬畾
+ if (order.getReportOnce() < 4) {
+ //涓婃姤宸插畬鎴愯鍗曡嚦ERP銆丮ES绛変笁鏂圭郴缁�
+ reportMsgService.reportOrders(order);
+ order.setReportOnce(order.getReportOnce() + 1);
+ if (!asnOrderService.updateById(order)) {
+ log.error(order.getCode() + "锛屽崟鎹笂浼犳鏁颁慨鏀瑰け璐ワ紒锛�");
+ }
}
+ } catch (Exception e) {
+ log.error(e.getMessage());
}
- } catch (Exception e) {
- log.error(e.getMessage());
}
if (order.getNtyStatus().equals(OrderReportStatus.ORDER_REPORT_STATUS_ALL.val)) {
AsnOrderLog one = asnOrderLogService.getOne(new LambdaQueryWrapper<AsnOrderLog>().eq(AsnOrderLog::getCode, order.getCode()), false);
@@ -339,12 +235,6 @@
}
if (!this.asnOrderService.removeById(order.getId())) {
throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
- }
- try {
- //浼戠湢3绉�
- Thread.sleep(3000);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
}
}
}
--
Gitblit v1.9.1