From c71714508fbe3ace3543423c7700d7bbcca90056 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 12 八月 2025 13:41:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/mes/job/ProductionOrderSyncCreationJob.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 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 086a7b1..d81111b 100644
--- a/src/main/java/org/jeecg/modules/mes/job/ProductionOrderSyncCreationJob.java
+++ b/src/main/java/org/jeecg/modules/mes/job/ProductionOrderSyncCreationJob.java
@@ -14,6 +14,7 @@
import org.jeecg.modules.sap.dto.OrderBomDTO;
import org.jeecg.modules.sap.dto.OrderProcessDTO;
import org.jeecg.modules.sap.dto.ProductionOrderDTO;
+import org.jeecg.modules.sap.request.ProductionOrderSyncRequest;
import org.jeecg.modules.sap.service.OrderBomSync;
import org.jeecg.modules.sap.service.OrderProcessSync;
import org.jeecg.modules.sap.service.ProductionOrderSync;
@@ -100,15 +101,22 @@
//鑾峰彇涓婃鍚屾鏃堕棿
String lastSyncDateLow = productionOrderService.getLastSyncCreateDate();
String lastSyncDateHigh = null;
- if(lastSyncDateLow != null) {
+ if (lastSyncDateLow != null) {
lastSyncDateHigh = DateUtils.format(new Date(), "yyyyMMdd");
- if(lastSyncDateLow.equals(lastSyncDateHigh)) {
+ if (lastSyncDateLow.equals(lastSyncDateHigh)) {
lastSyncDateHigh = null;
}
}
+ ProductionOrderSyncRequest request = new ProductionOrderSyncRequest();
+ request.setFactoryCode(FACTORY_CODE);
+ request.setOrderTypeCode(ORDER_TYPE_CODE);
+ request.setProductionManager(PRODUCTION_MANAGER);
+ request.setOrderStatus(ORDER_STATUS);
+ request.setCreateTimeLow(lastSyncDateLow);
+ request.setCreateTimeHigh(lastSyncDateHigh);
try {
//璋冪敤SAP鎺ュ彛鑾峰彇鐢熶骇璁㈠崟
- Map<String, Object> productionOrderMap = productionOrderSync.syncProductionOrder(FACTORY_CODE, ORDER_TYPE_CODE, PRODUCTION_MANAGER, ORDER_STATUS, lastSyncDateLow, lastSyncDateHigh, null, null);
+ Map<String, Object> productionOrderMap = productionOrderSync.syncProductionOrder(request);
if (productionOrderMap == null || !SUCCESS_CODE.equals(productionOrderMap.get("ztype"))) {
log.error("鏈悓姝ュ埌璁㈠崟淇℃伅锛佹棩鏈燂細{}", LocalDateTime.now());
return;
@@ -116,7 +124,7 @@
//璋冪敤鎴愬姛锛岃幏鍙栬繑鍥炴暟鎹�
Object result = productionOrderMap.get("result");
boolean b = result instanceof List;
- if(!b) {
+ if (!b) {
log.error("杩斿洖绫诲瀷閿欒锛� class:{}", result == null ? null : result.getClass());
return;
}
@@ -132,13 +140,13 @@
//璋冪敤鎴愬姛锛岃幏鍙栬繑鍥炴暟鎹�
result = orderBomMap.get("result");
b = result instanceof List;
- if(!b) {
+ if (!b) {
log.error("杩斿洖绫诲瀷閿欒锛� class:{}", result == null ? null : result.getClass());
return;
}
List<OrderBomDTO> orderBomDTOList = (List<OrderBomDTO>) result;
b = processBillMaterialsService.saveOrUpdateOrderBom(orderMap, orderBomDTOList);
- if(!b) {
+ if (!b) {
log.error("淇濆瓨璁㈠崟BOM澶辫触锛屾棩鏈燂細{}", LocalDateTime.now());
return;
}
@@ -151,13 +159,13 @@
//璋冪敤鎴愬姛锛岃幏鍙栬繑鍥炴暟鎹�
result = orderProcessMap.get("result");
b = result instanceof List;
- if(!b) {
+ if (!b) {
log.error("杩斿洖绫诲瀷閿欒锛� class:{}", result == null ? null : result.getClass());
return;
}
List<OrderProcessDTO> orderProcessDTOList = (List<OrderProcessDTO>) result;
b = materialProcessService.saveOrUpdateOrderProcess(orderMap, orderProcessDTOList);
- if(!b) {
+ if (!b) {
log.error("淇濆瓨璁㈠崟宸ュ簭澶辫触锛屾棩鏈燂細{}", LocalDateTime.now());
}
quartzLog.setIsSuccess(0);
--
Gitblit v1.9.3