From 8d0850541f66e843849e2118d0c8057e4d080ba1 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 05 九月 2024 09:18:29 +0800
Subject: [PATCH] 设置菜单语言从语言文件中获取
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
index b6d53d3..827b172 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -16,7 +16,6 @@
<result property="thisWornQuantity" column="this_worn_quantity"/>
<result property="deviceName" column="device_name"/>
<result property="teamsGroupsName" column="teams_groups_name"/>
- <result property="reviewedState" column="reviewed_state"/>
<result property="reportingWorkId" column="reporting_work_id"/>
<result property="processId" column="process_id"/>
<result property="completedArea" column="completedArea"/>
@@ -24,6 +23,7 @@
<result property="qualityInspector" column="quality_inspector"/>
<result property="qualityInsTime" column="quality_ins_time"/>
<result property="notes" column="notes"/>
+ <result property="reviewed" column="reviewed"/>
<association property="order" javaType="com.example.erp.entity.sd.Order">
<result property="customerId" column="customer_id"/>
@@ -389,14 +389,14 @@
and b.order_id = SUBSTR(#{processId} from 1 for 10)
and b.process = #{thisProcess}
and b.process_id = a.process_id
- left join (select sum(patch_num) as patchNumSum,order_sort,technology_number,process_id
+ left join (select sum(patch_num) as patchNumSum,order_sort,technology_number,process_id,patch_processes
from patch_log
- group by order_sort,technology_number) as c
+ group by process_id,order_sort,technology_number,patch_processes) as c
on
c.process_id = a.process_id
and c.order_sort = a.order_number
and c.technology_number = a.technology_number
-
+ and c.patch_processes= #{thisProcess}
where
a.process_id=SUBSTR(#{processId} from 1 for 14)
and a.order_number = #{orderNumber}
@@ -518,7 +518,8 @@
rw.device_name,
rw.teams_groups_name,
rw.reviewed_state,
- rw.notes
+ rw.notes,
+ rw.reviewed
# (IF(rw.reviewed_state = 0, '鏈鏍�', IF(rw.reviewed_state = 1, '瀹℃牳閫氳繃', '瀹℃牳涓嶉�氳繃'))) as reviewed_state
from sd.order as o
left join sd.order_glass_detail as ogd on ogd.order_id = o.order_id
@@ -802,7 +803,7 @@
<update id="ReviewReportingWorkMp">
update reporting_work as rw
left join reporting_work_detail as rwd on rw.reporting_work_id = rwd.reporting_work_id
- set rw.reviewed_state = 1
+ set rw.reviewed_state = 1 ,rw.reviewed=#{userName}
where rw.process_id = #{substring} and rw.this_process=#{process}
and POSITION(rwd.technology_number in #{result}) and reviewed_state=0
</update>
--
Gitblit v1.8.0