From 75095b5935026dab50a8b84a337b3f1c2a0b2dd3 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Fri, 19 Sep 2025 15:39:26 +0800 Subject: [PATCH] =?UTF-8?q?2025-09-19=20=20=E6=96=87=E4=BB=B6=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=EF=BC=9A=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0"=E5=85=B3=E8=81=94=E5=B7=A5=E5=BA=8F"=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gaotao/modules/pms/controller/QcController.java | 10 ++++++++++ .../modules/pms/entity/StandardOperationEntity.java | 10 ++++++++++ .../gaotao/modules/pms/mapper/QcBaseInfoMapper.java | 3 +++ .../pms/service/Impl/QcBaseInfoServiceImpl.java | 9 +++++++++ .../gaotao/modules/pms/service/QcBaseInfoService.java | 3 +++ src/main/resources/mapper/pms/QcBaseInfoMapper.xml | 8 ++++++++ src/main/resources/mapper/pms/QcMapper.xml | 9 ++++++--- 7 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/gaotao/modules/pms/entity/StandardOperationEntity.java 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 087ec71..03860e1 100644 --- a/src/main/java/com/gaotao/modules/pms/controller/QcController.java +++ b/src/main/java/com/gaotao/modules/pms/controller/QcController.java @@ -6,6 +6,7 @@ import com.gaotao.modules.base.data.BuData; import com.gaotao.modules.oss.entity.SysOssEntity; import com.gaotao.modules.pms.data.*; import com.gaotao.modules.pms.entity.PartDefectTrackingEntity; +import com.gaotao.modules.pms.entity.StandardOperationEntity; import com.gaotao.modules.pms.entity.vo.CheckSubDetailValueVo; import com.gaotao.modules.pms.entity.vo.PartDefectTrackingVo; import com.gaotao.modules.pms.entity.vo.PartInformationVo; @@ -1655,6 +1656,15 @@ public class QcController { return R.ok().put("page", page); } + /** + * 获取标准工序 + **/ + @PostMapping("/getStandardOperation") + public R getStandardOperation(@RequestBody StandardOperationEntity data){ + List list = qcBaseInfoService.getStandardOperation(data); + return R.ok().put("rows", list); + } + } diff --git a/src/main/java/com/gaotao/modules/pms/entity/StandardOperationEntity.java b/src/main/java/com/gaotao/modules/pms/entity/StandardOperationEntity.java new file mode 100644 index 0000000..a97ccab --- /dev/null +++ b/src/main/java/com/gaotao/modules/pms/entity/StandardOperationEntity.java @@ -0,0 +1,10 @@ +package com.gaotao.modules.pms.entity; + +import lombok.Data; + +@Data +public class StandardOperationEntity { + private Integer id; + private String site; + private String operationDesc; +} 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 8a56a6d..cf8d7db 100644 --- a/src/main/java/com/gaotao/modules/pms/mapper/QcBaseInfoMapper.java +++ b/src/main/java/com/gaotao/modules/pms/mapper/QcBaseInfoMapper.java @@ -1,6 +1,7 @@ package com.gaotao.modules.pms.mapper; import com.gaotao.modules.pms.entity.PartDefectTrackingEntity; +import com.gaotao.modules.pms.entity.StandardOperationEntity; import com.gaotao.modules.pms.entity.vo.PartDefectTrackingVo; import com.gaotao.modules.pms.entity.vo.PartInformationVo; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -238,4 +239,6 @@ public interface QcBaseInfoMapper { List getPA2(QcTemplateData partData); List getPA3(QcTemplateData partData); + + List getStandardOperation(StandardOperationEntity 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 38f9c15..6cf8748 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 @@ -6,6 +6,7 @@ import com.gaotao.common.utils.PageUtils; import com.gaotao.modules.base.data.BuData; import com.gaotao.modules.pms.data.*; import com.gaotao.modules.pms.entity.PartDefectTrackingEntity; +import com.gaotao.modules.pms.entity.StandardOperationEntity; import com.gaotao.modules.pms.entity.vo.PartDefectTrackingVo; import com.gaotao.modules.pms.entity.vo.PartInformationVo; import com.gaotao.modules.pms.entity.vo.PartLabelTemplateVo; @@ -25,6 +26,7 @@ import org.springframework.web.multipart.MultipartFile; import java.io.InputStream; import java.math.BigDecimal; +import java.util.Collections; import java.util.List; @Service @@ -1330,4 +1332,11 @@ public class QcBaseInfoServiceImpl implements QcBaseInfoService { List list = qcBaseInfoMapper.getCustomerList(data); return list; } + + @Override + public List getStandardOperation(StandardOperationEntity data) { + List list = qcBaseInfoMapper.getStandardOperation(data); + return list; + } + } 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 1634f9c..58a2851 100644 --- a/src/main/java/com/gaotao/modules/pms/service/QcBaseInfoService.java +++ b/src/main/java/com/gaotao/modules/pms/service/QcBaseInfoService.java @@ -4,6 +4,7 @@ import com.gaotao.common.utils.PageUtils; import com.gaotao.modules.base.data.BuData; import com.gaotao.modules.pms.data.*; import com.gaotao.modules.pms.entity.PartDefectTrackingEntity; +import com.gaotao.modules.pms.entity.StandardOperationEntity; import com.gaotao.modules.pms.entity.vo.PartDefectTrackingVo; import com.gaotao.modules.pms.entity.vo.PartInformationVo; import com.gaotao.modules.pms.entity.vo.PartLabelTemplateVo; @@ -146,4 +147,6 @@ public interface QcBaseInfoService { void updateLabelTemplate(PartLabelTemplateVo data); List getCustomerList(QcPartAttributeData data); + + List getStandardOperation(StandardOperationEntity data); } diff --git a/src/main/resources/mapper/pms/QcBaseInfoMapper.xml b/src/main/resources/mapper/pms/QcBaseInfoMapper.xml index 3feb9e5..22b7e2a 100644 --- a/src/main/resources/mapper/pms/QcBaseInfoMapper.xml +++ b/src/main/resources/mapper/pms/QcBaseInfoMapper.xml @@ -1689,4 +1689,12 @@ WHERE site = #{site} and bu_no = #{buNo} and attribute_no = #{attributeNo} and attribute_type = #{attributeType} and template_id = #{templateId} and customer_id = #{customerID} + diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index 75beb9f..92f204e 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -3130,7 +3130,8 @@ ps.phase_out_date as phaseOutDate, ps.created_by as createdBy, ps.creation_date as creationDate, - ps.sop_type as sopType + ps.sop_type as sopType, + ps.operation_desc as operationDesc FROM part_sop ps @@ -3195,7 +3196,8 @@ phase_in_date, phase_out_date, created_by, - creation_date + creation_date, + operation_desc ) VALUES ( #{data.site}, #{data.buNo}, @@ -3230,7 +3232,8 @@ GETDATE() - + , + #{data.operationDesc} )