diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesNcProcessingService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesNcProcessingService.java index 196b221..04cb51d 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesNcProcessingService.java +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesNcProcessingService.java @@ -37,6 +37,6 @@ public interface IMesNcProcessingService { List queryPartInspectionCreateUser(String organizeCode); - void syncQmsScrap(String organizeCode); + void syncQmsScrap(String organizeCode,String userName); } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesNcProcessingController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesNcProcessingController.java index 2f675c5..7ba46dd 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesNcProcessingController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesNcProcessingController.java @@ -158,10 +158,10 @@ public class MesNcProcessingController { @GetMapping("/sync-qms-scrap") @ApiOperation(value = "同步到qms中间表") - public ResultBean syncQmsScrap(String organizeCode) { + public ResultBean syncQmsScrap(String organizeCode, String userName) { try { ValidatorBean.checkNotNull(organizeCode, "工厂不能为空"); - ncProcessingService.syncQmsScrap(organizeCode); + ncProcessingService.syncQmsScrap(organizeCode, userName); return ResultBean.success("同步成功"); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java index 2b993d3..0ce4d8c 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java @@ -1077,7 +1077,7 @@ public class MesNcProcessingService implements IMesNcProcessingService { } @Override - public void syncQmsScrap(String organizeCode) { + public void syncQmsScrap(String organizeCode, String userName) { String url = ""; MesConfig mesConfig = configService.getCfgValueByCode(organizeCode, "MES_SCRAP_URL"); if (mesConfig == null) { @@ -1086,6 +1086,7 @@ public class MesNcProcessingService implements IMesNcProcessingService { url = mesConfig.getCfgValue(); Map map = new HashMap<>(); map.put("organizeCode", organizeCode); + map.put("userName", userName); ResultBean resultBean = getModuleData(url, map); //校验平台登陆结果