Yangwl
/
lanju-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

库存检验，动态添加不良信息

Browse Source
master
shaoyong 1 year ago
parent d585533008
commit 7592451f79
5 changed files with 104 additions and 51 deletions
Show Stats Download Patch File Download Diff File

26
op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskInventory.java
Unescape Escape View File

@ -2,6 +2,8 @@ package com.op.quality.domain;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
@ -119,7 +121,7 @@ public class QcCheckTaskInventory extends BaseEntity {
/** 不合格数量 */ /** 不合格数量 */
@Excel(name = "不合格数量") @Excel(name = "不合格数量")
private BigDecimal nookQuality; private BigDecimal noOkQuality;
/** 抽样数量 */ /** 抽样数量 */
@Excel(name = "抽样数量") @Excel(name = "抽样数量")
@ -150,6 +152,8 @@ public class QcCheckTaskInventory extends BaseEntity {
private String checkTimeStart; private String checkTimeStart;
private String checkTimeEnd; private String checkTimeEnd;
private List<QcCheckTaskDefect> defects;
public void setRecordId(String recordId) { public void setRecordId(String recordId) {
this.recordId = recordId; this.recordId = recordId;
} }
@ -325,13 +329,15 @@ public class QcCheckTaskInventory extends BaseEntity {
public String getCheckType() { public String getCheckType() {
return checkType; return checkType;
} }
public void setNookQuality(BigDecimal nookQuality) {
this.nookQuality = nookQuality; public BigDecimal getNoOkQuality() {
return noOkQuality;
} }
public BigDecimal getNookQuality() { public void setNoOkQuality(BigDecimal noOkQuality) {
return nookQuality; this.noOkQuality = noOkQuality;
} }
public void setSampleQuality(BigDecimal sampleQuality) { public void setSampleQuality(BigDecimal sampleQuality) {
this.sampleQuality = sampleQuality; this.sampleQuality = sampleQuality;
} }
@ -407,6 +413,14 @@ public class QcCheckTaskInventory extends BaseEntity {
this.checkTimeEnd = checkTimeEnd; this.checkTimeEnd = checkTimeEnd;
} }
public List<QcCheckTaskDefect> getDefects() {
return defects;
}
public void setDefects(List<QcCheckTaskDefect> defects) {
this.defects = defects;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@ -439,7 +453,7 @@ public class QcCheckTaskInventory extends BaseEntity {
.append("factoryCode", getFactoryCode()) .append("factoryCode", getFactoryCode())
.append("delFlag", getDelFlag()) .append("delFlag", getDelFlag())
.append("checkType", getCheckType()) .append("checkType", getCheckType())
.append("nookQuality", getNookQuality()) .append("nookQuality", getNoOkQuality())
.append("sampleQuality", getSampleQuality()) .append("sampleQuality", getSampleQuality())
.append("aNoOkquality", getaNoOkquality()) .append("aNoOkquality", getaNoOkquality())
.append("bNoOkquality", getbNoOkquality()) .append("bNoOkquality", getbNoOkquality())

11
op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
Unescape Escape View File

@ -82,7 +82,16 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
@Override @Override
@DS("#header.poolName") @DS("#header.poolName")
public QcCheckTaskIncome selectQcCheckTaskIncomeByRecordId(String recordId) { public QcCheckTaskIncome selectQcCheckTaskIncomeByRecordId(String recordId) {
return qcCheckTaskIncomeMapper.selectQcCheckTaskIncomeByRecordId(recordId); QcCheckTaskIncome qcCheckTaskIncome = qcCheckTaskIncomeMapper.selectQcCheckTaskIncomeByRecordId(recordId);
//获取拼接好的检验人员信息
QcCheckTaskUser qcCheckTaskUser = qcCheckTaskUserService.selectQcCheckTaskUserByBelongTo(recordId);
if (qcCheckTaskUser != null && StringUtils.isNotBlank(qcCheckTaskUser.getManNames())) {
qcCheckTaskIncome.setCheckManName(qcCheckTaskUser.getManNames());
}
if (qcCheckTaskUser != null && StringUtils.isNotBlank(qcCheckTaskUser.getManCodes())) {
qcCheckTaskIncome.setCheckManCode(qcCheckTaskUser.getManCodes());
}
return qcCheckTaskIncome;
} }
/** /**

32
op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskInventoryServiceImpl.java
Unescape Escape View File

@ -13,6 +13,7 @@ import com.op.common.core.utils.uuid.IdUtils;
import com.op.common.security.utils.SecurityUtils; import com.op.common.security.utils.SecurityUtils;
import com.op.quality.domain.*; import com.op.quality.domain.*;
import com.op.quality.mapper.*; import com.op.quality.mapper.*;
import com.op.quality.service.IQcCheckTaskDefectService;
import com.op.quality.service.IQcCheckTaskUserService; import com.op.quality.service.IQcCheckTaskUserService;
import com.op.system.api.domain.quality.QcUserMaterialDTO; import com.op.system.api.domain.quality.QcUserMaterialDTO;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -52,6 +53,9 @@ public class QcCheckTaskInventoryServiceImpl implements IQcCheckTaskInventorySer
@Autowired @Autowired
private QcCheckTaskIncomeMapper qcCheckTaskIncomeMapper; private QcCheckTaskIncomeMapper qcCheckTaskIncomeMapper;
@Autowired
private IQcCheckTaskDefectService qcCheckTaskDefectService;
/** /**
* 查询库存检验任务 * 查询库存检验任务
* *
@ -70,6 +74,11 @@ public class QcCheckTaskInventoryServiceImpl implements IQcCheckTaskInventorySer
if (qcCheckTaskUser != null && StringUtils.isNotBlank(qcCheckTaskUser.getManCodes())) { if (qcCheckTaskUser != null && StringUtils.isNotBlank(qcCheckTaskUser.getManCodes())) {
qcCheckTaskInventory.setCheckManCode(qcCheckTaskUser.getManCodes()); qcCheckTaskInventory.setCheckManCode(qcCheckTaskUser.getManCodes());
} }
//获取不良品检验信息
List<QcCheckTaskDefect> qcCheckTaskDefectList = qcCheckTaskDefectService.selectDefectByBelongTo(recordId);
if (!CollectionUtils.isEmpty(qcCheckTaskDefectList)) {
qcCheckTaskInventory.setDefects(qcCheckTaskDefectList);
}
return qcCheckTaskInventory; return qcCheckTaskInventory;
} }
@ -182,6 +191,18 @@ public class QcCheckTaskInventoryServiceImpl implements IQcCheckTaskInventorySer
logger.info("检查人新增"+m+"成功"); logger.info("检查人新增"+m+"成功");
} }
} }
/** 不良品数据插入 */
BigDecimal noOkQuality = new BigDecimal(0);
List<QcCheckTaskDefect> defectList = qcCheckTaskInventory.getDefects();
if (!CollectionUtils.isEmpty(defectList)) {
for (QcCheckTaskDefect defect : defectList) {
defect.setBelongTo(beLongId);
qcCheckTaskDefectService.insertQcCheckTaskDefect(defect);
noOkQuality = noOkQuality.add(defect.getNoOkQuality()==null?new BigDecimal("0"):defect.getNoOkQuality());
}
}
qcCheckTaskInventory.setNoOkQuality(noOkQuality);
/**qc_check_task**/ /**qc_check_task**/
qcCheckTaskInventoryMapper.insertQcCheckTaskInventory(qcCheckTaskInventory); qcCheckTaskInventoryMapper.insertQcCheckTaskInventory(qcCheckTaskInventory);
@ -206,7 +227,6 @@ public class QcCheckTaskInventoryServiceImpl implements IQcCheckTaskInventorySer
@Override @Override
@DS("#header.poolName") @DS("#header.poolName")
public int updateQcCheckTaskInventory(QcCheckTaskInventory qcCheckTaskInventory) { public int updateQcCheckTaskInventory(QcCheckTaskInventory qcCheckTaskInventory) {
qcCheckTaskInventory.setUpdateTime(DateUtils.getNowDate()); qcCheckTaskInventory.setUpdateTime(DateUtils.getNowDate());
/** qc_task_user**/ /** qc_task_user**/
String checkManName = qcCheckTaskInventory.getCheckManName(); String checkManName = qcCheckTaskInventory.getCheckManName();
@ -226,19 +246,19 @@ public class QcCheckTaskInventoryServiceImpl implements IQcCheckTaskInventorySer
} }
qcCheckTaskUserService.updateQcCheckTaskUser(qcCheckTaskUserList); qcCheckTaskUserService.updateQcCheckTaskUser(qcCheckTaskUserList);
/** 不良品数据修改 **/ /** 不良品数据修改 **/
/*BigDecimal noOkQuality = new BigDecimal(0); BigDecimal noOkQuality = new BigDecimal(0);
List<QcCheckTaskDefect> defectList = qcCheckTaskProduce.getDefects(); List<QcCheckTaskDefect> defectList = qcCheckTaskInventory.getDefects();
String belongTo = qcCheckTaskProduce.getRecordId(); String belongTo = qcCheckTaskInventory.getRecordId();
//不是空执行下一步，空不做操作 //不是空执行下一步，空不做操作
if (!CollectionUtils.isEmpty(defectList)) { if (!CollectionUtils.isEmpty(defectList)) {
qcCheckTaskDefectService.deleteQcCheckTaskDefectByBelongTo(belongTo); qcCheckTaskDefectService.deleteQcCheckTaskDefectByBelongTo(belongTo);
for (QcCheckTaskDefect defect : defectList) { for (QcCheckTaskDefect defect : defectList) {
defect.setBelongTo(belongTo); defect.setBelongTo(belongTo);
qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); qcCheckTaskDefectService.insertQcCheckTaskDefect(defect);
noOkQuality = noOkQuality.add(defect.getNoOkQuality()); noOkQuality = noOkQuality.add(defect.getNoOkQuality()==null?new BigDecimal("0"):defect.getNoOkQuality());
} }
} }
qcCheckTaskProduce.setNoOkQuality(noOkQuality);*/ qcCheckTaskInventory.setNoOkQuality(noOkQuality);
return qcCheckTaskInventoryMapper.updateQcCheckTaskInventory(qcCheckTaskInventory); return qcCheckTaskInventoryMapper.updateQcCheckTaskInventory(qcCheckTaskInventory);
} }

11
op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java
Unescape Escape View File

@ -62,7 +62,16 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin
@Override @Override
@DS("#header.poolName") @DS("#header.poolName")
public QcCheckTaskWarehousing selectQcCheckTaskWarehousingByRecordId(String recordId) { public QcCheckTaskWarehousing selectQcCheckTaskWarehousingByRecordId(String recordId) {
return qcCheckTaskWarehousingMapper.selectQcCheckTaskWarehousingByRecordId(recordId); QcCheckTaskWarehousing checkTaskWarehousing = qcCheckTaskWarehousingMapper.selectQcCheckTaskWarehousingByRecordId(recordId);
//获取拼接好的检验人员信息
QcCheckTaskUser qcCheckTaskUser = qcCheckTaskUserService.selectQcCheckTaskUserByBelongTo(recordId);
if (qcCheckTaskUser != null && StringUtils.isNotBlank(qcCheckTaskUser.getManNames())) {
checkTaskWarehousing.setCheckManName(qcCheckTaskUser.getManNames());
}
if (qcCheckTaskUser != null && StringUtils.isNotBlank(qcCheckTaskUser.getManCodes())) {
checkTaskWarehousing.setCheckManCode(qcCheckTaskUser.getManCodes());
}
return checkTaskWarehousing;
} }
/** /**

73
op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskInventoryMapper.xml
Unescape Escape View File

@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="factoryCode" column="factory_code" /> <result property="factoryCode" column="factory_code" />
<result property="delFlag" column="del_flag" /> <result property="delFlag" column="del_flag" />
<result property="checkType" column="check_type" /> <result property="checkType" column="check_type" />
<result property="nookQuality" column="noOk_quality" /> <result property="noOkQuality" column="noOk_quality" />
<result property="sampleQuality" column="sample_quality" /> <result property="sampleQuality" column="sample_quality" />
<result property="aNoOkquality" column="aNoOkquality" /> <result property="aNoOkquality" column="aNoOkquality" />
<result property="bNoOkquality" column="bNoOkquality" /> <result property="bNoOkquality" column="bNoOkquality" />
@ -47,42 +47,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select record_id, check_no, income_batch_no, order_no, material_code, material_name, quality, unit, supplier_code, select record_id, check_no, income_batch_no, order_no, material_code, material_name, quality, unit, supplier_code,
supplier_name, income_time, check_loc, check_status, check_man_code, check_man_name, check_time, check_result, supplier_name, income_time, check_loc, check_status, check_man_code, check_man_name, check_time, check_result,
status, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, factory_code, del_flag, status, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, factory_code, del_flag,
check_type, noOk_quality, sample_quality, aNoOkquality, bNoOkquality, cNoOkquality, type_code, order_type from qc_check_task check_type, noOk_quality, sample_quality, aNoOkquality, bNoOkquality, cNoOkquality, type_code, order_type
from qc_check_task
</sql> </sql>
<select id="selectQcCheckTaskInventoryList" parameterType="QcCheckTaskInventory" resultMap="QcCheckTaskInventoryResult"> <select id="selectQcCheckTaskInventoryList" parameterType="QcCheckTaskInventory" resultMap="QcCheckTaskInventoryResult">
<include refid="selectQcCheckTaskInventoryVo"/> select qct.record_id, qct.check_no, qct.income_batch_no,
qct.order_no, qct.material_code, qct.material_name, qct.quality, qct.unit,
qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_loc, qct.check_status,
qct.check_man_code, qct.check_man_name,qct.check_time, qct.check_result, qct.status,
qct.create_by,qct.create_time, qct.update_by, qct.update_time,
qct.check_type,qct.sample_quality,qct.noOk_quality,
q.type_code
from qc_check_task qct
left join qc_check_type q on q.id = qct.check_type
<where> <where>
<if test="checkNo != null and checkNo != ''"> and check_no = #{checkNo}</if> <if test="checkNo != null and checkNo != ''"> and qct.check_no = #{checkNo}</if>
<if test="incomeBatchNo != null and incomeBatchNo != ''"> and income_batch_no = #{incomeBatchNo}</if> <if test="incomeBatchNo != null and incomeBatchNo != ''"> and qct.income_batch_no = #{incomeBatchNo}</if>
<if test="orderNo != null and orderNo != ''"> and order_no = #{orderNo}</if> <if test="orderNo != null and orderNo != ''"> and qct.order_no = #{orderNo}</if>
<if test="materialCode != null and materialCode != ''"> and material_code = #{materialCode}</if> <if test="materialCode != null and materialCode != ''"> and qct.material_code = #{materialCode}</if>
<if test="materialName != null and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if> <if test="materialName != null and materialName != ''"> and qct.material_name like concat('%', #{materialName}, '%')</if>
<if test="quality != null "> and quality = #{quality}</if> <if test="supplierCode != null and supplierCode != ''"> and qct.supplier_code = #{supplierCode}</if>
<if test="unit != null and unit != ''"> and unit = #{unit}</if> <if test="supplierName != null and supplierName != ''"> and qct.supplier_name like concat('%', #{supplierName}, '%')</if>
<if test="supplierCode != null and supplierCode != ''"> and supplier_code = #{supplierCode}</if> <if test="incomeTime != null "> and qct.income_time = #{incomeTime}</if>
<if test="supplierName != null and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if> <if test="checkLoc != null and checkLoc != ''"> and qct.check_loc = #{checkLoc}</if>
<if test="incomeTime != null "> and income_time = #{incomeTime}</if> <if test="checkStatus != null and checkStatus != ''"> and qct.check_status = #{checkStatus}</if>
<if test="checkLoc != null and checkLoc != ''"> and check_loc = #{checkLoc}</if> <if test="checkManCode != null and checkManCode != ''"> and qct.check_man_code = #{checkManCode}</if>
<if test="checkStatus != null and checkStatus != ''"> and check_status = #{checkStatus}</if> <if test="checkManName != null and checkManName != ''"> and qct.check_man_name like concat('%', #{checkManName}, '%')</if>
<if test="checkManCode != null and checkManCode != ''"> and check_man_code = #{checkManCode}</if> <if test="checkResult != null and checkResult != ''"> and qct.check_result = #{checkResult}</if>
<if test="checkManName != null and checkManName != ''"> and check_man_name like concat('%', #{checkManName}, '%')</if> <if test="status != null and status != ''"> and qct.status = #{status}</if>
<if test="checkTime != null "> and check_time = #{checkTime}</if> <if test="delFlag != null and delFlag != ''"> and qct.del_flag = #{delFlag}</if>
<if test="checkResult != null and checkResult != ''"> and check_result = #{checkResult}</if> <if test="factoryCode != null and factoryCode != ''"> and qct.factory_code = #{factoryCode}</if>
<if test="status != null and status != ''"> and status = #{status}</if> <if test="incomeTimeStart != null "> and CONVERT(varchar(30),qct.income_time, 120) >= #{incomeTimeStart}</if>
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if> <if test="incomeTimeEnd != null "> and #{incomeTimeEnd} > CONVERT(varchar(30),qct.income_time, 120)</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if> <if test="checkTimeStart != null "> and CONVERT(varchar(30),qct.check_time, 120) >= #{checkTimeStart}</if>
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if> <if test="checkTimeEnd != null "> and #{checkTimeEnd} > CONVERT(varchar(30),qct.check_time, 120)</if>
<if test="attr4 != null and attr4 != ''"> and attr4 = #{attr4}</if> <if test="checkType != null "> and qct.check_type = #{checkType} </if>
<if test="factoryCode != null and factoryCode != ''"> and factory_code = #{factoryCode}</if> <if test="typeCode != null "> and q.type_code = #{typeCode} </if>
<if test="checkType != null and checkType != ''"> and check_type = #{checkType}</if>
<if test="nookQuality != null "> and noOk_quality = #{nookQuality}</if>
<if test="sampleQuality != null "> and sample_quality = #{sampleQuality}</if>
<if test="aNoOkquality != null "> and aNoOkquality = #{aNoOkquality}</if>
<if test="bNoOkquality != null "> and bNoOkquality = #{bNoOkquality}</if>
<if test="cNoOkquality != null "> and cNoOkquality = #{cNoOkquality}</if>
<if test="typeCode != null and typeCode != ''"> and type_code = #{typeCode}</if>
<if test="orderType != null and orderType != ''"> and order_type = #{orderType}</if>
</where> </where>
</select> </select>
@ -123,7 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="factoryCode != null and factoryCode != ''">factory_code,</if> <if test="factoryCode != null and factoryCode != ''">factory_code,</if>
<if test="delFlag != null">del_flag,</if> <if test="delFlag != null">del_flag,</if>
<if test="checkType != null">check_type,</if> <if test="checkType != null">check_type,</if>
<if test="nookQuality != null">noOk_quality,</if> <if test="noOkQuality != null">noOk_quality,</if>
<if test="sampleQuality != null">sample_quality,</if> <if test="sampleQuality != null">sample_quality,</if>
<if test="aNoOkquality != null">aNoOkquality,</if> <if test="aNoOkquality != null">aNoOkquality,</if>
<if test="bNoOkquality != null">bNoOkquality,</if> <if test="bNoOkquality != null">bNoOkquality,</if>
@ -161,7 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="factoryCode != null and factoryCode != ''">#{factoryCode},</if> <if test="factoryCode != null and factoryCode != ''">#{factoryCode},</if>
<if test="delFlag != null">#{delFlag},</if> <if test="delFlag != null">#{delFlag},</if>
<if test="checkType != null">#{checkType},</if> <if test="checkType != null">#{checkType},</if>
<if test="nookQuality != null">#{nookQuality},</if> <if test="noOkQuality != null">#{noOkQuality},</if>
<if test="sampleQuality != null">#{sampleQuality},</if> <if test="sampleQuality != null">#{sampleQuality},</if>
<if test="aNoOkquality != null">#{aNoOkquality},</if> <if test="aNoOkquality != null">#{aNoOkquality},</if>
<if test="bNoOkquality != null">#{bNoOkquality},</if> <if test="bNoOkquality != null">#{bNoOkquality},</if>
@ -202,7 +203,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="factoryCode != null and factoryCode != ''">factory_code = #{factoryCode},</if> <if test="factoryCode != null and factoryCode != ''">factory_code = #{factoryCode},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if> <if test="delFlag != null">del_flag = #{delFlag},</if>
<if test="checkType != null">check_type = #{checkType},</if> <if test="checkType != null">check_type = #{checkType},</if>
<if test="nookQuality != null">noOk_quality = #{nookQuality},</if> <if test="noOkQuality != null">noOk_quality = #{noOkQuality},</if>
<if test="sampleQuality != null">sample_quality = #{sampleQuality},</if> <if test="sampleQuality != null">sample_quality = #{sampleQuality},</if>
<if test="aNoOkquality != null">aNoOkquality = #{aNoOkquality},</if> <if test="aNoOkquality != null">aNoOkquality = #{aNoOkquality},</if>
<if test="bNoOkquality != null">bNoOkquality = #{bNoOkquality},</if> <if test="bNoOkquality != null">bNoOkquality = #{bNoOkquality},</if>

Write Preview
Loading…
Cancel
Save