From e9365986c7adc1eb233a6ca6ead7a91899290e75 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 28 五月 2025 12:56:13 +0800
Subject: [PATCH] 组托历史档优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java | 56 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 34 insertions(+), 22 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
index a3ce17e..4a84232 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
@@ -71,7 +71,8 @@
private WarehouseAreasService warehouseAreasService;
@Autowired
private WarehouseAreasItemServiceImpl warehouseAreasItemService;
-
+ @Autowired
+ private CompanysService companysService;
/**
* @author Ryan
@@ -87,7 +88,6 @@
if (Objects.isNull(config)) {
return;
}
-
if (!Boolean.parseBoolean(config.getVal())) {
return;
}
@@ -146,6 +146,11 @@
* @version 1.0
*/
private void extracted(WarehouseAreas areasItem, AsnOrderItem orderItem, AsnOrder asnOrder, Matnr matnr) {
+ Companys companys = new Companys();
+ if (StringUtils.isNoneBlank(orderItem.getSplrCode())) {
+ companys = companysService.getOne(new LambdaQueryWrapper<Companys>().eq(Companys::getCode, orderItem.getSplrCode()));
+ }
+
WarehouseAreasItem item = new WarehouseAreasItem();
item.setTrackCode(orderItem.getBarcode())
.setAreaName(areasItem.getName())
@@ -154,6 +159,11 @@
.setAsnCode(asnOrder.getCode())
.setAsnId(asnOrder.getId())
.setProdTime(orderItem.getProdTime())
+ .setPlatItemId(orderItem.getPlatItemId())
+ .setPlatOrderCode(orderItem.getPlatOrderCode())
+ .setPlatWorkCode(orderItem.getPlatWorkCode())
+ .setProjectCode(orderItem.getProjectCode())
+ .setSplrId(companys.getId())
//搴撳瓨鍗曚綅涓烘渶灏忓崟浣�
.setUnit(orderItem.getStockUnit())
.setStockUnit(orderItem.getStockUnit())
@@ -329,32 +339,34 @@
if (pakins.isEmpty()) {
throw new CoolException("缁勬嫋鍗曚负绌猴紒锛�");
}
- List<WaitPakinLog> pakinLogs = new ArrayList<>();
pakins.forEach(pakin -> {
WaitPakinLog log = new WaitPakinLog();
BeanUtils.copyProperties(pakin, log);
log.setPakinId(pakin.getId()).setIoStatus(Short.parseShort("2"));
- pakinLogs.add(log);
- });
- if (!waitPakinLogService.saveBatch(pakinLogs)) {
- throw new CoolException("鍘嗗彶妗ｄ繚瀛樺け璐ワ紒锛�");
- }
- List<WaitPakinItemLog> itemLogs = new ArrayList<>();
- List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().in(WaitPakinItem::getPakinId, list));
- if (pakinItems.isEmpty()) {
- throw new CoolException("缁勬嫋鏄庣粏涓虹┖锛侊紒");
- }
- pakinItems.forEach(item -> {
- WaitPakinItemLog itemLog = new WaitPakinItemLog();
- BeanUtils.copyProperties(item, itemLog);
- itemLog.setPakinItemId(item.getId())
- .setPakinId(item.getPakinId());
- itemLogs.add(itemLog);
+
+ if (!waitPakinLogService.save(log)) {
+ throw new CoolException("缁勬墭鏃ュ織淇濆瓨澶辫触锛侊紒");
+ }
+ List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().in(WaitPakinItem::getPakinId, pakin.getId()));
+ if (pakinItems.isEmpty()) {
+ throw new CoolException("缁勬嫋鏄庣粏涓虹┖锛侊紒");
+ }
+ List<WaitPakinItemLog> itemLogs = new ArrayList<>();
+
+ pakinItems.forEach(item -> {
+ WaitPakinItemLog itemLog = new WaitPakinItemLog();
+ BeanUtils.copyProperties(item, itemLog);
+ itemLog.setPakinItemId(item.getId())
+ .setLogId(log.getId())
+ .setPakinId(item.getPakinId());
+ itemLogs.add(itemLog);
+ });
+
+ if (!waitPakinItemLogService.saveBatch(itemLogs)) {
+ throw new CoolException("鍘嗗彶鏄庣粏妗ｄ繚瀛樺け璐ワ紒锛�");
+ }
});
- if (!waitPakinItemLogService.saveBatch(itemLogs)) {
- throw new CoolException("鍘嗗彶鏄庣粏妗ｄ繚瀛樺け璐ワ紒锛�");
- }
if (!waitPakinService.removeByIds(list)) {
throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
}
--
Gitblit v1.9.1