From f43e7c64626194d0b011215c6b5cdfc26c06fcfc Mon Sep 17 00:00:00 2001 From: "zhang.xw" Date: Mon, 6 May 2024 14:04:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=B8=BB=E6=95=B0?= =?UTF-8?q?=E6=8D=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/apiservice/controller/base/ExtProdOrgController.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/ExtProdOrgController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/ExtProdOrgController.java index c33b6a1..84e732f 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/ExtProdOrgController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/ExtProdOrgController.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.controller.base; +import cn.estsh.i3plus.ext.mes.api.base.IMesWorkCellService; +import cn.estsh.i3plus.ext.mes.api.base.IMesWorkCenterService; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; import cn.estsh.i3plus.mes.api.iservice.base.IProdOrgService; import cn.estsh.i3plus.mes.api.iservice.busi.IEquipmentService; @@ -54,6 +56,12 @@ public class ExtProdOrgController extends MesBaseController { @Autowired private IEquipmentService mesEquipmentService; + @Autowired + private IMesWorkCenterService mesWorkCenterService; + + @Autowired + private IMesWorkCellService mesWorkCellService; + @GetMapping(value = "/mes-data-tree/query") @ApiOperation(value = "查询MES组织模型数据返回树结构") public ResultBean queryMesDataTree() { @@ -227,7 +235,7 @@ public class ExtProdOrgController extends MesBaseController { .notNull(MesCommConstWords.WORK_CENTER_NAME, workCenter.getWorkCenterName()) .notNull(MesCommConstWords.AREA_CODE, workCenter.getAreaCode()); - prodOrgService.updateMesWorkCenter(workCenter, AuthUtil.getSessionUser().getUserName(), AuthUtil.getOrganize().getOrganizeCode()); + mesWorkCenterService.update(workCenter); return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); @@ -319,7 +327,7 @@ public class ExtProdOrgController extends MesBaseController { .notNull("workCellType", workCell.getWorkCellType()) .notNull(MesCommConstWords.AREA_CODE, workCell.getAreaCode()); - prodOrgService.updateMesWorkCell(workCell, AuthUtil.getSessionUser().getUserName(), AuthUtil.getOrganize().getOrganizeCode()); + mesWorkCellService.update(workCell); return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); From 3b6dabc2c8bae03dd6caa90f65dfc2e71036f6a8 Mon Sep 17 00:00:00 2001 From: jun Date: Mon, 6 May 2024 16:38:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?40512=20=E5=AE=A2=E6=88=B7=E8=BD=A6?= =?UTF-8?q?=E5=9E=8B=E9=85=8D=E7=BD=AE-3=E4=B8=AA=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E7=9A=84=E8=BD=A6=E5=9E=8B=EF=BC=8C=E6=98=8E=E7=BB=86=E4=B8=80?= =?UTF-8?q?=E6=A0=B7=EF=BC=8C=E6=96=B0=E6=B7=BB=E5=8A=A0=E8=BD=A6=E5=9E=8B?= =?UTF-8?q?=E5=90=8E=E4=BE=9D=E7=84=B6=E6=9C=89=E5=89=8D=E8=BD=A6=E5=9E=8B?= =?UTF-8?q?=E7=9A=84=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/base/MesCustomerCarModelDetailService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerCarModelDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerCarModelDetailService.java index ba4de99..e4be9be 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerCarModelDetailService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerCarModelDetailService.java @@ -5,16 +5,18 @@ import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.mes.bean.MesCustomerCarModel; import cn.estsh.i3plus.pojo.mes.bean.MesCustomerCarModelDetail; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.util.ValidatorBean; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @Service @Slf4j public class MesCustomerCarModelDetailService extends BaseMesService implements IMesCustomerCarModelDetailService { + protected void setPackQueryBean(MesCustomerCarModelDetail bean, DdlPackBean packBean) { + DdlPreparedPack.getStringEqualPack(bean.getCarModelCode(),"carModelCode",packBean); + } + protected void onInsertBean(MesCustomerCarModelDetail item) { // 数据校验 From e54eb1e58e19b6e735dc554c1f191362b27ce771 Mon Sep 17 00:00:00 2001 From: jun Date: Mon, 6 May 2024 17:28:11 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E9=85=8D=E7=BD=AE(?= =?UTF-8?q?=E6=96=B0=E5=A2=9E)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/ext/mes/api/base/IMesWindowService.java | 15 +++++ .../controller/base/MesWindowController.java | 18 ++++++ .../serviceimpl/base/MesWindowServiceImpl.java | 71 ++++++++++++++++++++++ 3 files changed, 104 insertions(+) create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWindowService.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWindowController.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWindowServiceImpl.java diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWindowService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWindowService.java new file mode 100644 index 0000000..9fa1c20 --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWindowService.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesWindow; + +/** + * @Description : MES_看板界面 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/5/6 15:52 + * @Modify: + **/ +public interface IMesWindowService extends IBaseMesService { + + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWindowController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWindowController.java new file mode 100644 index 0000000..f421541 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWindowController.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.ext.mes.apiservice.controller.base; + +import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; +import cn.estsh.i3plus.pojo.mes.bean.MesWindow; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description : MES_看板界面 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/5/6 15:53 + * @Modify: + **/ +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesWindow") +public class MesWindowController extends BaseMesController { +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWindowServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWindowServiceImpl.java new file mode 100644 index 0000000..97a9064 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWindowServiceImpl.java @@ -0,0 +1,71 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.api.base.IMesWindowService; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.MesWindow; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.util.ValidatorBean; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +/** + * @Description : MES_看板界面 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/5/6 15:52 + * @Modify: + **/ +@Service +@Slf4j +public class MesWindowServiceImpl extends BaseMesService implements IMesWindowService { + + protected void setPackQueryBean(MesWindow bean, DdlPackBean packBean) { + DdlPreparedPack.getStringEqualPack(bean.getWindowNo(),"windowNo",packBean); + DdlPreparedPack.getStringLikerPack(bean.getWindowName(),"windowName",packBean); + DdlPreparedPack.getNumEqualPack(bean.getWindowType(),"windowType",packBean); + } + + protected void onInsertBean(MesWindow item) { + // 数据校验 + ValidatorBean.checkNotNull(item.getWindowNo(), "界面编号不能为空"); + ValidatorBean.checkNotNull(item.getWindowName(), "界面名称不能为空"); + ValidatorBean.checkNotNull(item.getWindowType(), "界面类型不能为空"); + + DdlPackBean partPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getWindowNo(), "windowNo", partPackBean); + boolean flg = baseRDao.isExitByHql(partPackBean); + if (flg) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("【%s】界面编号已经存在，请检查数据", item.getWindowNo()) + .build(); + } + + + } + + protected void onUpdateBean(MesWindow item) { + + // 数据校验 + ValidatorBean.checkNotNull(item.getWindowNo(), "界面编号不能为空"); + ValidatorBean.checkNotNull(item.getWindowName(), "界面名称不能为空"); + ValidatorBean.checkNotNull(item.getWindowType(), "界面类型不能为空"); + + DdlPackBean partPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getWindowNo(), "windowNo", partPackBean); + DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", partPackBean); + boolean flg = baseRDao.isExitByHql(partPackBean); + if (flg) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("【%s】界面编号已经存在，请检查数据", item.getWindowNo()) + .build(); + } + + } + +}