Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
陈恒杰 1 year ago
parent db81932f2c 245301f4f8
commit eebf7a2cf5
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File

2
op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java
Unescape Escape View File

@ -79,5 +79,5 @@ public interface QcCheckUnqualifiedMapper {
List<QcCheckTaskIncome> getWorkOrder(QcCheckTaskIncome qcCheckTaskIncome); List<QcCheckTaskIncome> getWorkOrder(QcCheckTaskIncome qcCheckTaskIncome);
int updateWorkOrderStatus(QcCheckTaskIncome qcCheckTaskIncome); int updateWorkOrderBatchStatus(QcCheckTaskIncome qcCheckTaskIncome);
} }

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

@ -285,9 +285,9 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
n = qcCheckTaskProduceMapper.updateQcCheckTaskProduce(qcCheckTaskProduce); n = qcCheckTaskProduceMapper.updateQcCheckTaskProduce(qcCheckTaskProduce);
/**pro_order_workorder-->status->w5**/ /**pro_order_workorder_batch-->qc_status->2**/
qcCheckTaskIncome.setStatus("w5"); qcCheckTaskIncome.setStatus("2");
qcCheckUnqualifiedMapper.updateWorkOrderStatus(qcCheckTaskIncome); qcCheckUnqualifiedMapper.updateWorkOrderBatchStatus(qcCheckTaskIncome);
}else if("product".equals(qcCheckTaskIncome.getTypeCode())){ }else if("product".equals(qcCheckTaskIncome.getTypeCode())){
QcCheckTaskWarehousing warehousing = new QcCheckTaskWarehousing(); QcCheckTaskWarehousing warehousing = new QcCheckTaskWarehousing();
warehousing.setCheckStatus("2"); warehousing.setCheckStatus("2");
@ -413,9 +413,9 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
qcCheckTaskIncome.setCheckResult(result.equals("Y")?"1":"2"); qcCheckTaskIncome.setCheckResult(result.equals("Y")?"1":"2");
qcCheckUnqualifiedMapper.updateQualityStatus(qcCheckTaskIncome); qcCheckUnqualifiedMapper.updateQualityStatus(qcCheckTaskIncome);
}else if("produce".equals(qcCheckTaskIncome.getTypeCode())){ }else if("produce".equals(qcCheckTaskIncome.getTypeCode())){
/**pro_order_workorder-->status->w5**/ /**pro_order_workorder_batch-->status->w5**/
qcCheckTaskIncome.setStatus("w5"); qcCheckTaskIncome.setStatus("2");
qcCheckUnqualifiedMapper.updateWorkOrderStatus(qcCheckTaskIncome); qcCheckUnqualifiedMapper.updateWorkOrderBatchStatus(qcCheckTaskIncome);
}else if("product".equals(qcCheckTaskIncome.getTypeCode())){ }else if("product".equals(qcCheckTaskIncome.getTypeCode())){
} }

4
op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml
Unescape Escape View File

@ -186,8 +186,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update wms_raw_order_in set quality_status = #{checkResult} update wms_raw_order_in set quality_status = #{checkResult}
where order_no = #{orderNo} where order_no = #{orderNo}
</update> </update>
<update id="updateWorkOrderStatus"> <update id="updateWorkOrderBatchStatus">
update pro_order_workorder set status = #{status} where workorder_code_sap = #{orderNo} update pro_order_workorder_batch set qc_status = #{status} where batch_code = #{incomeBatchNo}
</update> </update>
<delete id="deleteQcCheckUnqualifiedById" parameterType="String"> <delete id="deleteQcCheckUnqualifiedById" parameterType="String">

Write Preview
Loading…
Cancel
Save