From ec6cfd590535ca0ae71f661622c523a88810eaf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LML=E4=B8=B6?= Date: Mon, 20 May 2024 14:17:04 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8F=91=E8=BF=90=E9=80=BB=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/MesShippingOrderManagementService.java | 61 ++++++++++++++++++---- 1 file changed, 52 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java index 629c721..13f36b3 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java @@ -1,8 +1,8 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; import cn.estsh.i3plus.ext.mes.api.base.IMesConfigService; +import cn.estsh.i3plus.ext.mes.api.base.IMesPartService; import cn.estsh.i3plus.ext.mes.api.base.IMesShippingOrderManagementService; -import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.platform.common.tool.TimeTool; @@ -13,6 +13,7 @@ import cn.estsh.i3plus.pojo.mes.bean.*; import cn.estsh.i3plus.pojo.mes.repository.MesJisShippingRepository; import cn.estsh.i3plus.pojo.mes.repository.MesPartRepository; import cn.estsh.i3plus.pojo.mes.repository.MesPartShippingGroupRepository; +import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ValidatorBean; @@ -25,6 +26,8 @@ import org.springframework.util.StringUtils; import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; @Service @Slf4j @@ -47,6 +50,9 @@ public class MesShippingOrderManagementService extends BaseMesService { MesShippingOrderManagementDetail detail = new MesShippingOrderManagementDetail(); + MesPart part = partService.getPartByPartNo(k.getPartNo(), k.getOrganizeCode()); + detail.setPartName(part.getPartName()); + detail.setCustPartNo(k.getCustomerPartNo()); + detail.setPlanQty(1D); + detail.setActualQty(1); detail.setShippingOrderNo(finalBean.getShippingOrderNo()); detail.setOrganizeCode(k.getOrganizeCode()); detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue()); @@ -259,12 +270,13 @@ public class MesShippingOrderManagementService extends BaseMesService detailDeleteList = detailService.findAll(detailPackBean); - ; + Map> detailMap = detailDeleteList.stream().collect(Collectors.groupingBy(k -> k.getPartNo())); + List jisShippingList = new ArrayList<>(); - detailDeleteList.forEach(k -> { + detailMap.forEach((k, v) -> { DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(k.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringEqualPack(v.get(0).getPartNo(), "partNo", packBean); MesPart part = partRepository.getByProperty(packBean); MesJisShipping jisShipping = new MesJisShipping(); @@ -277,13 +289,13 @@ public class MesShippingOrderManagementService extends BaseMesService { +// +// DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode()); +// DdlPreparedPack.getStringEqualPack(k.getPartNo(), "partNo", packBean); +// MesPart part = partRepository.getByProperty(packBean); +// +// MesJisShipping jisShipping = new MesJisShipping(); +// BeanUtils.copyProperties(originBean, jisShipping, "id"); +// BeanUtils.copyProperties(k, jisShipping, "id"); +// jisShipping.setFactoryCode(originBean.getOrganizeCode()); +// jisShipping.setCusCode(originBean.getCustCode()); +// jisShipping.setShippingTime(TimeTool.getNowTime(true)); +// jisShipping.setDock(originBean.getSendDockCode()); +// jisShipping.setErpWarerhouse(configService.getCfgValue(bean.getOrganizeCode(), "ERP_WARERHOUSE")); +// jisShipping.setErpWarehous(configService.getCfgValue(bean.getOrganizeCode(), "ERP_WAREHOUS")); +// jisShipping.setCusDock(originBean.getCustDockCode()); +// jisShipping.setCustOrderNo(k.getCustOrderNo()); +// jisShipping.setSerialNumber(k.getBarcode()); +// jisShipping.setQuantityPerCar(detailDeleteList.size()); +// jisShipping.setShippingOrderCode(originBean.getShippingOrderNo()); +// jisShipping.setVin(k.getVin()); +// jisShipping.setCarNo(k.getVin()); +// if(!StringUtils.isEmpty(part)){ +// jisShipping.setUnit(part.getUnit()); +// } +// jisShipping.setOffTime(TimeTool.getNowTime(true)); +// ConvertBean.serviceModelInitialize(jisShipping, AuthUtil.getSessionUser().getUserName()); +// jisShippingList.add(jisShipping); +// }); + //修改当前发运单状态 originBean.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue()); From c5ddfe0c9fe4e619b0c58d8704faa74b1fc57580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LML=E4=B8=B6?= Date: Mon, 20 May 2024 14:18:17 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8F=91=E8=BF=90=E9=80=BB=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/serviceimpl/base/MesShippingOrderManagementService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java index 13f36b3..d7239a5 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java @@ -291,7 +291,7 @@ public class MesShippingOrderManagementService extends BaseMesService Date: Mon, 20 May 2024 14:26:31 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8F=91=E8=BF=90=E9=80=BB=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/MesShippingOrderManagementService.java | 31 ---------------------- 1 file changed, 31 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java index d7239a5..0a31cf4 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java @@ -303,37 +303,6 @@ public class MesShippingOrderManagementService extends BaseMesService { -// -// DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode()); -// DdlPreparedPack.getStringEqualPack(k.getPartNo(), "partNo", packBean); -// MesPart part = partRepository.getByProperty(packBean); -// -// MesJisShipping jisShipping = new MesJisShipping(); -// BeanUtils.copyProperties(originBean, jisShipping, "id"); -// BeanUtils.copyProperties(k, jisShipping, "id"); -// jisShipping.setFactoryCode(originBean.getOrganizeCode()); -// jisShipping.setCusCode(originBean.getCustCode()); -// jisShipping.setShippingTime(TimeTool.getNowTime(true)); -// jisShipping.setDock(originBean.getSendDockCode()); -// jisShipping.setErpWarerhouse(configService.getCfgValue(bean.getOrganizeCode(), "ERP_WARERHOUSE")); -// jisShipping.setErpWarehous(configService.getCfgValue(bean.getOrganizeCode(), "ERP_WAREHOUS")); -// jisShipping.setCusDock(originBean.getCustDockCode()); -// jisShipping.setCustOrderNo(k.getCustOrderNo()); -// jisShipping.setSerialNumber(k.getBarcode()); -// jisShipping.setQuantityPerCar(detailDeleteList.size()); -// jisShipping.setShippingOrderCode(originBean.getShippingOrderNo()); -// jisShipping.setVin(k.getVin()); -// jisShipping.setCarNo(k.getVin()); -// if(!StringUtils.isEmpty(part)){ -// jisShipping.setUnit(part.getUnit()); -// } -// jisShipping.setOffTime(TimeTool.getNowTime(true)); -// ConvertBean.serviceModelInitialize(jisShipping, AuthUtil.getSessionUser().getUserName()); -// jisShippingList.add(jisShipping); -// }); - //修改当前发运单状态 originBean.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue()); From f7bcdab3d790e834f26294bf2a2a7d431f8ddfe8 Mon Sep 17 00:00:00 2001 From: gsz Date: Mon, 20 May 2024 14:31:31 +0800 Subject: [PATCH 4/4] =?UTF-8?q?Mes-Maximo=E4=BB=AA=E8=A1=A8=E4=B8=BB?= =?UTF-8?q?=E6=95=B0=E6=8D=AE&=E6=A8=A1=E5=85=B7=E6=98=A0=E5=B0=84?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/api/base/IMesMouldMappingCfgService.java | 13 ++++ .../base/MesMouldMappingCfgController.java | 18 ++++++ .../base/MesMouldMappingCfgServiceImpl.java | 70 ++++++++++++++++++++++ 3 files changed, 101 insertions(+) create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesMouldMappingCfgService.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMouldMappingCfgController.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMouldMappingCfgServiceImpl.java diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesMouldMappingCfgService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesMouldMappingCfgService.java new file mode 100644 index 0000000..0599bab --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesMouldMappingCfgService.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesMouldMappingCfg; + +/** + * @Description :模具映射关系维护 + * @Reference : + * @Author : gsz + * @CreateDate 2024/5/20 10:06 + * @Modify: + **/ +public interface IMesMouldMappingCfgService extends IBaseMesService { +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMouldMappingCfgController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMouldMappingCfgController.java new file mode 100644 index 0000000..890fdab --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMouldMappingCfgController.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.MesMouldMappingCfg; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description :模具映射关系维护 + * @Reference : + * @Author : gsz + * @CreateDate : 2024-05-20 10:16 + * @Modify: + **/ +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesMouldMappingCfg") +public class MesMouldMappingCfgController extends BaseMesController{ +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMouldMappingCfgServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMouldMappingCfgServiceImpl.java new file mode 100644 index 0000000..6aecfb6 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMouldMappingCfgServiceImpl.java @@ -0,0 +1,70 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.api.base.IMesMouldMappingCfgService; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.util.MesConstWords; +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.*; +import cn.estsh.i3plus.pojo.mes.repository.MesEquipmentRepository; +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.Objects; + + +/** + * @Description : 模具映射关系维护 + * @Reference : + * @Author : gsz + * @CreateDate 2024/5/20 10:06 + * @Modify: + **/ +@Service +@Slf4j +public class MesMouldMappingCfgServiceImpl extends BaseMesService implements IMesMouldMappingCfgService { + + @Autowired + private MesEquipmentRepository mesEquipmentRDao; + + protected void setPackQueryBean(MesMouldMappingCfg bean, DdlPackBean packBean) { + DdlPreparedPack.getStringEqualPack(bean.getAssetNum(), "assetNum", packBean); +// DdlPreparedPack.getStringEqualPack(bean.getEquipmentCode(), "equipmentCode", packBean); + } + protected void onInsertBean(MesMouldMappingCfg item) { + // 数据校验 + ValidatorBean.checkNotNull(item.getOrganizeCode(), "工厂号不能为空"); + ValidatorBean.checkNotNull(item.getAssetNum(), "assetNum不能为空" ); + ValidatorBean.checkNotNull(item.getMouldNo(), "mouldNo不能为空"); + ValidatorBean.checkNotNull(item.getEquipmentCode(), "equipmentCode不能为空"); + + MesEquipment mesEquipmentDb = mesEquipmentRDao.getByProperty( + new String[]{MesConstWords.ORGANIZE_CODE, MesConstWords.IS_DELETED, MesConstWords.IS_VALID, "equipmentCode"}, + new Object[]{item.getOrganizeCode(), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), + CommonEnumUtil.IS_VAILD.VAILD.getValue(), item.getEquipmentCode()}); + if (null == mesEquipmentDb) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("设备代码【%s】无效", item.getEquipmentCode()) + .build(); + } + DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getAssetNum(), "assetNum", packBean); + DdlPreparedPack.getStringEqualPack(item.getMouldNo(), "mouldNo", packBean); + DdlPreparedPack.getStringEqualPack(item.getEquipmentCode(), "equipmentCode", packBean); + + boolean flg = baseRDao.isExitByHql(packBean); + if (flg) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("maximo模具号【%s】设备代码【%s】已经存在，请检查数据", item.getAssetNum(),item.getEquipmentCode()) + .build(); + } + } +}