From bcf310ce141c3996fdb3092b7972853593d5c1cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com> Date: Wed, 8 Nov 2023 11:26:42 +0800 Subject: [PATCH] =?UTF-8?q?2023-11-08=EF=BC=8C=E8=AE=BE=E5=A4=87=E5=92=8C?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/pms/controller/QcController.java | 19 +++++++-- .../sys/modules/pms/data/QcFAIRecordData.java | 30 ++++++++++++++ .../sys/modules/pms/mapper/QcMapper.java | 4 +- .../pms/service/Impl/QcServiceImpl.java | 17 +++++++- .../sys/modules/pms/service/QcService.java | 4 +- src/main/resources/mapper/pms/QcMapper.xml | 40 +++++++++++++------ 6 files changed, 95 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java b/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java index c3840fbe..5958234c 100644 --- a/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java +++ b/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java @@ -379,9 +379,9 @@ public class QcController { * @param: [] * @return: com.xujie.sys.common.utils.R **/ - @PostMapping(value="/InspectionTypeSearch") - public R InspectionTypeSearch(@RequestBody QcInspectionTypeData data){ - List list = qcService.InspectionTypeSearch(data); + @PostMapping(value="/inspectionTypeSearch") + public R inspectionTypeSearch(@RequestBody QcInspectionTypeData data){ + List list = qcService.inspectionTypeSearch(data); return R.ok().put("rows", list); } @@ -1662,6 +1662,19 @@ public class QcController { List list = qcService.queryPartList(data); return R.ok().put("rows", list); } + + /** + * @description: 查询单位列表 + * @author: fengyuan_yang + * @date: 2023/11/8 9:27 + * @param: [data] + * @return: com.xujie.sys.common.utils.R + **/ + @PostMapping(value="/umSearch") + public R umSearch(@RequestBody QcFAIRecordData data){ + List list = qcService.umSearch(data); + return R.ok().put("rows", list); + } } diff --git a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java b/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java index 220f0217..5582eef2 100644 --- a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java +++ b/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java @@ -163,6 +163,36 @@ public class QcFAIRecordData extends QueryPage { private Integer subDetailRecordNum; // 加工中心 private String workCenterNo; + // 单位编码 + private String umId; + // 单位名称 + private String umName; + // 是否可用 + private String active; + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getUmId() { + return umId; + } + + public void setUmId(String umId) { + this.umId = umId; + } + + public String getUmName() { + return umName; + } + + public void setUmName(String umName) { + this.umName = umName; + } public String getInspectorName() { return inspectorName; diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java index aa617342..57ef790f 100644 --- a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java +++ b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java @@ -161,7 +161,7 @@ public interface QcMapper { String queryLastSamplingPlanNo(QcSamplingInspectionPlanData data); - List InspectionTypeSearch(QcInspectionTypeData data); + List inspectionTypeSearch(QcInspectionTypeData data); IPage qcPartAttributeSearch(Page qcPartAttributeDataPage,@Param("query") QcPartAttributeData data); @@ -429,4 +429,6 @@ public interface QcMapper { QcFAIRecordData rollNoEnter(QcFAIRecordData data); List queryPartList(QcFAIRecordData data); + + List umSearch(QcFAIRecordData data); } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java index 15c92cc3..472f90da 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java @@ -939,8 +939,8 @@ public class QcServiceImpl implements QcService { * @return: java.util.List **/ @Override - public List InspectionTypeSearch(QcInspectionTypeData data) { - List list = qcMapper.InspectionTypeSearch(data); + public List inspectionTypeSearch(QcInspectionTypeData data) { + List list = qcMapper.inspectionTypeSearch(data); return list; } @@ -3229,6 +3229,19 @@ public class QcServiceImpl implements QcService { return list; } + /** + * @description: 查询单位列表 + * @author: fengyuan_yang + * @date: 2023/11/8 9:28 + * @param: [data] + * @return: java.util.List + **/ + @Override + public List umSearch(QcFAIRecordData data) { + List list = qcMapper.umSearch(data); + return list; + } + } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/QcService.java b/src/main/java/com/xujie/sys/modules/pms/service/QcService.java index 9d2f606b..03b0e9c3 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/QcService.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/QcService.java @@ -104,7 +104,7 @@ public interface QcService { void samplingLevelDelete(QcSamplingInspectionLevelData data); - List InspectionTypeSearch(QcInspectionTypeData data); + List inspectionTypeSearch(QcInspectionTypeData data); PageUtils qcPartAttributeSearch(QcPartAttributeData data); @@ -257,4 +257,6 @@ public interface QcService { List rollNoEnter(QcFAIRecordData data); List queryPartList(QcFAIRecordData data); + + List umSearch(QcFAIRecordData data); } diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index db2657a3..f1fce409 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -502,10 +502,10 @@ - SELECT inspection_type_no, inspection_type_name - FROM qc_inspection_type + FROM qc_inspection_type WHERE site = #{site} @@ -1423,8 +1423,8 @@ - INSERT INTO qc_fai_record (inspection_no, site, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id, part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no, special_requirements, work_center_no, roll_no) - VALUES(#{inspectionNo}, #{site}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId}, #{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo}, #{specialRequirements}, #{workCenterNo}, #{rollNo}) + INSERT INTO qc_fai_record (inspection_no, site, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id, part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no, special_requirements, work_center_no, roll_no, um_id) + VALUES(#{inspectionNo}, #{site}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId}, #{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo}, #{specialRequirements}, #{workCenterNo}, #{rollNo}, #{umId}) @@ -1468,7 +1468,9 @@ batch_roll_no, special_requirements, work_center_no, - roll_no + roll_no, + um_id, + dbo.qc_get_um_name(site, um_id) as umName FROM qc_fai_record site = #{query.site} @@ -1703,8 +1705,8 @@ - INSERT INTO qc_ipqc_record (inspection_no, site, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id, part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no, special_requirements, work_center_no, roll_no) - VALUES(#{inspectionNo}, #{site}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId}, #{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo}, #{specialRequirements}, #{workCenterNo}, #{rollNo}) + INSERT INTO qc_ipqc_record (inspection_no, site, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id, part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no, special_requirements, work_center_no, roll_no, um_id) + VALUES(#{inspectionNo}, #{site}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId}, #{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo}, #{specialRequirements}, #{workCenterNo}, #{rollNo}, #{umId}) @@ -1741,7 +1743,9 @@ batch_roll_no, special_requirements, work_center_no, - roll_no + roll_no, + um_id, + dbo.qc_get_um_name(site, um_id) as umName FROM qc_ipqc_record site = #{query.site} @@ -1752,7 +1756,7 @@ AND part_no LIKE '%' + #{query.partNo} + '%' - AND `state` = #{query.state} + AND state = #{query.state} AND inspection_type_no = #{query.inspectionTypeNo} @@ -2318,7 +2322,9 @@ batch_roll_no, special_requirements, work_center_no, - roll_no + roll_no, + um_id, + dbo.qc_get_um_name(site, um_id) as umName FROM qc_fqc_record site = #{query.site} @@ -2359,8 +2365,8 @@ - INSERT INTO qc_fqc_record (inspection_no, site, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id, part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no, special_requirements, work_center_no, roll_no) - VALUES(#{inspectionNo}, #{site}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId}, #{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo}, #{specialRequirements}, #{workCenterNo}, #{rollNo}) + INSERT INTO qc_fqc_record (inspection_no, site, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id, part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no, special_requirements, work_center_no, roll_no, um_id) + VALUES(#{inspectionNo}, #{site}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId}, #{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo}, #{specialRequirements}, #{workCenterNo}, #{rollNo}, #{umId}) @@ -2688,6 +2694,16 @@ + + +