From 19859d11c91fbe38e2bf29fba2e2e77642abbeb8 Mon Sep 17 00:00:00 2001 From: gsz Date: Tue, 4 Jun 2024 17:36:10 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=89=80=E6=9C=89=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=A8=A1=E7=B3=8A=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/MesCarSeriesLoosePartService.java | 2 +- .../serviceimpl/base/MesCcscRuleServiceImpl.java | 2 +- .../serviceimpl/base/MesCcscTaskServiceImpl.java | 2 +- .../base/MesCustomerCarModelService.java | 2 +- .../serviceimpl/base/MesCustomerPartService.java | 2 +- .../base/MesDefectWarnConfigService.java | 2 +- .../base/MesEquipmentSpotCheckPartService.java | 2 +- .../base/MesItemPartErrorPreventionService.java | 2 +- .../serviceimpl/base/MesLocationConfigService.java | 30 ++++++++++++++++++++++ .../base/MesMouldMultiCavityServiceImpl.java | 2 +- .../base/MesPackingDefineDetailsServiceImpl.java | 2 +- .../base/MesPartProdGroupDetailService.java | 2 +- .../serviceimpl/base/MesPartProdGroupService.java | 2 +- .../serviceimpl/base/MesPartSapService.java | 2 +- .../serviceimpl/base/MesPartService.java | 2 +- .../base/MesPartShippingGroupDetailService.java | 2 +- .../base/MesProdCraftRouteServiceImpl.java | 2 +- .../serviceimpl/base/MesProductVersionService.java | 2 +- .../MesShippingOrderManagementDetailService.java | 2 +- .../serviceimpl/base/MesWorkOrderService.java | 2 +- 20 files changed, 49 insertions(+), 19 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCarSeriesLoosePartService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCarSeriesLoosePartService.java index b9ff2ea..0faa138 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCarSeriesLoosePartService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCarSeriesLoosePartService.java @@ -59,7 +59,7 @@ public class MesCarSeriesLoosePartService extends BaseMesService implemen @Override protected void setPackQueryBean(MesCcscRule bean, DdlPackBean packBean) { - DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean); } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCcscTaskServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCcscTaskServiceImpl.java index c4fab1e..e3568b0 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCcscTaskServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCcscTaskServiceImpl.java @@ -41,7 +41,7 @@ public class MesCcscTaskServiceImpl extends BaseMesService implemen @Override protected void setPackQueryBean(MesCcscTask bean, DdlPackBean packBean) { - DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringEqualPack(bean.getTaskNo(), "taskNo", packBean); DdlPreparedPack.getStringEqualPack(bean.getWorkOrderNo(), "workOrderNo", packBean); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerCarModelService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerCarModelService.java index 39f8667..8953064 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerCarModelService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerCarModelService.java @@ -72,7 +72,7 @@ public class MesCustomerCarModelService extends BaseMesService findMesCustomerCarModel(MesCustomerCarModelDetail mesPartProdGroupDetail) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mesPartProdGroupDetail.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(mesPartProdGroupDetail.getPartNo(),"partNo",ddlPackBean); + DdlPreparedPack.getStringLikerPack(mesPartProdGroupDetail.getPartNo(),"partNo",ddlPackBean); List mesCustomerCarModelDetails = mesCustomerCarModelDetailRDao.findByHqlWhere(ddlPackBean); if(CollectionUtils.isEmpty(mesCustomerCarModelDetails)){ return new ArrayList<>(); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerPartService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerPartService.java index 5587012..8b75c33 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerPartService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerPartService.java @@ -88,7 +88,7 @@ public class MesCustomerPartService extends BaseMesService impl @Override public List findMesCustomerPart(MesCustomerCarModelDetail mesPartProdGroupDetail) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mesPartProdGroupDetail.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(mesPartProdGroupDetail.getPartNo(), "partNo", ddlPackBean); + DdlPreparedPack.getStringLikerPack(mesPartProdGroupDetail.getPartNo(), "partNo", ddlPackBean); DdlPreparedPack.getStringEqualPack(mesPartProdGroupDetail.getCarModelCode(), "carModelCode", ddlPackBean); List mesCustomerCarModelDetails = mesCustomerCarModelDetailRDao.findByHqlWhere(ddlPackBean); if (CollectionUtils.isEmpty(mesCustomerCarModelDetails)) { diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectWarnConfigService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectWarnConfigService.java index d2cfd08..6c3cf88 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectWarnConfigService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectWarnConfigService.java @@ -98,7 +98,7 @@ public class MesDefectWarnConfigService extends BaseMesService implements IMesLocationConfigService { + + + @Override + public MesLocationConfig insert(MesLocationConfig bean) { + //插入前构造并校验数据 + onInsertBean(bean); + // 检查字符串长度是否为2 + if (bean.getDefectLocation().length() == 2) { + bean.setDefectLocation(bean.getDefectLocation().charAt(0) + "0" + bean.getDefectLocation().charAt(1)); + } + + bean = baseRDao.insert(bean); + return bean; + } + protected void onInsertBean(MesLocationConfig item) { + // 数据校验 + /* ValidatorBean.checkNotNull(item.getDefectLocation(), "缺陷位置代码不能为空"); + + DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getDefectLocation(), "defectLocation", seriesPackBean); + boolean flg = baseRDao.isExitByHql(seriesPackBean); + if (flg) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("【%s】设备代码已经存在，请检查数据", item.getDefectLocation()) + .build(); + }*/ + } + } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMouldMultiCavityServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMouldMultiCavityServiceImpl.java index fc8cf85..a8c2788 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMouldMultiCavityServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMouldMultiCavityServiceImpl.java @@ -19,7 +19,7 @@ public class MesMouldMultiCavityServiceImpl extends BaseMesService im public List findMesPartProdGroup(MesPartProdGroupDetail mesPartProdGroupDetail){ DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mesPartProdGroupDetail.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(mesPartProdGroupDetail.getPartNo(),"partNo",ddlPackBean); + DdlPreparedPack.getStringLikerPack(mesPartProdGroupDetail.getPartNo(),"partNo",ddlPackBean); DdlPreparedPack.getStringEqualPack(mesPartProdGroupDetail.getWorkCenterCode(),"workCenterCode",ddlPackBean); List mesPartProdGroupDetails = mesPartProdGroupDetailRDao.findByHqlWhere(ddlPackBean); if(CollectionUtils.isEmpty(mesPartProdGroupDetails)){ diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartSapService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartSapService.java index cfaa354..228f09a 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartSapService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartSapService.java @@ -18,7 +18,7 @@ public class MesPartSapService extends BaseMesService implements IMe @Override protected void setPackQueryBean(MesPartSap bean, DdlPackBean packBean) { - DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringLikeEqualPack(bean.getPartName(), "partName", packBean); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartService.java index 14be6cc..8670991 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartService.java @@ -17,7 +17,7 @@ import org.springframework.stereotype.Service; public class MesPartService extends BaseMesService implements IMesPartService { protected void setPackQueryBean(MesPart bean, DdlPackBean packBean) { - DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringLikerPack(bean.getPartName(), "partName", packBean); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartShippingGroupDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartShippingGroupDetailService.java index ae811a6..e72f906 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartShippingGroupDetailService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartShippingGroupDetailService.java @@ -13,6 +13,6 @@ public class MesPartShippingGroupDetailService extends BaseMesService @Override protected void setPackQueryBean(MesProductVersion bean, DdlPackBean packBean) { - DdlPreparedPack.getStringEqualPack(bean.getPartNo(),"partNo",packBean); + DdlPreparedPack.getStringLikerPack(bean.getPartNo(),"partNo",packBean); DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(),"workCenterCode",packBean); DdlPreparedPack.getStringEqualPack(bean.getProductVersion(),"productVersion",packBean); DdlPreparedPack.getStringEqualPack(bean.getShipInventoryPoint(),"shipInventoryPoint",packBean); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementDetailService.java index 3e5c207..b0f5bd9 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementDetailService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementDetailService.java @@ -25,7 +25,7 @@ public class MesShippingOrderManagementDetailService extends BaseMesService implements DdlPreparedPack.getStringLikerPack(bean.getWorkOrderNo(), "workOrderNo", packBean); DdlPreparedPack.getStringLikerPack(bean.getPartNameRdd(), "partNameRdd", packBean); DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", packBean); - DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringEqualPack(bean.getCustomerPartNo(), "customerPartNo", packBean); DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getNumEqualPack(bean.getWorkOrderStatus(), "workOrderStatus", packBean); From f62c90d3ff2526c403e3468f74e2b22086c359ec Mon Sep 17 00:00:00 2001 From: gsz Date: Tue, 4 Jun 2024 17:39:13 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95produce?= =?UTF-8?q?Seq=E7=B1=BB=E5=9E=8B=E6=94=B9=E5=8F=98=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java index e4c3556..70251c1 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java @@ -83,7 +83,7 @@ public class MesWorkOrderService extends BaseMesService implements if (bean.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.SORT.getValue()) { Integer produceSeq = 0; if (null != result && result.getProduceSeq() != null) { - produceSeq = result.getProduceSeq(); + produceSeq = Math.toIntExact(result.getProduceSeq()); } //生成工单号 @@ -92,7 +92,7 @@ public class MesWorkOrderService extends BaseMesService implements MesWorkOrder copyMesWorkOrder = new MesWorkOrder(); BeanUtils.copyProperties(bean, copyMesWorkOrder); - copyMesWorkOrder.setProduceSeq(produceSeq + 1); + copyMesWorkOrder.setProduceSeq((long) (produceSeq + 1)); copyMesWorkOrder.setQty(1D); copyMesWorkOrder.setWorkOrderNo(resultList.get(0)); ConvertBean.serviceModelInitialize(copyMesWorkOrder, bean.getCreateUser()); @@ -113,9 +113,9 @@ public class MesWorkOrderService extends BaseMesService implements genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_ORDER_NO); Integer produceSeq = 0; if (null != result && result.getProduceSeq() != null) { - produceSeq = result.getProduceSeq(); + produceSeq = Math.toIntExact(result.getProduceSeq()); } - bean.setProduceSeq(produceSeq + 1); + bean.setProduceSeq((long) (produceSeq + 1)); GenSerialNoModel orderSeqSerialNoModel = new GenSerialNoModel(MesCommonConstant.ORDER_NO_BTO_SEQ); List resultList = syncFuncService.syncSerialNo(orderSeqSerialNoModel, bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList(); bean.setWorkOrderSeq(resultList.get(0)); From 544247bae8313cd4cf0ba50af43d96a80bd4f4d0 Mon Sep 17 00:00:00 2001 From: gsz Date: Wed, 5 Jun 2024 10:39:46 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E4=BA=BA=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/ext/mes/api/base/IMesOrgService.java | 15 ++++++ .../controller/base/MesOrgController.java | 17 +++++++ .../serviceimpl/base/MesOrgServiceImpl.java | 59 ++++++++++++++++++++++ 3 files changed, 91 insertions(+) create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesOrgService.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesOrgController.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesOrgServiceImpl.java diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesOrgService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesOrgService.java new file mode 100644 index 0000000..88f9c27 --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesOrgService.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.ext.mes.api.base; + + +import cn.estsh.i3plus.pojo.mes.bean.MesOrg; + +/** + * @Description: 责任人区域关系 + * @Author: gsz + * @Date: 2024/5/25 18:16 + * @Modify: + */ +public interface IMesOrgService extends IBaseMesService { + + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesOrgController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesOrgController.java new file mode 100644 index 0000000..2029c58 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesOrgController.java @@ -0,0 +1,17 @@ +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.MesOrg; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description: 责任人区域关系 + * @Author: gsz + * @Date: 2024/5/25 18:16 + * @Modify: + */ +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesOrg") +public class MesOrgController extends BaseMesController{ +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesOrgServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesOrgServiceImpl.java new file mode 100644 index 0000000..a38c8b2 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesOrgServiceImpl.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.api.base.IMesOrgService; +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.base.util.StringUtil; +import cn.estsh.i3plus.pojo.mes.bean.MesOrg; +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: 责任人区域关系 + * @Author: gsz + * @Date: 2024/5/27 19:10 + * @Modify: + */ +@Service +@Slf4j +public class MesOrgServiceImpl extends BaseMesService implements IMesOrgService { + + @Override + protected void setPackQueryBean(MesOrg bean, DdlPackBean packBean) { + DdlPreparedPack.getStringEqualPack(bean.getAreaCode(), "areaCode", packBean); + if(StringUtil.isEmpty(bean.getResponsibleParty())){ + DdlPreparedPack.getIsNotNull( "responsibleParty", packBean); + }else { + DdlPreparedPack.getStringEqualPack(bean.getResponsibleParty(), "responsibleParty", packBean); + } + + } + + @Override + protected void onInsertBean(MesOrg item) { + // 数据校验 + ValidatorBean.checkNotNull(item.getOrganizeCode(), "工厂号不能为空"); + ValidatorBean.checkNotNull(item.getAreaCode(), "areaCode 不能为空"); + ValidatorBean.checkNotNull(item.getResponsibleParty(), "responsibleParty 不能为空"); + + //唯一性校验 + DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getAreaCode(), "areaCode", packBean); + DdlPreparedPack.getStringEqualPack(item.getResponsibleParty(), "responsibleParty", packBean); + boolean flg = baseRDao.isExitByHql(packBean); + if (flg) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("区域代码【%s】【%s】已经存在，请检查数据", + item.getAreaCode(), item.getResponsibleParty() ) + .build(); + } + } + + +} From 90cc18b191243fdf04d1b64550d0a4fbbf1b45eb Mon Sep 17 00:00:00 2001 From: gsz Date: Wed, 5 Jun 2024 13:25:54 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E4=BA=BA=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E5=85=B3=E7=B3=BB=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/base/MesEquipmentService.java | 28 +++++++++++++++++----- .../serviceimpl/base/MesOrgServiceImpl.java | 10 ++++---- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentService.java index f516c04..d6e0e62 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentService.java @@ -5,22 +5,38 @@ 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.base.util.StringUtil; +import cn.estsh.i3plus.pojo.mes.bean.*; import cn.estsh.i3plus.pojo.mes.bean.MesEquipment; -import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentProdParamCfg; -import cn.estsh.i3plus.pojo.mes.bean.MesEquipment; +import cn.estsh.i3plus.pojo.mes.repository.MesWcEquipmentRepository; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ValidatorBean; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + @Service @Slf4j public class MesEquipmentService extends BaseMesService implements IMesEquitmentService { - + + @Autowired + private MesWcEquipmentRepository mesWcEquipmentRepository; + @Override protected void setPackQueryBean(MesEquipment bean, DdlPackBean packBean) { - DdlPreparedPack.getStringEqualPack(bean.getEquipmentCode(),"equipmentCode",packBean); - DdlPreparedPack.getStringEqualPack(bean.getEquipmentName(),"equipmentName",packBean); + if (!StringUtil.isEmpty(bean.getFilterWorkCell())) { + //过滤已绑定工位 + DdlPackBean packBean1 = DdlPackBean.getDdlPackBean(bean.getOrganizeCode()); + DdlPreparedPack.getIsNotNull("equipmentCode", packBean); + DdlPreparedPack.getIsNotNull( "workCellCode", packBean); + + List workCells = mesWcEquipmentRepository.findByHqlWhere(packBean); + DdlPreparedPack.getNotInPack(workCells.stream().map(MesWcEquipment::getEquipmentCode), "equipmentCode", packBean); + } + DdlPreparedPack.getStringEqualPack(bean.getEquipmentCode(), "equipmentCode", packBean); + DdlPreparedPack.getStringEqualPack(bean.getEquipmentName(), "equipmentName", packBean); } @@ -29,7 +45,7 @@ public class MesEquipmentService extends BaseMesService implements //插入前构造并校验数据 onInsertBean(bean); Integer equipId = 1; - DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + DdlPackBean packBean = DdlPackBean.getDdlPackBean(); packBean.setOrderByStr(" order by equipId desc"); MesEquipment mesEquipment = baseRDao.getByProperty(packBean); if (mesEquipment != null && mesEquipment.getEquipId() != null) { diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesOrgServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesOrgServiceImpl.java index a38c8b2..48e7d3f 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesOrgServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesOrgServiceImpl.java @@ -24,7 +24,7 @@ public class MesOrgServiceImpl extends BaseMesService implements IMesOrg @Override protected void setPackQueryBean(MesOrg bean, DdlPackBean packBean) { - DdlPreparedPack.getStringEqualPack(bean.getAreaCode(), "areaCode", packBean); + DdlPreparedPack.getStringEqualPack(bean.getInventoryLocationCode(), "inventoryLocationCode", packBean); if(StringUtil.isEmpty(bean.getResponsibleParty())){ DdlPreparedPack.getIsNotNull( "responsibleParty", packBean); }else { @@ -37,20 +37,20 @@ public class MesOrgServiceImpl extends BaseMesService implements IMesOrg protected void onInsertBean(MesOrg item) { // 数据校验 ValidatorBean.checkNotNull(item.getOrganizeCode(), "工厂号不能为空"); - ValidatorBean.checkNotNull(item.getAreaCode(), "areaCode 不能为空"); + ValidatorBean.checkNotNull(item.getInventoryLocationCode(), "inventoryLocationCode 不能为空"); ValidatorBean.checkNotNull(item.getResponsibleParty(), "responsibleParty 不能为空"); //唯一性校验 DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(item.getAreaCode(), "areaCode", packBean); + DdlPreparedPack.getStringEqualPack(item.getInventoryLocationCode(), "inventoryLocationCode", packBean); DdlPreparedPack.getStringEqualPack(item.getResponsibleParty(), "responsibleParty", packBean); boolean flg = baseRDao.isExitByHql(packBean); if (flg) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("区域代码【%s】【%s】已经存在，请检查数据", - item.getAreaCode(), item.getResponsibleParty() ) + .setErrorDetail("区域代码【%s】责任方【%s】已经存在，请检查数据", + item.getInventoryLocationCode(), item.getResponsibleParty() ) .build(); } } From b32a1b1160d79c6eb59f4e6157397e298cfc66d7 Mon Sep 17 00:00:00 2001 From: gsz Date: Wed, 5 Jun 2024 13:42:06 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=BE=E5=A4=87=E8=BF=87=E6=BB=A4=E5=B7=B2?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=B7=A5=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/serviceimpl/base/MesEquipmentService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentService.java index d6e0e62..4fea993 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentService.java @@ -29,10 +29,10 @@ public class MesEquipmentService extends BaseMesService implements if (!StringUtil.isEmpty(bean.getFilterWorkCell())) { //过滤已绑定工位 DdlPackBean packBean1 = DdlPackBean.getDdlPackBean(bean.getOrganizeCode()); - DdlPreparedPack.getIsNotNull("equipmentCode", packBean); - DdlPreparedPack.getIsNotNull( "workCellCode", packBean); + DdlPreparedPack.getIsNotNull("equipmentCode", packBean1); + DdlPreparedPack.getIsNotNull( "workCellCode", packBean1); - List workCells = mesWcEquipmentRepository.findByHqlWhere(packBean); + List workCells = mesWcEquipmentRepository.findByHqlWhere(packBean1); DdlPreparedPack.getNotInPack(workCells.stream().map(MesWcEquipment::getEquipmentCode), "equipmentCode", packBean); } DdlPreparedPack.getStringEqualPack(bean.getEquipmentCode(), "equipmentCode", packBean);