From 1d3a6acfd86f7f7d4160c90b2e6776ed9047aa11 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期一, 28 四月 2025 10:13:29 +0800
Subject: [PATCH] 【UPDATE-BUGFIX】修改同步U9工单工序任务代码，增加雪花ID主键插入，工序修改和更新时间记录
---
aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml | 2 ++
aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java | 19 ++++++++++---------
aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java | 18 ++++++++++--------
aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderProcessMapper.xml | 2 ++
4 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java b/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java
index 1ec08fb..93de2ee 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java
@@ -7,6 +7,7 @@
import org.apache.commons.lang3.builder.ToStringStyle;
import java.io.Serial;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -45,7 +46,7 @@
/** 鏍囧噯宸ユ椂-灏忔暟 */
@Excel(name = "鏍囧噯宸ユ椂-灏忔暟")
- private Float standardTime;
+ private BigDecimal standardTime;
/** 宸ュ簭璁″垝寮�濮嬫椂闂� */
@JsonFormat(pattern = "yyyy-MM-dd")
@@ -59,11 +60,11 @@
/** 鍔犲伐鏁伴噺-灏忔暟 */
@Excel(name = "鍔犲伐鏁伴噺-灏忔暟")
- private Float processQty;
+ private BigDecimal processQty;
/** 搴熷純鏁伴噺 */
@Excel(name = "搴熷純鏁伴噺")
- private Float scrapQty;
+ private BigDecimal scrapQty;
/** 宸ュ簭鐘舵�� */
@Excel(name = "宸ュ簭鐘舵��")
@@ -140,12 +141,12 @@
return processName;
}
- public void setStandardTime(Float standardTime)
+ public void setStandardTime(BigDecimal standardTime)
{
this.standardTime = standardTime;
}
- public Float getStandardTime()
+ public BigDecimal getStandardTime()
{
return standardTime;
}
@@ -170,22 +171,22 @@
return planCompleteDate;
}
- public void setProcessQty(Float processQty)
+ public void setProcessQty(BigDecimal processQty)
{
this.processQty = processQty;
}
- public Float getProcessQty()
+ public BigDecimal getProcessQty()
{
return processQty;
}
- public void setScrapQty(Float scrapQty)
+ public void setScrapQty(BigDecimal scrapQty)
{
this.scrapQty = scrapQty;
}
- public Float getScrapQty()
+ public BigDecimal getScrapQty()
{
return scrapQty;
}
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 e6fd750..3aa537d 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
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.StringUtils;
+import com.aps.common.core.utils.uuid.Sequence;
import com.aps.job.domain.ApsWorkOrderJob;
import com.aps.job.domain.ApsWorkOrderJobLog;
import com.aps.job.domain.ApsWorkOrderProcess;
@@ -12,7 +13,6 @@
import com.aps.job.mapper.ApsWorkOrderProcessMapper;
import com.aps.job.service.IApsWorkOrderJobLogService;
import com.aps.job.service.IApsWorkOrderProcessService;
-import com.aps.common.core.utils.uuid.Sequence;
import com.github.pagehelper.PageHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -183,11 +183,11 @@
apsWorkOrderProcess.setOpNum(process.getString("OpNum"));
apsWorkOrderProcess.setOpId(process.getString("OpID"));
apsWorkOrderProcess.setProcessName(process.getString("StdOp"));
- apsWorkOrderProcess.setStandardTime(process.getFloat("StandardTime"));
+ apsWorkOrderProcess.setStandardTime(process.getBigDecimal("StandardTime"));
apsWorkOrderProcess.setPalnStartDate(process.getDate("PlanStartDate"));
apsWorkOrderProcess.setPlanCompleteDate(process.getDate("PlanCompleteDate"));
- apsWorkOrderProcess.setProcessQty(process.getFloat("ProcessQty"));
- apsWorkOrderProcess.setScrapQty(process.getFloat("ScrapQty"));
+ apsWorkOrderProcess.setProcessQty(process.getBigDecimal("ProcessQty"));
+ apsWorkOrderProcess.setScrapQty(process.getBigDecimal("ScrapQty"));
apsWorkOrderProcess.setOpStatus(process.getString("OpStatus"));
apsWorkOrderProcess.setOrg(process.getString("Org"));
apsWorkOrderProcess.setOrgCode(process.getString("OrgCode"));
@@ -227,10 +227,12 @@
param.put("docNos", haveProcessDocNos);
apsWorkOrderJobMapper.updateApsWorkOrderJobPrccessStatus(param);
}
- Map<String, Object> param = new HashMap<>();
- param.put("status", "2");
- param.put("docNos", docNos);
- apsWorkOrderJobMapper.updateApsWorkOrderJobPrccessStatus(param);
+ if(!docNos.isEmpty()){
+ Map<String, Object> param = new HashMap<>();
+ param.put("status", "2");
+ param.put("docNos", docNos);
+ apsWorkOrderJobMapper.updateApsWorkOrderJobPrccessStatus(param);
+ }
}else{
apsWorkOrderJobLog.setResponseData(response.getBody());
apsWorkOrderJobLog.setResult("fail");
diff --git a/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml b/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml
index 93a24ed..02d2945 100644
--- a/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml
+++ b/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml
@@ -220,6 +220,7 @@
<insert id="batchInsertApsWorkOrderJob" parameterType="java.util.List">
insert into aps_work_order_job
<trim prefix="(" suffix=")" suffixOverrides=",">
+ id,
order_id,
doc_no,
mainitem_code,
@@ -258,6 +259,7 @@
values
<foreach collection="list" item="job" separator=",">
(
+ #{job.id},
#{job.orderId},
#{job.docNo},
#{job.mainitemCode},
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 55d4621..c7e0a50 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
@@ -163,6 +163,7 @@
<insert id="insertApsWorkOrderProcessBatch">
INSERT INTO aps_work_order_process (
+ id,
item_code,
doc_no,
op_num,
@@ -182,6 +183,7 @@
) VALUES
<foreach collection="list" item="item" separator=",">
(
+ #{item.id},
#{item.itemCode},
#{item.docNo},
#{item.opNum},
--
Gitblit v1.9.3