From d4a7b1faad635b4817891185a4f471595db2eece Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 15 九月 2025 19:33:49 +0800
Subject: [PATCH] art: 生产订单SAP同步
---
src/main/java/org/jeecg/modules/mes/service/IMesProductionOrderService.java | 7 +++
src/main/java/org/jeecg/common/constant/CommonConstant.java | 5 ++
src/main/java/org/jeecg/modules/mes/job/ProductionOrderSyncCreationJob.java | 12 ++----
src/main/java/org/jeecg/modules/mes/service/impl/MesProductionOrderServiceImpl.java | 57 ++++++++++++++++++++++++++--
src/main/java/org/jeecg/modules/mes/job/ProductionOrderSyncUpdateJob.java | 12 ++----
src/main/java/org/jeecg/modules/mes/controller/MesProductionOrderController.java | 10 +++++
6 files changed, 83 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/jeecg/common/constant/CommonConstant.java b/src/main/java/org/jeecg/common/constant/CommonConstant.java
index 2343268..fa74d05 100644
--- a/src/main/java/org/jeecg/common/constant/CommonConstant.java
+++ b/src/main/java/org/jeecg/common/constant/CommonConstant.java
@@ -618,4 +618,9 @@
Integer SHIFT_TYPE_1 = 1;
Integer SHIFT_TYPE_2 = 2;
+ /**
+ * SAP璇锋眰鎴愬姛缂栫爜
+ */
+ String SAP_SUCCESS_CODE = "S";
+
}
diff --git a/src/main/java/org/jeecg/modules/mes/controller/MesProductionOrderController.java b/src/main/java/org/jeecg/modules/mes/controller/MesProductionOrderController.java
index 22bac4b..c49a394 100644
--- a/src/main/java/org/jeecg/modules/mes/controller/MesProductionOrderController.java
+++ b/src/main/java/org/jeecg/modules/mes/controller/MesProductionOrderController.java
@@ -111,4 +111,14 @@
}).collect(Collectors.toList());
return Result.OK(res);
}
+
+ @ApiOperation(value = "SAP鐢熶骇璁㈠崟-鏍规嵁璁㈠崟鍙峰悓姝ユ渶鏂颁俊鎭�", notes = "SAP鐢熶骇璁㈠崟-鏍规嵁璁㈠崟鍙峰悓姝ユ渶鏂颁俊鎭�")
+ @GetMapping(value = "/syncSapProductionOrder")
+ public Result<?> syncSapProductionOrder(@RequestParam(name = "id") String id) {
+ boolean b = mesProductionOrderService.syncSapProductionOrder(id);
+ if (!b) {
+ return Result.error("鍚屾澶辫触锛�");
+ }
+ return Result.ok("鍚屾鎴愬姛锛�");
+ }
}
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 1d0c9fa..3a274ef 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.common.constant.CommonConstant;
import org.jeecg.modules.lsw.service.ILswMaterialService;
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.util.ThrowableUtil;
@@ -72,11 +73,6 @@
@Value("${xhj.orderStatus:REL}")
private String ORDER_STATUS;
- /**
- * 璇锋眰鎴愬姛缂栫爜
- */
- private static final String SUCCESS_CODE = "S";
-
@Autowired
private ProductionOrderSync productionOrderSync;
@Autowired
@@ -125,7 +121,7 @@
try {
//璋冪敤SAP鎺ュ彛鑾峰彇鐢熶骇璁㈠崟
Map<String, Object> productionOrderMap = productionOrderSync.syncProductionOrder(request);
- if (productionOrderMap == null || !SUCCESS_CODE.equals(productionOrderMap.get("ztype"))) {
+ if (productionOrderMap == null || !CommonConstant.SAP_SUCCESS_CODE.equals(productionOrderMap.get("ztype"))) {
log.error("鏈悓姝ュ埌璁㈠崟淇℃伅锛佹棩鏈燂細{}", LocalDateTime.now());
return;
}
@@ -141,7 +137,7 @@
String orderCodes = String.join(",", orderMap.keySet());
//璁㈠崟BOM鍚屾
Map<String, Object> orderBomMap = orderBomSync.syncOrderBom(FACTORY_CODE, orderCodes);
- if (orderBomMap == null || !SUCCESS_CODE.equals(orderBomMap.get("ztype"))) {
+ if (orderBomMap == null || !CommonConstant.SAP_SUCCESS_CODE.equals(orderBomMap.get("ztype"))) {
log.error("鏈悓姝ュ埌璁㈠崟BOM淇℃伅锛佹棩鏈燂細{}", LocalDateTime.now());
return;
}
@@ -167,7 +163,7 @@
}
//璁㈠崟宸ュ簭鍚屾
Map<String, Object> orderProcessMap = orderProcessSync.syncOrderProcess(FACTORY_CODE, orderCodes);
- if (orderBomMap == null || !SUCCESS_CODE.equals(orderProcessMap.get("ztype"))) {
+ if (orderBomMap == null || !CommonConstant.SAP_SUCCESS_CODE.equals(orderProcessMap.get("ztype"))) {
log.error("鏈悓姝ュ埌璁㈠崟宸ュ簭淇℃伅锛佹棩鏈燂細{}", LocalDateTime.now());
return;
}
diff --git a/src/main/java/org/jeecg/modules/mes/job/ProductionOrderSyncUpdateJob.java b/src/main/java/org/jeecg/modules/mes/job/ProductionOrderSyncUpdateJob.java
index 35ac0a3..610d6f5 100644
--- a/src/main/java/org/jeecg/modules/mes/job/ProductionOrderSyncUpdateJob.java
+++ b/src/main/java/org/jeecg/modules/mes/job/ProductionOrderSyncUpdateJob.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.mes.job;
import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.constant.CommonConstant;
import org.jeecg.modules.lsw.service.ILswMaterialService;
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.util.ThrowableUtil;
@@ -72,11 +73,6 @@
@Value("${xhj.orderStatus:REL}")
private String ORDER_STATUS;
- /**
- * 璇锋眰鎴愬姛缂栫爜
- */
- private static final String SUCCESS_CODE = "S";
-
@Autowired
private ProductionOrderSync productionOrderSync;
@Autowired
@@ -125,7 +121,7 @@
try {
//璋冪敤SAP鎺ュ彛鑾峰彇鐢熶骇璁㈠崟
Map<String, Object> productionOrderMap = productionOrderSync.syncProductionOrder(request);
- if (productionOrderMap == null || !SUCCESS_CODE.equals(productionOrderMap.get("ztype"))) {
+ if (productionOrderMap == null || !CommonConstant.SAP_SUCCESS_CODE.equals(productionOrderMap.get("ztype"))) {
log.error("鏈悓姝ュ埌璁㈠崟淇℃伅锛佹棩鏈燂細{}", LocalDateTime.now());
return;
}
@@ -141,7 +137,7 @@
String orderCodes = String.join(",", orderMap.keySet());
//璁㈠崟BOM鍚屾
Map<String, Object> orderBomMap = orderBomSync.syncOrderBom(FACTORY_CODE, orderCodes);
- if (orderBomMap == null || !SUCCESS_CODE.equals(orderBomMap.get("ztype"))) {
+ if (orderBomMap == null || !CommonConstant.SAP_SUCCESS_CODE.equals(orderBomMap.get("ztype"))) {
log.error("鏈悓姝ュ埌璁㈠崟BOM淇℃伅锛佹棩鏈燂細{}", LocalDateTime.now());
return;
}
@@ -166,7 +162,7 @@
}
//璁㈠崟宸ュ簭鍚屾
Map<String, Object> orderProcessMap = orderProcessSync.syncOrderProcess(FACTORY_CODE, orderCodes);
- if (orderBomMap == null || !SUCCESS_CODE.equals(orderProcessMap.get("ztype"))) {
+ if (orderBomMap == null || !CommonConstant.SAP_SUCCESS_CODE.equals(orderProcessMap.get("ztype"))) {
log.error("鏈悓姝ュ埌璁㈠崟宸ュ簭淇℃伅锛佹棩鏈燂細{}", LocalDateTime.now());
return;
}
diff --git a/src/main/java/org/jeecg/modules/mes/service/IMesProductionOrderService.java b/src/main/java/org/jeecg/modules/mes/service/IMesProductionOrderService.java
index a64fe23..c95f441 100644
--- a/src/main/java/org/jeecg/modules/mes/service/IMesProductionOrderService.java
+++ b/src/main/java/org/jeecg/modules/mes/service/IMesProductionOrderService.java
@@ -40,4 +40,11 @@
* @return
*/
String getLastSyncUpdateDate();
+
+ /**
+ * 鍚屾SAP鐢熶骇璁㈠崟鐨勬渶鏂扮姸鎬�
+ * @param id
+ * @return
+ */
+ boolean syncSapProductionOrder(String id);
}
diff --git a/src/main/java/org/jeecg/modules/mes/service/impl/MesProductionOrderServiceImpl.java b/src/main/java/org/jeecg/modules/mes/service/impl/MesProductionOrderServiceImpl.java
index 19c42ec..495ac47 100644
--- a/src/main/java/org/jeecg/modules/mes/service/impl/MesProductionOrderServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/mes/service/impl/MesProductionOrderServiceImpl.java
@@ -4,15 +4,21 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.modules.mdc.util.DateUtils;
+import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.modules.mes.entity.MesProductionOrder;
import org.jeecg.modules.mes.mapper.MesProductionOrderMapper;
import org.jeecg.modules.mes.service.IMesProductionOrderService;
import org.jeecg.modules.sap.dto.ProductionOrderDTO;
+import org.jeecg.modules.sap.request.ProductionOrderSyncRequest;
+import org.jeecg.modules.sap.service.ProductionOrderSync;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* @Description: SAP鐢熶骇璁㈠崟
@@ -22,6 +28,12 @@
*/
@Service
public class MesProductionOrderServiceImpl extends ServiceImpl<MesProductionOrderMapper, MesProductionOrder> implements IMesProductionOrderService {
+ //宸ュ巶缂栫爜(鏂扮伀鐐� 2301)
+ @Value("${xhj.factoryCode:2301}")
+ private String FACTORY_CODE;
+
+ @Autowired
+ private ProductionOrderSync productionOrderSync;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -57,7 +69,7 @@
@Override
public String getLastSyncCreateDate() {
String lastSyncDate = this.getBaseMapper().getLastSyncCreateDate();
- if(lastSyncDate == null){
+ if (lastSyncDate == null) {
return null;
}
return lastSyncDate.replaceAll("-", "");
@@ -66,9 +78,46 @@
@Override
public String getLastSyncUpdateDate() {
String lastSyncDate = this.getBaseMapper().getLastSyncUpdateDate();
- if(lastSyncDate == null){
+ if (lastSyncDate == null) {
return null;
}
return lastSyncDate.replaceAll("-", "");
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean syncSapProductionOrder(String id) {
+ MesProductionOrder entity = super.getById(id);
+ if (entity == null) {
+ throw new JeecgBootException("鐢熶骇璁㈠崟涓嶅瓨鍦紝璇峰埛鏂伴噸缃紒");
+ }
+ ProductionOrderSyncRequest request = new ProductionOrderSyncRequest();
+ request.setOrderCode(entity.getOrderCode());
+ request.setFactoryCode(FACTORY_CODE);
+ try {
+ Map<String, Object> resultMap = productionOrderSync.syncProductionOrder(request);
+ if (resultMap == null) {
+ throw new JeecgBootException("鍝嶅簲缁撴灉涓虹┖锛�");
+ }
+ if (!CommonConstant.SAP_SUCCESS_CODE.equals(resultMap.get("ztype"))) {
+ throw new JeecgBootException(resultMap.get("zmess").toString());
+ }
+ //璋冪敤鎴愬姛锛岃幏鍙栬繑鍥炴暟鎹�
+ Object result = resultMap.get("result");
+ boolean b = result instanceof List;
+ if (!b) {
+ throw new JeecgBootException("杩斿洖缁撴灉鏍煎紡閿欒锛�");
+ }
+ List<ProductionOrderDTO> productionOrderDTOList = (List<ProductionOrderDTO>) result;
+ if (CollectionUtil.isEmpty(productionOrderDTOList)) {
+ throw new JeecgBootException("SAP鏈煡璇㈠埌鐢熸垚璁㈠崟锛�");
+ }
+ ProductionOrderDTO dto = productionOrderDTOList.get(0);
+ entity.updateEntity(dto);
+ super.updateById(entity);
+ } catch (Exception e) {
+ throw new JeecgBootException("璇锋眰SAP澶辫触锛�" + e.getMessage());
+ }
+ return true;
+ }
}
--
Gitblit v1.9.3