From cc8efc81d2d35bed40e47d0a5b0920a4b6f8095f Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 23 十月 2025 11:04:05 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/FinishedGlassShelf.xml | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedGlassShelf.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedGlassShelf.xml
index 6b1b74c..b85bddf 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGlassShelf.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGlassShelf.xml
@@ -182,9 +182,13 @@
fed.emit_number as emitNumber
from
mm.finished_glass_shelf_emit_details fed left join
- (select count(*) as quantity,max_weight,max_width,max_height
- from mm.finished_glass_shelf_information where state=0 group by max_weight,max_width,max_height) fi
- on fed.max_weight=fi.max_weight and fed.max_weight=fi.max_weight and fed.max_width=fi.max_width
+ (select count(*) as quantity,max_weight,max_width,max_height,glass_shelf_name,unit,price
+ from mm.finished_glass_shelf_information
+ where state=0
+ group by max_weight,max_width,max_height,glass_shelf_name,unit,price
+ ) fi
+ on fed.max_weight=fi.max_weight and fed.max_weight=fi.max_weight and fed.max_width=fi.max_width and
+ fed.glass_shelf_name=fi.glass_shelf_name and fed.unit=fi.unit and fed.price=fi.price
where emit_id=#{emitId}
</select>
@@ -224,10 +228,10 @@
<insert id="insertFinishedGlassShelfEmitDetailsLog" useGeneratedKeys="true" >
insert into mm.finished_glass_shelf_log(document_id,document_number,type,quantity,price,money,unit,
- remarks,create_time,max_weight,max_width,max_height,glass_shelf_name)
+ remarks,create_time,max_weight,max_width,max_height,glass_shelf_name,operator)
values (
#{emitId},#{emitNumber},#{type},#{quantity},#{price},#{money},#{unit},
- #{remarks},now(),#{maxWeight},#{maxWidth},#{maxHeight},#{glassShelfName}
+ #{remarks},now(),#{maxWeight},#{maxWidth},#{maxHeight},#{glassShelfName},#{operator}
)
</insert>
--
Gitblit v1.8.0