From 00298a6bbcf433f244df08037dad5470635934a1 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期二, 20 五月 2025 08:04:48 +0800 Subject: [PATCH] #问题修复 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 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..b2bc885 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.*; @@ -70,7 +71,8 @@ private WarehouseAreasService warehouseAreasService; @Autowired private WarehouseAreasItemServiceImpl warehouseAreasItemService; - + @Autowired + private CompanysService companysService; /** * @author Ryan @@ -86,7 +88,6 @@ if (Objects.isNull(config)) { return; } - if (!Boolean.parseBoolean(config.getVal())) { return; } @@ -145,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()) @@ -153,6 +159,10 @@ .setAsnCode(asnOrder.getCode()) .setAsnId(asnOrder.getId()) .setProdTime(orderItem.getProdTime()) + .setPlatOrderCode(orderItem.getPlatOrderCode()) + .setPlatWorkCode(orderItem.getPlatWorkCode()) + .setProjectCode(orderItem.getProjectCode()) + .setSplrId(companys.getId()) //搴撳瓨鍗曚綅涓烘渶灏忓崟浣� .setUnit(orderItem.getStockUnit()) .setStockUnit(orderItem.getStockUnit()) @@ -203,7 +213,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 +276,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鍗曟墽琛屽畬鎴愬悗锛屼繚瀛樺け璐ワ紒锛�"); -- Gitblit v1.9.1