From d25c8fa670a8fea0977c85f67b13917b3bdefa89 Mon Sep 17 00:00:00 2001 From: verou <857149855@qq.com> Date: 星期五, 14 三月 2025 17:01:24 +0800 Subject: [PATCH] fix:增加datagrid --- rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 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 e811c81..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,14 +93,21 @@ 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(purchase.getId()) + .setAsnId(order.getId()) .setQty(item.getQty()) .setSplrName(item.getSplrName()) .setSplrCode(item.getSplrCode()) .setMatnk(item.getMatnrName()) - .setPoDetlId(item.getId() + "") + .setPoDetlId(item.getId()) + .setBarcode(barcode) + .setPoCode(purchase.getCode()) .setPurQty(item.getAnfme()) .setPurUnit(item.getUnit()) .setMatnk(matnr.getName()) @@ -113,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