Browse Source

2026-04-14

物料档案管理增加“检验标准维护”功能
master
fengyuan_yang 2 months ago
parent
commit
4e0964f568
  1. 30
      src/main/java/com/gaotao/modules/pms/controller/QcController.java
  2. 24
      src/main/java/com/gaotao/modules/pms/data/QcSpecData.java
  3. 10
      src/main/java/com/gaotao/modules/pms/mapper/QcBaseInfoMapper.java
  4. 42
      src/main/java/com/gaotao/modules/pms/service/Impl/QcBaseInfoServiceImpl.java
  5. 10
      src/main/java/com/gaotao/modules/pms/service/QcBaseInfoService.java
  6. 68
      src/main/resources/mapper/pms/QcBaseInfoMapper.xml

30
src/main/java/com/gaotao/modules/pms/controller/QcController.java

@ -456,6 +456,36 @@ public class QcController {
return R.ok(); return R.ok();
} }
@PostMapping("/qcSpecSearch")
public R qcSpecSearch(@RequestBody QcSpecData data){
List<QcSpecData> 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<QcSpecData> list = qcBaseInfoService.getQcSpecItemList(data);
return R.ok().put("rows", list);
}
/** /**
* 查询物料模板 * 查询物料模板
**/ **/

24
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<QcSpecData> itemList;
}

10
src/main/java/com/gaotao/modules/pms/mapper/QcBaseInfoMapper.java

@ -189,6 +189,16 @@ public interface QcBaseInfoMapper {
void qcPartAttributeEdit(PartInformationVo data); void qcPartAttributeEdit(PartInformationVo data);
List<QcSpecData> qcSpecSearch(QcSpecData data);
void qcSpecSave(QcSpecData data);
void qcSpecUpdate(QcSpecData data);
void qcSpecDelete(QcSpecData data);
List<QcSpecData> getQcSpecItemList(QcSpecData data);
IPage<QcSamplingInspectionProgrammeData> samplingProgrammeSearch(Page<QcSamplingInspectionProgrammeData> qcSamplingInspectionProgrammeDataPage,@Param("query") QcSamplingInspectionProgrammeData data); IPage<QcSamplingInspectionProgrammeData> samplingProgrammeSearch(Page<QcSamplingInspectionProgrammeData> qcSamplingInspectionProgrammeDataPage,@Param("query") QcSamplingInspectionProgrammeData data);
void samplingProgrammeSave(QcSamplingInspectionProgrammeData data); void samplingProgrammeSave(QcSamplingInspectionProgrammeData data);

42
src/main/java/com/gaotao/modules/pms/service/Impl/QcBaseInfoServiceImpl.java

@ -1004,6 +1004,48 @@ public class QcBaseInfoServiceImpl implements QcBaseInfoService {
qcBaseInfoMapper.qcPartAttributeEdit(data); qcBaseInfoMapper.qcPartAttributeEdit(data);
} }
@Override
public List<QcSpecData> 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<QcSpecData> getQcSpecItemList(QcSpecData data) {
return qcBaseInfoMapper.getQcSpecItemList(data);
}
/** /**
* 查询物料模板 * 查询物料模板
**/ **/

10
src/main/java/com/gaotao/modules/pms/service/QcBaseInfoService.java

@ -113,6 +113,16 @@ public interface QcBaseInfoService {
void qcPartAttributeEdit(PartInformationVo data); void qcPartAttributeEdit(PartInformationVo data);
List<QcSpecData> qcSpecSearch(QcSpecData data);
void qcSpecSave(QcSpecData data);
void qcSpecUpdate(QcSpecData data);
void qcSpecDelete(QcSpecData data);
List<QcSpecData> getQcSpecItemList(QcSpecData data);
PageUtils samplingProgrammeSearch(QcSamplingInspectionProgrammeData data); PageUtils samplingProgrammeSearch(QcSamplingInspectionProgrammeData data);
void samplingProgrammeSave(QcSamplingInspectionProgrammeData data); void samplingProgrammeSave(QcSamplingInspectionProgrammeData data);

68
src/main/resources/mapper/pms/QcBaseInfoMapper.xml

@ -1821,4 +1821,72 @@
ORDER BY operationDesc ORDER BY operationDesc
</select> </select>
<!-- 检验标准维护 -->
<select id="qcSpecSearch" resultType="com.gaotao.modules.pms.data.QcSpecData">
SELECT
a.site,
a.bu_no as buNo,
a.part_no as partNo,
a.item_no as itemNo,
b.ItemDesc as itemDesc,
a.inspection_type_no as inspectionTypeNo,
dbo.qc_get_inspection_type_name(a.site, a.inspection_type_no) as inspectionTypeName,
a.default_value as defaultValue,
a.max_value as maxValue,
a.min_value as minValue,
a.create_by as createBy,
a.create_time as createTime
FROM qc_spec a
LEFT JOIN eam_properties_item b ON a.site = b.site AND a.bu_no = b.bu_no AND a.item_no = b.ItemNo
WHERE a.site = #{site} AND a.bu_no = #{buNo} AND a.part_no = #{partNo}
</select>
<insert id="qcSpecSave" parameterType="com.gaotao.modules.pms.data.QcSpecData">
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()
)
</insert>
<update id="qcSpecUpdate" parameterType="com.gaotao.modules.pms.data.QcSpecData">
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}
</update>
<delete id="qcSpecDelete" parameterType="com.gaotao.modules.pms.data.QcSpecData">
DELETE FROM qc_spec
WHERE site = #{site} AND bu_no = #{buNo} AND part_no = #{partNo} AND item_no = #{itemNo} AND inspection_type_no = #{inspectionTypeNo}
</delete>
<select id="getQcSpecItemList" resultType="com.gaotao.modules.pms.data.QcSpecData">
SELECT
a.site,
a.bu_no as buNo,
a.ItemNo as itemNo,
a.ItemDesc as itemDesc,
a.DefaultValue as defaultValue,
a.MaxValue as maxValue,
a.MinValue as minValue,
a.inspection_type_no as inspectionTypeNo,
dbo.qc_get_inspection_type_name(a.site, a.inspection_type_no) as inspectionTypeName
FROM eam_properties_item a
LEFT JOIN qc_spec b ON a.site = b.site AND a.bu_no = b.bu_no AND a.ItemNo = b.item_no AND a.inspection_type_no = b.inspection_type_no AND b.part_no = #{partNo}
<where>
a.site = #{site} AND a.bu_no = #{buNo} AND b.part_no IS NULL
<if test="inspectionTypeNo != null and inspectionTypeNo != ''">
AND a.inspection_type_no = #{inspectionTypeNo}
</if>
<if test="itemNo != null and itemNo != ''">
AND a.ItemNo LIKE '%' + #{itemNo} + '%'
</if>
<if test="itemDesc != null and itemDesc != ''">
AND a.ItemDesc LIKE '%' + #{itemDesc} + '%'
</if>
</where>
</select>
</mapper> </mapper>
Loading…
Cancel
Save