质量问题修改9

master
zhaoxiaolin 1 year ago
parent cce1431375
commit 282aab7213

@ -49,15 +49,15 @@ public class QcCheckTaskProduceController extends BaseController {
@GetMapping("/list")
public TableDataInfo list(QcCheckTaskProduce qcCheckTaskProduce) {
//默认时间范围T 00:00:00~T+1 00:00:00
if(StringUtils.isEmpty(qcCheckTaskProduce.getIncomeTimeStart())){
qcCheckTaskProduce.setIncomeTimeStart(DateUtils.getDate()+" 00:00:00");//start
LocalDate date = LocalDate.now();
LocalDate dateEnd = date.plusDays(1);
DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
String dateEndStr = dtf.format(dateEnd)+" 00:00:00";
qcCheckTaskProduce.setIncomeTimeEnd(dateEndStr);//end
}
// //默认时间范围T 00:00:00~T+1 00:00:00
// if(StringUtils.isEmpty(qcCheckTaskProduce.getIncomeTimeStart())){
// qcCheckTaskProduce.setIncomeTimeStart(DateUtils.getDate()+" 00:00:00");//start
// LocalDate date = LocalDate.now();
// LocalDate dateEnd = date.plusDays(1);
// DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
// String dateEndStr = dtf.format(dateEnd)+" 00:00:00";
// qcCheckTaskProduce.setIncomeTimeEnd(dateEndStr);//end
// }
// if(StringUtils.isEmpty(qcCheckTaskProduce.getCheckTimeStart())){
// qcCheckTaskProduce.setCheckTimeStart(qcCheckTaskProduce.getProduceDateStart());//start
@ -77,15 +77,15 @@ public class QcCheckTaskProduceController extends BaseController {
@PostMapping("/export")
public void export(HttpServletResponse response, QcCheckTaskProduce qcCheckTaskProduce) {
//默认时间范围T 00:00:00~T+1 00:00:00
if(StringUtils.isEmpty(qcCheckTaskProduce.getIncomeTimeStart())){
qcCheckTaskProduce.setIncomeTimeStart(DateUtils.getDate()+" 00:00:00");//start
LocalDate date = LocalDate.now();
LocalDate dateEnd = date.plusDays(1);
DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
String dateEndStr = dtf.format(dateEnd)+" 00:00:00";
qcCheckTaskProduce.setIncomeTimeEnd(dateEndStr);//end
}
// //默认时间范围T 00:00:00~T+1 00:00:00
// if(StringUtils.isEmpty(qcCheckTaskProduce.getIncomeTimeStart())){
// qcCheckTaskProduce.setIncomeTimeStart(DateUtils.getDate()+" 00:00:00");//start
// LocalDate date = LocalDate.now();
// LocalDate dateEnd = date.plusDays(1);
// DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
// String dateEndStr = dtf.format(dateEnd)+" 00:00:00";
// qcCheckTaskProduce.setIncomeTimeEnd(dateEndStr);//end
// }
// if(StringUtils.isEmpty(qcCheckTaskProduce.getCheckTimeStart())){
// qcCheckTaskProduce.setCheckTimeStart(qcCheckTaskProduce.getProduceDateStart());//start

@ -140,6 +140,24 @@ public class QcCheckTaskIncome extends BaseEntity {
private String fileList;
private List<BaseFile> files;
private String remark;
private String belongTo;
private String oldBelongTo;
public String getOldBelongTo() {
return oldBelongTo;
}
public void setOldBelongTo(String oldBelongTo) {
this.oldBelongTo = oldBelongTo;
}
public String getBelongTo() {
return belongTo;
}
public void setBelongTo(String belongTo) {
this.belongTo = belongTo;
}
@Override
public String getRemark() {

@ -84,4 +84,9 @@ public interface QcCheckUnqualifiedMapper {
List<QcCheckTaskIncome> getProductWorkOrder(QcCheckTaskIncome qcCheckTaskIncome);
void updatePutStatus(QcCheckTaskIncome qcCheckTaskIncome);
int repeatCheckTask(QcCheckTaskIncome recheck);
int repeatCheckTaskDefect(QcCheckTaskIncome recheck);
int repeatCheckTaskDetail(QcCheckTaskIncome recheck);
int repeatCheckTaskUser(QcCheckTaskIncome recheck);
}

@ -536,6 +536,28 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
/**pro_order_workorder_batch-->status->w5**/
qcCheckTaskIncome.setStatus("2");
qcCheckUnqualifiedMapper.updateWorkOrderBatchStatus(qcCheckTaskIncome);
if("checkTypeSC".equals(qcCheckTaskIncome.getCheckType())){
QcCheckTaskIncome recheck = new QcCheckTaskIncome();
recheck.setOldBelongTo(belongId);
recheck.setBelongTo(recheck.getRecordId());
recheck.setCreateBy(updateBy);
recheck.setCreateTime(nowTime);
//首件不合格触发复检
recheck.setRecordId(IdUtils.fastSimpleUUID());
n = qcCheckUnqualifiedMapper.repeatCheckTask(recheck);
logger.info("复检表qc_check_task:" + n);
recheck.setRecordId(IdUtils.fastSimpleUUID());
n = qcCheckUnqualifiedMapper.repeatCheckTaskDefect(recheck);
logger.info("复检表qc_check_task_defect:" + n);
recheck.setRecordId(IdUtils.fastSimpleUUID());
n = qcCheckUnqualifiedMapper.repeatCheckTaskDetail(recheck);
logger.info("复检表qc_check_task_detail:" + n);
recheck.setRecordId(IdUtils.fastSimpleUUID());
n = qcCheckUnqualifiedMapper.repeatCheckTaskUser(recheck);
logger.info("复检表qc_check_task_user:" + n);
}
}else if("product".equals(qcCheckTaskIncome.getTypeCode())){
/**wms_product_put-->check_status->1**/
qcCheckTaskIncome.setStatus("2");

@ -222,7 +222,7 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService
for (QcCheckTaskDefect defect : defectList) {
defect.setBelongTo(beLongId);
qcCheckTaskDefectService.insertQcCheckTaskDefect(defect);
noOkQuality = noOkQuality.add(defect.getNoOkQuality());
noOkQuality = noOkQuality.add(defect.getNoOkQuality()==null?new BigDecimal("0"):defect.getNoOkQuality());
}
}
qcCheckTaskProduce.setNoOkQuality(noOkQuality);
@ -278,7 +278,7 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService
for (QcCheckTaskDefect defect : defectList) {
defect.setBelongTo(belongTo);
qcCheckTaskDefectService.insertQcCheckTaskDefect(defect);
noOkQuality = noOkQuality.add(defect.getNoOkQuality());
noOkQuality = noOkQuality.add(defect.getNoOkQuality()==null?new BigDecimal("0"):defect.getNoOkQuality());
}
}
qcCheckTaskProduce.setNoOkQuality(noOkQuality);

@ -149,7 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select powb.batch_id batchId,
powb.batch_code batchCode
from pro_order_workorder_batch powb
left join pro_order_workorder pow on powb.workorder_id = pow.workorder_id
left join pro_order_workorder pow on powb.workorder_id = pow.workorder_id
where powb.del_flag = '0' and pow.del_flag = '0'
and pow.workorder_code = #{workorderCode}
</select>

@ -114,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
product_date incomeTime,
status
from pro_order_workorder
where status != 'w5' and parent_order != '0' and workorder_code_sap is not null
where status != 'w5' and parent_order = '0' and workorder_code_sap is not null
<if test="orderNo != null">and workorder_code_sap like concat ('%',#{orderNo},'%')</if>
order by product_date desc
</select>
@ -178,6 +178,67 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="requestid != null">#{requestid},</if>
</trim>
</insert>
<insert id="repeatCheckTask">
insert into qc_check_task(
record_id,check_no,income_batch_no,order_no,
material_code,material_name,quality,unit,
supplier_code,supplier_name,income_time,
check_status,
create_by,create_time,factory_code,del_flag,
check_type,noOk_quality,sample_quality,type_code,order_type
)
select
#{recordId},check_no,income_batch_no ,order_no ,
material_code,material_name,quality ,unit ,
supplier_code,supplier_name,income_time,
'0',
#{createBy},#{createTime},factory_code,del_flag,
check_type,noOk_quality,sample_quality,type_code ,'reCheckCS'
from qc_check_task where record_id = #{oldBelongTo} and del_flag = '0'
</insert>
<insert id="repeatCheckTaskDefect">
insert qc_check_task_defect(
record_id,
defect_code,defect_subclass,
create_by,create_time,
factory_code,del_flag,
belong_to,noOk_quality)
select
REPLACE(NEWID(), '-',''),
defect_code,defect_subclass,
#{createBy},#{createTime},
factory_code,del_flag,
#{belongTo},noOk_quality
from qc_check_task_defect where belong_to = #{oldBelongTo} and del_flag = '0'
</insert>
<insert id="repeatCheckTaskDetail">
insert into qc_check_task_detail(
record_id,belong_to,order_num,rule_name,property_code,
check_mode,check_tool,unit_code,check_standard,actual_value,
create_by,create_time,factory_code,del_flag,
project_id,project_no,type_project_id,defect_code
)
select
REPLACE(NEWID(), '-',''),#{belongTo},order_num,rule_name,property_code,
check_mode,check_tool,unit_code,check_standard,actual_value,
#{createBy},#{createTime},factory_code,del_flag,
project_id,project_no,type_project_id,defect_code
from qc_check_task_detail where belong_to = #{oldBelongTo} and del_flag = '0'
</insert>
<insert id="repeatCheckTaskUser">
insert into qc_check_task_user(
record_id,check_no,
check_man_code,check_man_name,
create_by,create_time,
factory_code,del_flag,belong_to
)
select
REPLACE(NEWID(), '-',''),check_no,
check_man_code,check_man_name,
#{createBy},#{createTime},
factory_code,del_flag,#{belongTo}
from qc_check_task_user where belong_to = #{oldBelongTo} and del_flag = '0'
</insert>
<update id="updateQcCheckUnqualified" parameterType="QcCheckUnqualified">
update qc_check_unqualified

@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="factoryCode != null and factoryCode != ''">factory_code,</if>
<if test="delFlag != null">del_flag,</if>
<if test="standardNo != null">standard_no,</if>
<if test="version != null">version = #{version}</if>
<if test="version != null">version,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@ -68,8 +68,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">#{updateTime},</if>
<if test="factoryCode != null and factoryCode != ''">#{factoryCode},</if>
<if test="delFlag != null">#{delFlag},</if>
<if test="standardNo != null">#{standardNo}</if>
<if test="version != null">#{version}</if>
<if test="standardNo != null">#{standardNo},</if>
<if test="version != null">#{version},</if>
</trim>
</insert>

Loading…
Cancel
Save