fengyuan_yang
/
boying-java
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2026-01-14 

优化
master
fengyuan_yang 2 months ago
parent
1028535092
commit
12d9d86a42
3 changed files with 37 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      src/main/resources/mapper/shopOrder/ProductionReportMapper.xml
  2. 4
      src/main/resources/mapper/sys/SystemLogDao.xml
  3. 28
      src/main/resources/mapper/warehouse/LabelTransactionLogMapper.xml

21
src/main/resources/mapper/shopOrder/ProductionReportMapper.xml
View File

@ -261,8 +261,12 @@
B.StartDate as date1, B.StartDate as date1,
B.ReportDate as date2, B.ReportDate as date2,
B.Reportedby, B.Reportedby,
(CASE WHEN ISNULL(A.status , '*') = '*' THEN '在制品' else a.status end) as roll_type ,
(CASE WHEN B.RollNo IS NOT NULL THEN '已消耗' WHEN ISNULL(A.status , '*') != '*' THEN '待入库' ELSE '未消耗' END) AS final_status,
RollType,
(CASE WHEN RollType ='删除卷' THEN '删除卷'
WHEN RollType <![CDATA[<>]]> '删除卷' AND B.RollNo IS NOT NULL THEN '已消耗'
WHEN RollType <![CDATA[<>]]> '删除卷' AND ISNULL(A.status, '*') = '*' AND B.RollNo IS NULL THEN '未消耗'
WHEN RollType <![CDATA[<>]]> '删除卷' AND ISNULL(A.status, '*') != '*' THEN '待入库' ELSE ''
END) AS finalStatus,
B.HistType, B.HistType,
a.partNo, a.partNo,
p.PartDescription AS partDesc, p.PartDescription AS partDesc,
@ -326,6 +330,12 @@
<if test=" spec != null and spec != ''"> <if test=" spec != null and spec != ''">
AND p.Spec like '%'+#{spec}+'%' AND p.Spec like '%'+#{spec}+'%'
</if> </if>
<if test=" rollNo != null and rollNo != ''">
AND A.RollNo like '%'+#{rollNo}+'%'
</if>
<if test=" rollType != null and rollType != ''">
AND A.RollType = #{rollType}
</if>
</where> </where>
ORDER BY A.CreatedDate DESC ORDER BY A.CreatedDate DESC
<if test="page != null and limit != null"> <if test="page != null and limit != null">
@ -357,6 +367,7 @@
<if test=" createdOpsItemNo != null and createdOpsItemNo != '' and createdOpsItemNo != 0"> <if test=" createdOpsItemNo != null and createdOpsItemNo != '' and createdOpsItemNo != 0">
AND CAST(A.CreatedOpsItemNo AS VARCHAR) like '%'+CAST(#{createdOpsItemNo} AS VARCHAR)+'%' AND CAST(A.CreatedOpsItemNo AS VARCHAR) like '%'+CAST(#{createdOpsItemNo} AS VARCHAR)+'%'
</if> </if>
<if test=" consumeOrderNo != null and consumeOrderNo != ''"> <if test=" consumeOrderNo != null and consumeOrderNo != ''">
AND B.OrderNo like '%'+#{consumeOrderNo}+'%' AND B.OrderNo like '%'+#{consumeOrderNo}+'%'
</if> </if>
@ -375,6 +386,12 @@
<if test=" spec != null and spec != ''"> <if test=" spec != null and spec != ''">
AND p.Spec like '%'+#{spec}+'%' AND p.Spec like '%'+#{spec}+'%'
</if> </if>
<if test=" rollNo != null and rollNo != ''">
AND A.RollNo like '%'+#{rollNo}+'%'
</if>
<if test=" rollType != null and rollType != ''">
AND A.RollType = #{rollType}
</if>
</where> </where>
</select> </select>
</mapper> </mapper>

4
src/main/resources/mapper/sys/SystemLogDao.xml
View File

@ -36,7 +36,7 @@
<where> <where>
a.site in (select site from AccessSite where userID = #{userName}) OR a.site = '*' a.site in (select site from AccessSite where userID = #{userName}) OR a.site = '*'
and a.bu_no in (select bu_no from AccessBu where username = #{userName}) OR a.bu_no = '*' and a.bu_no in (select bu_no from AccessBu where username = #{userName}) OR a.bu_no = '*'
and type &lt;&gt; 'Interface'
and a.type <![CDATA[<>]]> 'Interface'
<if test="interfaceName != null and interfaceName.trim() != ''"> <if test="interfaceName != null and interfaceName.trim() != ''">
AND a.interface_name LIKE '%' + #{interfaceName} + '%' AND a.interface_name LIKE '%' + #{interfaceName} + '%'
</if> </if>
@ -89,7 +89,7 @@
<where> <where>
a.site in (select site from AccessSite where userID = #{userName}) OR a.site = '*' a.site in (select site from AccessSite where userID = #{userName}) OR a.site = '*'
and a.bu_no in (select bu_no from AccessBu where username = #{userName}) OR a.bu_no = '*' and a.bu_no in (select bu_no from AccessBu where username = #{userName}) OR a.bu_no = '*'
and type &lt;&gt; 'Interface'
and a.type <![CDATA[<>]]> 'Interface'
<if test="interfaceName != null and interfaceName.trim() != ''"> <if test="interfaceName != null and interfaceName.trim() != ''">
AND a.interface_name LIKE '%' + #{interfaceName} + '%' AND a.interface_name LIKE '%' + #{interfaceName} + '%'
</if> </if>

28
src/main/resources/mapper/warehouse/LabelTransactionLogMapper.xml
View File

@ -17,6 +17,8 @@
a.roll_qty AS rollQty, a.roll_qty AS rollQty,
a.batch_no AS batchNo, a.batch_no AS batchNo,
a.part_no AS partNo, a.part_no AS partNo,
d.PartDescription as partDesc,
d.Spec AS spec,
a.warehouse_id as warehouseId, a.warehouse_id as warehouseId,
b.WareHouseName as warehouseName, b.WareHouseName as warehouseName,
a.location_id as locationId, a.location_id as locationId,
@ -30,6 +32,7 @@
FROM StockTransactionLog as a FROM StockTransactionLog as a
LEFT JOIN WareHouse as b ON a.site = b.site AND a.bu_no = b.bu_no AND a.warehouse_id = b.WareHouseID LEFT JOIN WareHouse as b ON a.site = b.site AND a.bu_no = b.bu_no AND a.warehouse_id = b.WareHouseID
LEFT JOIN Location as c ON a.site = c.site AND a.bu_no = c.bu_no AND a.location_id = c.LocationID LEFT JOIN Location as c ON a.site = c.site AND a.bu_no = c.bu_no AND a.location_id = c.LocationID
left join part as d on a.site = d.site and a.part_no = d.PartNo
WHERE a.site IN (SELECT site FROM AccessSite WHERE userID = #{query.userName}) WHERE a.site IN (SELECT site FROM AccessSite WHERE userID = #{query.userName})
AND a.bu_no IN (SELECT bu_no FROM AccessBu WHERE username = #{query.userName}) AND a.bu_no IN (SELECT bu_no FROM AccessBu WHERE username = #{query.userName})
<if test="query.buNo != null and query.buNo != ''"> <if test="query.buNo != null and query.buNo != ''">
@ -44,12 +47,11 @@
<if test="query.partNo != null and query.partNo != ''"> <if test="query.partNo != null and query.partNo != ''">
AND a.part_no LIKE '%' + #{query.partNo} + '%' AND a.part_no LIKE '%' + #{query.partNo} + '%'
</if> </if>
<if test="query.partSpec != null and query.partSpec != ''">
AND EXISTS (
SELECT 1 FROM Part p
WHERE p.site = a.site AND p.bu_no = a.bu_no AND p.PartNo = a.part_no
AND p.PartSpecification LIKE '%' + #{query.partSpec} + '%'
)
<if test="query.partDesc != null and query.partDesc != ''">
AND d.PartDescription LIKE '%' + #{query.partDesc} + '%'
</if>
<if test="query.spec != null and query.spec != ''">
AND d.Spec LIKE '%' + #{query.spec} + '%'
</if> </if>
<if test="query.documentNo != null and query.documentNo != ''"> <if test="query.documentNo != null and query.documentNo != ''">
AND a.document_no LIKE '%' + #{query.documentNo} + '%' AND a.document_no LIKE '%' + #{query.documentNo} + '%'
@ -77,6 +79,9 @@
<select id="queryTotal" resultType="int"> <select id="queryTotal" resultType="int">
SELECT COUNT(1) SELECT COUNT(1)
FROM StockTransactionLog as a FROM StockTransactionLog as a
LEFT JOIN WareHouse as b ON a.site = b.site AND a.bu_no = b.bu_no AND a.warehouse_id = b.WareHouseID
LEFT JOIN Location as c ON a.site = c.site AND a.bu_no = c.bu_no AND a.location_id = c.LocationID
left join part as d on a.site = d.site and a.part_no = d.PartNo
WHERE a.site IN (SELECT site FROM AccessSite WHERE userID = #{query.userName}) WHERE a.site IN (SELECT site FROM AccessSite WHERE userID = #{query.userName})
AND a.bu_no IN (SELECT bu_no FROM AccessBu WHERE username = #{query.userName}) AND a.bu_no IN (SELECT bu_no FROM AccessBu WHERE username = #{query.userName})
<if test="query.buNo != null and query.buNo != ''"> <if test="query.buNo != null and query.buNo != ''">
@ -91,12 +96,11 @@
<if test="query.partNo != null and query.partNo != ''"> <if test="query.partNo != null and query.partNo != ''">
AND a.part_no LIKE '%' + #{query.partNo} + '%' AND a.part_no LIKE '%' + #{query.partNo} + '%'
</if> </if>
<if test="query.partSpec != null and query.partSpec != ''">
AND EXISTS (
SELECT 1 FROM Part p
WHERE p.site = a.site AND p.bu_no = a.bu_no AND p.PartNo = a.part_no
AND p.PartSpecification LIKE '%' + #{query.partSpec} + '%'
)
<if test="query.partDesc != null and query.partDesc != ''">
AND d.PartDescription LIKE '%' + #{query.partDesc} + '%'
</if>
<if test="query.spec != null and query.spec != ''">
AND d.Spec LIKE '%' + #{query.spec} + '%'
</if> </if>
<if test="query.documentNo != null and query.documentNo != ''"> <if test="query.documentNo != null and query.documentNo != ''">
AND a.document_no LIKE '%' + #{query.documentNo} + '%' AND a.document_no LIKE '%' + #{query.documentNo} + '%'

Write Preview
Loading…
Cancel
Save