Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -18,7 +18,8 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_ACTION_MODULE {
         WORK_ORDER_LANDED(10, "生产工单下达"),
-        QUEUE_JIT_ACTUAL_LANDED(20, "客户JIT生产工单下达");
+        QUEUE_JIT_ACTUAL_LANDED(20, "客户JIT生产工单下达"),
+        MES_WORK_ORDER(30, "生产工单导入");
 
         private int value;
         private String description;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -2651,8 +2651,8 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MONITOR_TASK_OBJECT_TYPE {
 
-        PLC(10, "PLC");
+        PLC(10, "PLC"),
-//        DB(20, "DB");
+        DB(20, "DB");
 
         private int value;
         private String description;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -5538,9 +5538,9 @@ public class WmsEnumUtil {
         WAVE_MERGE_RULE(10, "WAVE_MERGE_RULE", "合并规则"),
         WAVE_MERGE_RANGE(20, "WAVE_MERGE_RANGE", "合并范围");
 
-        int value;
+        private int value;
-        String code;
+        private String code;
-        String description;
+        private String description;
 
         WAVE_MERGE_TYPE(int value, String code, String description) {
             this.value = value;
@@ -5725,6 +5725,16 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**
@@ -5764,16 +5774,7 @@ public class WmsEnumUtil {
             return null;
         }
 
-        public static String valueOf(int val) {
+        public static String valueOfDescription ( int val){
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-        public static String valueOfDescription(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
@@ -5823,4 +5824,56 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+
+    /**
+     * 业务场景Supplier
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BUSI_SCENE_TYPE {
+        YFAS_DELIVERY(10, "YFAS_DELIVERY", "YFAS送货"),
+        TURN_ZAITU_LOCATE(20, "TURN_ZAITU_LOCATE", "转储到在途库位"),
+        ORGANIZE_TRUN(30, "ORGANIZE_TRUN", "工厂内转储"),
+        SUPPLIER_SELF(40, "SUPPLIER_SELF", "供应商自提"),
+        CUSTOMER_SELF(50, "CUSTOMER_SELF", "客户自提");
+        private int value;
+        private String code;
+        private String description;
+
+        BUSI_SCENE_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static BUSI_SCENE_TYPE codeOf(String code) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java

@@ -38,13 +38,9 @@ public class MesMonitorTaskDetail extends BaseBean implements Serializable {
     @ApiParam("数据对象编号")
     private String dataObjectNo;
 
-//    @Column(name = "STORE_OBJECT_CODE")
+    @Column(name = "STORE_OBJECT_CODE")
-//    @ApiParam("存储对象代码")
+    @ApiParam("存储对象代码")
-//    private String storeObjectCode;
+    private String storeObjectCode;
-//
-//    @Column(name = "STORE_FIELD_CODE")
-//    @ApiParam("存储字段代码")
-//    private String storeFieldCode;
 
     @Transient
     @ApiParam("任务名称")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentToolingModel.java

@@ -0,0 +1,66 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesTooling;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @Description : MES_设备工装关系Model
+ * @Reference :
+ * @Author :qianhuasheng
+ * @CreateDate : 2020-04-02 16:34
+ * @Modify:
+ **/
+@Data
+@Api("MES_设备工装关系Model")
+public class MesEquipmentToolingModel implements Serializable {
+
+    private static final long serialVersionUID = 1947971352179107711L;
+
+    private Long id;
+
+    @ApiParam("显示颜色")
+    private String color;
+
+    @ApiParam("设备代码")
+    private String equipmentCode;
+
+    @ApiParam("工装编号")
+    private String toolingNo;
+
+    @ApiParam("工装代码")
+    private String toolingCode ;
+
+    @ApiParam("工装名称")
+    private String toolingName;
+
+    @ApiParam("工装类型")
+    private Integer toolingType;
+
+    @ApiParam("使用次数")
+    private Integer useCount;
+
+    @ApiParam("更换开始时间")
+    private String startTime;
+
+    @ApiParam("更换结束时间")
+    private String endTime;
+
+    @Transient
+    @ApiParam("最大次数")
+    private Integer useCountMax;
+
+    public MesEquipmentToolingModel(MesTooling tooling, Integer useCount) {
+        this.toolingCode = tooling.getToolingCode();
+        this.toolingName = tooling.getToolingName();
+        this.useCount = useCount;
+        this.useCountMax = tooling.getUseCountMax();
+    }
+    public MesEquipmentToolingModel() {
+    }
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java

@@ -107,6 +107,10 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam(value = "车牌号")
     private String carNo;
 
+    @Column(name = "DRIVER_NO")
+    @ApiParam("司机")
+    public String driverNo;
+
     @Column(name = "CUST_ORDER_NO")
     @ApiParam(value = "客户单号")
     private String custOrderNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java

@@ -0,0 +1,91 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import javax.persistence.*;
+import java.util.List;
+
+
+/**
+ * @Description : 运输规则表
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2020-03-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_TRANSPORT_RULE")
+@Api("运输规则表")
+public class WmsTransportRule extends BaseBean {
+    private static final long serialVersionUID = 6120257805546343124L;
+
+    @Column(name = "COMMAND_TYPE")
+    @ApiParam(value = "指令类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IMPORT_ORDER_TYPE.class, refForeignKey = "value", value = "description")
+    private String commandType;
+
+    @Column(name = "BUSI_TYPE")
+    @ApiParam("业务类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "OUT_MOVEMENT_BUSI_TYPE")
+    public Integer busiType;
+
+    @Column(name = "BUSI_SCENE_TYPE")
+    @ApiParam("业务场景")
+    //@AnnoOutputColumn(refClass = WmsEnumUtil.BUSI_SCENE_TYPE.class, refForeignKey = "value", value = "description")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BUSI_SCENE_TYPE")
+    public Integer busiSceneType;
+
+
+    @Column(name = "SRC_AREA_NO")
+    @ApiParam("发货库存地")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    public String srcAreaNo;
+
+
+    @Column(name = "DEST_AREA_NO")
+    @ApiParam("目标库存地")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    public String destAreaNo;
+
+    @Column(name = "OUT_VENDOR_NO")
+    @ApiParam("委外供应商编码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    public String outVendorNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    public String partNo;
+
+    @Column(name = "CUST_NO")
+    @ApiParam("客户代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    public String custNo;
+
+    @Column(name = "IS_TRANSPORT")
+    @ApiParam("是否安排运输")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE")
+    public int isTransport;
+
+    @Column(name = "REMARK",length = 255)
+    @ApiParam("备注")
+    public String remark;
+
+    @ApiParam("物料编码")
+    @Transient
+    public List<String> partNoLst;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransportRuleRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTransportRule;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 运输规则dao层
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2020-03-27 10:30
+ * @Modify:
+ **/
+@Repository
+public interface WmsTransportRuleRepository extends BaseRepository<WmsTransportRule, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -2907,4 +2907,17 @@ public class WmsHqlPack {
         return result;
     }
 
+    /**
+     * 运输规则分页查询条件
+     * @param wmsTransportRule
+     * @return
+     */
+    public static DdlPackBean packHqlBasPlugin(WmsTransportRule wmsTransportRule) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getNumEqualPack(wmsTransportRule.getBusiType(), "busiType", result);
+        DdlPreparedPack.getStringLikerPack(wmsTransportRule.getCustNo(), "custNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsTransportRule.getPartNo(), "partNo", result);
+        getStringBuilderPack(wmsTransportRule, result);
+        return result;
+    }
 }

pom.xml

@@ -15,7 +15,7 @@
     <groupId>i3plus.pojo</groupId>
     <artifactId>i3plus-pojo</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
+    <version>1.0-${profileActive}-SNAPSHOT</version>
     <modules>
         <module>modules/i3plus-pojo-base</module>
         <module>modules/i3plus-pojo-platform</module>
@@ -202,56 +202,24 @@
     </distributionManagement>
 
     <!--<build>-->
-        <!--<plugins>-->
+    <!--<plugins>-->
-            <!--<plugin>-->
+    <!--<plugin>-->
-                <!--<groupId>org.springframework.boot</groupId>-->
+    <!--<groupId>org.springframework.boot</groupId>-->
-                <!--<artifactId>spring-boot-maven-plugin</artifactId>-->
+    <!--<artifactId>spring-boot-maven-plugin</artifactId>-->
-            <!--</plugin>-->
+    <!--</plugin>-->
-
+
-            <!--&lt;!&ndash;  添加编译插件 &ndash;&gt;-->
+    <!--&lt;!&ndash;  添加编译插件 &ndash;&gt;-->
-            <!--<plugin>-->
+    <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
+    <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-compiler-plugin</artifactId>-->
+    <!--<artifactId>maven-compiler-plugin</artifactId>-->
-                <!--<version>3.5.1</version>-->
+    <!--<version>3.5.1</version>-->
-                <!--<configuration>-->
+    <!--<configuration>-->
-                    <!--<source>1.8</source>-->
+    <!--<source>1.8</source>-->
-                    <!--<target>1.8</target>-->
+    <!--<target>1.8</target>-->
-                    <!--<encoding>UTF-8</encoding>-->
+    <!--<encoding>UTF-8</encoding>-->
-                <!--</configuration>-->
+    <!--</configuration>-->
-            <!--</plugin>-->
+    <!--</plugin>-->
-        <!--</plugins>-->
+    <!--</plugins>-->
     <!--</build>-->
 
-    <profiles>
-        <profile>
-            <id>dev</id>
-            <properties>
-                <profileActive>DEV</profileActive>
-            </properties>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-        </profile>
-        <profile>
-            <id>test</id>
-            <properties>
-                <profileActive>TEST</profileActive>
-            </properties>
-        </profile>
-        <profile>
-            <id>docker</id>
-            <properties>
-                <profileActive>DOCKER</profileActive>
-            </properties>
-        </profile>
-        <profile>
-            <id>prod</id>
-            <properties>
-                <profileActive>PROD</profileActive>
-            </properties>
-        </profile>
-    </profiles>
-    <build>
-        <finalName>${project.artifactId}-${project.version}</finalName>
-    </build>
 </project>