From 462031be0c21dc92733a382cc8e74d24157b70b9 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 28 一月 2026 11:00:24 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java | 86 ++++++++++++++++++++----------------------
1 files changed, 41 insertions(+), 45 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..b7827a5 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.erp.params.ReportDataParam;
@@ -9,10 +10,7 @@
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.system.entity.User;
import com.vincent.rsf.server.system.service.UserService;
@@ -115,11 +113,7 @@
* @description: 涓婁紶宸插畬鎴愯鍗曡嚦ERP骞冲彴
* @version 1.0
*/
- public void reportOrders(List<WkOrder> orders) {
- for (WkOrder order : orders) {
- if (order.getReportOnce() > 4 || order.getNtyStatus() == 1) {
- continue;
- }
+ 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()) {
@@ -144,7 +138,7 @@
.setItemCode(orderItem.getMatnrCode())
.setEditUser(nickName)
.setEditDate(order.getUpdateTime())
- .setGoodsNO(fields.get("crushNo"))
+// .setGoodsNO(fields.get("crushNo"))
.setMemoDtl(order.getMemo());
if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_DONE_IN.type)) {
@@ -188,23 +182,15 @@
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);
+ 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);
}
- }
}
@@ -213,30 +199,37 @@
* @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) {
+ try {
+ if (Cools.isEmpty(order.getReportOnce())){
+ log.error(order.getCode() + "锛屽崟鎹笂浼犳鏁颁负绌猴紝缃负0锛侊紒");
+ order.setReportOnce(0);
+ }
+ //涓婃姤娆℃暟闄愬畾
+ if (order.getReportOnce() < 4 ) {
+ //涓婃姤宸插畬鎴愯鍗曡嚦ERP銆丮ES绛変笁鏂圭郴缁�
+ 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();
@@ -327,10 +320,13 @@
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