diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java index f7656700..ac3d7117 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java @@ -402,7 +402,6 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { } else { workOrder.setUploadStatus("2"); workOrder.setUploadMsg(r.getMsg()); - return r; } workOrder.setUploadTime(DateUtils.getNowDate()); mesReportWorkMapper.updateSyncSapStatus(workOrder); diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml index ba20408a..db99de73 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml @@ -255,8 +255,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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.check_type, - qct.noOk_quality,qct.aNoOkquality,qct.bNoOkquality,qct.cNoOkquality,qct.sample_quality, - qct.create_time + qct.noOk_quality,qct.aNoOkquality,qct.bNoOkquality,qct.cNoOkquality,qct.sample_quality ,pow.workorder_code_sap workorderCodeSap from qc_check_task qct left join qc_check_task_user qctu on qctu.belong_to = qct.record_id