From 945dceb00585738771882b05f13df2240b5cbedd Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Tue, 2 Dec 2025 11:20:45 +0800 Subject: [PATCH] =?UTF-8?q?2025-12-02=20=E6=9C=BA=E5=8F=B0=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E5=8F=B0=E8=BF=87=E7=A8=8B=E6=A3=80=E9=AA=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/service/Impl/QcServiceImpl.java | 22 +++++++-------- src/main/resources/mapper/pms/QcMapper.xml | 28 ++++++++++--------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java index b250fa5..4780b88 100644 --- a/src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java +++ b/src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java @@ -894,17 +894,17 @@ public class QcServiceImpl implements QcService { } // 新增IPQC主记录信息 qcMapper.saveIPQCRecord(data); - // 将记录新增到 redis - // 检查是否已创建 key - String key = data.getSite() + "_" + data.getSeqNo(); - Integer val = (Integer) redisTemplate.opsForValue().get(key); - if (val == null) { - // 如果 key 不存在，则新建 key 并设置 value 为 1 - redisTemplate.opsForValue().set(key, 1); - } else { - // 如果 key 已经存在，则获取当前 value 并加 1 - redisTemplate.opsForValue().set(key, val + 1); - } +// // 将记录新增到 redis +// // 检查是否已创建 key +// String key = data.getSite() + "_" + data.getSeqNo(); +// Integer val = (Integer) redisTemplate.opsForValue().get(key); +// if (val == null) { +// // 如果 key 不存在，则新建 key 并设置 value 为 1 +// redisTemplate.opsForValue().set(key, 1); +// } else { +// // 如果 key 已经存在，则获取当前 value 并加 1 +// redisTemplate.opsForValue().set(key, val + 1); +// } } diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index 2fc01e2..7f59ea6 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -19,6 +19,7 @@ a.itemno as itemNo, a.id as ssrId FROM soscheduledrouting as a + inner join ShopOrder as so on a.site = so.site and a.orderno = so.orderNo LEFT JOIN sfdc as b ON a.site = b.site and a.seqno = b.assjob_seq_no and b.id in ( select min(sfdc.id) @@ -26,7 +27,7 @@ group by sfdc.assjob_seq_no, site ) LEFT JOIN view_SO_Routing as c ON c.site = a.site and c.orderNo = a.orderno and a.itemno = c.itemNo - LEFT JOIN part j ON a.site = j.site and a.part_no = j.partNo + LEFT JOIN part j ON so.site = j.site and so.PartNo = j.partNo WHERE a.itemno = '10' AND a.id not in (select ssr_id from qc_fai_record) AND b.approve_qty is not null @@ -457,6 +458,7 @@ a.itemno as itemNo, a.id as ssrId FROM soscheduledrouting as a + inner join ShopOrder as so on a.site = so.site and a.orderno = so.orderNo LEFT JOIN sfdc as b ON a.site = b.site and a.seqno = b.assjob_seq_no and b.id in ( select max(sfdc.id) @@ -464,8 +466,7 @@ group by sfdc.assjob_seq_no, site ) LEFT JOIN view_SO_Routing as c ON c.site = a.site and c.orderNo = a.orderno and a.itemno = c.itemNo - LEFT JOIN part j - ON a.site = j.site and a.part_no = j.partNo + LEFT JOIN part j ON so.site = j.site and so.partno = j.partNo LEFT JOIN (select ssr_id from qc_ipqc_record where check_type = '末件检') as temp ON a.id = temp.ssr_id WHERE b.approve_qty is not null and temp.ssr_id is null @@ -817,10 +818,11 @@ a.itemno as operationNo, a.s_resourceid as resourceId, DBO.getResourceDesc(a.site, a.s_resourceid) as resourceDesc, - c.work_center_no + c.WorkCenterNo FROM soscheduledrouting as a + inner join ShopOrder as so on a.site = so.site and a.orderno = so.orderNo LEFT JOIN view_SO_Routing as c ON c.site = a.site and c.orderNo = a.orderno and a.itemno = c.itemNo - LEFT JOIN part j ON a.site = j.site and a.part_no = j.partNo + LEFT JOIN part j ON so.site = j.site and so.partno = j.partNo WHERE a.site = #{site} and a.seqno = #{seqNo} @@ -833,7 +835,7 @@ FROM soscheduledrouting as a LEFT JOIN sfdc as b ON a.site = b.site and a.seqno = b.assjob_seq_no LEFT JOIN view_SO_Routing as c ON c.site = a.site and c.orderNo = a.orderno and a.itemno = c.itemNo - LEFT JOIN part j ON a.site = j.site and a.part_no = j.partNo + WHERE a.site = #{site} and b.approve_qty is not null and a.seqno = #{seqNo} ORDER BY a.id desc @@ -1271,7 +1273,7 @@ FROM soscheduledrouting as a LEFT JOIN sfdc as b ON a.site = b.site and a.seqno = b.assjob_seq_no LEFT JOIN view_SO_Routing as c ON c.site = a.site and c.orderNo = a.orderno and a.itemno = c.itemNo - LEFT JOIN part j ON a.site = j.site and a.part_no = j.partNo + a.site = #{site} AND b.approve_qty is not null @@ -1750,10 +1752,10 @@ SELECT DISTINCT top 3 a.seqno, a.orderno, - b.roll_no + b.RollNo FROM soscheduledrouting AS a - LEFT JOIN sfdc_rolls AS b ON a.site = b.site AND a.seqno = b.createdops_seqno - WHERE a.site = #{site} and b.roll_no like '%' + #{rollNo} + '%' + LEFT JOIN sfdc_rolls AS b ON a.site = b.site AND a.seqno = b.CreatedOpsSeqNo + WHERE a.site = #{site} and b.RollNo like '%' + #{rollNo} + '%' @@ -1762,11 +1764,11 @@ a.site, a.seqno as seqNo, a.orderno as orderNo, - b.roll_no, + b.RollNo, #{inspectionTypeNo} as inspectionTypeNo FROM soscheduledrouting AS a - LEFT JOIN sfdc_rolls AS b ON a.site = b.site AND a.seqno = b.createdops_seqno - WHERE a.site = #{site} and b.roll_no = #{rollNo} + LEFT JOIN sfdc_rolls AS b ON a.site = b.site AND a.seqno = b.CreatedOpsSeqNo + WHERE a.site = #{site} and b.RollNo = #{rollNo}