From 669fe984048785873c20fbd0ce8abb3cd52c1fce Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 29 四月 2025 15:22:24 +0800
Subject: [PATCH] 新增出库单优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 110 insertions(+), 9 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 8616605..4cf03ae 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
@@ -6,9 +6,12 @@
import com.vincent.rsf.server.common.utils.CommonUtil;
import com.vincent.rsf.server.common.utils.DateUtils;
import com.vincent.rsf.server.manager.entity.*;
+import com.vincent.rsf.server.manager.enums.PakinIOStatus;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -19,6 +22,7 @@
import java.util.Date;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* @author Ryan
@@ -46,6 +50,16 @@
@Resource
private SysStockProperties flowProperties;
+ @Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private WaitPakinItemService waitPakinItemService;
+ @Autowired
+ private WaitPakinLogService waitPakinLogService;
+ @Autowired
+ private WaitPakinItemLogService waitPakinItemLogService;
+
+
/**
* @author Ryan
* @description 鏍规嵁PO鍗曟嵁鐢熸垚ASN鍗�,鑷姩鐢熸垚ASN鍗曚负鍏ㄩ噺鐢熸垚
@@ -54,9 +68,8 @@
* @time 2025/3/3 15:44
*/
@Scheduled(cron = "0 0/05 * * * ? ")
-// @Scheduled(cron = "0/5 * * * * ?")
@Transactional(rollbackFor = Exception.class)
- public void genAsnOrder() {
+ public synchronized void genAsnOrder() {
//鍒ゆ柇鏄惁寮�鍚嚜鍔ㄧ敓鎴怉SN鍗曟嵁
if (!flowProperties.getFlagAutoAsn()) {
return;
@@ -98,23 +111,26 @@
if (Objects.isNull(matnr)) {
throw new CoolException("鏁版嵁閿欒锛氬綋鍓嶇墿鏂欎笉瀛樺湪!!");
}
- //TODO barcode鐢熸垚绛栫暐
- String barcode = code + matnr.getCode();
+ String trackCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, item);
+ if (StringUtils.isBlank(trackCode)) {
+ throw new CoolException("鍗曟嵁璺熻釜鐮佺敓鎴愬け璐ワ細璇锋鏌ャ�宻ys_asn_mantr_label銆嶆槸鍚﹂厤缃畬鎴愶紒锛�");
+ }
+// String barcode = code + matnr.getCode();
orderItem.setAnfme(item.getAnfme())
.setAsnId(order.getId())
.setQty(item.getQty())
.setSplrName(item.getSplrName())
.setAsnCode(code)
.setSplrCode(item.getSplrCode())
- .setMatnk(item.getMatnrName())
.setPoDetlId(item.getId())
.setPlatItemId(item.getPlatItemId())
- .setBarcode(barcode)
+ .setTrackCode(trackCode)
.setPoCode(purchase.getCode())
.setPurQty(item.getAnfme())
.setPurUnit(item.getUnit())
- .setMatnk(matnr.getName())
- .setMatnrId(matnr.getId() + "");
+ .setMatnrCode(matnr.getCode())
+ .setMaktx(matnr.getName())
+ .setMatnrId(matnr.getId());
orderItems.add(orderItem);
});
if (!asnOrderItemService.saveBatch(orderItems)) {
@@ -127,8 +143,93 @@
if (!purchaseService.saveOrUpdate(purchase)) {
throw new CoolException("PO鍗曟墽琛屽畬鎴愬悗锛屼繚瀛樺け璐ワ紒锛�");
}
-
});
}
+ /**
+ * @author Ryan
+ * @description 鐢熸垚鐗╂枡鏍囩
+ * @param
+ * @return
+ * @time 2025/3/29 12:35
+ */
+ @Scheduled(cron = "0 0/05 * * * ? ")
+ @Transactional(rollbackFor = Exception.class)
+ public void generateMatnrLabel() {
+ List<AsnOrderItem> list = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
+ .isNull(AsnOrderItem::getTrackCode)
+ .select(AsnOrderItem::getId));
+ if (Objects.isNull(list) || list.isEmpty()) {
+ return;
+ }
+ List<AsnOrderItem> items = new ArrayList<>();
+ list.forEach(item -> {
+ String trackCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, item);
+ if (StringUtils.isBlank(trackCode)) {
+ throw new CoolException("鍗曟嵁璺熻釜鐮佺敓鎴愬け璐ワ細璇锋鏌ャ�宻ys_asn_mantr_label銆嶆槸鍚﹂厤缃畬鎴愶紒锛�");
+ }
+ item.setTrackCode(trackCode);
+ items.add(item);
+ });
+
+ if (!asnOrderItemService.updateBatchById(items)) {
+ throw new CoolException("鐢熸垚缂栫爜澶辫触锛侊紒");
+ }
+ }
+
+ /**
+ * @author Ryan
+ * @description 缁勬嫋鍘嗗彶妗�
+ * @param
+ * @return
+ * @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