diff --git a/modules/i3plus-ext-mes-apiservice/src/groovy/ccscTask/sapToMesCcscTaskResult.groovy b/modules/i3plus-ext-mes-apiservice/src/groovy/ccscTask/sapToMesCcscTaskResult.groovy index 6a05bbd..8ed2569 100644 --- a/modules/i3plus-ext-mes-apiservice/src/groovy/ccscTask/sapToMesCcscTaskResult.groovy +++ b/modules/i3plus-ext-mes-apiservice/src/groovy/ccscTask/sapToMesCcscTaskResult.groovy @@ -10,6 +10,7 @@ import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper import cn.estsh.i3plus.pojo.mes.repository.MesDefectTypeRepository import cn.estsh.i3plus.pojo.mes.repository.MesProduceSnRepository import cn.estsh.i3plus.pojo.mes.repository.MesWorkOrderToSapRepository +import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil import lombok.Getter import lombok.Setter import org.apache.commons.collections.CollectionUtils @@ -93,6 +94,7 @@ class sapToMesCcscTaskResult { String work_center_code = resultWorkMap.get(0).get("work_center_code") String work_cell_code = resultWorkMap.get(0).get("work_cell_code") long workOrderId = Long.valueOf(resultWorkMap.get(0).get("id")+"") + int workOrderStatus = Integer.parseInt(resultWorkMap.get(0).get("work_order_status")+"") LOGGER.info("-------- filterData Start QMS同步MES_CCSC任务检测结果 70{}",work_center_code) String logUpdateSql="update mes_comunication_log set is_deleted = 1 " + @@ -120,7 +122,11 @@ class sapToMesCcscTaskResult { mesInputDefectRecordService.savePartInspection(mesProduceSn, "JOB",mesDefect,"A01") } } - workOrderUpdate = "update mes_work_order set ccsc_status = 20,work_order_status=40 where id= "+workOrderId+"; " + if(workOrderStatus < MesExtEnumUtil.ORDER_STATUS.CLOSE.getValue()){ + workOrderUpdate = "update mes_work_order set ccsc_status = 20,work_order_status=40 where id= "+workOrderId+"; " + }else{ + workOrderUpdate = "update mes_work_order set ccsc_status = 20 where id= "+workOrderId+"; " + } }else{ workOrderUpdate = "update mes_work_order set ccsc_status = 10 where id= "+workOrderId+"; " } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesInputDefectRecordServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesInputDefectRecordServiceImpl.java index b23f189..f34cbf3 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesInputDefectRecordServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesInputDefectRecordServiceImpl.java @@ -75,7 +75,7 @@ public class MesInputDefectRecordServiceImpl implements IMesInputDefectRecordSer ConvertBean.serviceModelInitialize(mesProduceSn, userName); mesProduceSnRepository.update(mesProduceSn); //移库 - createMove(mesPartSap, mesPartInspection.getId(), configService.getCfgValue(mesProduceSn.getOrganizeCode(), "LGORT"), configService.getCfgValue(mesProduceSn.getOrganizeCode(), "UMLGO"), mesProduceSn); + createMove(mesPartSap, mesPartInspection.getId(), configService.getCfgValue(mesProduceSn.getOrganizeCode(), "LGORT"), configService.getCfgValue(mesProduceSn.getOrganizeCode(), "UMLGO"), mesProduceSn,userName); } private void saveDetail(String organizeCode, MesDefectType mesDefect, long partInspectionId, String userName,String defectLocation) { @@ -115,10 +115,10 @@ public class MesInputDefectRecordServiceImpl implements IMesInputDefectRecordSer * @param target 目标 * @return */ - private void createMove(MesPartSap mesPartSap, long partInspectionId, String source, String target, MesProduceSn mesProduceSn) { + private void createMove(MesPartSap mesPartSap, long partInspectionId, String source, String target, MesProduceSn mesProduceSn,String userName) { GenSerialNoModel serialNoModel = new GenSerialNoModel("INPUT_DEFECT_ZRSUM"); serialNoModel.setPartNo(mesPartSap.getPartNo()); - ResultBean rb = syncFuncService.syncSerialNo(serialNoModel, AuthUtil.getSessionUser().getUserName(), mesProduceSn.getOrganizeCode(), 1); + ResultBean rb = syncFuncService.syncSerialNo(serialNoModel, userName, mesProduceSn.getOrganizeCode(), 1); String zrsum = ""; if (null != rb && !CollectionUtils.isEmpty(rb.getResultList())) { zrsum = (rb.getResultList().get(0)).toString(); @@ -139,7 +139,7 @@ public class MesInputDefectRecordServiceImpl implements IMesInputDefectRecordSer move.setMoveType(MesExtEnumUtil.MOVE_TYPE.SUSPICIOUS_MOVE.getValue()); move.setProductSn(mesProduceSn.getProductSn()); move.setWorkCenter(workCenterService.getErpWorkCenterCode(mesProduceSn.getOrganizeCode(), mesProduceSn.getWorkCenterCode())); - ConvertBean.serviceModelInitialize(move, AuthUtil.getSessionUser().getUserName()); + ConvertBean.serviceModelInitialize(move, userName); moveRepository.insert(move); } }