|
|
@ -379,17 +379,17 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
|
|
|
|
DdlPreparedPack.getStringEqualPack(requestModel.getSn(),"productSn",packBean);
|
|
|
|
DdlPreparedPack.getStringEqualPack(requestModel.getSn(),"productSn",packBean);
|
|
|
|
DdlPreparedPack.getStringEqualPack(sn.getPartNo(),"partNo",packBean);
|
|
|
|
DdlPreparedPack.getStringEqualPack(sn.getPartNo(),"partNo",packBean);
|
|
|
|
//更新加工记录
|
|
|
|
//更新加工记录
|
|
|
|
mesProductionRecordRepository.updateByProperties(new String[]{"modifyUser", "modifyDatetime","productSn","description"},
|
|
|
|
mesProductionRecordRepository.updateByProperties(new String[]{"modifyUser", "modifyDatetime", "productSn", "description", "systemSyncStatus"},
|
|
|
|
new Object[]{userName, TimeTool.getNowTime(true),sn.getProductSn(),sn.getDescription()},packBean);
|
|
|
|
new Object[]{userName, TimeTool.getNowTime(true), sn.getProductSn(), sn.getDescription(), CommonEnumUtil.FALSE}, packBean);
|
|
|
|
//更新装配记录
|
|
|
|
//更新装配记录
|
|
|
|
mesProductionAssemblyRepository.updateByProperties(new String[]{"modifyUser", "modifyDatetime","productSn","description"},
|
|
|
|
mesProductionAssemblyRepository.updateByProperties(new String[]{"modifyUser", "modifyDatetime", "productSn", "description", "systemSyncStatus"},
|
|
|
|
new Object[]{userName, TimeTool.getNowTime(true),sn.getProductSn(),sn.getDescription()},packBean);
|
|
|
|
new Object[]{userName, TimeTool.getNowTime(true), sn.getProductSn(), sn.getDescription(), CommonEnumUtil.FALSE}, packBean);
|
|
|
|
//更新返工记录
|
|
|
|
//更新返工记录
|
|
|
|
packBean = DdlPackBean.getDdlPackBean(organizeCode);
|
|
|
|
packBean = DdlPackBean.getDdlPackBean(organizeCode);
|
|
|
|
DdlPreparedPack.getStringEqualPack(requestModel.getSn(),"sn",packBean);
|
|
|
|
DdlPreparedPack.getStringEqualPack(requestModel.getSn(), "sn", packBean);
|
|
|
|
DdlPreparedPack.getStringEqualPack(sn.getPartNo(),"partNo",packBean);
|
|
|
|
DdlPreparedPack.getStringEqualPack(sn.getPartNo(), "partNo", packBean);
|
|
|
|
mesReworkTaskRepository.updateByProperties(new String[]{"modifyUser", "modifyDatetime","sn","description"},
|
|
|
|
mesReworkTaskRepository.updateByProperties(new String[]{"modifyUser", "modifyDatetime", "sn", "description", "systemSyncStatus"},
|
|
|
|
new Object[]{userName, TimeTool.getNowTime(true),sn.getProductSn(),sn.getDescription()},packBean);
|
|
|
|
new Object[]{userName, TimeTool.getNowTime(true), sn.getProductSn(), sn.getDescription(), CommonEnumUtil.FALSE}, packBean);
|
|
|
|
IPrintTemplateStrategyService strategyService = (IPrintTemplateStrategyService) SpringContextsUtil.getBean(methodCode);
|
|
|
|
IPrintTemplateStrategyService strategyService = (IPrintTemplateStrategyService) SpringContextsUtil.getBean(methodCode);
|
|
|
|
return strategyService.execute(null, mesProduceSnPrintModel, null, null, null, true);
|
|
|
|
return strategyService.execute(null, mesProduceSnPrintModel, null, null, null, true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|