Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-ext-mes-api/pom.xml

@@ -19,14 +19,6 @@
         <dependency>
             <groupId>i3plus.pojo</groupId>
             <artifactId>i3plus-pojo-mes</artifactId>
-            <version>1.0.0-yfai</version>
-
-        </dependency>
-        <dependency>
-            <groupId>i3plus.platform</groupId>
-            <artifactId>i3plus-platform-common</artifactId>
-            <version>1.0.0.1-patch</version>
-            <type>pom</type>
         </dependency>
         <dependency>
             <groupId>i3plus.ext.mes</groupId>

modules/i3plus-ext-mes-apiservice/pom.xml

@@ -78,20 +78,22 @@
 
         <dependency>
             <groupId>i3plus.pojo</groupId>
+            <artifactId>i3plus-pojo-model</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>i3plus.pojo</groupId>
             <artifactId>i3plus-pojo-mes</artifactId>
         </dependency>
 
         <dependency>
             <groupId>i3plus.platform</groupId>
             <artifactId>i3plus-platform-common</artifactId>
-            <version>1.0.0.1-patch</version>
         </dependency>
 
         <dependency>
             <groupId>i3plus.platform</groupId>
             <artifactId>i3plus-platform-plugin</artifactId>
-            <version>1.0.0.1-patch</version>
-
         </dependency>
         <!-- webservice -->
         <dependency>

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<MesPartProdGro
 
     @Autowired
     private IMesPartProdGroupService mesPartProdGroupService;
+    @Autowired
+    private ICoreScheduleUtilCloud coreScheduleUtilCloud;
 
     @GetMapping(value = "/find-mes-part-prod-group")
     @ApiOperation(value = "查询零件生产组")
@@ -45,4 +53,20 @@ public class MesPartProdGroupController extends BaseMesController<MesPartProdGro
             return ResultBean.fail(e);
         }
     }
+
+    @GetMapping(value = "/sys-label-template/list-detail")
+    @ApiOperation(value = "查询零件生产组")
+    public ResultBean labelList() {
+        try {
+            SysLabelTemplate template = new SysLabelTemplate();
+            BaseResultBean listDetail = coreScheduleUtilCloud.findList(template);
+            return ResultBean.success("查询成功")
+                    .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(listDetail.getResultList());
+        } catch (ImppBusiException e) {
+            return ResultBean.fail(e).build();
+        } catch (Exception e) {
+            return ResultBean.fail(e);
+        }
+    }
+
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/TestBusiController.java

@@ -1,8 +0,0 @@
-package cn.estsh.i3plus.ext.mes.apiservice.controller.busi;
-
-import cn.estsh.impp.framework.base.controller.MesBaseController;
-
-public class TestBusiController  extends MesBaseController {
-
-
-}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartProdGroupDetailService.java

@@ -1,7 +1,14 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesPartProdGroupDetailService;
+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.impp.framework.boot.exception.ImppExceptionBuilder;
+import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -9,4 +16,11 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class MesPartProdGroupDetailService extends BaseMesService<MesPartProdGroupDetail> implements IMesPartProdGroupDetailService {
 
+
+
+    protected void setPackQueryBean(MesPartProdGroup bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getPartProdGroupCode(), "partProdGroupCode", packBean);
+    }
+
+
 }

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<MesPartProdGroup> im
         if(CollectionUtils.isEmpty(mesPartProdGroupDetails)){
             return new ArrayList<>();
         }
-        List<String> partProdGroupNoList = mesPartProdGroupDetails.stream().map(MesPartProdGroupDetail::getPartProdGroupNo).collect(Collectors.toList());
+        List<String> 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();
+        }
+    }
 }

modules/i3plus-ext-mes-icloud/pom.xml

@@ -28,7 +28,6 @@
         <dependency>
             <groupId>i3plus.platform</groupId>
             <artifactId>i3plus-platform-common</artifactId>
-            <version>1.0.0.1-patch</version>
         </dependency>
 
         <dependency>

modules/i3plus-ext-mes-pojo/pom.xml

@@ -16,8 +16,6 @@
         <dependency>
             <groupId>i3plus.pojo</groupId>
             <artifactId>i3plus-pojo-mes</artifactId>
-            <version>1.0.0-yfai</version>
-
         </dependency>
         <dependency>
             <groupId>org.quartz-scheduler</groupId>

pom.xml

@@ -30,14 +30,12 @@
         <skipTests>true</skipTests>
         <app.charset>UTF-8</app.charset>
 
-        <impp.framework.version>1.0.0.3</impp.framework.version>
+        <impp.framework.version>1.0.1-YZ</impp.framework.version>
-<!--        <impp.framework.version>1.0.1-YZ</impp.framework.version>-->
         <i3plus.pojo.version>1.0.0-yfai</i3plus.pojo.version>
         <i3plus.platform.version>1.0.0.1-patch</i3plus.platform.version>
         <i3plus.icloud.version>1.0.0.1-patch</i3plus.icloud.version>
         <i3plus.mes.version>1.0.0-yfai</i3plus.mes.version>
         <log4j2.version>2.17.1</log4j2.version>
-
     </properties>
 
 
@@ -61,13 +59,9 @@
                 <artifactId>i3plus-icloud</artifactId>
                 <version>${i3plus.icloud.version}</version>
                 <type>pom</type>
+                <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>i3plus.icloud</groupId>
-                <artifactId>i3plus-icloud-wms</artifactId>
-                <version>${i3plus.icloud.version}</version>
 
-            </dependency>
             <dependency>
                 <groupId>i3plus.pojo</groupId>
                 <artifactId>i3plus-pojo</artifactId>
@@ -89,9 +83,15 @@
                 <artifactId>i3plus-mes</artifactId>
                 <version>${i3plus.mes.version}</version>
                 <type>pom</type>
+                <scope>import</scope>
             </dependency>
 
             <dependency>
+                <groupId>i3plus.icloud</groupId>
+                <artifactId>i3plus-icloud-wms</artifactId>
+                <version>${i3plus.icloud.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>i3plus.mes</groupId>
                 <artifactId>i3plus-mes-apiservice</artifactId>
                 <version>${i3plus.mes.version}</version>
@@ -125,7 +125,6 @@
                 <groupId>impp.framework</groupId>
                 <artifactId>impp-framework-boot</artifactId>
                 <version>${impp.framework.version}</version>
-                <!--                <version>1.0.1-TEST-SNAPSHOT</version>-->
             </dependency>
 
             <dependency>
@@ -152,25 +151,33 @@
             <dependency>
                 <groupId>i3plus.pojo</groupId>
                 <artifactId>i3plus-pojo-mes</artifactId>
-                <version>1.0.0-yfai</version>
+                <version>${i3plus.pojo.version}</version>
             </dependency>
-
             <dependency>
                 <groupId>i3plus.pojo</groupId>
-                <artifactId>i3plus-pojo-andon</artifactId>
+                <artifactId>i3plus-pojo-base</artifactId>
-                <version>1.0.0-yfai</version>
+                <version>${i3plus.pojo.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>i3plus.pojo</groupId>
+                <artifactId>i3plus-pojo-model</artifactId>
+                <version>${i3plus.pojo.version}</version>
             </dependency>
             <dependency>
                 <groupId>i3plus.platform</groupId>
                 <artifactId>i3plus-platform-common</artifactId>
-                <version>1.0.0.1-patch</version>
+                <version>${i3plus.platform.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>i3plus.platform</groupId>
+                <artifactId>i3plus-platform-plugin</artifactId>
+                <version>${i3plus.platform.version}</version>
             </dependency>
             <dependency>
                 <groupId>i3plus.icloud</groupId>
                 <artifactId>i3plus-icloud-core</artifactId>
                 <version>${i3plus.icloud.version}</version>
             </dependency>
-
             <dependency>
                 <groupId>i3plus.icloud</groupId>
                 <artifactId>i3plus-icloud-andon</artifactId>