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

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java

@@ -51,10 +51,12 @@ public class AndonCellAlarmCause extends BaseBean  implements Serializable {
     @ApiParam(value = "事件描述")
     private String acCode;
 
+    @AnnoOutputColumn(hidden = true)
     @Transient
     @ApiParam(value = "安灯类型名称")
     private String alarmCodeName;
 
+    @AnnoOutputColumn(hidden = true)
     @Transient
     @ApiParam(value = "呼叫原因描述")
     private String acName;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java

@@ -45,4 +45,7 @@ public class CommonMsgModel implements Serializable {
     @ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true")
     private boolean errorInnerAction = false;
 
+    @ApiModelProperty("默认异常入库")
+    private boolean errorInsertFlag = true;
+
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java

@@ -66,7 +66,7 @@ public class Material extends BaseAPS {
     private String purchaseLeadTime;
 
     @Column(name="MANUF_LEAD_TIME")
-    @ApiParam(value ="制造提前期")
+    @ApiParam(value ="生产提前期")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String manufLeadTime;
 
@@ -80,7 +80,7 @@ public class Material extends BaseAPS {
     private Integer unitPurchase;
 
     @Column(name="UNIT_MANUF")
-    @ApiParam(value ="单位制造量")
+    @ApiParam(value ="单位生产量")
     private Integer unitManuf;
 
     @Column(name="UNIT_SHIPMENT")
@@ -99,16 +99,16 @@ public class Material extends BaseAPS {
     private Boolean autoFixPegging;
 
     @Column(name="MAX_PRODUCT_BATCH", columnDefinition = "decimal(18,8)")
-    @ApiParam(value ="最大制造批量")
+    @ApiParam(value ="最大生产批量")
     private Double maxProductBatch;
 
     @Column(name="MIN_PRODUCT_BATCH", columnDefinition = "decimal(18,8)")
-    @ApiParam(value ="最小制造批量")
+    @ApiParam(value ="最小生产批量")
     @FieldAnnotation(defaultValue = "0.0")
     private Double minProductBatch;
 
     @Column(name="UNIT_PRODUCT_BATCH", columnDefinition = "decimal(18,8)")
-    @ApiParam(value ="制造批量单位")
+    @ApiParam(value ="生产批量单位")
     private Double UnitProductBatch;
 
     @Column(name="MAX_PUR_BATCH", columnDefinition = "decimal(18,8)")
@@ -143,6 +143,14 @@ public class Material extends BaseAPS {
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String orderBatchPeriod;
 
+    @Column(name="LABEL_NAME")
+    @ApiParam(value ="标签名称")
+    private String labelName;
+
+    @Column(name="LABEL_COLOR")
+    @ApiParam(value ="标签颜色")
+    private String labelColor;
+
     @JsonBackReference
     public List<ProductRouting> getProductRoutings() {
         return BeanRelation.list(this, EMaterial.ProductRoutings);

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
+import cn.estsh.i3plus.pojo.aps.holders.EMaterialDeliveryPromise;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * @Description :物料交期承诺
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "APS_MATERIAL_DELIVERY_PROMISE")
+@Api("物料")
+public class MaterialDeliveryPromise extends BaseBean {
+    @Column(name="QTY")
+    @ApiParam(value ="到货数量")
+    private Double count;
+
+    @Column(name="DATE_TIME")
+    @ApiParam(value ="到货日期")
+    private Date dateTime;
+
+    @Column(name="MATERIAL_ID")
+    @ApiParam(value ="物料")
+    @FieldAnnotation(relation = "Material", notEmpty = true)
+    private Long materialId;
+
+    public Material getMaterial() {
+        return BeanRelation.get(this, EMaterialDeliveryPromise.Material);
+    }
+
+    public void setMaterial(Material material) {
+        this.materialId = material != null ? material.getId() : 0l;
+        BeanRelation.set(this, EMaterialDeliveryPromise.Material, material);
+    }
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java

@@ -51,6 +51,11 @@ public class SalesOrder extends BaseOrder {
     @FieldAnnotation(modify = false)
     private String calcLeadTime;
 
+    @Column(name="ALLOW_DELAY_TIME")
+    @ApiParam(value ="允许延期时间")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
+    private String allowDelayTime;
+
     @JsonIgnore
     public Work getWork() {
         return BeanRelation.get(this, EBaseOrder.Works);

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java

@@ -29,6 +29,10 @@ public class DateDuration {
     private double rate = 0.0;
     private boolean bValid = false;
 
+    public DateDuration(int value) {
+        this.time = value;
+    }
+
     public DateDuration(String value) {
         setValue(value);
     }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterialDeliveryPromise.java

@@ -0,0 +1,5 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EMaterialDeliveryPromise {
+    Material,
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/DelaySalesOrder.java

@@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Description : 延期订单
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
+@Data
+public class DelaySalesOrder {
+    @ApiParam(value ="订单编码")
+    private String orderCode;
+
+    @ApiParam(value ="订单名称")
+    private String orderName;
+
+    @ApiParam(value ="物料编码")
+    private String materialCode;
+
+    @ApiParam(value ="物料名称")
+    private String materialName;
+
+    @ApiParam(value ="订单数量")
+    private Double count;
+
+    @ApiParam(value ="最晚结束时间")
+    private Date let;
+
+    @ApiParam(value ="计划开始时间")
+    private Date planStart;
+
+    @ApiParam(value ="计划结束时间")
+    private Date planEnd;
+
+    @ApiParam(value ="总跨度时间")
+    private String overTime;
+
+    @ApiParam(value ="总生产时间")
+    private String productTime;
+
+    @ApiParam(value ="延期时间")
+    private String delayTime;
+
+    @ApiParam(value ="允许的最大延期时间")
+    private String allowDelayTime;
+
+    // 0正常显示，1显示黄色，2显示红色
+    @ApiParam(value ="背景显示颜色")
+    private Integer backgroundColor;
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/LargeSpanOrder.java

@@ -0,0 +1,53 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Description : 大跨度订单
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
+@Data
+public class LargeSpanOrder {
+    @ApiParam(value ="订单编码")
+    private String orderCode;
+
+    @ApiParam(value ="订单名称")
+    private String orderName;
+
+    @ApiParam(value ="物料编码")
+    private String materialCode;
+
+    @ApiParam(value ="物料名称")
+    private String materialName;
+
+    @ApiParam(value ="订单数量")
+    private Double count;
+
+    @ApiParam(value ="最晚结束时间")
+    private Date let;
+
+    @ApiParam(value ="计划开始时间")
+    private Date planStart;
+
+    @ApiParam(value ="计划结束时间")
+    private Date planEnd;
+
+    @ApiParam(value ="总跨度时间")
+    private String overTime;
+
+    @ApiParam(value ="总生产时间")
+    private String productTime;
+
+    @ApiParam(value ="跨度时间")
+    private String spanTime;
+
+    // 0正常显示，1显示黄色，2显示红色
+    @ApiParam(value ="背景显示颜色")
+    private Integer backgroundColor;
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MaterialDeliveryAnalyze.java

@@ -0,0 +1,36 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Description : 物料交期分析表
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
+@Data
+public class MaterialDeliveryAnalyze {
+
+    private String orderCode;
+
+    private String orderName;
+
+    private String materialCode;
+
+    private String materialName;
+
+    private String labelName;
+
+    private String labelColor;
+
+    private Date requireDate;
+
+    private Date arrivalDate;
+
+    private Double requireCount;
+
+    private Double count;
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PrematureProduct.java

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Description : 过早生产
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
+@Data
+public class PrematureProduct {
+    @ApiParam(value ="订单编码")
+    private String orderCode;
+
+    @ApiParam(value ="订单名称")
+    private String orderName;
+
+    @ApiParam(value ="物料编码")
+    private String materialCode;
+
+    @ApiParam(value ="物料名称")
+    private String materialName;
+
+    @ApiParam(value ="订单编码")
+    private Double count;
+
+    @ApiParam(value ="最晚结束时间")
+    private Date let;
+
+    @ApiParam(value ="计划开始时间")
+    private Date planStart;
+
+    @ApiParam(value ="计划结束时间")
+    private Date planEnd;
+
+    @ApiParam(value ="提前完成时间")
+    private String times;
+
+    // 0正常显示，1显示红色
+    @ApiParam(value ="背景显示颜色")
+    private Integer backgroundColor;
+
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MaterialDeliveryPromiseRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.aps.repository;
+
+import cn.estsh.i3plus.pojo.aps.bean.MaterialDeliveryPromise;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface MaterialDeliveryPromiseRepository extends CrudRepository<MaterialDeliveryPromise, Long> {
+}

modules/i3plus-pojo-aps/src/main/resources/relations/MaterialDeliveryPromise.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="MaterialDeliveryPromise">
+    <Relation field="Material" name="Material" type="MULTI_TO_ONE">
+    </Relation>
+</Class>

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

@@ -195,7 +195,7 @@ public class ApsEnumUtil {
     public enum MATERIAL_ASSIGN_LIMIT {
         INVENTORY(1, "库存制约"),
         PURCHASE(2, "采购制约"),
-        PRODUCT(4, "制造制约");
+        PRODUCT(4, "生产制约");
 
         private int value;
         private String description;
@@ -1110,4 +1110,33 @@ public class ApsEnumUtil {
             return description;
         }
     }
+
+    /**
+     * 订单状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ORDER_STATUS {
+        NOPLAN("NOPLAN", "未计划"),
+        PLANDONE("PLANDONE", "计划完毕"),
+        INDICATIONDONE("INDICATIONDONE", "指示完毕"),
+        CONFIRM("CONFIRM", "确认"),
+        STARTPRODUCT("STARTPRODUCT", "开始生产"),
+        FINISH("FINISH", "完成");
+
+        private String value;
+        private String description;
+
+        ORDER_STATUS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }

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

@@ -3482,6 +3482,7 @@ public class MesEnumUtil {
         PACKAGE_SCAN(35, "打包扫描"),
         INSTOCKED(40, "入库"),
         SHIPING(50, "发运"),
+        REDO(60, "重做"),
         CLOSE(90, "关闭"),
         ;
 
@@ -6277,4 +6278,50 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 停机类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STOP_MACHINE_TYPE {
+        TIMER_TIME_OUT(10, "计时器超时停机"),
+        DELAY_HELP(20, "延时帮助停机"),
+        URGENT_STOP(30, "急停停机");
+
+        private int value;
+        private String description;
+
+        STOP_MACHINE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(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) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -2376,6 +2376,7 @@ public class MesPcnEnumUtil {
         PACKAGE_SCAN(35, "打包扫描"),
         INSTOCKED(40, "入库"),
         SHIPPING(50, "发运"),
+        REDO(60, "重做"),
         CLOSE(90, "关闭");
 
         private int value;
@@ -2521,7 +2522,8 @@ public class MesPcnEnumUtil {
         RUNNING_INFO("runningInfo", "执行信息"),
         STOP_PCS_CTL("stopPcsCtl", "停止监控"),
         RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"),
-        PROCESS_CONTENT("processContent", "过程组件内容");
+        PROCESS_CONTENT("processContent", "过程组件内容"),
+        TIME_MODULE_CONTENT("timeModuleContent", "定时组件内容");
 
         private String value;
         private String description;
@@ -3397,6 +3399,7 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum FSM_STATE_TYPE {
         BEGIN(10, "begin", "开始状态点"),
+        BACK(20, "back", "回退状态点"),
         END(40, "end", "结束状态点");
 
         private int value;
@@ -3599,7 +3602,8 @@ public class MesPcnEnumUtil {
         START(10, "START", "开始状态"),
         EXECUTING(20, "EXECUTING", "执行中状态"),
         TERMINATE(30, "TERMINATE", "中断状态"),
-        FINISH(40, "FINISH", "完成状态");
+        FINISH(40, "FINISH", "完成状态"),
+        BACK(99, "BACK", "回退状态");
 
         private int value;
         private String code;
@@ -4069,52 +4073,6 @@ public class MesPcnEnumUtil {
     }
 
     /**
-     * 停机类型
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum STOP_MACHINE_TYPE {
-        TIMER_TIME_OUT(10, "计时器超时停机"),
-        DELAY_HELP(20, "延时帮助停机"),
-        URGENT_STOP(30, "急停停机");
-
-        private int value;
-        private String description;
-
-        STOP_MACHINE_TYPE(int value, String description) {
-            this.value = value;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public static String valueOf(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) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-    }
-
-    /**
      * plc状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -1281,7 +1281,7 @@ public class PtlPcnEnumUtil {
     }
 
     /**
-     * mes-pcn定时任务同步结果状态
+     * ptl-pcn定时任务同步结果状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PTL_PCN_TASK_SYNC_STATUS {
@@ -1583,4 +1583,40 @@ public class PtlPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 同步标识
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SYNC_FLAG {
+
+        UNSYNC(1, "未同步"),
+        SYNCED(2, "已同步");
+
+        private int value;
+        private String description;
+
+        SYNC_FLAG(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java

@@ -700,4 +700,44 @@ public class SwebEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 条码类型 10=实物条码，20=虚拟条码
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ORDER_STOCK_TYPE {
+        SOURCE(10, "实物条码"),
+        TARGET(20, "虚拟条码"),
+        CUST_SN(30, "客户条码");
+
+        private int value;
+        private String description;
+
+        ORDER_STOCK_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(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) {
+            return valueOf(val);
+        }
+    }
 }

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

@@ -88,35 +88,35 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable {
 
     @Column(name = "PEST1")
     @ApiParam("PEST编码1")
-    private Integer pest1;
+    private String pest1;
 
     @Column(name = "PEST2")
     @ApiParam("PEST编码2")
-    private Integer pest2;
+    private String pest2;
 
     @Column(name = "PEST3")
     @ApiParam("PEST编码3")
-    private Integer pest3;
+    private String pest3;
 
     @Column(name = "PEST4")
     @ApiParam("PEST编码4")
-    private Integer pest4;
+    private String pest4;
 
     @Column(name = "PEST5")
     @ApiParam("PEST编码5")
-    private Integer pest5;
+    private String pest5;
 
     @Column(name = "PEST6")
     @ApiParam("PEST编码6")
-    private Integer pest6;
+    private String pest6;
 
     @Column(name = "PEST7")
     @ApiParam("PEST编码7")
-    private Integer pest7;
+    private String pest7;
 
     @Column(name = "PEST8")
     @ApiParam("PEST编码8")
-    private Integer pest8;
+    private String pest8;
 
     @Column(name = "TORQUE_NO")
     @ApiParam("扭矩枪编号")

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

@@ -78,6 +78,10 @@ public class MesStateMachineStatus extends BaseBean implements Serializable {
     @ApiParam("状态类型 10=初始化状态")
     private Integer statusType;
 
+    @Column(name = "SEQ")
+    @ApiParam("状态点顺序")
+    private Integer seq;
+
     @Transient
     @ApiParam("状态点是否完成")
     private boolean isComplete;

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

@@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 @Api("数据复核model")
-public class DataReviewStepModel {
+public class DataReviewModel {
 
     @ApiParam("关键件")
     private String itemPartNo;
@@ -25,5 +25,16 @@ public class DataReviewStepModel {
     @ApiParam("对象代码")
     private String objectCode;
 
+    @ApiParam("对象名称")
+    private String objectCodeName;
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("复核结果")
+    private Integer reviewResult;
+
+    @ApiParam("补录操作")
+    private Integer supplementaryOperate;
 
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -2937,4 +2937,68 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 物料校验项
+     * @param partCheck
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesPartCheck(MesPartCheck partCheck, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(partCheck, organizeCode);
+        if (!StringUtils.isEmpty(partCheck.getPartNo())) {
+            DdlPreparedPack.getStringEqualPack(partCheck.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(partCheck.getObjectCode())) {
+            DdlPreparedPack.getStringEqualPack(partCheck.getObjectCode(), "objectCode", packBean);
+        }
+        return packBean;
+    }
+
+
+    /**
+     * 过程质量检测数据
+     *
+     * @param qcOrderDetail
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesQcOrderDetailData(MesQcOrderDetail qcOrderDetail, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(qcOrderDetail, organizeCode);
+        if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) {
+            DdlPreparedPack.getStringRightLikerPack(qcOrderDetail.getOrderNo(), "orderNo", packBean);
+        }
+        if (qcOrderDetail.getCheckType() != null) {
+            DdlPreparedPack.getNumEqualPack(qcOrderDetail.getCheckType(), "checkType", packBean);
+        }
+        if (!StringUtils.isEmpty(qcOrderDetail.getSerialNumber())) {
+            DdlPreparedPack.getStringLikerPack(qcOrderDetail.getSerialNumber(), "serialNumber", packBean);
+        }
+        if (!StringUtils.isEmpty(qcOrderDetail.getCreateDateTimeStart()) || !StringUtils.isEmpty(qcOrderDetail.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    qcOrderDetail.getCreateDateTimeStart(),
+                    qcOrderDetail.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES AGV停机记录信息条件查询
+     * @param stopRecord
+     * @return
+     */
+    public static DdlPackBean getMesAgvRecoredData(MesAgvStopRecord stopRecord, String organizeCode) {
+        DdlPackBean packBean = getAllBaseData(organizeCode);
+        DdlPreparedPack.getStringEqualPack(stopRecord.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(stopRecord.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getNumEqualPack(stopRecord.getStopType(), "stopType", packBean);
+        DdlPreparedPack.getStringLikerPack(stopRecord.getProductSn(), "productSn", packBean);
+        DdlPreparedPack.getStringEqualPack(stopRecord.getPartNo(), "partNo", packBean);
+        if (!StringUtils.isEmpty(stopRecord.getStopStartTime()) || !StringUtils.isEmpty(stopRecord.getStopEndTime())) {
+            DdlPreparedPack.timeBuilder(stopRecord.getCreateDateTimeStart(), stopRecord.getCreateDateTimeEnd(),
+                    "stopStartTime", packBean, true);
+        }
+        return packBean;
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java

@@ -119,13 +119,13 @@ public class MesPcnHqlPack {
      * @param rawPartSn
      * @return
      */
-    public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, MesRawPartSn rawPartSn) {
+    public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, String rawPartNo) {
         DdlPackBean packBean = getAllBaseData(stationBom.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean);
         DdlPreparedPack.getStringEqualPack(stationBom.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(), "isFeed", packBean);
-        DdlPreparedPack.getStringEqualPack(rawPartSn.getPartNo(), "itemPartNo", packBean);
+        DdlPreparedPack.getStringEqualPack(rawPartNo, "itemPartNo", packBean);
         return packBean;
     }
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java

@@ -65,11 +65,33 @@ public class WmsTaskInfoModel implements Serializable {
     @ApiParam(value = "erp单号")
     public String erpSrcNo;
 
+    @ApiParam(value = "工厂代码")
+    public String organizeCode;
+
     public WmsTaskInfoModel() {
     }
 
     public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc,
                             String busiTypeCode, String zdate, String ztime, String custNo, String vendorNo,
+                            String createDatetime, String srcZoneNo, String createUser, String organizeCode) {
+        this.orderNo = orderNo;
+        this.taskStatus = taskStatus;
+        this.opTypeName = opTypeName;
+        this.transTypeCode = transTypeCode;
+        this.refSrc = refSrc;
+        this.busiTypeCode = busiTypeCode;
+        this.zdate = zdate;
+        this.ztime = ztime;
+        this.custNo = custNo;
+        this.vendorNo = vendorNo;
+        this.createDatetime = createDatetime;
+        this.srcZoneNo = srcZoneNo;
+        this.createUser = createUser;
+        this.organizeCode = organizeCode;
+    }
+
+    public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc,
+                            String busiTypeCode, String zdate, String ztime, String custNo, String vendorNo,
                             String createDatetime, String srcZoneNo, String createUser) {
         this.orderNo = orderNo;
         this.taskStatus = taskStatus;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.ptl.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+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.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "IF_PICK_DATA")
+@EqualsAndHashCode(callSuper = true)
+@Api("IF_拣货数据")
+public class IfPickData extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -1057633269490937118L;
+
+    @Column(name = "AREA_NO")
+    @ApiParam("区域代码")
+    private String areaNo;
+
+    @Column(name = "SECTION_NO")
+    @ApiParam("区段编号")
+    private String sectionNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编号")
+    private String partNo;
+
+    @Column(name = "QTY")
+    @ApiParam("拣货数量")
+    private Integer qty;
+
+    @Column(name = "SYNC_FLAG")
+    @ApiParam("同步标识")
+    private Integer syncFlag;
+
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java

@@ -51,4 +51,7 @@ public class CommonMsgModel implements Serializable {
     @ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true")
     private boolean errorInnerAction = false;
 
+    @ApiModelProperty("默认异常入库")
+    private boolean errorInsertFlag = true;
+
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/IfPickDataRepository.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.ptl.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.ptl.bean.IfPickData;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+public interface IfPickDataRepository extends BaseRepository<IfPickData, Long> {
+
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java

@@ -179,6 +179,7 @@ public class SwebHqlPack {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringLikerPack(master.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringLikerPack(master.getVendorCode(), "vendorCode", result);
+        DdlPreparedPack.getNumEqualPack(master.getOrderStatus(), "orderStatus", result);
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
         return buildHql(master, result);
     }

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

@@ -121,6 +121,11 @@ public class WmsDocMovementDetails extends BaseBean {
     @Transient
     @ApiParam(value = "状态中文")
     private String itemStatusStr;
+
+    @Transient
+    @ApiParam(value = "ERP单号")
+    private String erpSrcNo;
+
     /**
      * 是否免费:0=计费,1=免费
      */
@@ -133,6 +138,9 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value = "操作原因")
     private String remark;
 
+    /**
+     * 配料数量
+     **/
     @Column(name = "PICK_QTY", columnDefinition = "decimal(18,8)")
     @ColumnDefault("0")
     @ApiParam(value = "已拣货数量", example = "1")

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

@@ -247,6 +247,9 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam("物料编号组")
     public String[] partNos;
 
+    @Transient
+    @ApiParam("工厂集合")
+    private List<String> organizeCodeList;
 
     public int getOrderStatusVal() {
         return this.orderStatus == null ? 0 : this.orderStatus;

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

@@ -41,6 +41,7 @@ public class WmsSerialSnTrans extends BaseBean {
 
     @Column(name="SERIAL_SN")
     @ApiParam("产品条码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String serialSn;
 
     @Column(name="BH_TYPE")
@@ -65,15 +66,17 @@ public class WmsSerialSnTrans extends BaseBean {
 
     @Column(name="SRC_STOCK_SN")
     @ApiParam("源库存条码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String srcStockSn;
 
     @Column(name="DEST_STOCK_SN")
     @ApiParam("目标库存条码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String destStockSn;
 
     @Column(name="TRANS_TYPE")
     @ApiParam("操作类型")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BACTH_TRANS_TYPE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 1, dataSrc = "BACTH_TRANS_TYPE")
     @AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class, refForeignKey = "value", value = "description")
     private Integer transType;
 

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

@@ -10,7 +10,11 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -104,6 +108,10 @@ public class WmsTaskInfo extends BaseBean {
     @ApiParam(value = "供应商编号")
     private String vendorNo;
 
+    @Transient
+    @ApiParam("工厂集合")
+    private List<String> organizeCodeList;
+
     public WmsTaskInfo(){};
 
     public WmsTaskInfo(String orderNo ,Integer taskStatus , String zdate ,String ztime,String custNo,String vendorNo){

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveInfoModel.java

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.wms.modelbean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -18,26 +20,38 @@ public class WmsMoveInfoModel {
 
     @ApiParam(value = "操作时间")
     private String modifyDateTime;
+
     @ApiParam(value = "物料号")
     private String partNo;
+
     @ApiParam(value = "物料名称")
     private String partNameRdd;
+
     @ApiParam(value = "交易类型")
     private String transTypeCode;
+
     @ApiParam(value = "交易类型名称")
     private String transTypeName;
+
     @ApiParam(value = "业务类型")
-    private String busiTypeCode;
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer busiTypeCode;
+
     @ApiParam(value = "处理数量")
     private String sumQty;
+
     @ApiParam(value = "工厂代码")
     private String organizeCode;
+
+
     @ApiParam(value = "操作状态")
-    private String itemStatus;
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer itemStatus;
+
     public WmsMoveInfoModel() {
     }
 
-    public WmsMoveInfoModel(String modifyDateTime, String partNo, String partNameRdd, String transTypeCode, String transTypeName, String busiTypeCode, String sumQty, String organizeCode) {
+    public WmsMoveInfoModel(String modifyDateTime, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer busiTypeCode, String sumQty, String organizeCode) {
         this.modifyDateTime = modifyDateTime;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;

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

@@ -224,7 +224,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean);
         DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean);
         DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean);
-
+        DdlPreparedPack.getInPackList(wmsDocMovementMaster.getOrganizeCodeList(), "organizeCode", packBean);
         getStringBuilderPack(wmsDocMovementMaster, packBean);
 
         return packBean;

sonar-project.properties

@@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 # defaults to project key
 sonar.projectName=i3plus-pojo
 # defaults to 'not provided'
-sonar.projectVersion=1.0-DEV-SNAPSHOT
+sonar.projectVersion=1.0-PROD-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./