mes/nalinv-qms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(檢驗頻率): 調整檢驗頻率邏輯

Browse Source 
1.調整Mapper
2.調整檢索邏輯

refs:#12831
This commit is contained in:
YiLiLin 2023-07-05 14:14:39 +08:00
parent e6016ec674
commit 1f5470b786
4 changed files with 80 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

169
qms-api/src/main/java/com/foreverwin/iep/qms/entity/QmsInspecFreq.java
View File

@ -1,23 +1,5 @@
/*
* Copyright (c) 2018-2025, mom All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the foreverwin.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: mom
*/
package com.foreverwin.iep.qms.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@ -34,7 +16,7 @@ import java.time.LocalDateTime;
* 检验频率表
*
* @author mom code generator
* @date 2023-06-06 15:15:24
* @date 2023-07-05 13:50:30
*/
@Data
@TableName("qms_inspec_freq")
@ -47,134 +29,117 @@ public class QmsInspecFreq extends Model<QmsInspecFreq> {
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value="主键")
@TableId(type = IdType.INPUT)
@ApiModelProperty(value = "主键")
private String sid;
/**
* 生产点
* 工厂
*/
@ApiModelProperty(value="生产点")
@ApiModelProperty(value = "工厂")
private String site;
/**
* 检验类型
*/
@ApiModelProperty(value = "检验类型")
private String inspecType;
/**
* 检验频率编号
*/
@ApiModelProperty(value="检验频率编号")
@ApiModelProperty(value = "检验频率编号")
private String inspecNo;
/**
* 说明
*/
@ApiModelProperty(value="说明")
@ApiModelProperty(value = "说明")
private String description;
/**
* 工单第一个生产的SFC
* 工单第一个生产的生产批
*/
@ApiModelProperty(value="工单第一个生产的SFC")
@ApiModelProperty(value = "工单第一个生产的生产批")
private String chkFirstSfc;
/**
* 设备换模具后第一个生产的SFC
* 每日第一个生产的生产批
*/
@ApiModelProperty(value="设备换模具后第一个生产的SFC")
@ApiModelProperty(value = "每日第一个生产的生产批")
private String chkDailyFirstSfc;
/**
* 每日起始時間
*/
@ApiModelProperty(value = "每日起始時間")
private String dailyFirstSfc;
/**
* 更换产品后第一个生产的生产批
*/
@ApiModelProperty(value = "更换产品后第一个生产的生产批")
private String chkChangeProduct;
/**
* 设备换工具后第一个生产的生产批
*/
@ApiModelProperty(value = "设备换工具后第一个生产的生产批")
private String chkChangeMould;
/**
* 设备维修后第一个生产的SFC
* 设备维修后第一个生产的生产批
*/
@ApiModelProperty(value="设备维修后第一个生产的SFC")
@ApiModelProperty(value = "设备维修后第一个生产的生产批")
private String chkMaintenFirstSfc;
/**
* 设备停机X小时以上再启用第一个生产的SFC
* 设备停机N小时以上, 生產的第一个生产批
*/
@ApiModelProperty(value="设备停机X小时以上再启用第一个生产的SFC")
@ApiModelProperty(value = "设备停机N小时以上, 生產的第一个生产批")
private String chkStopAfterSfc;
/**
* 停机小时数, 为正数，最多小数点两位
* 停机小时数
*/
@ApiModelProperty(value="停机小时数, 为正数，最多小数点两位")
@ApiModelProperty(value = "停机小时数")
private BigDecimal stopAfterSfc;
/**
* 间隔X小时(设备+物料)
* 生产单一产品每N小时
*/
@ApiModelProperty(value="间隔X小时(设备+物料)")
@ApiModelProperty(value = "生产单一产品每N小时")
private String chkIntervalHour;
/**
* 间隔小时数, 为正数，最多小数点两位
* 间隔小时数
*/
@ApiModelProperty(value="间隔小时数, 为正数，最多小数点两位")
@ApiModelProperty(value = "间隔小时数")
private BigDecimal intervalHour;
/**
* 每_Z_个SFC
* 每N个生产批
*/
@ApiModelProperty(value="每_Z_个SFC")
@ApiModelProperty(value = "每N个生产批")
private String chkSeveralSfc;
/**
* SFC数量, 应为正整数
* 生产批批数
*/
@ApiModelProperty(value="SFC数量, 应为正整数")
@ApiModelProperty(value = "生产批批数")
private Integer severalSfc;
/**
* 机台生产每N小时
*/
@ApiModelProperty(value = "机台生产每N小时")
private String chkIntervalHour2;
/**
* 间隔小时数
*/
@ApiModelProperty(value = "间隔小时数")
private BigDecimal intervalHour2;
/**
* 每日固定N点
*/
@ApiModelProperty(value = "每日固定N点")
private String chkDailyFixedTime;
/**
* 每日固定N点
*/
@ApiModelProperty(value = "每日固定N点")
private String dailyFixedTime;
/**
* 修改时间
*/
@ApiModelProperty(value="修改时间")
@ApiModelProperty(value = "修改时间")
private LocalDateTime modifiedDateTime;
/**
* 修改人员
*/
@ApiModelProperty(value="修改人员")
@ApiModelProperty(value = "修改人员")
private String modifiedUser;
/**
* 每日第一个生产的SFC
*/
@ApiModelProperty(value="每日第一个生产的SFC")
private String chkDailyFirstSfc;
/**
* 每日固定几点
*/
@ApiModelProperty(value="每日固定几点")
private String chkDailyFixedTime;
/**
* 每日固定几点，多个时间时以逗号区隔(ex:9:00,11:00)
*/
@ApiModelProperty(value="每日固定几点，多个时间时以逗号区隔(ex:9:00,11:00)")
private String dailyFixedTime;
/**
* 间隔X小时(设备+检验计划)
*/
@ApiModelProperty(value="间隔X小时(设备+检验计划)")
private String chkIntervalHour2;
/**
* 间隔小时数, 为正数，最多小数点两位
*/
@ApiModelProperty(value="间隔小时数, 为正数，最多小数点两位")
private BigDecimal intervalHour2;
/**
* 每N pcs
*/
@ApiModelProperty(value="每N pcs")
private String chkEachPcs;
/**
* 每N pcs, N为正整数
*/
@ApiModelProperty(value="每N pcs, N为正整数")
private Integer eachPcs;
}

4
qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsInspecFreqController.java
View File

@ -39,8 +39,8 @@ public class QmsInspecFreqController {
public R getQmsInspecFreqPage(Page page, QmsInspecFreq qmsInspecFreq) {
return R.ok(qmsInspecFreqService.page(page, Wrappers.lambdaQuery(QmsInspecFreq.class)
.eq(QmsInspecFreq::getSite, TenantContextHolder.getTenantId())
.like(StrUtil.isNotBlank(qmsInspecFreq.getInspecNo()),
QmsInspecFreq::getInspecNo, qmsInspecFreq.getInspecNo())
.like(StrUtil.isNotBlank(qmsInspecFreq.getInspecNo()), QmsInspecFreq::getInspecNo, qmsInspecFreq.getInspecNo())
.eq(StrUtil.isNotBlank(qmsInspecFreq.getInspecType()), QmsInspecFreq::getInspecType, qmsInspecFreq.getInspecType())
.orderByAsc(QmsInspecFreq::getInspecNo)));
}

6
qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecFreqServiceImpl.java
View File

@ -53,11 +53,11 @@ public class QmsInspecFreqServiceImpl extends ServiceImpl<QmsInspecFreqMapper, Q
String intervalHour2 = inspecFreq.getIntervalHour2().stripTrailingZeros().toPlainString();
String severalSfc = inspecFreq.getSeveralSfc().toString();
String dailyFixedTime = inspecFreq.getDailyFixedTime();
String eachPcs = inspecFreq.getEachPcs().toString();
String dailyFirstSfc = inspecFreq.getDailyFirstSfc();
List<FreqItem> iList = new ArrayList<>();
iList.add(new FreqItem(inspecFreq.getChkFirstSfc(), "inspec.chk.sfc", null));
iList.add(new FreqItem(inspecFreq.getChkDailyFirstSfc(), "inspec.chk.daily.first.sfc", null));
iList.add(new FreqItem(inspecFreq.getChkDailyFirstSfc(), "inspec.chk.daily.first.sfc", dailyFirstSfc));
iList.add(new FreqItem(inspecFreq.getChkChangeMould(), "inspec.chk.change.mould", null));
iList.add(new FreqItem(inspecFreq.getChkMaintenFirstSfc(), "inspec.chk.mainten.first.sfc", null));
iList.add(new FreqItem(inspecFreq.getChkStopAfterSfc(), "inspec.chk.stop.after.sfc", afterSfc));
@ -65,7 +65,7 @@ public class QmsInspecFreqServiceImpl extends ServiceImpl<QmsInspecFreqMapper, Q
iList.add(new FreqItem(inspecFreq.getChkIntervalHour2(), "inspec.chk.interval.hour2", intervalHour2));
iList.add(new FreqItem(inspecFreq.getChkSeveralSfc(), "inspec.chk.several.sfc", severalSfc));
iList.add(new FreqItem(inspecFreq.getChkDailyFixedTime(), "inspec.chk.daily.fixed.time", dailyFixedTime));
iList.add(new FreqItem(inspecFreq.getChkEachPcs(), "inspec.chk.each.pcs", eachPcs));
iList.add(new FreqItem(inspecFreq.getChkChangeProduct(), "inspec.chk.change.product", null));
inspecFreqMap.put(inspecFreq.getInspecNo(), iList);
}
return new InspecFreq(inspecFreq, inspecFreqMap);

15
qms-db/src/main/resources/qms/mapper/QmsInspecFreqMapper.xml
View File

@ -7,9 +7,13 @@
<resultMap id="qmsInspecFreqMap" type="com.foreverwin.iep.qms.entity.QmsInspecFreq">
<id property="sid" column="SID"/>
<result property="site" column="SITE"/>
<result property="inspecType" column="INSPEC_TYPE"/>
<result property="inspecNo" column="INSPEC_NO"/>
<result property="description" column="DESCRIPTION"/>
<result property="chkFirstSfc" column="CHK_FIRST_SFC"/>
<result property="chkDailyFirstSfc" column="CHK_DAILY_FIRST_SFC"/>
<result property="dailyFirstSfc" column="DAILY_FIRST_SFC"/>
<result property="chkChangeProduct" column="CHK_CHANGE_PRODUCT"/>
<result property="chkChangeMould" column="CHK_CHANGE_MOULD"/>
<result property="chkMaintenFirstSfc" column="CHK_MAINTEN_FIRST_SFC"/>
<result property="chkStopAfterSfc" column="CHK_STOP_AFTER_SFC"/>
@ -18,14 +22,11 @@
<result property="intervalHour" column="INTERVAL_HOUR"/>
<result property="chkSeveralSfc" column="CHK_SEVERAL_SFC"/>
<result property="severalSfc" column="SEVERAL_SFC"/>
<result property="modifiedDateTime" column="MODIFIED_DATE_TIME"/>
<result property="modifiedUser" column="MODIFIED_USER"/>
<result property="chkDailyFirstSfc" column="CHK_DAILY_FIRST_SFC"/>
<result property="chkDailyFixedTime" column="CHK_DAILY_FIXED_TIME"/>
<result property="dailyFixedTime" column="DAILY_FIXED_TIME"/>
<result property="chkIntervalHour2" column="CHK_INTERVAL_HOUR2"/>
<result property="intervalHour2" column="INTERVAL_HOUR2"/>
<result property="chkEachPcs" column="CHK_EACH_PCS"/>
<result property="eachPcs" column="EACH_PCS"/>
<result property="chkDailyFixedTime" column="CHK_DAILY_FIXED_TIME"/>
<result property="dailyFixedTime" column="DAILY_FIXED_TIME"/>
<result property="modifiedDateTime" column="MODIFIED_DATE_TIME"/>
<result property="modifiedUser" column="MODIFIED_USER"/>
</resultMap>
</mapper>