From a5c145b5b9afb665d3130bbcf8659ee1a4b15ebf Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 16 五月 2025 13:57:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWorkOrderProcessMapper.java | 5 ++
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlanCycle.java | 1
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java | 1
aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderProcessService.java | 11 ++++-
aps-modules/aps-core/src/main/java/com/aps/core/controller/CoreController.java | 2
aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java | 36 ++++++++++-------
aps-modules/aps-job/src/main/java/com/aps/job/task/RyTask.java | 4 ++
aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderProcessMapper.xml | 5 ++
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlanManagementMapper.xml | 2
9 files changed, 48 insertions(+), 19 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/CoreController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/CoreController.java
index b02e31b..9300848 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/CoreController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/CoreController.java
@@ -64,7 +64,7 @@
* @param orgCode
* @return
*/
- @PostMapping("refreshBomPrcessrouteStorageData")
+ @PostMapping("/refreshBomRouteStorageData")
public AjaxResult refreshBomRouteStorageData(String orgCode)
{
try {
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java
index 1c6f162..e2b1ddd 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java
@@ -58,6 +58,7 @@
for(ApsStandardProcess apsStandardProcessTemp : processList){
ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlanTemp = new ApsGasPipelineCapacityPlan();
apsGasPipelineCapacityPlanTemp.setProcessName(apsStandardProcessTemp.getProcessName());
+ apsGasPipelineCapacityPlanTemp.setOrgCode(apsStandardProcessTemp.getPlant());
list.add(apsGasPipelineCapacityPlanTemp);
}
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlanCycle.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlanCycle.java
index d2ddd82..4a975c0 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlanCycle.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlanCycle.java
@@ -60,6 +60,7 @@
/** 璁″垝ID */
@Excel(name = "璁″垝ID")
@Schema(description = "璁″垝ID")
+ @JsonFormat(shape = JsonFormat.Shape.STRING)
private Long planId;
public void setType(String type)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlanManagementMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlanManagementMapper.xml
index 94faf29..4a6ff13 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlanManagementMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlanManagementMapper.xml
@@ -23,7 +23,7 @@
<select id="selectApsPlanManagementList" parameterType="com.aps.core.domain.ApsPlanManagement" resultMap="ApsPlanManagementResult">
<include refid="selectApsPlanManagementVo"/>
<where>
- <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
+ <if test="name != null and name != ''"> and name like concat('%', cast(#{name} as varchar), '%')</if>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="area != null and area != ''"> and area = #{area}</if>
<if test="rule != null and rule != ''"> and rule = #{rule}</if>
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWorkOrderProcessMapper.java b/aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWorkOrderProcessMapper.java
index 23b874f..baa604e 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWorkOrderProcessMapper.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWorkOrderProcessMapper.java
@@ -94,4 +94,9 @@
* 鍒犻櫎涓存椂宸ュ簭鏁版嵁
*/
public void deleteApsProcessRoute();
+
+ /**
+ * 鍒犻櫎宸ュ簭涓棿琛ㄦ暟鎹�
+ */
+ void deleteApsWorkOrderProcess();
}
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderProcessService.java b/aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderProcessService.java
index 361e46a..f3d6f58 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderProcessService.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderProcessService.java
@@ -1,7 +1,6 @@
package com.aps.job.service;
import com.aps.job.domain.ApsWorkOrderProcess;
-import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@@ -90,6 +89,14 @@
*/
boolean retryRequestWorkOrderProcessByLogId(Long id);
- @Transactional
+ /**
+ * 鍚屾宸ュ簭鏁版嵁鍒颁笟鍔¤〃涓�
+ */
void syncProcessRouteData();
+
+ /**
+ * 鍒犻櫎宸ュ簭涓棿琛ㄦ暟鎹�
+ */
+ void deleteApsWorkOrderProcess();
+
}
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java
index 9e44d14..304e372 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java
@@ -133,6 +133,7 @@
@Override
public void getWorkOrderProcessFromU9(List<String> docNos) throws Exception {
+ List<String> noProcessDocNos = docNos;
// 璁剧疆璇锋眰澶�
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
@@ -169,14 +170,14 @@
JSONObject process = (JSONObject) o;
if (nowDocNo == null) {
nowDocNo = process.getString("DocNo");
- docNos.remove(nowDocNo);
+ noProcessDocNos.remove(nowDocNo);
haveProcessDocNos.add(nowDocNo);
}
- Map<String, Object> params = new HashMap<>();
- params.put("docNo", process.getString("DocNo"));
- params.put("opNum", process.getString("OpNum"));
- params.put("opId", process.getString("OpID"));
- Long existsId = apsWorkOrderProcessMapper.existsByDocNoOpNumOpId(params);
+// Map<String, Object> params = new HashMap<>();
+// params.put("docNo", process.getString("DocNo"));
+// params.put("opNum", process.getString("OpNum"));
+// params.put("opId", process.getString("OpID"));
+// Long existsId = apsWorkOrderProcessMapper.existsByDocNoOpNumOpId(params);
ApsWorkOrderProcess apsWorkOrderProcess = new ApsWorkOrderProcess();
apsWorkOrderProcess.setItemCode(process.getString("ItemCode"));
apsWorkOrderProcess.setDocNo(process.getString("DocNo"));
@@ -192,17 +193,17 @@
apsWorkOrderProcess.setOrg(process.getString("Org"));
apsWorkOrderProcess.setOrgCode(process.getString("OrgCode"));
apsWorkOrderProcess.setWorkCenter(process.getString("WorkCenter"));
- if (existsId != null) {
- apsWorkOrderProcess.setId(existsId);
- apsWorkOrderProcess.setUpdateBy("task");
- apsWorkOrderProcess.setUpdateTime(DateUtils.getNowDate());
- updateList.add(apsWorkOrderProcess);
- } else {
+// if (existsId != null) {
+// apsWorkOrderProcess.setId(existsId);
+// apsWorkOrderProcess.setUpdateBy("task");
+// apsWorkOrderProcess.setUpdateTime(DateUtils.getNowDate());
+// updateList.add(apsWorkOrderProcess);
+// } else {
apsWorkOrderProcess.setId(IdUtil.getSnowflakeNextId());
apsWorkOrderProcess.setCreateBy("task");
apsWorkOrderProcess.setCreateTime(DateUtils.getNowDate());
addList.add(apsWorkOrderProcess);
- }
+// }
if(!nowDocNo.equals(process.getString("DocNo"))){
//鏇存柊宸ュ崟鍚屾宸ュ簭鐘舵��
docNos.remove(nowDocNo);
@@ -229,10 +230,10 @@
param.put("docNos", haveProcessDocNos);
apsWorkOrderJobMapper.updateApsWorkOrderJobPrccessStatus(param);
}else{
- if(!docNos.isEmpty()){
+ if(!noProcessDocNos.isEmpty()){
Map<String, Object> param = new HashMap<>();
param.put("status", "2");
- param.put("docNos", docNos);
+ param.put("docNos", noProcessDocNos);
apsWorkOrderJobMapper.updateApsWorkOrderJobPrccessStatus(param);
apsWorkOrderJobLog.setRequestData(requestBody.toJSONString());
apsWorkOrderJobLog.setResponseData(response.getBody());
@@ -365,4 +366,9 @@
apsWorkOrderProcessMapper.deleteApsProcessRoute();
apsWorkOrderProcessMapper.insertIntoApsProcessRoute();
}
+
+ @Override
+ public void deleteApsWorkOrderProcess() {
+ apsWorkOrderProcessMapper.deleteApsWorkOrderProcess();
+ }
}
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/task/RyTask.java b/aps-modules/aps-job/src/main/java/com/aps/job/task/RyTask.java
index dbbdb6a..5a7a1f2 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/task/RyTask.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/task/RyTask.java
@@ -7,6 +7,7 @@
import com.aps.system.api.RemoteCoreService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -61,9 +62,12 @@
/**
* 鍚屾宸ュ崟宸ュ簭鏁版嵁
*/
+ @Transactional(rollbackFor = Exception.class)
public void syncWorkOrderProcessData(String status, Integer pageSize)
{
+ iApsWorkOrderProcessService.deleteApsWorkOrderProcess();
iApsWorkOrderProcessService.syncWorkOrderProcessData(status, pageSize);
+ iApsWorkOrderProcessService.syncProcessRouteData();
}
/**
diff --git a/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderProcessMapper.xml b/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderProcessMapper.xml
index 7ba5eb8..1360735 100644
--- a/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderProcessMapper.xml
+++ b/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderProcessMapper.xml
@@ -245,6 +245,11 @@
</insert>
<!-- 鍒犻櫎 aps_process_route 琛ㄤ腑鐨勬暟鎹� -->
+ <delete id="deleteApsWorkOrderProcess">
+ DELETE FROM aps_work_order_process
+ </delete>
+
+ <!-- 鍒犻櫎 aps_process_route 琛ㄤ腑鐨勬暟鎹� -->
<delete id="deleteApsProcessRoute">
DELETE FROM aps_process_route
</delete>
--
Gitblit v1.9.3