From 1badfb47887a8b95e422341fb7b44f1610cae11b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 14 七月 2025 20:16:36 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java | 87 +++++++++----------------------------------
1 files changed, 18 insertions(+), 69 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 626dbd8..81b7147 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
@@ -11,6 +11,7 @@
import com.vincent.rsf.server.manager.controller.params.WarehouseAreaParam;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
+import com.vincent.rsf.server.manager.enums.POExceStatus;
import com.vincent.rsf.server.manager.enums.PakinIOStatus;
import com.vincent.rsf.server.manager.enums.WarehouseAreasType;
import com.vincent.rsf.server.manager.service.*;
@@ -57,20 +58,13 @@
@Resource
private SysStockProperties flowProperties;
@Autowired
- private WaitPakinService waitPakinService;
- @Autowired
- private WaitPakinItemService waitPakinItemService;
- @Autowired
- private WaitPakinLogService waitPakinLogService;
- @Autowired
- private WaitPakinItemLogService waitPakinItemLogService;
- @Autowired
private ConfigService configService;
@Autowired
private WarehouseAreasService warehouseAreasService;
@Autowired
private WarehouseAreasItemServiceImpl warehouseAreasItemService;
-
+ @Autowired
+ private CompanysService companysService;
/**
* @author Ryan
@@ -86,7 +80,6 @@
if (Objects.isNull(config)) {
return;
}
-
if (!Boolean.parseBoolean(config.getVal())) {
return;
}
@@ -145,6 +138,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())
@@ -153,6 +151,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())
@@ -179,7 +182,8 @@
WarehouseAreasItem serviceOne = warehouseAreasItemService.getOne(queryWrapper);
if (!Objects.isNull(serviceOne)) {
item.setId(serviceOne.getId());
- item.setAnfme(item.getAnfme() + serviceOne.getAnfme());
+ Double anfme = Math.round((item.getAnfme() + serviceOne.getAnfme()) * 10000) / 10000.0;
+ item.setAnfme(anfme);
}
//鏈川妫�
if (!warehouseAreasItemService.saveOrUpdate(item)) {
@@ -203,7 +207,7 @@
return;
}
//鑾峰彇鏈敓鎴怉SN鍗曟嵁
- List<Purchase> purchases = purchaseService.list(new LambdaQueryWrapper<Purchase>().eq(Purchase::getStatus, 0));
+ List<Purchase> purchases = purchaseService.list(new LambdaQueryWrapper<Purchase>().eq(Purchase::getExceStatus, 0));
//PO鍗曚负绌猴紝鐩存帴璺冲嚭褰撳墠浠诲姟
if (purchases.isEmpty()) {
return;
@@ -266,7 +270,8 @@
}
//浠诲姟鎵ц瀹屾垚锛屼慨鏀瑰凡瀹屾垚鏁伴噺鍜孭O鍗曟墽琛岀姸鎬�
- purchase.setQty(purchase.getAnfme()).setStatus(1);
+ purchase.setQty(purchase.getAnfme())
+ .setExceStatus(POExceStatus.PO_EXCE_STATUS_EXCE_ING.val);
if (!purchaseService.saveOrUpdate(purchase)) {
throw new CoolException("PO鍗曟墽琛屽畬鎴愬悗锛屼繚瀛樺け璐ワ紒锛�");
@@ -305,60 +310,4 @@
throw new CoolException("鐢熸垚缂栫爜澶辫触锛侊紒");
}
}
-
- /**
- * @param
- * @return
- * @author Ryan
- * @description 缁勬嫋鍘嗗彶妗�
- * @time 2025/3/29 12:36
- */
- @Scheduled(cron = "0/25 * * * * ?")
- @Transactional(rollbackFor = Exception.class)
- public void pakinLog() {
- List<WaitPakin> pakinIds = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>()
- .eq(WaitPakin::getIoStatus, Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_TASK_DONE.val))
- .select(WaitPakin::getId));
- if (pakinIds.isEmpty()) {
- return;
- }
- List<Long> list = pakinIds.stream().map(WaitPakin::getId).collect(Collectors.toList());
- List<WaitPakin> pakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().in(WaitPakin::getId, list));
- 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 (!waitPakinItemLogService.saveBatch(itemLogs)) {
- throw new CoolException("鍘嗗彶鏄庣粏妗ｄ繚瀛樺け璐ワ紒锛�");
- }
- if (!waitPakinService.removeByIds(list)) {
- throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
- }
- if (!waitPakinItemService.remove(new LambdaQueryWrapper<WaitPakinItem>().in(WaitPakinItem::getPakinId, list))) {
- throw new CoolException("鍘熷崟鎹槑缁嗗垹闄ゅけ璐ワ紒锛�");
- }
- }
-
}
--
Gitblit v1.9.1