From 0edbe07e9355fc22d6fbc55a70f2230a4b30101a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 11 三月 2025 15:15:09 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 c9bedbf..1dee193 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
@@ -52,7 +52,8 @@
* @return
* @time 2025/3/3 15:44
*/
- @Scheduled(cron = "0 0/30 * * * ? ")
+ @Scheduled(cron = "0 0/05 * * * ? ")
+// @Scheduled(cron = "0/5 * * * * ?")
@Transactional(rollbackFor = Exception.class)
public void genAsnOrder() {
//鍒ゆ柇鏄惁寮�鍚嚜鍔ㄧ敓鎴怉SN鍗曟嵁
@@ -92,7 +93,12 @@
List<AsnOrderItem> orderItems = new ArrayList<>();
items.forEach(item -> {
AsnOrderItem orderItem = new AsnOrderItem();
- Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getId, item.getMatnrCode()));
+ Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, item.getMatnrCode()));
+ if (Objects.isNull(matnr)) {
+ throw new CoolException("鏁版嵁閿欒锛氬綋鍓嶇墿鏂欎笉瀛樺湪!!");
+ }
+ //TODO barcode鐢熸垚绛栫暐
+ String barcode = code + matnr.getCode();
orderItem.setAnfme(item.getAnfme())
.setAsnId(order.getId())
.setQty(item.getQty())
@@ -100,6 +106,7 @@
.setSplrCode(item.getSplrCode())
.setMatnk(item.getMatnrName())
.setPoDetlId(item.getId())
+ .setBarcode(barcode)
.setPoCode(purchase.getCode())
.setPurQty(item.getAnfme())
.setPurUnit(item.getUnit())
@@ -114,7 +121,7 @@
//浠诲姟鎵ц瀹屾垚锛屼慨鏀瑰凡瀹屾垚鏁伴噺鍜孭O鍗曟墽琛岀姸鎬�
purchase.setQty(purchase.getAnfme()).setStatus(1);
- if (!purchaseService.save(purchase)) {
+ if (!purchaseService.saveOrUpdate(purchase)) {
throw new CoolException("PO鍗曟墽琛屽畬鎴愬悗锛屼繚瀛樺け璐ワ紒锛�");
}
--
Gitblit v1.9.1