diff --git a/modules/i3plus-ext-mes-api/pom.xml b/modules/i3plus-ext-mes-api/pom.xml
index 4b24fca..9cecd56 100644
--- a/modules/i3plus-ext-mes-api/pom.xml
+++ b/modules/i3plus-ext-mes-api/pom.xml
@@ -19,14 +19,6 @@
i3plus.pojo
i3plus-pojo-mes
- 1.0.0-yfai
-
-
-
- i3plus.platform
- i3plus-platform-common
- 1.0.0.1-patch
- pom
i3plus.ext.mes
diff --git a/modules/i3plus-ext-mes-apiservice/pom.xml b/modules/i3plus-ext-mes-apiservice/pom.xml
index c5054bb..6b2e26e 100644
--- a/modules/i3plus-ext-mes-apiservice/pom.xml
+++ b/modules/i3plus-ext-mes-apiservice/pom.xml
@@ -78,20 +78,22 @@
i3plus.pojo
+ i3plus-pojo-model
+
+
+
+ i3plus.pojo
i3plus-pojo-mes
i3plus.platform
i3plus-platform-common
- 1.0.0.1-patch
i3plus.platform
i3plus-platform-plugin
- 1.0.0.1-patch
-
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartProdGroupController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartProdGroupController.java
index 25a261e..770b5a2 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartProdGroupController.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartProdGroupController.java
@@ -3,10 +3,16 @@ package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
import cn.estsh.i3plus.ext.mes.api.base.IMesPartProdGroupService;
import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt;
import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.icloud.core.sdk.ICoreLabelTemplateCloud;
+import cn.estsh.i3plus.icloud.core.sdk.ICoreMessageCloud;
+import cn.estsh.i3plus.icloud.core.sdk.ICoreScheduleCloud;
+import cn.estsh.i3plus.icloud.core.sdk.ICoreScheduleUtilCloud;
+import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.mes.bean.MesPartProdGroup;
import cn.estsh.i3plus.pojo.mes.bean.MesPartProdGroupDetail;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
+import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.util.ResultBean;
import io.swagger.annotations.Api;
@@ -29,6 +35,8 @@ public class MesPartProdGroupController extends BaseMesController implements IMesPartProdGroupDetailService {
+
+
+ protected void setPackQueryBean(MesPartProdGroup bean, DdlPackBean packBean) {
+ DdlPreparedPack.getStringEqualPack(bean.getPartProdGroupCode(), "partProdGroupCode", packBean);
+ }
+
+
}
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartProdGroupService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartProdGroupService.java
index b49e922..acfba61 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartProdGroupService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartProdGroupService.java
@@ -1,11 +1,16 @@
package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
import cn.estsh.i3plus.ext.mes.api.base.IMesPartProdGroupService;
+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.MesPartProdGroup;
import cn.estsh.i3plus.pojo.mes.bean.MesPartProdGroupDetail;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartProdGroup;
import cn.estsh.i3plus.pojo.mes.repository.MesPartProdGroupDetailRepository;
+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;
@@ -30,9 +35,63 @@ public class MesPartProdGroupService extends BaseMesService im
if(CollectionUtils.isEmpty(mesPartProdGroupDetails)){
return new ArrayList<>();
}
- List partProdGroupNoList = mesPartProdGroupDetails.stream().map(MesPartProdGroupDetail::getPartProdGroupNo).collect(Collectors.toList());
+ List partProdGroupNoList = mesPartProdGroupDetails.stream().map(MesPartProdGroupDetail::getPartProdGroupCode).collect(Collectors.toList());
ddlPackBean = DdlPackBean.getDdlPackBean(mesPartProdGroupDetail.getOrganizeCode());
- DdlPreparedPack.getInPackList(partProdGroupNoList,"partProdGroupNo",ddlPackBean);
+ DdlPreparedPack.getInPackList(partProdGroupNoList,"partProdGroupCode",ddlPackBean);
return baseRDao.findByHqlWhere(ddlPackBean);
}
+
+
+
+ protected void setPackQueryBean(MesPartProdGroup bean, DdlPackBean packBean) {
+ DdlPreparedPack.getStringEqualPack(bean.getPartProdGroupCode(), "partProdGroupCode", packBean);
+ DdlPreparedPack.getStringLikerPack(bean.getPartProdGroupName(), "partProdGroupName", packBean);
+ DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBean);
+
+ }
+
+ @Override
+ public MesPartProdGroup insert(MesPartProdGroup bean) {
+ //插入前构造并校验数据
+ onInsertBean(bean);
+
+ bean = baseRDao.insert(bean);
+ return bean;
+ }
+
+ protected void onInsertBean(MesPartProdGroup item) {
+ // 数据校验
+ ValidatorBean.checkNotNull(item.getPartProdGroupCode(), "零件生产组代码不能为空");
+
+
+ DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+ DdlPreparedPack.getStringEqualPack(item.getPartProdGroupCode(), "partProdGroupCode", 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.getPartProdGroupCode(), item.getCustomerCode())
+ .build();
+ }
+
+ }
+
+ protected void onUpdateBean(MesPartProdGroup item) {
+ // 数据校验
+ ValidatorBean.checkNotNull(item.getPartProdGroupCode(), "零件生产组代码不能为空");
+
+
+ DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+ DdlPreparedPack.getStringEqualPack(item.getPartProdGroupCode(), "partProdGroupCode", seriesPackBean);
+ DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", 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.getPartProdGroupCode(), item.getCustomerCode())
+ .build();
+ }
+ }
}
diff --git a/modules/i3plus-ext-mes-icloud/pom.xml b/modules/i3plus-ext-mes-icloud/pom.xml
index 8bf9f97..1485500 100644
--- a/modules/i3plus-ext-mes-icloud/pom.xml
+++ b/modules/i3plus-ext-mes-icloud/pom.xml
@@ -28,7 +28,6 @@
i3plus.platform
i3plus-platform-common
- 1.0.0.1-patch
diff --git a/modules/i3plus-ext-mes-pojo/pom.xml b/modules/i3plus-ext-mes-pojo/pom.xml
index 4b29488..08d8df4 100644
--- a/modules/i3plus-ext-mes-pojo/pom.xml
+++ b/modules/i3plus-ext-mes-pojo/pom.xml
@@ -16,8 +16,6 @@
i3plus.pojo
i3plus-pojo-mes
- 1.0.0-yfai
-
org.quartz-scheduler
diff --git a/pom.xml b/pom.xml
index 052d8fb..6d52f5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,14 +30,12 @@
true
UTF-8
- 1.0.0.3
-
+ 1.0.1-YZ
1.0.0-yfai
1.0.0.1-patch
1.0.0.1-patch
1.0.0-yfai
2.17.1
-
@@ -61,13 +59,9 @@
i3plus-icloud
${i3plus.icloud.version}
pom
+ import
-
- i3plus.icloud
- i3plus-icloud-wms
- ${i3plus.icloud.version}
-
i3plus.pojo
i3plus-pojo
@@ -89,9 +83,15 @@
i3plus-mes
${i3plus.mes.version}
pom
+ import
+ i3plus.icloud
+ i3plus-icloud-wms
+ ${i3plus.icloud.version}
+
+
i3plus.mes
i3plus-mes-apiservice
${i3plus.mes.version}
@@ -125,7 +125,6 @@
impp.framework
impp-framework-boot
${impp.framework.version}
-
@@ -152,25 +151,33 @@
i3plus.pojo
i3plus-pojo-mes
- 1.0.0-yfai
+ ${i3plus.pojo.version}
-
i3plus.pojo
- i3plus-pojo-andon
- 1.0.0-yfai
+ i3plus-pojo-base
+ ${i3plus.pojo.version}
+
+
+ i3plus.pojo
+ i3plus-pojo-model
+ ${i3plus.pojo.version}
i3plus.platform
i3plus-platform-common
- 1.0.0.1-patch
+ ${i3plus.platform.version}
+
+
+ i3plus.platform
+ i3plus-platform-plugin
+ ${i3plus.platform.version}
i3plus.icloud
i3plus-icloud-core
${i3plus.icloud.version}
-
i3plus.icloud
i3plus-icloud-andon