From 8caf5f04be94d8f52fb291dd045663079d681c19 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 16 八月 2025 11:43:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/mes/job/ProductionOrderSyncCreationJob.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/mes/job/ProductionOrderSyncCreationJob.java b/src/main/java/org/jeecg/modules/mes/job/ProductionOrderSyncCreationJob.java
index d81111b..42bd30d 100644
--- a/src/main/java/org/jeecg/modules/mes/job/ProductionOrderSyncCreationJob.java
+++ b/src/main/java/org/jeecg/modules/mes/job/ProductionOrderSyncCreationJob.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.mes.job;
import lombok.extern.slf4j.Slf4j;
+import org.jeecg.modules.lsw.service.ILswMaterialService;
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.util.ThrowableUtil;
import org.jeecg.modules.mes.entity.MesProductionOrder;
@@ -87,6 +88,8 @@
private ISysQuartzLogService sysQuartzLogService;
@Autowired
private IQuartzJobService quartzJobService;
+ @Autowired
+ private ILswMaterialService lswMaterialService;
@Override
public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
@@ -144,12 +147,19 @@
log.error("杩斿洖绫诲瀷閿欒锛� class:{}", result == null ? null : result.getClass());
return;
}
+ //璁㈠崟BOM鏁版嵁澶勭悊
List<OrderBomDTO> orderBomDTOList = (List<OrderBomDTO>) result;
b = processBillMaterialsService.saveOrUpdateOrderBom(orderMap, orderBomDTOList);
if (!b) {
log.error("淇濆瓨璁㈠崟BOM澶辫触锛屾棩鏈燂細{}", LocalDateTime.now());
return;
}
+ //鐗╂枡鏁版嵁澶勭悊
+ b = lswMaterialService.saveOrUpdateMaterial(orderMap, orderBomDTOList);
+ if (!b) {
+ log.error("淇濆瓨鐗╂枡澶辫触锛屾棩鏈燂細{}", LocalDateTime.now());
+ return;
+ }
//璁㈠崟宸ュ簭鍚屾
Map<String, Object> orderProcessMap = orderProcessSync.syncOrderProcess(FACTORY_CODE, orderCodes);
if (orderBomMap == null || !SUCCESS_CODE.equals(orderProcessMap.get("ztype"))) {
--
Gitblit v1.9.3