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 ec51825..d932b65 100644 --- a/src/main/java/com/gaotao/modules/pms/controller/QcController.java +++ b/src/main/java/com/gaotao/modules/pms/controller/QcController.java @@ -456,6 +456,36 @@ public class QcController { return R.ok(); } + @PostMapping("/qcSpecSearch") + public R qcSpecSearch(@RequestBody QcSpecData data){ + List list = qcBaseInfoService.qcSpecSearch(data); + return R.ok().put("rows", list); + } + + @PostMapping("/qcSpecSave") + public R qcSpecSave(@RequestBody QcSpecData data){ + qcBaseInfoService.qcSpecSave(data); + return R.ok(); + } + + @PostMapping("/qcSpecUpdate") + public R qcSpecUpdate(@RequestBody QcSpecData data){ + qcBaseInfoService.qcSpecUpdate(data); + return R.ok(); + } + + @PostMapping("/qcSpecDelete") + public R qcSpecDelete(@RequestBody QcSpecData data){ + qcBaseInfoService.qcSpecDelete(data); + return R.ok(); + } + + @PostMapping("/getQcSpecItemList") + public R getQcSpecItemList(@RequestBody QcSpecData data){ + List list = qcBaseInfoService.getQcSpecItemList(data); + return R.ok().put("rows", list); + } + /** * 查询物料模板 **/ diff --git a/src/main/java/com/gaotao/modules/pms/data/QcSpecData.java b/src/main/java/com/gaotao/modules/pms/data/QcSpecData.java new file mode 100644 index 0000000..46d988e --- /dev/null +++ b/src/main/java/com/gaotao/modules/pms/data/QcSpecData.java @@ -0,0 +1,24 @@ +package com.gaotao.modules.pms.data; + +import lombok.Data; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +@Data +public class QcSpecData { + private String site; + private String buNo; + private String partNo; + private String itemNo; + private String itemDesc; + private String inspectionTypeNo; + private String inspectionTypeName; + private String defaultValue; + private BigDecimal maxValue; + private BigDecimal minValue; + private String createBy; + private Date createTime; + + private List itemList; +} \ No newline at end of file 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 8f12c03..91946d6 100644 --- a/src/main/java/com/gaotao/modules/pms/mapper/QcBaseInfoMapper.java +++ b/src/main/java/com/gaotao/modules/pms/mapper/QcBaseInfoMapper.java @@ -189,6 +189,16 @@ public interface QcBaseInfoMapper { void qcPartAttributeEdit(PartInformationVo data); + List qcSpecSearch(QcSpecData data); + + void qcSpecSave(QcSpecData data); + + void qcSpecUpdate(QcSpecData data); + + void qcSpecDelete(QcSpecData data); + + List getQcSpecItemList(QcSpecData data); + IPage samplingProgrammeSearch(Page qcSamplingInspectionProgrammeDataPage,@Param("query") QcSamplingInspectionProgrammeData data); void samplingProgrammeSave(QcSamplingInspectionProgrammeData 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 e3b4996..6259656 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 @@ -1004,6 +1004,48 @@ public class QcBaseInfoServiceImpl implements QcBaseInfoService { qcBaseInfoMapper.qcPartAttributeEdit(data); } + @Override + public List qcSpecSearch(QcSpecData data) { + return qcBaseInfoMapper.qcSpecSearch(data); + } + + @Override + @Transactional + public void qcSpecSave(QcSpecData data) { + if (data.getItemList() != null && !data.getItemList().isEmpty()) { + for (QcSpecData item : data.getItemList()) { + item.setSite(data.getSite()); + item.setBuNo(data.getBuNo()); + item.setPartNo(data.getPartNo()); + item.setCreateBy(data.getCreateBy()); + qcBaseInfoMapper.qcSpecSave(item); + } + } + } + + @Override + @Transactional + public void qcSpecUpdate(QcSpecData data) { + if (data.getItemList() != null && !data.getItemList().isEmpty()) { + for (QcSpecData item : data.getItemList()) { + item.setSite(data.getSite()); + item.setBuNo(data.getBuNo()); + item.setPartNo(data.getPartNo()); + qcBaseInfoMapper.qcSpecUpdate(item); + } + } + } + + @Override + public void qcSpecDelete(QcSpecData data) { + qcBaseInfoMapper.qcSpecDelete(data); + } + + @Override + public List getQcSpecItemList(QcSpecData data) { + return qcBaseInfoMapper.getQcSpecItemList(data); + } + /** * 查询物料模板 **/ 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 96a386f..7ec41eb 100644 --- a/src/main/java/com/gaotao/modules/pms/service/QcBaseInfoService.java +++ b/src/main/java/com/gaotao/modules/pms/service/QcBaseInfoService.java @@ -113,6 +113,16 @@ public interface QcBaseInfoService { void qcPartAttributeEdit(PartInformationVo data); + List qcSpecSearch(QcSpecData data); + + void qcSpecSave(QcSpecData data); + + void qcSpecUpdate(QcSpecData data); + + void qcSpecDelete(QcSpecData data); + + List getQcSpecItemList(QcSpecData data); + PageUtils samplingProgrammeSearch(QcSamplingInspectionProgrammeData data); void samplingProgrammeSave(QcSamplingInspectionProgrammeData data); diff --git a/src/main/resources/mapper/pms/QcBaseInfoMapper.xml b/src/main/resources/mapper/pms/QcBaseInfoMapper.xml index e08b2eb..ef70c60 100644 --- a/src/main/resources/mapper/pms/QcBaseInfoMapper.xml +++ b/src/main/resources/mapper/pms/QcBaseInfoMapper.xml @@ -1821,4 +1821,72 @@ ORDER BY operationDesc + + + + + INSERT INTO qc_spec ( + site, bu_no, part_no, item_no, inspection_type_no, default_value, max_value, min_value, create_by, create_time + ) VALUES ( + #{site}, #{buNo}, #{partNo}, #{itemNo}, #{inspectionTypeNo}, #{defaultValue}, #{maxValue}, #{minValue}, #{createBy}, GETDATE() + ) + + + + UPDATE qc_spec + SET default_value = #{defaultValue}, + max_value = #{maxValue}, + min_value = #{minValue} + WHERE site = #{site} AND bu_no = #{buNo} AND part_no = #{partNo} AND item_no = #{itemNo} AND inspection_type_no = #{inspectionTypeNo} + + + + DELETE FROM qc_spec + WHERE site = #{site} AND bu_no = #{buNo} AND part_no = #{partNo} AND item_no = #{itemNo} AND inspection_type_no = #{inspectionTypeNo} + + + +