From 7db20fcf4b984747a8e306ee700733234b4d3afa Mon Sep 17 00:00:00 2001 From: jun Date: Sat, 10 Aug 2024 21:52:11 +0800 Subject: [PATCH] =?UTF-8?q?AuthUtil=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/busi/IMesBoxingErrorProofingService.java | 2 +- .../busi/MesBoxingErrorProofingController.java | 21 +++++++++++---------- .../busi/MesDowntimeReasonTypeController.java | 3 ++- .../controller/busi/MesEnumDetailController.java | 3 ++- .../busi/MesInputDefectRecordController.java | 6 +++--- .../controller/busi/MesNcProcessingController.java | 8 ++++---- .../busi/MesPartShippingGroupController.java | 3 ++- .../busi/MesProduceSnPrintController.java | 3 ++- .../busi/MesRawPartChargingController.java | 9 +++++---- .../controller/busi/MesReworkTaskController.java | 4 ++-- .../controller/busi/MesWorkOrderController.java | 3 ++- .../busi/spot/MesSpotCheckOrderController.java | 18 +++++++++--------- .../serviceimpl/base/MesReworkTaskServiceImpl.java | 4 ++-- .../busi/MesBoxingErrorProofingService.java | 2 +- .../pcn/pojo/model/MesNcProcessingInputModel.java | 3 +++ .../mes/pcn/pojo/model/MesSpotCheckOrderModel.java | 3 +++ 16 files changed, 54 insertions(+), 41 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesBoxingErrorProofingService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesBoxingErrorProofingService.java index b65bcd5..73a62ce 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesBoxingErrorProofingService.java +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesBoxingErrorProofingService.java @@ -35,5 +35,5 @@ public interface IMesBoxingErrorProofingService { void updateMesPackageDetails(MesPackageDetail mesPackage); @ApiOperation(value = "解锁") - void unLock(String organizeCode, String userName, String pwd); + void unLock(String organizeCode, String pwd); } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesBoxingErrorProofingController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesBoxingErrorProofingController.java index e893cf7..a736dc1 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesBoxingErrorProofingController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesBoxingErrorProofingController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -38,7 +39,7 @@ public class MesBoxingErrorProofingController { try { ValidatorBean.checkNotNull(mesPackage.getPackageNo(), "箱条码不能为空"); - mesPackage.setOrganizeCode(AuthUtil.getOrganizeCode()); + mesPackage.setOrganizeCode(!StringUtils.isEmpty(mesPackage.getOrganizeCode())?mesPackage.getOrganizeCode():AuthUtil.getOrganizeCode()); ListPager partInspectionListPager = mesBoxingErrorProofingService.queryMesPackageDetailByPager(mesPackage, pager); return ResultBean.success("查询成功").setListPager(partInspectionListPager); } catch (ImppBusiException imppException) { @@ -55,8 +56,8 @@ public class MesBoxingErrorProofingController { try { ValidatorBean.checkNotNull(mesPackageDetail.getPackageNo(), "箱条码不能为空"); - mesPackageDetail.setOrganizeCode(AuthUtil.getOrganizeCode()); - ConvertBean.serviceModelInitialize(mesPackageDetail, AuthUtil.getSessionUser().getUserName()); + mesPackageDetail.setOrganizeCode(!StringUtils.isEmpty(mesPackageDetail.getOrganizeCode())?mesPackageDetail.getOrganizeCode():AuthUtil.getOrganizeCode()); + ConvertBean.serviceModelInitialize(mesPackageDetail,!StringUtils.isEmpty(mesPackageDetail.getModifyUser())?mesPackageDetail.getModifyUser():AuthUtil.getSessionUser().getUserName()); MesPackage mesPackage = mesBoxingErrorProofingService.doScan(mesPackageDetail); return ResultBean.success("扫描成功").setResultObject(mesPackage); } catch (ImppBusiException imppException) { @@ -75,7 +76,8 @@ public class MesBoxingErrorProofingController { mesPackageDetailList.forEach(mesPackageDetail -> { ValidatorBean.checkNotNull(mesPackageDetail.getPackageNo(), "箱条码不能为空"); }); - String userName = AuthUtil.getSessionUser().getUserName(); + MesPackageDetail next = mesPackageDetailList.iterator().next(); + String userName = !StringUtils.isEmpty(next.getModifyUser())?next.getModifyUser():AuthUtil.getSessionUser().getUserName(); MesPackage mesPackage = mesBoxingErrorProofingService.saveMesPackageDetails(mesPackageDetailList, userName); return ResultBean.success("保存成功").setResultObject(mesPackage); } catch (ImppBusiException imppException) { @@ -94,8 +96,8 @@ public class MesBoxingErrorProofingController { ValidatorBean.checkNotNull(mesPackage.getPackageNo(), "箱条码不能为空"); ValidatorBean.checkNotNull(mesPackage.getIsSealed(), "是否封箱不能为空"); - mesPackage.setOrganizeCode(AuthUtil.getOrganizeCode()); - ConvertBean.serviceModelUpdate(mesPackage, AuthUtil.getSessionUser().getUserName()); + mesPackage.setOrganizeCode(!StringUtils.isEmpty(mesPackage.getOrganizeCode())?mesPackage.getOrganizeCode():AuthUtil.getOrganizeCode()); + ConvertBean.serviceModelUpdate(mesPackage, !StringUtils.isEmpty(mesPackage.getModifyUser())?mesPackage.getModifyUser():AuthUtil.getSessionUser().getUserName()); return mesBoxingErrorProofingService.updateMesPackage(mesPackage); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); @@ -114,7 +116,7 @@ public class MesBoxingErrorProofingController { ValidatorBean.checkNotNull(mesPackage.getSerialNumber(), "替换条码不能为空"); ValidatorBean.checkNotNull(mesPackage.getOldSerialNumber(), "替换源条码不能为空"); - ConvertBean.serviceModelUpdate(mesPackage, AuthUtil.getSessionUser().getUserName()); + ConvertBean.serviceModelUpdate(mesPackage, !StringUtils.isEmpty(mesPackage.getModifyUser())?mesPackage.getModifyUser():AuthUtil.getSessionUser().getUserName()); mesBoxingErrorProofingService.updateMesPackageDetails(mesPackage); return ResultBean.success("保存成功"); } catch (ImppBusiException imppException) { @@ -126,12 +128,11 @@ public class MesBoxingErrorProofingController { @GetMapping("/unLock") @ApiOperation(value = "解锁") - public ResultBean unLock(String pwd) { + public ResultBean unLock(String pwd,String organizeCode) { try { //属性校验 ValidatorBean.checkNotNull(pwd, "密码不能为空"); - - mesBoxingErrorProofingService.unLock(AuthUtil.getOrganizeCode(), AuthUtil.getSessionUser().getUserName(), pwd); + mesBoxingErrorProofingService.unLock(!StringUtils.isEmpty(organizeCode)?organizeCode:AuthUtil.getOrganizeCode(),pwd); 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/controller/busi/MesDowntimeReasonTypeController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesDowntimeReasonTypeController.java index f434f8e..2f18c10 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesDowntimeReasonTypeController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesDowntimeReasonTypeController.java @@ -11,6 +11,7 @@ import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.util.ResultBean; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -35,7 +36,7 @@ public class MesDowntimeReasonTypeController { @ApiOperation(value = "查询设备停机类型和原因") public ResultBean findMesDowntimeTypeReason(MesDowntimeReasonType mesDowntimeReasontype, Pager pager) { try { - mesDowntimeReasontype.setOrganizeCode(AuthUtil.getOrganizeCode()); + mesDowntimeReasontype.setOrganizeCode(!StringUtils.isEmpty(mesDowntimeReasontype.getOrganizeCode())?mesDowntimeReasontype.getOrganizeCode():AuthUtil.getOrganizeCode()); //查询汇总工单数量 List mesDowntimeReasonTypes = downtimeReasonTypeService.findMesDowntimeTypeReason(mesDowntimeReasontype, pager); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesEnumDetailController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesEnumDetailController.java index d2b5d55..d03486a 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesEnumDetailController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesEnumDetailController.java @@ -9,6 +9,7 @@ import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -35,7 +36,7 @@ public class MesEnumDetailController { public ResultBean findMesEnumDetail(MesEnumDetail mesEnumDetail) { try { ValidatorBean.checkNotNull(mesEnumDetail.getEnumCode(), "枚举代码不能为空"); - mesEnumDetail.setOrganizeCode(AuthUtil.getOrganizeCode()); + mesEnumDetail.setOrganizeCode(!StringUtils.isEmpty(mesEnumDetail.getOrganizeCode())?mesEnumDetail.getOrganizeCode():AuthUtil.getOrganizeCode()); List mesEnumDetailList = mesEnumDetailService.findMesEnumDetail(mesEnumDetail); return ResultBean.success("查询成功").setResultList(mesEnumDetailList); } catch (ImppBusiException imppException) { diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesInputDefectRecordController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesInputDefectRecordController.java index 486437b..a30bddf 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesInputDefectRecordController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesInputDefectRecordController.java @@ -46,7 +46,7 @@ public class MesInputDefectRecordController { @GetMapping("/query-part-type-defect") @ApiOperation(value = "查询零件类型缺陷类型对应关系") - public ResultBean queryPartTypeDefect(String partNo, String defectLocation, boolean flg, Integer frontBack) { + public ResultBean queryPartTypeDefect(String partNo, String defectLocation, boolean flg, Integer frontBack,String organizeCode) { try { // 数据校验 @@ -55,7 +55,7 @@ public class MesInputDefectRecordController { ValidatorBean.checkNotNull(frontBack, "正反面不能为空"); // return ResultBean.success("查询成功").setResultList(inputDefectRecordService.queryPartTypeDefect(partNo, defectLocationCode, flg, frontBack, "2031")); - return ResultBean.success("查询成功").setResultList(inputDefectRecordService.queryPartTypeDefect(partNo, defectLocation, flg, frontBack, AuthUtil.getOrganizeCode())); + return ResultBean.success("查询成功").setResultList(inputDefectRecordService.queryPartTypeDefect(partNo, defectLocation, flg, frontBack,!StringUtils.isEmpty(organizeCode)?organizeCode:AuthUtil.getOrganizeCode())); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); } catch (Exception e) { @@ -76,7 +76,7 @@ public class MesInputDefectRecordController { } // inputDefectRecordService.savePartInspection(model, "CK01"); - inputDefectRecordService.savePartInspection(model, AuthUtil.getOrganizeCode()); + inputDefectRecordService.savePartInspection(model, !StringUtils.isEmpty(model.getOrganizeCode())?model.getOrganizeCode():AuthUtil.getOrganizeCode()); 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/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 1fc4490..176692b 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 @@ -53,7 +53,7 @@ public class MesNcProcessingController { try { - partInspection.setOrganizeCode(AuthUtil.getOrganizeCode()); + partInspection.setOrganizeCode(!StringUtils.isEmpty(partInspection.getOrganizeCode())?partInspection.getOrganizeCode():AuthUtil.getOrganizeCode()); return ResultBean.success("查询成功").setResultObject(ncProcessingService.queryPartInspection(partInspection)); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); @@ -64,11 +64,11 @@ public class MesNcProcessingController { @GetMapping("/query-person") @ApiOperation(value = "查询责任人") - public ResultBean queryPerson() { + public ResultBean queryPerson(String organizeCode) { try { - return ResultBean.success("查询成功").setResultList(ncProcessingService.queryPerson(AuthUtil.getOrganizeCode())); + return ResultBean.success("查询成功").setResultList(ncProcessingService.queryPerson(!StringUtils.isEmpty(organizeCode)?organizeCode:AuthUtil.getOrganizeCode())); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); } catch (Exception e) { @@ -102,7 +102,7 @@ public class MesNcProcessingController { if (CollectionUtils.isEmpty(model.getPartInspectionDetailList())) { throw new ImppBusiException(String.format("不存在可疑信息，请检查数据", model.getType())); } - ncProcessingService.saveNc(model, AuthUtil.getOrganizeCode(), false); + ncProcessingService.saveNc(model, !StringUtils.isEmpty(model.getOrganizeCode())? model.getOrganizeCode() : AuthUtil.getOrganizeCode(), false); return ResultBean.success("NC处理成功"); } 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/controller/busi/MesPartShippingGroupController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesPartShippingGroupController.java index 929a29c..ef62414 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesPartShippingGroupController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesPartShippingGroupController.java @@ -11,6 +11,7 @@ import cn.estsh.impp.framework.boot.util.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -40,7 +41,7 @@ public class MesPartShippingGroupController { //默认查询所有 // DdlPackBean listAllPackBean = DdlPackBean.getDdlPackBean("CK01"); - DdlPackBean listAllPackBean = DdlPackBean.getDdlPackBean(AuthUtil.getOrganizeCode()); + DdlPackBean listAllPackBean = DdlPackBean.getDdlPackBean(!StringUtils.isEmpty(partShippingGroup.getOrganizeCode())?partShippingGroup.getOrganizeCode():AuthUtil.getOrganizeCode()); ; return ResultBean.success("查询成功").setResultList(shippingGroupService.findAll(listAllPackBean)); } catch (ImppBusiException imppException) { diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesProduceSnPrintController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesProduceSnPrintController.java index 7952e0b..3b6e679 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesProduceSnPrintController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesProduceSnPrintController.java @@ -13,6 +13,7 @@ import cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -88,7 +89,7 @@ public class MesProduceSnPrintController { if (Objects.isNull(mesProduceSnPrintModel.getPrintQty()) || mesProduceSnPrintModel.getPrintQty() <= 0) { MesPcnException.throwMesBusiException("打印数量不能小于等于零"); } - mesProduceSnPrintModel.setUserName(AuthUtil.getSessionUser().getUserName()); + mesProduceSnPrintModel.setUserName(!StringUtils.isEmpty(mesProduceSnPrintModel.getUserName())?mesProduceSnPrintModel.getUserName():AuthUtil.getSessionUser().getUserName()); return ResultBean.success("查询成功").setResultObject(mesProduceSnPrintService.doPrint(mesProduceSnPrintModel)); } 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/controller/busi/MesRawPartChargingController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesRawPartChargingController.java index bd6cf3b..33f8a4f 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesRawPartChargingController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesRawPartChargingController.java @@ -10,6 +10,7 @@ import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; /** @@ -31,8 +32,8 @@ public class MesRawPartChargingController { public ResultBean findMesRawPackagePart(MesRawPartChargingModel mesRawPartChargingModel) { try { ValidatorBean.checkNotNull(mesRawPartChargingModel.getPackageSn(),"料筒条码不能为空"); - mesRawPartChargingModel.setUserName(AuthUtil.getSessionUser().getUserName()); - mesRawPartChargingModel.setOrganizeCode(AuthUtil.getOrganizeCode()); + mesRawPartChargingModel.setUserName(!StringUtils.isEmpty(mesRawPartChargingModel.getUserName())?mesRawPartChargingModel.getUserName():AuthUtil.getSessionUser().getUserName()); + mesRawPartChargingModel.setOrganizeCode(!StringUtils.isEmpty(mesRawPartChargingModel.getOrganizeCode())?mesRawPartChargingModel.getOrganizeCode():AuthUtil.getOrganizeCode()); return ResultBean.success("执行成功").setResultObject(mesRawPartChargingService.findMesRawPackagePart(mesRawPartChargingModel)); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); @@ -46,8 +47,8 @@ public class MesRawPartChargingController { public ResultBean doAction(@RequestBody MesRawPartChargingModel mesRawPartChargingModel) { try { ValidatorBean.checkNotNull(mesRawPartChargingModel.getType(), "操作类型不能为空"); - mesRawPartChargingModel.setUserName(AuthUtil.getSessionUser().getUserName()); - mesRawPartChargingModel.setOrganizeCode(AuthUtil.getOrganizeCode()); + mesRawPartChargingModel.setUserName(!StringUtils.isEmpty(mesRawPartChargingModel.getUserName())?mesRawPartChargingModel.getUserName():AuthUtil.getSessionUser().getUserName()); + mesRawPartChargingModel.setOrganizeCode(!StringUtils.isEmpty(mesRawPartChargingModel.getOrganizeCode())?mesRawPartChargingModel.getOrganizeCode():AuthUtil.getOrganizeCode()); return ResultBean.success("执行成功").setResultObject(mesRawPartChargingService.doAction(mesRawPartChargingModel)); } 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/controller/busi/MesReworkTaskController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesReworkTaskController.java index 7253ad4..28a282d 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesReworkTaskController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesReworkTaskController.java @@ -40,7 +40,7 @@ public class MesReworkTaskController { @ApiOperation(value = "查询所有返工单") public ResultBean queryReworkTaskByPager(MesReworkTask reworkTask, Pager pager) { try { - reworkTask.setOrganizeCode(AuthUtil.getOrganizeCode()); + reworkTask.setOrganizeCode(!StringUtils.isEmpty(reworkTask.getOrganizeCode())?reworkTask.getOrganizeCode():AuthUtil.getOrganizeCode()); ListPager mesReworkTaskListPager = mesReworkTaskService.queryReworkTask(reworkTask, pager); return ResultBean.success("查询成功").setListPager(mesReworkTaskListPager); } catch (ImppBusiException imppException) { @@ -54,7 +54,7 @@ public class MesReworkTaskController { @ApiOperation(value = "根据条码查询返工详情") public ResultBean queryBySn(MesReworkTaskRequestModel requestModel) { try { - requestModel.setOrganizeCode(AuthUtil.getOrganizeCode()); + requestModel.setOrganizeCode(!StringUtils.isEmpty(requestModel.getOrganizeCode())?requestModel.getOrganizeCode():AuthUtil.getOrganizeCode()); MesReworkTaskModel mesReworkTaskModel = mesReworkTaskService.queryReworkTaskModel(requestModel); return ResultBean.success("查询成功").setResultObject(mesReworkTaskModel); } catch (ImppBusiException imppException) { diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesWorkOrderController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesWorkOrderController.java index f1a374a..22bec65 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesWorkOrderController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesWorkOrderController.java @@ -12,6 +12,7 @@ import cn.estsh.impp.framework.boot.util.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -65,7 +66,7 @@ public class MesWorkOrderController { @ApiOperation(value = "生产报工") public ResultBean doProductReport(MesWorkOrder mesWorkOrder) { try { - workOrderService.doProductReport(mesWorkOrder, AuthUtil.getSessionUser().getUserName()); + workOrderService.doProductReport(mesWorkOrder, !StringUtils.isEmpty(mesWorkOrder.getModifyUser())?mesWorkOrder.getModifyUser():AuthUtil.getSessionUser().getUserName()); return ResultBean.success("报工成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException e) { diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/spot/MesSpotCheckOrderController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/spot/MesSpotCheckOrderController.java index 3a0875d..7461784 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/spot/MesSpotCheckOrderController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/spot/MesSpotCheckOrderController.java @@ -32,7 +32,7 @@ public class MesSpotCheckOrderController { @ApiOperation(value = "查询设备点检") public ResultBean findEquipmentSpotCheck(MesEquipmentSpotCheck spotCheckOrder) { try { - spotCheckOrder.setOrganizeCode(AuthUtil.getOrganizeCode()); + spotCheckOrder.setOrganizeCode(!StringUtils.isEmpty(spotCheckOrder.getOrganizeCode())?spotCheckOrder.getOrganizeCode():AuthUtil.getOrganizeCode()); return ResultBean.success("查询成功").setResultList(spotCheckOrderService.findEquipmentSpotCheck(spotCheckOrder)); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); @@ -48,7 +48,7 @@ public class MesSpotCheckOrderController { try { - spotCheckOrder.setOrganizeCode(AuthUtil.getOrganizeCode()); + spotCheckOrder.setOrganizeCode(!StringUtils.isEmpty(spotCheckOrder.getOrganizeCode())?spotCheckOrder.getOrganizeCode():AuthUtil.getOrganizeCode()); return ResultBean.success("查询成功").setResultList(spotCheckOrderService.queryEquipmentSpotCheck(spotCheckOrder)); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); @@ -66,7 +66,7 @@ public class MesSpotCheckOrderController { if (StringUtils.isEmpty(bean)) { throw new ImppBusiException("点检单不能为空"); } - bean.setOrganizeCode(AuthUtil.getOrganizeCode()); + bean.setOrganizeCode(!StringUtils.isEmpty(bean.getOrganizeCode())?bean.getOrganizeCode():AuthUtil.getOrganizeCode()); return ResultBean.success("扫描产品条码成功").setResultObject(spotCheckOrderService.insert(bean)); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); @@ -81,7 +81,7 @@ public class MesSpotCheckOrderController { try { - spotCheckOrder.setOrganizeCode(AuthUtil.getOrganizeCode()); + spotCheckOrder.setOrganizeCode(!StringUtils.isEmpty(spotCheckOrder.getOrganizeCode())?spotCheckOrder.getOrganizeCode():AuthUtil.getOrganizeCode()); return ResultBean.success("查询成功").setListPager(spotCheckOrderService.querySpotCheckOrder(spotCheckOrder, pager)); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); @@ -95,7 +95,7 @@ public class MesSpotCheckOrderController { public ResultBean queryWorkOrderByPager(MesSpotCheckOrder spotCheckOrder) { try { - spotCheckOrder.setOrganizeCode(AuthUtil.getOrganizeCode()); + spotCheckOrder.setOrganizeCode(!StringUtils.isEmpty(spotCheckOrder.getOrganizeCode())?spotCheckOrder.getOrganizeCode():AuthUtil.getOrganizeCode()); return ResultBean.success("查询成功").setResultObject(spotCheckOrderService.querySpotCheckOrderResult(spotCheckOrder)); } catch (ImppBusiException imppException) { @@ -120,7 +120,7 @@ public class MesSpotCheckOrderController { if (CollectionUtils.isEmpty(model.getOrderPartList())) { throw new ImppBusiException("点检明细零件不能为空"); } - return ResultBean.success("扫描产品条码成功").setResultObject(spotCheckOrderService.scanProduceSn(model, AuthUtil.getOrganizeCode())); + return ResultBean.success("扫描产品条码成功").setResultObject(spotCheckOrderService.scanProduceSn(model, !StringUtils.isEmpty(model.getOrganizeCode())?model.getOrganizeCode():AuthUtil.getOrganizeCode())); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); } catch (Exception e) { @@ -141,7 +141,7 @@ public class MesSpotCheckOrderController { if (CollectionUtils.isEmpty(model.getOrderResultList())) { throw new ImppBusiException("点检单明细不能为空"); } - return ResultBean.success("点检结果获取成功").setResultObject(spotCheckOrderService.queryEquipInfo(model, AuthUtil.getOrganizeCode())); + return ResultBean.success("点检结果获取成功").setResultObject(spotCheckOrderService.queryEquipInfo(model, !StringUtils.isEmpty(model.getOrganizeCode())?model.getOrganizeCode():AuthUtil.getOrganizeCode())); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); } catch (Exception e) { @@ -163,7 +163,7 @@ public class MesSpotCheckOrderController { throw new ImppBusiException("点检单明细不能为空"); } - spotCheckOrderService.saveCheck(model, AuthUtil.getOrganizeCode()); + spotCheckOrderService.saveCheck(model, !StringUtils.isEmpty(model.getOrganizeCode())?model.getOrganizeCode():AuthUtil.getOrganizeCode()); return ResultBean.success("完成点检成功"); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); @@ -183,7 +183,7 @@ public class MesSpotCheckOrderController { } - spotCheckOrderService.saveReCheck(model, AuthUtil.getOrganizeCode()); + spotCheckOrderService.saveReCheck(model, !StringUtils.isEmpty(model.getOrganizeCode())?model.getOrganizeCode():AuthUtil.getOrganizeCode()); 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/base/MesReworkTaskServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java index a7a0f52..4548a16 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java @@ -78,8 +78,8 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { @Override public ListPager queryReworkTask(MesReworkTask mesReworkTask, Pager pager) { - - DdlPackBean packBean = DdlPackBean.getDdlPackBean(AuthUtil.getOrganizeCode()); + String organizeCode = !StringUtils.isEmpty(mesReworkTask.getOrganizeCode())?mesReworkTask.getOrganizeCode():AuthUtil.getOrganizeCode(); + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); if (mesReworkTask.getSn() != null) { DdlPreparedPack.getStringEqualPack(mesReworkTask.getSn(), "sn", packBean); } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesBoxingErrorProofingService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesBoxingErrorProofingService.java index d3bb7b1..26a5b45 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesBoxingErrorProofingService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesBoxingErrorProofingService.java @@ -238,7 +238,7 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer } @Override - public void unLock(String organizeCode, String userName, String pwd) { + public void unLock(String organizeCode, String pwd) { String cfgValue = configService.getCfgValue(organizeCode, MesCommonConstant.BOXING_ERROR_PROOFING_PWD); if (!Objects.equals(cfgValue, pwd)) { MesPcnException.throwMesBusiException("解锁失败密码错误"); diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesNcProcessingInputModel.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesNcProcessingInputModel.java index 0e89103..28f0f95 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesNcProcessingInputModel.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesNcProcessingInputModel.java @@ -41,6 +41,9 @@ public class MesNcProcessingInputModel { @ApiParam("版本号") private String productVersion; + @ApiParam + private String organizeCode; + @ApiParam("NC-零件检测详情") private List partInspectionDetailList; diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesSpotCheckOrderModel.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesSpotCheckOrderModel.java index 2cdccc3..e2d041e 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesSpotCheckOrderModel.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesSpotCheckOrderModel.java @@ -31,5 +31,8 @@ public class MesSpotCheckOrderModel { @ApiParam("扫描条码") private String produceSn; + @ApiParam("工厂代码") + private String organizeCode; + }