From fa32e887b8fdcd4a2bc3326306cbc558e119a9bb Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 01 八月 2024 10:00:33 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 d4e0e9f..a255700 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -23,6 +23,7 @@
<result property="wornArea" column="wornArea"/>
<result property="qualityInspector" column="quality_inspector"/>
<result property="qualityInsTime" column="quality_ins_time"/>
+ <result property="notes" column="notes"/>
<association property="order" javaType="com.example.erp.entity.sd.Order">
<result property="customerId" column="customer_id"/>
@@ -194,7 +195,8 @@
odpd.broken_num as onceBroken,
ogd.`group`,
if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
- od.other_columns
+ od.other_columns,
+ ogd.id as 'glassId'
FROM
sd.order_detail AS od
@@ -209,6 +211,7 @@
and technology_number =#{technologyStr}
limit 1)
</if>
+
LEFT JOIN flow_card AS fc
ON fc.order_id = ogd.order_id
@@ -469,7 +472,7 @@
and f.order_number = a.order_number
and f.technology_number = a.technology_number
<if test="nextProcess != null and nextProcess != ''">
- left join (select ifnull(sum(completed_quantity),0) as completed_quantity ,
+ left join (select sum(ifnull(completed_quantity,0)+ifnull(breakage_quantity,0)) as completed_quantity ,
rw.process_id,
rwd.order_number,
rwd.technology_number,
@@ -505,7 +508,8 @@
round(ogd.area * rw.this_worn_quantity,2) as wornArea,
rw.device_name,
rw.teams_groups_name,
- rw.reviewed_state
+ rw.reviewed_state,
+ rw.notes
# (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
--
Gitblit v1.8.0