From 25cc86fd8a2fb3b2bb6b385cba0adaf89ff3dcdc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 十二月 2025 16:39:32 +0800
Subject: [PATCH] 流程卡进度打印部分代码
---
north-glass-erp/src/main/resources/mapper/mm/FinishedGlassShelf.xml | 399 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 337 insertions(+), 62 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 377be11..ff6017c 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGlassShelf.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGlassShelf.xml
@@ -28,37 +28,39 @@
*
from
mm.finished_glass_shelf_information
- where glass_shelf_number = #{finishedGlassShelfInformation.glassShelfNumber}
- and glass_shelf_name = #{finishedGlassShelfInformation.glassShelfName}
- and price = #{finishedGlassShelfInformation.price}
- and unit = #{finishedGlassShelfInformation.unit}
- and max_weight = #{finishedGlassShelfInformation.maxWeight}
+ where
+ max_weight = #{finishedGlassShelfInformation.maxWeight}
and max_width = #{finishedGlassShelfInformation.maxWidth}
and max_height = #{finishedGlassShelfInformation.maxHeight}
</select>
+ <select id="getSelectFinishedGlassShelfInformationInventoryArea">
+ SELECT
+ ifnull(MAX(CAST(REGEXP_REPLACE(glass_shelf_number, '[^0-9]', '')AS UNSIGNED)),0) AS maxDindex
+ FROM
+ finished_glass_shelf_information
+ WHERE
+ glass_shelf_number regexp #{inventoryArea}
+
+ </select>
+
<insert id="insetFinishedGlassShelfInformation" useGeneratedKeys="true" >
- insert into mm.finished_glass_shelf_information(glass_shelf_number,glass_shelf_name,available_quantity,
- total_quantity,price,money,unit,max_weight,max_width,max_height,remarks,create_time)
+ insert into mm.finished_glass_shelf_information(glass_shelf_number,glass_shelf_name,price,unit,max_weight,max_width,max_height,remarks,create_time)
values (
- #{finishedGlassShelfInformation.glassShelfNumber},#{finishedGlassShelfInformation.glassShelfName}
- ,#{finishedGlassShelfInformation.totalQuantity},#{finishedGlassShelfInformation.totalQuantity}
- ,#{finishedGlassShelfInformation.price},#{finishedGlassShelfInformation.money}
- ,#{finishedGlassShelfInformation.unit},#{finishedGlassShelfInformation.maxWeight}
+ #{inventoryAreaNumber},#{finishedGlassShelfInformation.glassShelfName}
+ ,#{finishedGlassShelfInformation.price},#{finishedGlassShelfInformation.unit},#{finishedGlassShelfInformation.maxWeight}
,#{finishedGlassShelfInformation.maxWidth},#{finishedGlassShelfInformation.maxHeight},#{finishedGlassShelfInformation.remarks},now()
)
</insert>
<insert id="insetFinishedGlassShelfLog" useGeneratedKeys="true" >
- insert into mm.finished_glass_shelf_log(type,glass_shelf_number,glass_shelf_name,quantity,price,money,unit,
+ insert into mm.finished_glass_shelf_log(type,glass_shelf_name,quantity,price,unit,
max_weight,max_width,max_height,remarks,create_time)
values (
- 3,#{finishedGlassShelfInformation.glassShelfNumber},#{finishedGlassShelfInformation.glassShelfName}
- ,#{finishedGlassShelfInformation.totalQuantity}
- ,#{finishedGlassShelfInformation.price},#{finishedGlassShelfInformation.money}
- ,#{finishedGlassShelfInformation.unit},#{finishedGlassShelfInformation.maxWeight}
+ 3,#{finishedGlassShelfInformation.glassShelfName},#{quantity}
+ ,#{finishedGlassShelfInformation.price},#{finishedGlassShelfInformation.unit},#{finishedGlassShelfInformation.maxWeight}
,#{finishedGlassShelfInformation.maxWidth},#{finishedGlassShelfInformation.maxHeight},#{finishedGlassShelfInformation.remarks},now()
)
</insert>
@@ -69,12 +71,9 @@
</update>
<update id="updateFinishedGlassShelfInformation">
- update mm.finished_glass_shelf_information set glass_shelf_number=#{finishedGlassShelfInformation.glassShelfNumber},
+ update mm.finished_glass_shelf_information set
glass_shelf_name=#{finishedGlassShelfInformation.glassShelfName},
- available_quantity=#{finishedGlassShelfInformation.availableQuantity},
- total_quantity=#{finishedGlassShelfInformation.totalQuantity},
price=#{finishedGlassShelfInformation.price},
- money=#{finishedGlassShelfInformation.money},
unit=#{finishedGlassShelfInformation.unit},
max_weight=#{finishedGlassShelfInformation.maxWeight},
max_width=#{finishedGlassShelfInformation.maxWidth},
@@ -86,15 +85,42 @@
<select id="getSelectFinishedGlassShelfInformationDate">
- select * from mm.finished_glass_shelf_information where available_quantity>0 limit #{offset},#{pageSize};
+ select
+ id,
+ glass_shelf_name as glassShelfName,
+ price,
+ unit,
+ count(*) as quantity,
+ max_weight as maxWeight,
+ max_width as maxWidth,
+ max_height as maxHeight
+ from mm.finished_glass_shelf_information
+ where state=0
+ group by glass_shelf_name,price,unit,max_weight,max_width,max_height
+ limit #{offset},#{pageSize};
</select>
<select id="getSelectFinishedGlassShelfInformationDatePageTotal">
select
- CEILING(count(id)/#{pageSize}) as 'pageTotal',
- count(id) as 'total'
- from
- mm.finished_glass_shelf_information where available_quantity>0
+ CEILING(count(zu.id)/#{pageSize}) as 'pageTotal',
+ count(zu.id) as 'total'
+ from ( select id as id from mm.finished_glass_shelf_information where state=0
+ group by glass_shelf_name,price,unit,max_weight,max_width,max_height) as zu
+ </select>
+
+ <select id="getSelectFinishedGlassShelfInformationDateDetail">
+ select
+ *
+ from mm.finished_glass_shelf_information
+ where state=0
+ limit #{offset},#{pageSize};
+ </select>
+
+ <select id="getSelectFinishedGlassShelfInformationDateDetailPageTotal">
+ select
+ CEILING(count(id)/#{pageSize}) as 'pageTotal',
+ count(id) as 'total'
+ from mm.finished_glass_shelf_information where state=0
</select>
<select id="getSelectFinishedGlassShelfInformationById">
@@ -106,25 +132,23 @@
</select>
+
<select id="getSelectFinishedGlassShelfInformationInId">
select
- id as informationId,
- glass_shelf_number as glassShelfNumber,
- glass_shelf_name as glassShelfName,
- available_quantity as availableQuantity,
- total_quantity as totalQuantity,
+ count(*) as quantity,
price,
- money,
unit,
+ '' as remarks,
max_weight as maxWeight,
max_width as maxWidth,
max_height as maxHeight,
- remarks
+ price,
+ unit,
+ glass_shelf_name as glassShelfName
from
- mm.finished_glass_shelf_information where id in
- <foreach item="id" collection="ids" open="(" separator="," close=")">
- #{id}
- </foreach>
+ mm.finished_glass_shelf_information where state=0 and max_weight=#{weight} and max_width=#{width} and max_height=#{height}
+ and glass_shelf_name=#{glassShelfName} and price=#{price} and unit=#{unit}
+ group by max_weight,max_width,max_height,glass_shelf_name,price,unit
</select>
@@ -142,20 +166,32 @@
<select id="getSelectFinishedGlassShelfEmitDetailsByemitId" >
select
- fed.information_id as informationId,
- fed.glass_shelf_number as glassShelfNumber,
fed.glass_shelf_name as glassShelfName,
fed.quantity as quantity,
- fi.available_quantity+fed.quantity as availableQuantity,
- fi.total_quantity as totalQuantity,
+ ifnull(fi.quantity+fed.quantity,fed.quantity) as availableQuantity,
fed.price,
fed.money,
fed.unit,
- fed.remarks
- from
- mm.finished_glass_shelf_emit_details fed left join mm.finished_glass_shelf_information fi on fed.information_id=fi.id
+ fed.remarks,
+ fed.max_weight as maxWeight,
+ fed.max_width as maxWidth,
+ fed.max_height as maxHeight,
+ fed.withdraw_quantity as withdrawQuantity,
+ fed.quantity-fed.withdraw_quantity as quantity2,
+ fed.emit_id as emitId,
+ 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,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>
+
<select id="getSelectFinishedGlassShelfEmitDetailsByemitId1" >
select * from mm.finished_glass_shelf_emit_details where emit_id=#{emitId}
@@ -167,7 +203,7 @@
</select>
<select id="getmaximumWithdraw" >
- select ifnull(SUBSTR(max(right(emit_id,8)) from 7),0) from mm.finished_glass_shelf_withdraw where date(create_time)=CURDATE()
+ select ifnull(SUBSTR(max(right(withdraw_id,8)) from 7),0) from mm.finished_glass_shelf_withdraw where date(create_time)=CURDATE()
</select>
@@ -180,34 +216,43 @@
</insert>
<insert id="insertFinishedGlassShelfEmitDetails" useGeneratedKeys="true" >
- insert into mm.finished_glass_shelf_emit_details(emit_id,emit_number,information_id,glass_shelf_number,glass_shelf_name,
- withdraw_quantity,quantity,price,unit,money,remarks)
+ insert into mm.finished_glass_shelf_emit_details(emit_id,emit_number,max_weight,max_width,max_height,
+ withdraw_quantity,quantity,price,unit,money,remarks,glass_shelf_name)
values (
- #{emitId},#{emitNumber},#{finishedGlassShelfEmitDetails.informationId},
- #{finishedGlassShelfEmitDetails.glassShelfNumber},#{finishedGlassShelfEmitDetails.glassShelfName}
+ #{emitId},#{emitNumber},#{finishedGlassShelfEmitDetails.maxWeight},
+ #{finishedGlassShelfEmitDetails.maxWidth},#{finishedGlassShelfEmitDetails.maxHeight}
,0,#{finishedGlassShelfEmitDetails.quantity},#{finishedGlassShelfEmitDetails.price},#{finishedGlassShelfEmitDetails.unit},
- #{finishedGlassShelfEmitDetails.money},#{finishedGlassShelfEmitDetails.remarks}
+ #{finishedGlassShelfEmitDetails.money},#{finishedGlassShelfEmitDetails.remarks},#{finishedGlassShelfEmitDetails.glassShelfName}
)
</insert>
<insert id="insertFinishedGlassShelfEmitDetailsLog" useGeneratedKeys="true" >
- insert into mm.finished_glass_shelf_log(document_id,document_number,type,glass_shelf_number,glass_shelf_name,quantity,price,money,unit,
- remarks,create_time)
+ 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,operator)
values (
- #{emitId},#{emitNumber},1, #{finishedGlassShelfEmitDetails.glassShelfNumber},#{finishedGlassShelfEmitDetails.glassShelfName},
- #{finishedGlassShelfEmitDetails.quantity},#{finishedGlassShelfEmitDetails.price},
- #{finishedGlassShelfEmitDetails.money},#{finishedGlassShelfEmitDetails.unit},#{finishedGlassShelfEmitDetails.remarks},now()
+ #{emitId},#{emitNumber},#{type},#{quantity},#{price},#{money},#{unit},
+ #{remarks},now(),#{maxWeight},#{maxWidth},#{maxHeight},#{glassShelfName},#{operator}
)
</insert>
<update id="updateInformationAvailableQuantityOut">
- update mm.finished_glass_shelf_information set available_quantity=available_quantity-#{finishedGlassShelfEmitDetails.quantity}
- where id=#{finishedGlassShelfEmitDetails.informationId}
+ update finished_glass_shelf_information set state=1 where state=0 and max_weight=#{maxWeight}
+ and max_width=#{maxWidth}
+ and max_height=#{maxHeight}
+ and price=#{price}
+ and unit=#{unit}
+ and glass_shelf_name=#{glassShelfName}
+ order by id limit #{quantity}
</update>
<update id="updateInformationAvailableQuantityInt">
- update mm.finished_glass_shelf_information set available_quantity=available_quantity+#{finishedGlassShelfEmitDetails.quantity}
- where id=#{finishedGlassShelfEmitDetails.informationId}
+ update finished_glass_shelf_information set state=0 where state=1 and max_weight=#{maxWeight}
+ and max_width=#{maxWidth}
+ and max_height=#{maxHeight}
+ and price=#{price}
+ and unit=#{unit}
+ and glass_shelf_name=#{glassShelfName}
+ order by id limit #{quantity}
</update>
<update id="updateFinishedGlassShelfEmit" >
@@ -253,8 +298,8 @@
<if test="emit.operator != null and emit.operator != ''">
and operator regexp #{emit.operator}
</if>
- <if test="emit.state != null and emit.state != ''">
- and state regexp #{emit.state}
+ <if test="emit.state != null">
+ and `state` = #{emit.state}
</if>
<if test="emit.remarks != null and emit.remarks != ''">
and remarks regexp #{emit.remarks}
@@ -284,8 +329,8 @@
<if test="emit.operator != null and emit.operator != ''">
and operator regexp #{emit.operator}
</if>
- <if test="emit.state != null and emit.state != ''">
- and state regexp #{emit.state}
+ <if test="emit.state != null">
+ and state = #{emit.state}
</if>
<if test="emit.remarks != null and emit.remarks != ''">
and remarks regexp #{emit.remarks}
@@ -295,4 +340,234 @@
</select>
+ <select id="getSelectFinishedGlassShelfWithdrawByemitId">
+ select * from
+ mm.finished_glass_shelf_withdraw
+ where withdraw_id=#{withdrawId}
+ </select>
+
+ <select id="getSelectFinishedGlassShelfWithdrawDetailsBywithdrawId1" >
+ select * from mm.finished_glass_shelf_withdraw_details where withdraw_id=#{withdrawId}
+ </select>
+
+ <select id="getSelectFinishedGlassShelfWithdrawDetailsBywithdrawId" >
+ select
+ fgw.emit_id as emitId,
+ fgw.glass_shelf_name as glassShelfName,
+ fgw.emit_number as emitNumber,
+ fgw.max_weight as maxWeight,
+ fgw.max_width as maxWidth,
+ fgw.max_height as maxHeight,
+ fgw.quantity,
+ fge.quantity-fge.withdraw_quantity+fgw.quantity as quantity2,
+ fgw.unit,
+ fgw.price,
+ fgw.money,
+ fgw.remarks
+ from mm.finished_glass_shelf_withdraw_details fgw
+ left join mm.finished_glass_shelf_emit_details fge
+ on fgw.emit_id=fge.emit_id and fgw.emit_number=fge.emit_number
+ where withdraw_id=#{withdrawId}
+ </select>
+
+ <select id="getSelectFinishedGlassShelfWithdraw">
+ select * from mm.finished_glass_shelf_withdraw
+ <where>
+ date(create_time)>=#{startDate} and date(create_time) <= #{endDate}
+ <if test="withdraw.withdrawId != null and withdraw.withdrawId != ''">
+ and withdraw_id regexp #{withdraw.withdrawId}
+ </if>
+ <if test="withdraw.customerName != null and withdraw.customerName != ''">
+ and customer_name regexp #{withdraw.customerName}
+ </if>
+ <if test="withdraw.project != null and withdraw.project != ''">
+ and project regexp #{withdraw.project}
+ </if>
+ <if test="withdraw.operator != null and withdraw.operator != ''">
+ and operator regexp #{withdraw.operator}
+ </if>
+ <if test="withdraw.remarks != null and withdraw.remarks != ''">
+ and remarks regexp #{withdraw.remarks}
+ </if>
+
+ </where>
+ group by withdraw_id
+ limit #{offset},#{pageSize};
+ </select>
+
+ <select id="getSelectFinishedGlassShelfWithdrawPageTotal">
+ select
+ CEILING(count(id)/#{pageSize}) as 'pageTotal',
+ count(id) as 'total'
+ from mm.finished_glass_shelf_withdraw
+ <where>
+ date(create_time)>=#{startDate} and date(create_time) <= #{endDate}
+ <if test="withdraw.withdrawId != null and withdraw.withdrawId != ''">
+ and withdraw_id regexp #{withdraw.withdrawId}
+ </if>
+ <if test="withdraw.customerName != null and withdraw.customerName != ''">
+ and customer_name regexp #{withdraw.customerName}
+ </if>
+ <if test="withdraw.project != null and withdraw.project != ''">
+ and project regexp #{withdraw.project}
+ </if>
+ <if test="withdraw.operator != null and withdraw.operator != ''">
+ and operator regexp #{withdraw.operator}
+ </if>
+ <if test="withdraw.remarks != null and withdraw.remarks != ''">
+ and remarks regexp #{withdraw.remarks}
+ </if>
+ </where>
+ limit #{offset},#{pageSize};
+ </select>
+
+
+ <update id="updateEmitDetailsWithdrawQuantityInt">
+ update mm.finished_glass_shelf_emit_details set withdraw_quantity=withdraw_quantity+#{finishedGlassShelfWithdrawDetails.quantity}
+ where emit_id=#{finishedGlassShelfWithdrawDetails.emitId} and emit_number=#{finishedGlassShelfWithdrawDetails.emitNumber}
+ </update>
+
+ <update id="updateEmitDetailsWithdrawQuantityOut">
+ update mm.finished_glass_shelf_emit_details set withdraw_quantity=withdraw_quantity-#{finishedGlassShelfWithdrawDetails.quantity}
+ where emit_id=#{finishedGlassShelfWithdrawDetails.emitId} and emit_number=#{finishedGlassShelfWithdrawDetails.emitNumber}
+ </update>
+
+ <delete id="deleteFinishedGlassShelfWithdrawDetails" >
+ delete from mm.finished_glass_shelf_withdraw_details where withdraw_id=#{withdrawId}
+ </delete>
+
+ <delete id="deleteFinishedGlassShelfWithdraw" >
+ delete from mm.finished_glass_shelf_withdraw where withdraw_id=#{withdrawId}
+ </delete>
+
+
+ <update id="updateFinishedGlassShelfWithdraw" >
+ update mm.finished_glass_shelf_withdraw set create_time=now() where withdraw_id=#{withdrawId}
+ </update>
+
+ <insert id="insertFinishedGlassShelfWithdraw" useGeneratedKeys="true" >
+ insert into mm.finished_glass_shelf_withdraw(withdraw_id,create_time,customer_name,project,operator,remarks)
+ values (
+ #{withdrawId},now(),#{finishedGlassShelfWithdraw.customerName}
+ ,#{finishedGlassShelfWithdraw.project},#{finishedGlassShelfWithdraw.operator},#{finishedGlassShelfWithdraw.remarks}
+ )
+ </insert>
+
+ <insert id="insertFinishedGlassShelfWithdrawDetails" useGeneratedKeys="true" >
+ insert into mm.finished_glass_shelf_withdraw_details(withdraw_id,withdraw_number,max_weight,emit_id,emit_number,max_width,max_height,
+ quantity,price,unit,money,remarks,glass_shelf_name)
+ values (
+ #{withdrawId},#{withdrawNumber},#{finishedGlassShelfWithdrawDetails.maxWeight},#{finishedGlassShelfWithdrawDetails.emitId},#{finishedGlassShelfWithdrawDetails.emitNumber},
+ #{finishedGlassShelfWithdrawDetails.maxWidth},#{finishedGlassShelfWithdrawDetails.maxHeight}
+ ,#{finishedGlassShelfWithdrawDetails.quantity},#{finishedGlassShelfWithdrawDetails.price},#{finishedGlassShelfWithdrawDetails.unit},
+ #{finishedGlassShelfWithdrawDetails.money},#{finishedGlassShelfWithdrawDetails.remarks},#{finishedGlassShelfWithdrawDetails.glassShelfName}
+ )
+ </insert>
+
+ <update id="updateFinishedGlassShelfEmitState">
+ update mm.finished_glass_shelf_emit set state=#{state}
+ where emit_id=#{emitId}
+ </update>
+
+
+
+ <select id="getFinishedGlassShelfLogReport">
+ select *
+ from mm.finished_glass_shelf_log
+ <where>
+ date(create_time)>=#{startDate} and date(create_time) <= #{endDate} and type=#{type} and state=0
+ <if test="finishedGlassShelfLog.documentId != null and finishedGlassShelfLog.documentId != ''">
+ and document_id regexp #{finishedGlassShelfLog.documentId}
+ </if>
+ <if test="finishedGlassShelfLog.documentNumber != null and finishedGlassShelfLog.documentNumber != ''">
+ and document_number regexp #{finishedGlassShelfLog.documentNumber}
+ </if>
+ <if test="finishedGlassShelfLog.glassShelfNumber != null and finishedGlassShelfLog.glassShelfNumber != ''">
+ and glass_shelf_number regexp #{finishedGlassShelfLog.glassShelfNumber}
+ </if>
+ <if test="finishedGlassShelfLog.glassShelfName != null and finishedGlassShelfLog.glassShelfName != ''">
+ and glass_shelf_name regexp #{finishedGlassShelfLog.glassShelfName}
+ </if>
+ <if test="finishedGlassShelfLog.quantity != null and finishedGlassShelfLog.quantity != ''">
+ and quantity regexp #{finishedGlassShelfLog.quantity}
+ </if>
+ <if test="finishedGlassShelfLog.unit != null and finishedGlassShelfLog.unit != ''">
+ and unit regexp #{finishedGlassShelfLog.unit}
+ </if>
+ <if test="finishedGlassShelfLog.price != null and finishedGlassShelfLog.price != ''">
+ and price regexp REGEXP_REPLACE(#{finishedGlassShelfLog.price},'\\.0+$','')
+ </if>
+ <if test="finishedGlassShelfLog.money != null and finishedGlassShelfLog.money != ''">
+ and money regexp REGEXP_REPLACE(#{finishedGlassShelfLog.money},'\\.0+$','')
+ </if>
+ <if test="finishedGlassShelfLog.remarks != null and finishedGlassShelfLog.remarks != ''">
+ and remarks regexp #{finishedGlassShelfLog.remarks}
+ </if>
+ <if test="finishedGlassShelfLog.maxWeight != null and finishedGlassShelfLog.maxWeight != ''">
+ and max_weight regexp #{finishedGlassShelfLog.maxWeight}
+ </if>
+ <if test="finishedGlassShelfLog.maxWidth != null and finishedGlassShelfLog.maxWidth != ''">
+ and max_width regexp #{finishedGlassShelfLog.maxWidth}
+ </if>
+ <if test="finishedGlassShelfLog.maxHeight != null and finishedGlassShelfLog.maxHeight != ''">
+ and max_height regexp #{finishedGlassShelfLog.maxHeight}
+ </if>
+ </where>
+ order by id desc
+ limit #{offset},#{pageSize};
+ </select>
+
+
+ <select id="getFinishedGlassShelfLogReportTotal">
+ select CEILING(count(id)/#{pageSize}) as 'pageTotal',
+ count(id) as 'total'
+ from finished_glass_shelf_log
+ <where>
+ date(create_time)>=#{startDate} and date(create_time) <= #{endDate} and type=#{type} and state=0
+ <if test="finishedGlassShelfLog.documentId != null and finishedGlassShelfLog.documentId != ''">
+ and document_id regexp #{finishedGlassShelfLog.documentId}
+ </if>
+ <if test="finishedGlassShelfLog.documentNumber != null and finishedGlassShelfLog.documentNumber != ''">
+ and document_number regexp #{finishedGlassShelfLog.documentNumber}
+ </if>
+ <if test="finishedGlassShelfLog.glassShelfNumber != null and finishedGlassShelfLog.glassShelfNumber != ''">
+ and glass_shelf_number regexp #{finishedGlassShelfLog.glassShelfNumber}
+ </if>
+ <if test="finishedGlassShelfLog.glassShelfName != null and finishedGlassShelfLog.glassShelfName != ''">
+ and glass_shelf_name regexp #{finishedGlassShelfLog.glassShelfName}
+ </if>
+ <if test="finishedGlassShelfLog.quantity != null and finishedGlassShelfLog.quantity != ''">
+ and quantity regexp #{finishedGlassShelfLog.quantity}
+ </if>
+ <if test="finishedGlassShelfLog.unit != null and finishedGlassShelfLog.unit != ''">
+ and unit regexp #{finishedGlassShelfLog.unit}
+ </if>
+ <if test="finishedGlassShelfLog.price != null and finishedGlassShelfLog.price != ''">
+ and price regexp REGEXP_REPLACE(#{finishedGlassShelfLog.price},'\\.0+$','')
+ </if>
+ <if test="finishedGlassShelfLog.money != null and finishedGlassShelfLog.money != ''">
+ and money regexp REGEXP_REPLACE(#{finishedGlassShelfLog.money},'\\.0+$','')
+ </if>
+ <if test="finishedGlassShelfLog.remarks != null and finishedGlassShelfLog.remarks != ''">
+ and remarks regexp #{finishedGlassShelfLog.remarks}
+ </if>
+ <if test="finishedGlassShelfLog.maxWeight != null and finishedGlassShelfLog.maxWeight != ''">
+ and max_weight regexp #{finishedGlassShelfLog.maxWeight}
+ </if>
+ <if test="finishedGlassShelfLog.maxWidth != null and finishedGlassShelfLog.maxWidth != ''">
+ and max_width regexp #{finishedGlassShelfLog.maxWidth}
+ </if>
+ <if test="finishedGlassShelfLog.maxHeight != null and finishedGlassShelfLog.maxHeight != ''">
+ and max_height regexp #{finishedGlassShelfLog.maxHeight}
+ </if>
+ </where>
+ </select>
+
+ <select id="exportFinishedGlassShelfLogReport">
+ select * from mm.finished_glass_shelf_log
+ where date(create_time)>=#{dates[0]} and date(create_time) <= #{dates[1]} and type=#{type} and state=0
+
+ </select>
+
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0