From 2ee77bb6087ba2d1709233f82471fe5b613400cc Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 20 Feb 2025 17:41:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=87=8D=E5=BA=86=E6=8E=A8=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/base/IMesQueueOrderCellPushCfgService.java | 7 +++++++ .../base/MesQueueOrderCellPushCfgController.java | 13 ++++++++++++ .../base/MesQueueOrderCellPushCfgService.java | 24 ++++++++++++++++++++++ .../i3plus/ext/mes/pojo/util/MesExtConstWords.java | 4 ++++ 4 files changed, 48 insertions(+) create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesQueueOrderCellPushCfgService.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesQueueOrderCellPushCfgController.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQueueOrderCellPushCfgService.java diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesQueueOrderCellPushCfgService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesQueueOrderCellPushCfgService.java new file mode 100644 index 0000000..cae1181 --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesQueueOrderCellPushCfgService.java @@ -0,0 +1,7 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderCellPushCfg; + +public interface IMesQueueOrderCellPushCfgService extends IBaseMesService { + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesQueueOrderCellPushCfgController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesQueueOrderCellPushCfgController.java new file mode 100644 index 0000000..3d728c2 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesQueueOrderCellPushCfgController.java @@ -0,0 +1,13 @@ +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.MesQueueOrderCellPushCfg; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Api("生产队列工位推送配置信息") +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesQueueOrderCellPushCfg") +public class MesQueueOrderCellPushCfgController extends BaseMesController{ +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQueueOrderCellPushCfgService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQueueOrderCellPushCfgService.java new file mode 100644 index 0000000..10088b0 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQueueOrderCellPushCfgService.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.api.base.IMesQueueOrderCellPushCfgService; +import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderCellPushCfg; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Service +@Slf4j +public class MesQueueOrderCellPushCfgService extends BaseMesService implements IMesQueueOrderCellPushCfgService { + + @Override + protected void setPackQueryBean(MesQueueOrderCellPushCfg bean, DdlPackBean packBean) { + DdlPreparedPack.getStringLikerPack(bean.getPushSourceCode(), MesExtConstWords.PUSH_SOURCE_CODE, packBean); + DdlPreparedPack.getNumEqualPack(bean.getPushType(), MesExtConstWords.PUSH_TYPE, packBean); + DdlPreparedPack.getStringEqualPack(bean.getAreaCode(), MesExtConstWords.AREA_CODE, packBean); + DdlPreparedPack.getStringLikerPack(bean.getWorkCenterCode(), MesExtConstWords.WORK_CENTER_CODE, packBean); + DdlPreparedPack.getStringLikerPack(bean.getWorkCellCode(), MesExtConstWords.WORK_CELL_CODE, packBean); + } + +} diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java index 4ef475a..de03ae8 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java @@ -242,6 +242,10 @@ public class MesExtConstWords { public static final String DEFAULT_FLAG = "defaultFlag"; //零件类型 public static final String PART_TYPE = "partType"; + //推送来源代码 + public static final String PUSH_SOURCE_CODE = "pushSourceCode"; + //推送工位类型 + public static final String PUSH_TYPE = "pushType"; //时间[开始/结束]条件 public static final String START_TIME_START = "startTimeStart"; From 0200f6a308b1977ec296a5d47a1b9559fd39fa5d Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 20 Feb 2025 20:47:42 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=8E=A8=E5=8D=95?= =?UTF-8?q?=E4=B8=BB=E6=95=B0=E6=8D=AE=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/MesQueueOrderCellPushCfgService.java | 64 ++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQueueOrderCellPushCfgService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQueueOrderCellPushCfgService.java index 10088b0..1dd5612 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQueueOrderCellPushCfgService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQueueOrderCellPushCfgService.java @@ -2,12 +2,19 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; import cn.estsh.i3plus.ext.mes.api.base.IMesQueueOrderCellPushCfgService; import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords; +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.MesQueueOrderCellPushCfg; +import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; +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; +import java.util.List; + @Service @Slf4j public class MesQueueOrderCellPushCfgService extends BaseMesService implements IMesQueueOrderCellPushCfgService { @@ -21,4 +28,61 @@ public class MesQueueOrderCellPushCfgService extends BaseMesService validateReturnImport(List beanList) { + for (MesQueueOrderCellPushCfg item : beanList) { + onInsertBean(item); + } + return beanList; + } + } From 1b1a559e4d446dab3fcbd12c0516b8903715eae0 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 22 Feb 2025 11:55:12 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=8E=A8=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/api/base/IMesQueueOrderCellPushCfgService.java | 7 ------- .../mes/api/base/IMesQueueOrderPushCellCfgService.java | 7 +++++++ ...ller.java => MesQueueOrderPushCellCfgController.java} | 8 ++++---- ...Service.java => MesQueueOrderPushCellCfgService.java} | 16 ++++++++-------- 4 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesQueueOrderCellPushCfgService.java create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesQueueOrderPushCellCfgService.java rename modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/{MesQueueOrderCellPushCfgController.java => MesQueueOrderPushCellCfgController.java} (51%) rename modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/{MesQueueOrderCellPushCfgService.java => MesQueueOrderPushCellCfgService.java} (88%) diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesQueueOrderCellPushCfgService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesQueueOrderCellPushCfgService.java deleted file mode 100644 index cae1181..0000000 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesQueueOrderCellPushCfgService.java +++ /dev/null @@ -1,7 +0,0 @@ -package cn.estsh.i3plus.ext.mes.api.base; - -import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderCellPushCfg; - -public interface IMesQueueOrderCellPushCfgService extends IBaseMesService { - -} diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesQueueOrderPushCellCfgService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesQueueOrderPushCellCfgService.java new file mode 100644 index 0000000..e6c7bd6 --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesQueueOrderPushCellCfgService.java @@ -0,0 +1,7 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderPushCellCfg; + +public interface IMesQueueOrderPushCellCfgService extends IBaseMesService { + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesQueueOrderCellPushCfgController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesQueueOrderPushCellCfgController.java similarity index 51% rename from modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesQueueOrderCellPushCfgController.java rename to modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesQueueOrderPushCellCfgController.java index 3d728c2..066e576 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesQueueOrderCellPushCfgController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesQueueOrderPushCellCfgController.java @@ -1,13 +1,13 @@ 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.MesQueueOrderCellPushCfg; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderPushCellCfg; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Api("生产队列工位推送配置信息") +@Api("生产队列推送工位配置信息") @RestController -@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesQueueOrderCellPushCfg") -public class MesQueueOrderCellPushCfgController extends BaseMesController{ +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesQueueOrderPushCellCfg") +public class MesQueueOrderPushCellCfgController extends BaseMesController{ } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQueueOrderCellPushCfgService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQueueOrderPushCellCfgService.java similarity index 88% rename from modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQueueOrderCellPushCfgService.java rename to modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQueueOrderPushCellCfgService.java index 1dd5612..224612f 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQueueOrderCellPushCfgService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQueueOrderPushCellCfgService.java @@ -1,12 +1,12 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; -import cn.estsh.i3plus.ext.mes.api.base.IMesQueueOrderCellPushCfgService; +import cn.estsh.i3plus.ext.mes.api.base.IMesQueueOrderPushCellCfgService; import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords; 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.MesQueueOrderCellPushCfg; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderPushCellCfg; import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ValidatorBean; @@ -17,10 +17,10 @@ import java.util.List; @Service @Slf4j -public class MesQueueOrderCellPushCfgService extends BaseMesService implements IMesQueueOrderCellPushCfgService { +public class MesQueueOrderPushCellCfgService extends BaseMesService implements IMesQueueOrderPushCellCfgService { @Override - protected void setPackQueryBean(MesQueueOrderCellPushCfg bean, DdlPackBean packBean) { + protected void setPackQueryBean(MesQueueOrderPushCellCfg bean, DdlPackBean packBean) { DdlPreparedPack.getStringLikerPack(bean.getPushSourceCode(), MesExtConstWords.PUSH_SOURCE_CODE, packBean); DdlPreparedPack.getNumEqualPack(bean.getPushType(), MesExtConstWords.PUSH_TYPE, packBean); DdlPreparedPack.getStringEqualPack(bean.getAreaCode(), MesExtConstWords.AREA_CODE, packBean); @@ -29,7 +29,7 @@ public class MesQueueOrderCellPushCfgService extends BaseMesService validateReturnImport(List beanList) { - for (MesQueueOrderCellPushCfg item : beanList) { + public List validateReturnImport(List beanList) { + for (MesQueueOrderPushCellCfg item : beanList) { onInsertBean(item); } return beanList; From 7655555aa5b607f52b86689af3985da26292d0a3 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 26 Feb 2025 13:05:23 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8D=87=E7=BA=A7dev=20mes=E6=A0=B8?= =?UTF-8?q?=E5=BF=83=E5=8C=85=E7=89=88=E6=9C=AC=E4=B8=BA1.0.2-yfai?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 24fd5ff..71c8f37 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 1.0.0-yfai 1.0.0.1-patch 1.0.0.1-patch - 1.0.1-yfai + 1.0.2-yfai 2.17.1 From bc8cc7402143952182839241ccb28499b6eb6903 Mon Sep 17 00:00:00 2001 From: jason Date: Thu, 27 Feb 2025 17:30:31 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E5=8D=95=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=8F=91=E8=BF=90=E9=9B=B6=E4=BB=B6=E5=8F=B7=E5=8F=8A=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E5=8D=A1=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/MesShippingOrderManagementDetailService.java | 12 +++++++++++- .../pojo/model/MesShippingOrderManagementDetailModel.java | 9 +++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) 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 76e6c65..febf086 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 @@ -210,7 +210,18 @@ public class MesShippingOrderManagementDetailService extends BaseMesService mesJisShippings = new ArrayList<>(); for (MesShippingOrderManagementDetail mesShippingOrderManagementDetail : detailList) { + if (StringUtils.isEmpty(mesShippingOrderManagementDetail.getPartNo())) { + MesException.throwMesBusiException("零件号不能为空！"); + } MesShippingOrderManagement mesShippingOrderManagement = orderMap.get(mesShippingOrderManagementDetail.getPid()); + MesPartShippingGroup mesPartShippingGroup = mesPartShippingGroupService.getMesPartShippingGroup(organizeCode, mesShippingOrderManagement.getShippingGroupCode()); + if (mesPartShippingGroup != null) { + if (Objects.equals(mesPartShippingGroup.getConfirmPartType(), String.valueOf(MesExtEnumUtil.SHIPPING_GROUP_CONFIRM_PART_TYPE.SHIPPING_GROUP_CONFIRM_PART_TYPE_30.getValue()))) { + if (StringUtils.isEmpty(mesShippingOrderManagementDetail.getBarcode())) { + MesException.throwMesBusiException("条码不能为空！"); + } + } + } final String detailBarCode = mesShippingOrderManagementDetail.getBarcode(); if (!StringUtils.isEmpty(detailBarCode)) { @@ -227,7 +238,6 @@ public class MesShippingOrderManagementDetailService extends BaseMesService