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 | 156 ++++++++++-----------------------------------------
1 files changed, 31 insertions(+), 125 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 79266fe..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
@@ -9,14 +9,14 @@
import com.vincent.rsf.server.api.service.ReportMsgService;
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.entity.*;
-import com.vincent.rsf.server.manager.enums.AsnExceStatus;
-import com.vincent.rsf.server.manager.enums.OrderType;
-import com.vincent.rsf.server.manager.enums.OrderWorkType;
-import com.vincent.rsf.server.manager.enums.POExceStatus;
+import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.service.*;
+import com.vincent.rsf.server.manager.service.impl.StockItemServiceImpl;
+import com.vincent.rsf.server.manager.service.impl.StockServiceImpl;
import com.vincent.rsf.server.system.entity.User;
import com.vincent.rsf.server.system.service.UserService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -49,14 +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;
+
+
+
/**
* @param
@@ -83,7 +84,6 @@
}
}
-
/**
* @param
* @return
@@ -109,103 +109,7 @@
}
}
- /**
- * @author Ryan
- * @date 2025/10/28
- * @description: 涓婁紶宸插畬鎴愯鍗曡嚦ERP骞冲彴
- * @version 1.0
- */
- public void reportOrders(List<WkOrder> orders) {
- for (WkOrder order : orders) {
- if (order.getReportOnce() > 4 || order.getNtyStatus() == 1) {
- continue;
- }
- 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();
- }
- 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);
- R reported = reportMsgService.uploadReportOrders(params);
- order.setReportOnce(order.getReportOnce() + 1);
- if (!asnOrderService.updateById(order)) {
- throw new CoolException("鍗曟嵁涓婁紶娆℃暟淇敼澶辫触锛侊紒");
- }
-// if (reported.get("code").equals(200)) {
-// if (!asnOrderService.updateById(order)) {
-// throw new CoolException("涓婃姤鐘舵�佷慨鏀瑰け璐ワ紒锛�");
-// }
-// }
- try {
- //浼戠湢3绉�
- Thread.sleep(3000);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
- }
- }
/**
@@ -213,30 +117,35 @@
* @param type
* @return
* @author Ryan
- * @description 娣诲姞鍘嗗彶鍗曟嵁
+ * @description 娣诲姞鍘嗗彶鍗曟嵁, 浜т笂鎶RP
* @time 2025/6/16 08:56
*/
@Transactional(rollbackFor = Exception.class)
public void moveOrderToLog(List<WkOrder> wkOrders, String type) {
- boolean moveOrder = true;
- //涓婃姤宸插畬鎴愯鍗曡嚦ERP銆丮ES绛変笁鏂圭郴缁�
- try {
- reportOrders(wkOrders);
- } catch (Exception e) {
- log.error(e.getMessage());
- moveOrder = false;
+ Set<Long> longSet = wkOrders.stream().map(WkOrder::getId).collect(Collectors.toSet());
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .in(WkOrderItem::getOrderId, longSet));
+ if (orderItems.isEmpty()) {
+ throw new CoolException("鏀惰揣鏄庣粏涓虹┖锛侊紒");
}
- //鍒ゆ柇鏄惁鎶涘嚭寮傚父锛屾姏寮傚父涓嶅仛绉诲嚭鍔ㄤ綔
- if (moveOrder) {
- Set<Long> longSet = wkOrders.stream().map(WkOrder::getId).collect(Collectors.toSet());
- List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
- .in(WkOrderItem::getOrderId, longSet));
- if (orderItems.isEmpty()) {
- throw new CoolException("鏀惰揣鏄庣粏涓虹┖锛侊紒");
+ for (WkOrder order : wkOrders) {
+ 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());
+ }
}
-
- for (WkOrder order : wkOrders) {
+ if (order.getNtyStatus().equals(OrderReportStatus.ORDER_REPORT_STATUS_ALL.val)) {
AsnOrderLog one = asnOrderLogService.getOne(new LambdaQueryWrapper<AsnOrderLog>().eq(AsnOrderLog::getCode, order.getCode()), false);
if (Objects.isNull(one)) {
AsnOrderLog orderLog = new AsnOrderLog();
@@ -329,8 +238,5 @@
}
}
}
-
}
-
-
}
--
Gitblit v1.9.1