wilson
/
xujie-sys
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2024-12-18 

优化
java8
fengyuan_yang 1 year ago
parent
a7583b37bc
commit
3fdd54ae05
2 changed files with 51 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 62
      src/main/resources/mapper/pms/QcMapper.xml
  2. 38
      src/main/resources/mapper/pms/QcReportMapper.xml

62
src/main/resources/mapper/pms/QcMapper.xml
View File

@ -978,8 +978,8 @@
dbo.get_bu_desc(qa.site, qa.bu_no) as buDesc,
p.part_no as partNo,
p.part_desc,
dbo.qc_get_cinv_source_code(p.part_no) as cinvSourceCode,
dbo.qc_get_sku(part_no) as sku,
p.cinv_source_code as cinvSourceCode,
p.sku as sku,
p.FamilyID,
p.invtype as familyName,
p.spec,
@ -1009,10 +1009,10 @@
AND p.part_desc LIKE '%' + #{query.partDesc}+'%'
</if>
<if test = "query.cinvSourceCode != null and query.cinvSourceCode != ''">
AND dbo.qc_get_cinv_source_code(p.part_no) LIKE '%' + #{query.cinvSourceCode}+'%'
AND p.cinv_source_code LIKE '%' + #{query.cinvSourceCode}+'%'
</if>
<if test = "query.sku != null and query.sku != ''">
AND dbo.qc_get_sku(part_no) LIKE '%' + #{query.sku}+'%'
AND p.sku LIKE '%' + #{query.sku}+'%'
</if>
<if test = "query.familyName != null and query.familyName != ''">
AND p.invtype LIKE '%' + #{query.familyName}+'%'
@ -1461,7 +1461,7 @@
group by sfdc.assjob_seq_no, site
)
LEFT JOIN so_routing as c
ON c.order_no = a.orderno and a.itemno = c.item_no and c.site = a.site
ON c.site = a.site and c.order_no = a.orderno and a.itemno = c.item_no
LEFT JOIN part j
ON a.site = j.site and a.part_no = j.part_no
WHERE a.itemno = '10'
@ -1592,8 +1592,8 @@
ssr_id,
unqualified_qty,
submit_flag,
dbo.qc_get_cinv_source_code(part_no) as cinvSourceCode,
dbo.qc_get_sku(part_no) as sku,
dbo.qc_get_cinv_source_code(site, part_no) as cinvSourceCode,
dbo.qc_get_sku(site, part_no) as sku,
dbo.qc_get_invdefinetype(site, part_no) as invdefinetype,
seq_no,
batch_roll_no,
@ -1625,10 +1625,10 @@
AND dbo.qc_get_part_desc(site, bu_no, part_no) LIKE '%' + #{query.partDesc} + '%'
</if>
<if test = "query.cinvSourceCode != null and query.cinvSourceCode != ''">
AND dbo.qc_get_cinv_source_code(part_no) LIKE '%' + #{query.cinvSourceCode} + '%'
AND dbo.qc_get_cinv_source_code(site, part_no) LIKE '%' + #{query.cinvSourceCode} + '%'
</if>
<if test = "query.sku != null and query.sku != ''">
AND dbo.qc_get_sku(part_no) LIKE '%' + #{query.sku} + '%'
AND dbo.qc_get_sku(site, part_no) LIKE '%' + #{query.sku} + '%'
</if>
<if test = "query.disposalMeasures != null and query.disposalMeasures != ''">
AND disposal_measures LIKE '%' + #{query.disposalMeasures} + '%'
@ -1870,7 +1870,7 @@
group by sfdc.assjob_seq_no, site
)
LEFT JOIN so_routing as c
ON c.order_no = a.orderno and a.itemno = c.item_no and c.site = a.site
ON c.site = a.site and c.order_no = a.orderno and a.itemno = c.item_no
LEFT JOIN part j
ON a.site = j.site and a.part_no = j.part_no
LEFT JOIN (select ssr_id from qc_ipqc_record where check_type = '末件检') as temp
@ -1915,7 +1915,7 @@
dbo.qc_get_resource_desc(site, resource_id, work_center_no) as resourceDesc,
part_no,
dbo.qc_get_part_desc(site, bu_no, part_no) as part_desc,
dbo.qc_get_cinv_source_code(part_no) as cinvSourceCode,
dbo.qc_get_cinv_source_code(site, part_no) as cinvSourceCode,
inspection_remark,
roll_qty,
sampling_qty,
@ -1927,7 +1927,7 @@
ssr_id,
unqualified_qty,
submit_flag,
dbo.qc_get_sku(part_no) as sku,
dbo.qc_get_sku(site, part_no) as sku,
dbo.qc_get_invdefinetype(site, part_no) as invdefinetype,
seq_no,
batch_roll_no,
@ -1959,10 +1959,10 @@
AND dbo.qc_get_part_desc(site, bu_no, part_no) LIKE '%' + #{query.partDesc} + '%'
</if>
<if test = "query.cinvSourceCode != null and query.cinvSourceCode != ''">
AND dbo.qc_get_cinv_source_code(part_no) LIKE '%' + #{query.cinvSourceCode} + '%'
AND dbo.qc_get_cinv_source_code(site, part_no) LIKE '%' + #{query.cinvSourceCode} + '%'
</if>
<if test = "query.sku != null and query.sku != ''">
AND dbo.qc_get_sku(part_no) LIKE '%' + #{query.sku} + '%'
AND dbo.qc_get_sku(site, part_no) LIKE '%' + #{query.sku} + '%'
</if>
<if test = "query.states != null and query.states.size > 0">
AND state in
@ -2186,9 +2186,9 @@
DBO.getResourceDesc(a.site, a.s_resourceid) as resourceDesc,
c.work_center_no
FROM soscheduledrouting as a
LEFT JOIN so_routing as c ON c.order_no = a.orderno and a.itemno = c.item_no
LEFT JOIN part j ON a.part_no = j.part_no
WHERE a.seqno = #{seqNo}
LEFT JOIN so_routing as c ON a.site = c.site and c.order_no = a.orderno and a.itemno = c.item_no
LEFT JOIN part j ON a.site = j.site and a.part_no = j.part_no
WHERE a.site = #{site} and a.seqno = #{seqNo}
</select>
<!-- 根据工单号和工序号查出所有数据 -->
@ -2199,7 +2199,7 @@
c.work_center_no
FROM soscheduledrouting as a
LEFT JOIN sfdc as b ON a.site = b.site and a.seqno = b.assjob_seq_no
LEFT JOIN so_routing as c ON c.order_no = a.orderno and a.itemno = c.item_no and c.site = a.site
LEFT JOIN so_routing as c ON c.site = a.site and c.order_no = a.orderno and a.itemno = c.item_no
LEFT JOIN part j ON a.site = j.site and a.part_no = j.part_no
WHERE a.site = #{site} and b.approve_qty is not null and a.seqno = #{seqNo}
ORDER BY a.id desc
@ -2234,7 +2234,7 @@
qir.part_no,
p.part_desc,
p.cinv_source_code,
dbo.qc_get_sku(p.part_no) as sku,
p.sku as sku,
qir.roll_qty,
qir.print_flag,
qir.create_by,
@ -2285,8 +2285,8 @@
inspection_cycle,
part_no,
part_desc,
dbo.qc_get_cinv_source_code(part_no) as cinvSourceCode,
dbo.qc_get_sku(part_no) as sku,
dbo.qc_get_cinv_source_code(site, part_no) as cinvSourceCode,
dbo.qc_get_sku(site, part_no) as sku,
dbo.qc_get_invdefinetype(site, part_no) as invdefinetype,
dbo.qc_get_part_umid(site, part_no) as umId,
inspection_remark,
@ -2340,10 +2340,10 @@
AND part_desc LIKE '%' + #{query.partDesc} + '%'
</if>
<if test = "query.cinvSourceCode != null and query.cinvSourceCode != ''">
AND dbo.qc_get_cinv_source_code(part_no) LIKE '%' + #{query.cinvSourceCode} + '%'
AND dbo.qc_get_cinv_source_code(site, part_no) LIKE '%' + #{query.cinvSourceCode} + '%'
</if>
<if test = "query.sku != null and query.sku != ''">
AND dbo.qc_get_sku(part_no) LIKE '%' + #{query.sku} + '%'
AND dbo.qc_get_sku(site, part_no) LIKE '%' + #{query.sku} + '%'
</if>
<if test = "query.supplierDesc != null and query.supplierDesc != ''">
AND dbo.qc_get_supplier_name(site, supplier_no) LIKE '%' + #{query.supplierDesc} + '%'
@ -2617,7 +2617,7 @@
a.orderno as orderNo
FROM soscheduledrouting as a
LEFT JOIN sfdc as b ON a.site = b.site and a.seqno = b.assjob_seq_no
LEFT JOIN so_routing as c ON c.order_no = a.orderno and a.itemno = c.item_no and c.site = a.site
LEFT JOIN so_routing as c ON c.site = a.site and c.order_no = a.orderno and a.itemno = c.item_no
LEFT JOIN part j ON a.site = j.site and a.part_no = j.part_no
<where>
a.site = #{site}
@ -2659,8 +2659,8 @@
ssr_id,
unqualified_qty,
submit_flag,
dbo.qc_get_cinv_source_code(part_no) as cinvSourceCode,
dbo.qc_get_sku(part_no) as sku,
dbo.qc_get_cinv_source_code(site, part_no) as cinvSourceCode,
dbo.qc_get_sku(site, part_no) as sku,
dbo.qc_get_invdefinetype(site, part_no) as invdefinetype,
seq_no,
batch_roll_no,
@ -2692,10 +2692,10 @@
AND dbo.qc_get_part_desc(site, bu_no, part_no) LIKE '%' + #{query.partDesc} + '%'
</if>
<if test = "query.cinvSourceCode != null and query.cinvSourceCode != ''">
AND dbo.qc_get_cinv_source_code(part_no) LIKE '%' + #{query.cinvSourceCode} + '%'
AND dbo.qc_get_cinv_source_code(site, part_no) LIKE '%' + #{query.cinvSourceCode} + '%'
</if>
<if test = "query.sku != null and query.sku != ''">
AND dbo.qc_get_sku(part_no) LIKE '%' + #{query.sku} + '%'
AND dbo.qc_get_sku(site, part_no) LIKE '%' + #{query.sku} + '%'
</if>
<if test = "query.disposalMeasures != null and query.disposalMeasures != ''">
AND disposal_measures LIKE '%' + #{query.disposalMeasures} + '%'
@ -3075,7 +3075,7 @@
b.roll_no
FROM soscheduledrouting AS a
LEFT JOIN sfdc_rolls AS b ON a.site = b.site AND a.seqno = b.createdops_seqno
WHERE b.roll_no = #{rollNo}
WHERE a.site = #{site} and b.roll_no = #{rollNo}
</select>
<!-- 查询物料列表 -->
@ -3219,9 +3219,9 @@
J.sku,
sum(roll_qty) as sjzs
FROM soscheduledrouting AS a
inner JOIN so_routing AS c ON c.order_no = a.orderno AND a.itemno = c.item_no AND c.site = a.site
inner JOIN so_routing AS c ON c.site = a.site AND c.order_no = a.orderno AND a.itemno = c.item_no
inner JOIN part AS J ON a.site = J.site AND a.part_no = J.part_no
inner JOIN shoporder AS t ON t.orderno = a.orderno AND a.site = t.site
inner JOIN shoporder AS t ON a.site = t.site AND t.orderno = a.orderno
left join qc_ipqc_record as r on a.site = r.site and a.seqno = r.seq_no
WHERE
a.site = #{query.site}

38
src/main/resources/mapper/pms/QcReportMapper.xml
View File

@ -301,8 +301,8 @@
a.inspector_date,
a.inspector_no,
dbo.qc_get_inspector_name(a.site, a.inspector_no) as inspectorName,
dbo.qc_get_cinv_source_code(a.part_no) as cinvSourceCode,
dbo.qc_get_sku(a.part_no) as sku,
dbo.qc_get_cinv_source_code(a.site, a.part_no) as cinvSourceCode,
dbo.qc_get_sku(a.site, a.part_no) as sku,
dbo.qc_get_invdefinetype(a.site, a.part_no) as invdefinetype,
a.seq_no,
a.batch_roll_no,
@ -349,10 +349,10 @@
AND dbo.Get_Part_DescSpec(a.site, a.part_no) LIKE '%' + #{query.partDesc} + '%'
</if>
<if test = "query.cinvSourceCode != null and query.cinvSourceCode != ''">
AND dbo.qc_get_cinv_source_code(a.part_no) LIKE '%' + #{query.cinvSourceCode} + '%'
AND dbo.qc_get_cinv_source_code(a.site, a.part_no) LIKE '%' + #{query.cinvSourceCode} + '%'
</if>
<if test = "query.sku != null and query.sku != ''">
AND dbo.qc_get_sku(a.part_no) LIKE '%' + #{query.sku} + '%'
AND dbo.qc_get_sku(a.site, a.part_no) LIKE '%' + #{query.sku} + '%'
</if>
<if test = "query.disposalMeasures != null and query.disposalMeasures != ''">
AND a.disposal_measures LIKE '%' + #{query.disposalMeasures} + '%'
@ -426,8 +426,8 @@
a.inspector_date,
a.inspector_no,
dbo.qc_get_inspector_name(a.site, a.inspector_no) as inspectorName,
dbo.qc_get_cinv_source_code(a.part_no) as cinvSourceCode,
dbo.qc_get_sku(a.part_no) as sku,
dbo.qc_get_cinv_source_code(a.site, a.part_no) as cinvSourceCode,
dbo.qc_get_sku(a.site, a.part_no) as sku,
dbo.qc_get_invdefinetype(a.site, a.part_no) as invdefinetype,
a.seq_no,
a.batch_roll_no,
@ -474,10 +474,10 @@
AND dbo.qc_get_part_desc(a.site, a.bu_no, a.part_no) LIKE '%' + #{query.partDesc} + '%'
</if>
<if test = "query.cinvSourceCode != null and query.cinvSourceCode != ''">
AND dbo.qc_get_cinv_source_code(a.part_no) LIKE '%' + #{query.cinvSourceCode} + '%'
AND dbo.qc_get_cinv_source_code(a.site, a.part_no) LIKE '%' + #{query.cinvSourceCode} + '%'
</if>
<if test = "query.sku != null and query.sku != ''">
AND dbo.qc_get_sku(a.part_no) LIKE '%' + #{query.sku} + '%'
AND dbo.qc_get_sku(a.site, a.part_no) LIKE '%' + #{query.sku} + '%'
</if>
<if test = "query.disposalMeasures != null and query.disposalMeasures != ''">
AND a.disposal_measures LIKE '%' + #{query.disposalMeasures} + '%'
@ -1326,10 +1326,10 @@
AND dbo.qc_get_part_desc(a.site, a.bu_no, a.part_no) LIKE '%' + #{query.partDesc} + '%'
</if>
<if test = "query.cinvSourceCode != null and query.cinvSourceCode != ''">
AND dbo.qc_get_cinv_source_code(a.part_no) LIKE '%' + #{query.cinvSourceCode} + '%'
AND d.cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%'
</if>
<if test = "query.sku != null and query.sku != ''">
AND dbo.qc_get_sku(a.part_no) LIKE '%' + #{query.sku} + '%'
AND d.sku LIKE '%' + #{query.sku} + '%'
</if>
<if test = "query.disposalMeasures != null and query.disposalMeasures != ''">
AND a.disposal_measures LIKE '%' + #{query.disposalMeasures} + '%'
@ -1406,13 +1406,13 @@
AND a.part_no LIKE '%' + #{query.partNo} + '%'
</if>
<if test = "query.partDesc != null and query.partDesc != ''">
AND dbo.qc_get_part_desc(a.site, a.bu_no, a.part_no) LIKE '%' + #{query.partDesc} + '%'
AND d.part_desc LIKE '%' + #{query.partDesc} + '%'
</if>
<if test = "query.cinvSourceCode != null and query.cinvSourceCode != ''">
AND dbo.qc_get_cinv_source_code(a.part_no) LIKE '%' + #{query.cinvSourceCode} + '%'
AND d.cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%'
</if>
<if test = "query.sku != null and query.sku != ''">
AND dbo.qc_get_sku(a.part_no) LIKE '%' + #{query.sku} + '%'
AND d.sku LIKE '%' + #{query.sku} + '%'
</if>
<if test = "query.disposalMeasures != null and query.disposalMeasures != ''">
AND a.disposal_measures LIKE '%' + #{query.disposalMeasures} + '%'
@ -1678,13 +1678,13 @@
AND a.part_no LIKE '%' + #{query.partNo} + '%'
</if>
<if test = "query.partDesc != null and query.partDesc != ''">
AND dbo.qc_get_part_desc(a.site, a.bu_no, a.part_no) LIKE '%' + #{query.partDesc} + '%'
AND d.part_desc LIKE '%' + #{query.partDesc} + '%'
</if>
<if test = "query.cinvSourceCode != null and query.cinvSourceCode != ''">
AND dbo.qc_get_cinv_source_code(a.part_no) LIKE '%' + #{query.cinvSourceCode} + '%'
AND d.cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%'
</if>
<if test = "query.sku != null and query.sku != ''">
AND dbo.qc_get_sku(a.part_no) LIKE '%' + #{query.sku} + '%'
AND d.sku LIKE '%' + #{query.sku} + '%'
</if>
<if test = "query.disposalMeasures != null and query.disposalMeasures != ''">
AND a.disposal_measures LIKE '%' + #{query.disposalMeasures} + '%'
@ -1761,13 +1761,13 @@
AND a.part_no LIKE '%' + #{query.partNo} + '%'
</if>
<if test = "query.partDesc != null and query.partDesc != ''">
AND dbo.qc_get_part_desc(a.site, a.bu_no, a.part_no) LIKE '%' + #{query.partDesc} + '%'
AND d.part_desc LIKE '%' + #{query.partDesc} + '%'
</if>
<if test = "query.cinvSourceCode != null and query.cinvSourceCode != ''">
AND dbo.qc_get_cinv_source_code(a.part_no) LIKE '%' + #{query.cinvSourceCode} + '%'
AND d.cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%'
</if>
<if test = "query.sku != null and query.sku != ''">
AND dbo.qc_get_sku(a.part_no) LIKE '%' + #{query.sku} + '%'
AND d.sku LIKE '%' + #{query.sku} + '%'
</if>
<if test = "query.disposalMeasures != null and query.disposalMeasures != ''">
AND a.disposal_measures LIKE '%' + #{query.disposalMeasures} + '%'

Write Preview
Loading…
Cancel
Save