From f9aed065eb88df88e7974a259d753143ba518d3e Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Mon, 12 Jan 2026 20:44:43 +0800 Subject: [PATCH] =?UTF-8?q?2026-01-12=20=E7=89=A9=E6=96=99=E6=A1=A3?= =?UTF-8?q?=E6=A1=88=E7=AE=A1=E7=90=86=E5=8A=A0=E4=B8=80=E4=B8=AA=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E3=80=90=E5=B7=A1=E6=A3=80=E7=89=B9=E6=AE=8A=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/pms/controller/QcController.java | 38 ++++++++++ .../modules/pms/mapper/QcBaseInfoMapper.java | 12 +++ .../service/Impl/QcBaseInfoServiceImpl.java | 52 +++++++++++++ .../pms/service/QcBaseInfoService.java | 9 +++ .../resources/mapper/pms/QcBaseInfoMapper.xml | 76 +++++++++++++++++++ 5 files changed, 187 insertions(+) diff --git a/src/main/java/com/gaotao/modules/pms/controller/QcController.java b/src/main/java/com/gaotao/modules/pms/controller/QcController.java index 6b25705..a3c13a1 100644 --- a/src/main/java/com/gaotao/modules/pms/controller/QcController.java +++ b/src/main/java/com/gaotao/modules/pms/controller/QcController.java @@ -1949,6 +1949,44 @@ public class QcController { return R.ok().put("count", count); } + // ======================= 巡检特殊配置 ======================= + + /** + * 查询巡检特殊配置列表 + **/ + @PostMapping("/getPatrolConfigList") + public R getPatrolConfigList(@RequestBody Map params){ + List> list = qcBaseInfoService.getPatrolConfigList(params); + return R.ok().put("rows", list); + } + + /** + * 新增巡检特殊配置 + **/ + @PostMapping("/savePatrolConfig") + public R savePatrolConfig(@RequestBody Map data){ + qcBaseInfoService.savePatrolConfig(data); + return R.ok(); + } + + /** + * 更新巡检特殊配置 + **/ + @PostMapping("/updatePatrolConfig") + public R updatePatrolConfig(@RequestBody Map data){ + qcBaseInfoService.updatePatrolConfig(data); + return R.ok(); + } + + /** + * 删除巡检特殊配置 + **/ + @PostMapping("/deletePatrolConfig") + public R deletePatrolConfig(@RequestBody Map params){ + qcBaseInfoService.deletePatrolConfig(params); + return R.ok(); + } + } diff --git a/src/main/java/com/gaotao/modules/pms/mapper/QcBaseInfoMapper.java b/src/main/java/com/gaotao/modules/pms/mapper/QcBaseInfoMapper.java index a9e2637..f0d758d 100644 --- a/src/main/java/com/gaotao/modules/pms/mapper/QcBaseInfoMapper.java +++ b/src/main/java/com/gaotao/modules/pms/mapper/QcBaseInfoMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; @Mapper public interface QcBaseInfoMapper { @@ -243,4 +244,15 @@ public interface QcBaseInfoMapper { List getPA3(QcTemplateData partData); List getStandardOperation(StandardOperationEntity data); + + // 巡检特殊配置 + List> getPatrolConfigList(Map params); + + void savePatrolConfig(Map data); + + void updatePatrolConfig(Map data); + + void deletePatrolConfig(Map data); + + void clearPatrolConfigDefaultFlag(Map data); } diff --git a/src/main/java/com/gaotao/modules/pms/service/Impl/QcBaseInfoServiceImpl.java b/src/main/java/com/gaotao/modules/pms/service/Impl/QcBaseInfoServiceImpl.java index ca4f9b0..1bf51eb 100644 --- a/src/main/java/com/gaotao/modules/pms/service/Impl/QcBaseInfoServiceImpl.java +++ b/src/main/java/com/gaotao/modules/pms/service/Impl/QcBaseInfoServiceImpl.java @@ -1398,4 +1398,56 @@ public class QcBaseInfoServiceImpl implements QcBaseInfoService { return list; } + // ======================= 巡检特殊配置 ======================= + + /** + * 查询巡检特殊配置列表 + **/ + @Override + public List> getPatrolConfigList(Map params) { + return qcBaseInfoMapper.getPatrolConfigList(params); + } + + /** + * 新增巡检特殊配置 + **/ + @Override + @Transactional + public void savePatrolConfig(Map data) { + // 如果设置为默认，先将该物料的其他配置设为非默认 + String defaultFlag = (String) data.get("defaultFlag"); + if ("Y".equals(defaultFlag)) { + qcBaseInfoMapper.clearPatrolConfigDefaultFlag(data); + } + qcBaseInfoMapper.savePatrolConfig(data); + } + + /** + * 更新巡检特殊配置 + **/ + @Override + @Transactional + public void updatePatrolConfig(Map data) { + // 如果设置为默认，先将该物料的其他配置设为非默认 + String defaultFlag = (String) data.get("defaultFlag"); + if ("Y".equals(defaultFlag)) { + qcBaseInfoMapper.clearPatrolConfigDefaultFlag(data); + } + qcBaseInfoMapper.updatePatrolConfig(data); + } + + /** + * 删除巡检特殊配置 + **/ + @Override + @Transactional + public void deletePatrolConfig(Map params) { + List> list = (List>) params.get("list"); + if (list != null && !list.isEmpty()) { + for (Map item : list) { + qcBaseInfoMapper.deletePatrolConfig(item); + } + } + } + } diff --git a/src/main/java/com/gaotao/modules/pms/service/QcBaseInfoService.java b/src/main/java/com/gaotao/modules/pms/service/QcBaseInfoService.java index 663d78c..adee8fe 100644 --- a/src/main/java/com/gaotao/modules/pms/service/QcBaseInfoService.java +++ b/src/main/java/com/gaotao/modules/pms/service/QcBaseInfoService.java @@ -152,4 +152,13 @@ public interface QcBaseInfoService { List getCustomerList(QcPartAttributeData data); List getStandardOperation(StandardOperationEntity data); + + // 巡检特殊配置 + List> getPatrolConfigList(Map params); + + void savePatrolConfig(Map data); + + void updatePatrolConfig(Map data); + + void deletePatrolConfig(Map params); } diff --git a/src/main/resources/mapper/pms/QcBaseInfoMapper.xml b/src/main/resources/mapper/pms/QcBaseInfoMapper.xml index 53e5a79..c68e138 100644 --- a/src/main/resources/mapper/pms/QcBaseInfoMapper.xml +++ b/src/main/resources/mapper/pms/QcBaseInfoMapper.xml @@ -1717,4 +1717,80 @@ from standard_operation where site = #{site} + + + + + + + + + INSERT INTO IPQC_Patrol_Configuration ( + site, + bu_no, + part_no, + operation_desc, + first_inspection_duration, + next_inspection_duration, + total_inspection_duration, + default_flag + ) VALUES ( + #{site}, + #{buNo}, + #{partNo}, + #{operationDesc}, + #{firstInspectionDuration}, + #{nextInspectionDuration}, + #{totalInspectionDuration}, + #{defaultFlag} + ) + + + + + UPDATE IPQC_Patrol_Configuration + SET first_inspection_duration = #{firstInspectionDuration}, + next_inspection_duration = #{nextInspectionDuration}, + total_inspection_duration = #{totalInspectionDuration}, + default_flag = #{defaultFlag} + WHERE site = #{site} + AND bu_no = #{buNo} + AND part_no = #{partNo} + AND operation_desc = #{operationDesc} + + + + + DELETE FROM IPQC_Patrol_Configuration + WHERE site = #{site} + AND bu_no = #{buNo} + AND part_no = #{partNo} + AND operation_desc = #{operationDesc} + + + + + UPDATE IPQC_Patrol_Configuration + SET default_flag = 'N' + WHERE site = #{site} + AND bu_no = #{buNo} + AND part_no = #{partNo} + AND operation_desc != #{operationDesc} + +