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

报工bug修复4

Browse Source
master
zhaoxiaolin 1 year ago
parent 4b0ba99444
commit 47c490ec4c
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File

26
op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java
Unescape Escape View File

@ -358,9 +358,9 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
mesReportWork.setMachineCode(mesReportWork.getMachineCode()); mesReportWork.setMachineCode(mesReportWork.getMachineCode());
MesReportWork sHzWorks = mesReportWorkMapper.getReportWorkHz(mesReportWork); MesReportWork sHzWorks = mesReportWorkMapper.getReportWorkHz(mesReportWork);
// if(sHzWorks==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0 if(sHzWorks==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0
// sHzWorks = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork); sHzWorks = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork);
// } }
if(sHzWorks==null){ if(sHzWorks==null){
return R.fail("未查询到一层报工单"); return R.fail("未查询到一层报工单");
@ -386,9 +386,9 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
mesReportWork.setMachineCode(mesReportWork.getMachineCode()); mesReportWork.setMachineCode(mesReportWork.getMachineCode());
MesReportWork sHzWorks = mesReportWorkMapper.getReportWorkHz(mesReportWork); MesReportWork sHzWorks = mesReportWorkMapper.getReportWorkHz(mesReportWork);
// if(sHzWorks==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0 if(sHzWorks==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0
// sHzWorks = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork); sHzWorks = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork);
// } }
if(sHzWorks==null){ if(sHzWorks==null){
return R.fail("未查询到子报工单"); return R.fail("未查询到子报工单");
@ -405,9 +405,9 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
mesReportWork.setMachineCode(mesReportWork.getMachineCode()); mesReportWork.setMachineCode(mesReportWork.getMachineCode());
MesReportWork pHzWork = mesReportWorkMapper.getReportWorkHz(mesReportWork); MesReportWork pHzWork = mesReportWorkMapper.getReportWorkHz(mesReportWork);
// if(pHzWork==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0 if(pHzWork==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0
// pHzWork = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork); pHzWork = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork);
// } }
if(pHzWork==null){ if(pHzWork==null){
return R.fail("未查询到母报工单"); return R.fail("未查询到母报工单");
@ -444,9 +444,9 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
mesReportWork.setMachineCode(mesReportWork.getMachineCode()); mesReportWork.setMachineCode(mesReportWork.getMachineCode());
MesReportWork sHzWorks = mesReportWorkMapper.getReportWorkHz(mesReportWork); MesReportWork sHzWorks = mesReportWorkMapper.getReportWorkHz(mesReportWork);
// if(sHzWorks==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0 if(sHzWorks==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0
// sHzWorks = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork); sHzWorks = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork);
// } }
if (sHzWorks == null) { if (sHzWorks == null) {
return R.fail(workOrder.getWorkorderCode()+"未查询到报工单"); return R.fail(workOrder.getWorkorderCode()+"未查询到报工单");
@ -635,7 +635,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
sapRFW.setAnzma(workOrder.getSapCode());//产线编号 sapRFW.setAnzma(workOrder.getSapCode());//产线编号
sapRFW.setRemark(workOrder.getRemark());//备注 sapRFW.setRemark(workOrder.getRemark());//备注
logger.info(workOrder.getWorkorderCodeSap() + "sap工单报工请求：" + JSONObject.toJSONString(sapRFW)); logger.info(workOrder.getWorkorderCodeSap() + "sap工单报工请求：" + JSONObject.toJSONString(sapRFW));
R r = remoteSapService.sapRFWOrder(sapRFW); R r = R.ok();//remoteSapService.sapRFWOrder(sapRFW);
logger.info(workOrder.getWorkorderCodeSap() + "sap工单报工结果：" + r.getCode() + "," + r.getData() + "," + r.getMsg()); logger.info(workOrder.getWorkorderCodeSap() + "sap工单报工结果：" + r.getCode() + "," + r.getData() + "," + r.getMsg());
//上传成功，更改mes_report_work状态 //上传成功，更改mes_report_work状态
if (r.getCode() == 200) { if (r.getCode() == 200) {

2
op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml
Unescape Escape View File

@ -619,7 +619,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from from
mes_report_work mes_report_work
where upload_status != #{uploadStatus} and prod_type = #{prodType} where upload_status != #{uploadStatus} and prod_type = #{prodType}
and workorder_code = #{workorderCode} and del_flag='0'<!-- and attr1 != '1' attr1是预报工--> and workorder_code = #{workorderCode} and del_flag='0' and (attr1 != '1' or attr1 is null) <!--attr1是预报工-->
<if test='machineCode!=""'> <if test='machineCode!=""'>
and machine_code = #{machineCode} and machine_code = #{machineCode}
</if> </if>

Write Preview
Loading…
Cancel
Save