From 02b71e4cc5eae409138c635503840723636e898d Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期二, 29 四月 2025 13:03:26 +0800
Subject: [PATCH] 【UPDATE】修改同步U9工序数据过滤null工单号数据-补丁
---
aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml | 37 ++++++++++++++++++++++++++++++++++++-
aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWorkOrderJobMapper.java | 2 ++
aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java | 2 +-
3 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWorkOrderJobMapper.java b/aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWorkOrderJobMapper.java
index 4e52e2b..a93829d 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWorkOrderJobMapper.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWorkOrderJobMapper.java
@@ -93,4 +93,6 @@
int deleteAllGasPiping();
int batchInsertGasPiping();
+
+ List<ApsWorkOrderJob> selectApsWorkOrderJobListDocNoNotNull(ApsWorkOrderJob apsWorkOrderJob);
}
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 d8b8a7a..220c6e7 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
@@ -262,7 +262,7 @@
apsWorkOrderJob.setProcessStatus(status);
// 琛ユ煡涔嬪墠娌℃湁鏌ュ埌宸ュ簭鐨勫伐鍗�
if("2".equals(status)){
- int total = apsWorkOrderJobMapper.selectApsWorkOrderJobList(apsWorkOrderJob).size();
+ int total = apsWorkOrderJobMapper.selectApsWorkOrderJobListDocNoNotNull(apsWorkOrderJob).size();
int pages = total % pageSize == 0 ? total / pageSize : total / pageSize + 1;
for (int i = 1; i <= pages; i++){
PageHelper.startPage(i, pageSize);
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 d9babf5..bfeaeaa 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
@@ -81,7 +81,42 @@
<if test="delFlag != null and delFlag != ''"> and del_flag = #{delFlag}</if>
<if test="opStatus != null and opStatus != ''"> and op_status = #{opStatus}</if>
<if test="nextOpName != null and nextOpName != ''"> and next_op_name = #{nextOpName}</if>
- and doc_no is not null
+ </where>
+ </select>
+
+ <select id="selectApsWorkOrderJobListDocNoNotNull" parameterType="ApsWorkOrderJob" resultMap="ApsWorkOrderJobResult">
+ <include refid="selectApsWorkOrderJobVo"/>
+ <where>
+ <if test="orderId != null and orderId != ''"> and order_id = #{orderId}</if>
+ <if test="docNo != null and docNo != ''"> and doc_no = #{docNo}</if>
+ <if test="mainitemCode != null and mainitemCode != ''"> and mainitem_code = #{mainitemCode}</if>
+ <if test="mainitemFigure != null and mainitemFigure != ''"> and mainitem_figure = #{mainitemFigure}</if>
+ <if test="customerName != null and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
+ <if test="businessType != null "> and business_type = #{businessType}</if>
+ <if test="demandType != null and demandType != ''"> and demand_type = #{demandType}</if>
+ <if test="docStatus != null "> and doc_status = #{docStatus}</if>
+ <if test="itemCode != null and itemCode != ''"> and item_code = #{itemCode}</if>
+ <if test="itemFigure != null and itemFigure != ''"> and item_figure = #{itemFigure}</if>
+ <if test="itemFigureVersion != null and itemFigureVersion != ''"> and item_figure_version = #{itemFigureVersion}</if>
+ <if test="pruductQty != null "> and pruduct_qty = #{pruductQty}</if>
+ <if test="workQty != null "> and work_qty = #{workQty}</if>
+ <if test="opNum != null and opNum != ''"> and op_num = #{opNum}</if>
+ <if test="workCenter != null "> and work_center = #{workCenter}</if>
+ <if test="dept != null and dept != ''"> and dept = #{dept}</if>
+ <if test="startDate != null and startDate != ''"> and start_date = #{startDate}</if>
+ <if test="completeDate != null and completeDate != ''"> and complete_date = #{completeDate}</if>
+ <if test="nextDept != null and nextDept != ''"> and next_dept = #{nextDept}</if>
+ <if test="isHoldRelease != null "> and is_hold_release = #{isHoldRelease}</if>
+ <if test="isOutSource != null and isOutSource != ''"> and is_out_source = #{isOutSource}</if>
+ <if test="org != null and org != ''"> and org = #{org}</if>
+ <if test="pageNum != null "> and page_num = #{pageNum}</if>
+ <if test="pageIndex != null "> and page_index = #{pageIndex}</if>
+ <if test="orgCode != null and orgCode != ''"> and org_code = #{orgCode}</if>
+ <if test="processStatus != null and processStatus != ''"> and process_status = #{processStatus}</if>
+ <if test="delFlag != null and delFlag != ''"> and del_flag = #{delFlag}</if>
+ <if test="opStatus != null and opStatus != ''"> and op_status = #{opStatus}</if>
+ <if test="nextOpName != null and nextOpName != ''"> and next_op_name = #{nextOpName}</if>
+ and doc_no is not null
</where>
</select>
--
Gitblit v1.9.3