入库检验工单修改来源表

master
zhaoxiaolin 1 year ago
parent 9d37d5eb05
commit 6624eb2992

@ -0,0 +1,170 @@
package com.op.quality.domain;
import java.math.BigDecimal;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
/**
* -- qc_check_task_defect
*
* @author Open Platform
* @date 2023-12-27
*/
public class QcCheckTaskDefect extends BaseEntity {
private static final long serialVersionUID = 1L;
/** id */
private String recordId;
/** 不良分类编码 */
@Excel(name = "不良分类编码")
private String defectCode;
/** 不良分类名称 */
@Excel(name = "不良分类名称")
private String defectSubclass;
/** 预留字段1 */
@Excel(name = "预留字段1")
private String attr1;
/** 预留字段2 */
@Excel(name = "预留字段2")
private String attr2;
/** 预留字段3 */
@Excel(name = "预留字段3")
private String attr3;
/** 预留字段4 */
@Excel(name = "预留字段4")
private String attr4;
/** 工厂编码 */
@Excel(name = "工厂编码")
private String factoryCode;
/** 删除标识1删除0正常 */
private String delFlag;
/** 检验任务id */
@Excel(name = "检验任务id")
private String belongTo;
/** 合格数量 */
@Excel(name = "合格数量")
private BigDecimal okQuality;
/** 不合格数量 */
@Excel(name = "不合格数量")
private BigDecimal noOkQuality;
public void setRecordId(String recordId) {
this.recordId = recordId;
}
public String getRecordId() {
return recordId;
}
public void setDefectCode(String defectCode) {
this.defectCode = defectCode;
}
public String getDefectCode() {
return defectCode;
}
public void setDefectSubclass(String defectSubclass) {
this.defectSubclass = defectSubclass;
}
public String getDefectSubclass() {
return defectSubclass;
}
public void setAttr1(String attr1) {
this.attr1 = attr1;
}
public String getAttr1() {
return attr1;
}
public void setAttr2(String attr2) {
this.attr2 = attr2;
}
public String getAttr2() {
return attr2;
}
public void setAttr3(String attr3) {
this.attr3 = attr3;
}
public String getAttr3() {
return attr3;
}
public void setAttr4(String attr4) {
this.attr4 = attr4;
}
public String getAttr4() {
return attr4;
}
public void setFactoryCode(String factoryCode) {
this.factoryCode = factoryCode;
}
public String getFactoryCode() {
return factoryCode;
}
public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
public String getDelFlag() {
return delFlag;
}
public void setBelongTo(String belongTo) {
this.belongTo = belongTo;
}
public String getBelongTo() {
return belongTo;
}
public void setOkQuality(BigDecimal okQuality) {
this.okQuality = okQuality;
}
public BigDecimal getOkQuality() {
return okQuality;
}
public BigDecimal getNoOkQuality() {
return noOkQuality;
}
public void setNoOkQuality(BigDecimal noOkQuality) {
this.noOkQuality = noOkQuality;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("recordId", getRecordId())
.append("defectCode", getDefectCode())
.append("defectSubclass", getDefectSubclass())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())
.append("attr4", getAttr4())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("factoryCode", getFactoryCode())
.append("delFlag", getDelFlag())
.append("belongTo", getBelongTo())
.append("okQuality", getOkQuality())
.append("nookQuality", getNoOkQuality())
.toString();
}
}

@ -119,7 +119,7 @@ public class QcCheckTaskIncome extends BaseEntity {
/** 删除标识1删除0正常 */
private String delFlag;
private String orderType;
private String incomeTimeStart;
private String incomeTimeEnd;
private String checkTimeStart;
@ -130,12 +130,29 @@ public class QcCheckTaskIncome extends BaseEntity {
private String batchCode;
private String batchId;
private List<QcCheckTaskDetail> qcCheckTaskDetails;
private List<QcCheckTaskDefect> defects;
private BigDecimal sampleQuality;
private BigDecimal aNoOkquality;
private BigDecimal bNoOkquality;
private BigDecimal cNoOkquality;
public String getOrderType() {
return orderType;
}
public void setOrderType(String orderType) {
this.orderType = orderType;
}
public List<QcCheckTaskDefect> getDefects() {
return defects;
}
public void setDefects(List<QcCheckTaskDefect> defects) {
this.defects = defects;
}
public BigDecimal getSampleQuality() {
return sampleQuality;
}

@ -128,14 +128,7 @@ public class QcCheckTaskProduce extends BaseEntity {
private String typeCode;
private String checkType;
private String workorderCode;
public String getWorkorderCode() {
return workorderCode;
}
public void setWorkorderCode(String workorderCode) {
this.workorderCode = workorderCode;
}
private String orderType;
@Excel(name = "抽样数量")
private BigDecimal sampleQuality;
@ -152,6 +145,22 @@ public class QcCheckTaskProduce extends BaseEntity {
@Excel(name = "C类不合格数量")
private BigDecimal cNoOkquality;
public String getOrderType() {
return orderType;
}
public void setOrderType(String orderType) {
this.orderType = orderType;
}
public String getWorkorderCode() {
return workorderCode;
}
public void setWorkorderCode(String workorderCode) {
this.workorderCode = workorderCode;
}
public BigDecimal getaNoOkquality() {
return aNoOkquality;
}

@ -2,10 +2,7 @@ package com.op.quality.mapper;
import java.util.List;
import com.op.quality.domain.QcBomComponent;
import com.op.quality.domain.QcCheckTaskDetail;
import com.op.quality.domain.QcCheckTaskIncome;
import com.op.quality.domain.QcSupplier;
import com.op.quality.domain.*;
import com.op.system.api.domain.SysDictData;
import com.op.system.api.domain.SysUser;
import com.op.system.api.domain.quality.QcUserMaterialDTO;
@ -93,4 +90,8 @@ public interface QcCheckTaskIncomeMapper {
List<QcUserMaterialDTO> getUserByMaterial(String materialCode);
int addCheckUsers(@Param("list") List<QcUserMaterialDTO> users);
int addQcCheckTaskDefects(@Param("list") List<QcCheckTaskDefect> defects);
List<QcCheckTaskDefect> getCkeckDefectList(QcCheckTaskDetail qcCheckTaskDetail);
}

@ -34,7 +34,7 @@ public interface QcProCheckService {
List<QcCheckTaskIncome> getCheckTaskList(QcCheckTaskIncome qcCheckTaskIncome);
List<QcCheckTaskDetail > getCheckTaskDetailList(QcCheckTaskDetail qcCheckTaskDetail);
QcCheckTaskIncome getCheckTaskDetailList(QcCheckTaskDetail qcCheckTaskDetail);
List<SysDictData> getQcUnitList(SysDictData sysDictData);

@ -476,22 +476,18 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
qcCheckTask.setUpdateTime(nowTime);
qcCheckTask.setCheckTime(nowTime);
qcCheckTask.setCheckResult(result);//检验结果Y合格 N不合格
BigDecimal noOkQquality = new BigDecimal("0");
if(qcCheckTaskIncome.getaNoOkquality()!=null){
noOkQquality = noOkQquality.add(qcCheckTaskIncome.getaNoOkquality());
qcCheckTask.setaNoOkquality(qcCheckTaskIncome.getaNoOkquality());
}
if(qcCheckTaskIncome.getbNoOkquality()!=null){
noOkQquality = noOkQquality.add(qcCheckTaskIncome.getbNoOkquality());
qcCheckTask.setbNoOkquality(qcCheckTaskIncome.getbNoOkquality());
}
if(qcCheckTaskIncome.getcNoOkquality()!=null){
noOkQquality = noOkQquality.add(qcCheckTaskIncome.getcNoOkquality());
qcCheckTask.setcNoOkquality(qcCheckTaskIncome.getcNoOkquality());
}
if(qcCheckTask.getNoOkQuality()==null){
qcCheckTask.setNoOkQuality(noOkQquality);
List<QcCheckTaskDefect> defects = qcCheckTaskIncome.getDefects();
for(QcCheckTaskDefect defect:defects){
defect.setRecordId(IdUtils.fastSimpleUUID());
defect.setCreateTime(nowTime);
defect.setCreateBy(updateBy);
defect.setFactoryCode(factoryCode);
noOkQquality = noOkQquality.add(defect.getNoOkQuality());
}
qcCheckTask.setNoOkQuality(noOkQquality);//累计不合格数
qcCheckTask.setSampleQuality(qcCheckTaskIncome.getSampleQuality());
/**qc_check_task**/
n = qcCheckTaskIncomeMapper.updateQcCheckTask(qcCheckTask);
@ -500,10 +496,13 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
for(QcCheckTaskDetail detail:details){
detail.setUpdateTime(nowTime);
}
n= qcCheckTaskIncomeMapper.updateQcCheckTaskDetails(details);
logger.info("更新qc_check_task_detail:"+n);
/**qc_check_task_defect**/
n= qcCheckTaskIncomeMapper.addQcCheckTaskDefects(defects);
logger.info("qc_check_task_defect:"+n);
if("material".equals(qcCheckTaskIncome.getTypeCode())){
qcCheckTaskIncome.setCheckResult(result.equals("Y")?"1":"2");
qcCheckUnqualifiedMapper.updateQualityStatus(qcCheckTaskIncome);

@ -8,10 +8,7 @@ import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.StringUtils;
import com.op.common.core.utils.uuid.IdUtils;
import com.op.common.security.utils.SecurityUtils;
import com.op.quality.domain.QcCheckTaskDetail;
import com.op.quality.domain.QcCheckTaskIncome;
import com.op.quality.domain.QcCheckTypeProject;
import com.op.quality.domain.QcProCheck;
import com.op.quality.domain.*;
import com.op.quality.mapper.QcCheckTaskIncomeMapper;
import com.op.quality.mapper.QcProCheckMapper;
import com.op.quality.service.QcProCheckService;
@ -123,9 +120,14 @@ public class QcProCheckServiceImpl implements QcProCheckService {
}
@Override
public List<QcCheckTaskDetail> getCheckTaskDetailList(QcCheckTaskDetail qcCheckTaskDetail) {
public QcCheckTaskIncome getCheckTaskDetailList(QcCheckTaskDetail qcCheckTaskDetail) {
DynamicDataSourceContextHolder.push(qcCheckTaskDetail.getFactoryCode());
return qcCheckTaskIncomeMapper.getCkeckProjectList(qcCheckTaskDetail);
QcCheckTaskIncome dto = new QcCheckTaskIncome();
List<QcCheckTaskDetail> qcCheckTaskDetails =qcCheckTaskIncomeMapper.getCkeckProjectList(qcCheckTaskDetail);
dto.setQcCheckTaskDetails(qcCheckTaskDetails);
List<QcCheckTaskDefect> defects =qcCheckTaskIncomeMapper.getCkeckDefectList(qcCheckTaskDetail);
dto.setDefects(defects);
return dto;
}
@Override

@ -320,6 +320,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
user_name userName
from qc_user_material where material_code = #{materialCode}
</select>
<select id="getCkeckDefectList" resultType="com.op.quality.domain.QcCheckTaskDefect">
select
record_id recordId,
defect_code defectCode,
defect_subclass defectSubclass,
noOk_quality noOkQuality
from qc_check_task_defect
where del_flag = '0' and belong_to = #{belongTo}
</select>
<insert id="addCheckUsers">
insert into qc_check_task_user(
record_id,belong_to,check_no,
@ -334,4 +343,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
</foreach>
</insert>
<insert id="addQcCheckTaskDefects">
insert into qc_check_task_defect(
record_id,belong_to,
defect_code,defect_subclass,
noOk_quality,
create_by,create_time,factory_code
) values
<foreach item="item" index="index" collection="list" separator=",">
(
#{item.recordId},#{item.belongTo},
#{item.defectCode},#{item.defectSubclass},
#{item.noOkQuality},
#{item.createBy},#{item.createTime},#{item.factoryCode}
)
</foreach>
</insert>
</mapper>

Loading…
Cancel
Save