From ccd73cd5be524f42bf9b418d4c7339fcb176f287 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期二, 04 十一月 2025 10:39:47 +0800
Subject: [PATCH] 上传重复提交问题修复
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java | 207 ++++++++++++++++++++++++++++-----------------------
1 files changed, 112 insertions(+), 95 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 a83445d..79266fe 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
@@ -14,10 +14,9 @@
import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.manager.enums.POExceStatus;
import com.vincent.rsf.server.manager.service.*;
-import com.vincent.rsf.server.manager.service.impl.TransferOrderServiceImpl;
import com.vincent.rsf.server.system.entity.User;
import com.vincent.rsf.server.system.service.UserService;
-import com.vincent.rsf.server.system.service.impl.UserServiceImpl;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -34,6 +33,7 @@
* @description
* @create 2025/3/19 19:07
*/
+@Slf4j
@Component
public class AsnOrderLogSchedule {
@@ -70,8 +70,9 @@
public void InStockToLog() {
List<WkOrder> wkOrders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
.eq(WkOrder::getType, OrderType.ORDER_IN.type)
- .eq(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val)
- );
+ .isNotNull(WkOrder::getPoCode)
+ .ne(WkOrder::getPoCode, "")
+ .eq(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val));
if (wkOrders.isEmpty()) {
return;
}
@@ -95,9 +96,9 @@
public void outStockComplete() {
List<WkOrder> wkOrders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
.eq(WkOrder::getType, OrderType.ORDER_OUT.type)
- .eq(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val)
-
- );
+ .isNotNull(WkOrder::getPoCode)
+ .ne(WkOrder::getPoCode, "")
+ .eq(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val));
if (wkOrders.isEmpty()) {
return;
}
@@ -114,9 +115,11 @@
* @description: 涓婁紶宸插畬鎴愯鍗曡嚦ERP骞冲彴
* @version 1.0
*/
- @Transactional(rollbackFor = Exception.class)
public void reportOrders(List<WkOrder> orders) {
- orders.forEach(order -> {
+ 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()) {
@@ -136,6 +139,7 @@
//璁剧疆閫氱敤鍙傛暟
param.setWMSNO(order.getCode())
.setPONO(order.getPoCode())
+ .setOrderNO(order.getPoCode())
.setOrderDate(order.getCreateTime())
.setItemCode(orderItem.getMatnrCode())
.setEditUser(nickName)
@@ -168,7 +172,9 @@
//鐢熶骇琛ユ枡
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");
@@ -182,22 +188,23 @@
reportData.add(param);
});
params.setData(reportData);
-
R reported = reportMsgService.uploadReportOrders(params);
- if (reported.get("code").equals(200)) {
- order.setNtyStatus(1);
- if (!asnOrderService.updateById(order)) {
- throw new CoolException("涓婃姤鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
+ 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);
}
-
- });
+ }
}
@@ -211,57 +218,65 @@
*/
@Transactional(rollbackFor = Exception.class)
public void moveOrderToLog(List<WkOrder> wkOrders, String type) {
+ boolean moveOrder = true;
//涓婃姤宸插畬鎴愯鍗曡嚦ERP銆丮ES绛変笁鏂圭郴缁�
-// reportOrders(wkOrders);
- //
- 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("鏀惰揣鏄庣粏涓虹┖锛侊紒");
+ try {
+ reportOrders(wkOrders);
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ moveOrder = false;
}
- for (WkOrder order : wkOrders) {
- AsnOrderLog one = asnOrderLogService.getOne(new LambdaQueryWrapper<AsnOrderLog>().eq(AsnOrderLog::getCode, order.getCode()), false);
- if (Objects.isNull(one)) {
- AsnOrderLog orderLog = new AsnOrderLog();
- if (type.equals(OrderType.ORDER_OUT.type)) {
- order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
- order.setQty(order.getWorkQty());
- }
- BeanUtils.copyProperties(order, orderLog);
- orderLog.setId(null);
- orderLog.setAsnId(order.getId());
+ //鍒ゆ柇鏄惁鎶涘嚭寮傚父锛屾姏寮傚父涓嶅仛绉诲嚭鍔ㄤ綔
+ 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("鏀惰揣鏄庣粏涓虹┖锛侊紒");
+ }
- if (!asnOrderLogService.save(orderLog)) {
- throw new CoolException("涓诲崟鍘嗗彶妗ｆ坊鍔犲け璐ワ紒锛�");
- }
-
- List<AsnOrderItemLog> logs = new ArrayList<>();
- List<WkOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
- .eq(WkOrderItem::getOrderId, order.getId()));
- items.forEach(item -> {
- AsnOrderItemLog itemLog = new AsnOrderItemLog();
- BeanUtils.copyProperties(item, itemLog);
- itemLog.setAsnItemId(itemLog.getId())
- .setId(null)
- .setMatnrId(item.getMatnrId())
- .setLogId(orderLog.getId())
- .setAsnId(item.getOrderId());
- logs.add(itemLog);
- });
-
- if (!asnOrderItemLogService.saveBatch(logs)) {
- throw new CoolException("鍗曟嵁鏄庣粏鍘嗗彶妗ｄ繚瀛樺け璐ワ紒锛�");
- }
-
- //鏇存柊PO/DO鍗曟墽琛岀姸鎬�
- if (type.equals(OrderType.ORDER_IN.type)) {
- if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.type)) {
+ for (WkOrder order : wkOrders) {
+ AsnOrderLog one = asnOrderLogService.getOne(new LambdaQueryWrapper<AsnOrderLog>().eq(AsnOrderLog::getCode, order.getCode()), false);
+ if (Objects.isNull(one)) {
+ AsnOrderLog orderLog = new AsnOrderLog();
+ if (type.equals(OrderType.ORDER_OUT.type)) {
order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
- if (!asnOrderService.updateById(order)) {
- throw new CoolException("鍗曟嵁鐘舵�佹洿鏂板け璐ワ紒锛�");
- }
+ order.setQty(order.getWorkQty());
+ }
+ BeanUtils.copyProperties(order, orderLog);
+ orderLog.setId(null);
+ orderLog.setAsnId(order.getId());
+
+ if (!asnOrderLogService.save(orderLog)) {
+ throw new CoolException("涓诲崟鍘嗗彶妗ｆ坊鍔犲け璐ワ紒锛�");
+ }
+
+ List<AsnOrderItemLog> logs = new ArrayList<>();
+ List<WkOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getOrderId, order.getId()));
+ items.forEach(item -> {
+ AsnOrderItemLog itemLog = new AsnOrderItemLog();
+ BeanUtils.copyProperties(item, itemLog);
+ itemLog.setAsnItemId(itemLog.getId())
+ .setId(null)
+ .setMatnrId(item.getMatnrId())
+ .setLogId(orderLog.getId())
+ .setAsnId(item.getOrderId());
+ logs.add(itemLog);
+ });
+
+ if (!asnOrderItemLogService.saveBatch(logs)) {
+ throw new CoolException("鍗曟嵁鏄庣粏鍘嗗彶妗ｄ繚瀛樺け璐ワ紒锛�");
+ }
+
+ //鏇存柊PO/DO鍗曟墽琛岀姸鎬�
+ if (type.equals(OrderType.ORDER_IN.type)) {
+ if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.type)) {
+ order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
+ if (!asnOrderService.updateById(order)) {
+ throw new CoolException("鍗曟嵁鐘舵�佹洿鏂板け璐ワ紒锛�");
+ }
// List<TransferOrder> orders = transferOrderService.list(new LambdaQueryWrapper<TransferOrder>().eq(TransferOrder::getTransferId, order.getPoId()));
// if (orders.isEmpty()) {
// throw new CoolException("鏁版嵁閿欒锛氬叧鑱旇〃淇℃伅涓嶅瓨鍦紒锛�");
@@ -274,45 +289,47 @@
// if (!this.asnOrderService.removeByIds(orderIds)) {
// throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
// }
- if (!transferService.update(new LambdaUpdateWrapper<Transfer>()
- .eq(Transfer::getId, order.getPoId())
- .set(Transfer::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val))) {
- throw new CoolException("璋冩嫈鍗曠姸鎬佷慨鏀瑰け璐ワ紒锛�");
+ if (!transferService.update(new LambdaUpdateWrapper<Transfer>()
+ .eq(Transfer::getId, order.getPoId())
+ .set(Transfer::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val))) {
+ throw new CoolException("璋冩嫈鍗曠姸鎬佷慨鏀瑰け璐ワ紒锛�");
+ }
+ return;
+ } else {
+ if (!Objects.isNull(order.getPoId())) {
+ purchaseService.update(new LambdaUpdateWrapper<Purchase>()
+ .set(Purchase::getExceStatus, POExceStatus.PO_EXCE_STATUS_ALL_DONE.val)
+ .eq(Purchase::getId, order.getPoId()));
+ }
}
- return;
} else {
- if (!Objects.isNull(order.getPoId())) {
- purchaseService.update(new LambdaUpdateWrapper<Purchase>()
- .set(Purchase::getExceStatus, POExceStatus.PO_EXCE_STATUS_ALL_DONE.val)
- .eq(Purchase::getId, order.getPoId()));
- }
- }
- } else {
- if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.type)) {
- order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
- if (!asnOrderService.updateById(order)) {
- throw new CoolException("鍗曟嵁鐘舵�佹洿鏂板け璐ワ紒锛�");
- }
- //濡傛灉涓鸿皟鎷斿崟鎹繚鐣�
- return;
- } else {
- if (!Objects.isNull(order.getPoId())) {
- deliveryService.update(new LambdaUpdateWrapper<Delivery>()
- .eq(Delivery::getId, order.getPoId())
- .set(Delivery::getExceStatus, POExceStatus.PO_EXCE_STATUS_ALL_DONE.val));
+ if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.type)) {
+ order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
+ if (!asnOrderService.updateById(order)) {
+ throw new CoolException("鍗曟嵁鐘舵�佹洿鏂板け璐ワ紒锛�");
+ }
+ //濡傛灉涓鸿皟鎷斿崟鎹繚鐣�
+ return;
+ } else {
+ if (!Objects.isNull(order.getPoId())) {
+ deliveryService.update(new LambdaUpdateWrapper<Delivery>()
+ .eq(Delivery::getId, order.getPoId())
+ .set(Delivery::getExceStatus, POExceStatus.PO_EXCE_STATUS_ALL_DONE.val));
+ }
}
}
}
- }
- if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
- .eq(WkOrderItem::getOrderId, order.getId()))) {
- throw new CoolException("鍘熷崟鎹槑缁嗗垹闄ゅけ璐ワ紒锛�");
- }
- if (!this.asnOrderService.removeById(order.getId())) {
- throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
+ if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getOrderId, order.getId()))) {
+ throw new CoolException("鍘熷崟鎹槑缁嗗垹闄ゅけ璐ワ紒锛�");
+ }
+ if (!this.asnOrderService.removeById(order.getId())) {
+ throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
+ }
}
}
+
}
--
Gitblit v1.9.1