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

5 years ago · d750a88aad
parent 1c144eca4d 9c754e5816
commit d750a88aad
39 changed files with 246 additions and 106 deletions
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java
@ -1,50 +0,0 @@
-package cn.estsh.i3plus.pojo.aps.bean;
-
-import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport;
-import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
-import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * @Description :BOM树
- * @Reference :
- * @Author : jason.niu
- * @CreateDate : 2019-09-17
- * @Modify:
- **/
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Api("BOM树")
-@ExcludeImportExport
-public class BomTree extends BaseAPS {
-
-    @ApiParam(value ="物料类型")
-    private ApsEnumUtil.MATERIAL_TYPE type;
-
-    @ApiParam(value ="备料类型")
-    private ApsEnumUtil.PREPARE_TYPE prepareType;
-
-    @ApiParam(value ="补充类型")
-    private ApsEnumUtil.REPLENISHMENT_TYPE replType;
-
-    @ApiParam(value ="采购提前期")
-    private String purchaseLeadTime;
-
-    @ApiParam(value ="制造提前期")
-    private String manufLeadTime;
-
-    @ApiParam(value ="配送提前期")
-    private String shipmentLeadTime;
-
-    @ApiParam(value ="单位采购量")
-    private Integer unitPurchase;
-
-    @ApiParam(value ="单位制造量")
-    private Integer unitManuf;
-
-    @ApiParam(value ="单位配送量")
-    private Integer unitShipment;
-}
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java
@ -38,6 +38,12 @@ public class ExportProject extends BaseAPS {
    @FieldAnnotation(relation = "Link", notEmpty = true)
    private Long linkId;

+    @ApiParam(value ="当前执行的明细序号")
+    private transient Integer curDetailNumber;
+
+    @ApiParam(value ="当前执行的明细名称")
+    private transient String curDetailName;
+
    public DataLink getLink() {
        return BeanRelation.get(this, EExportProject.Link);
    }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java
@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.aps.bean;

 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@ -42,5 +43,6 @@ public class HeuristicRule extends BaseRule {

    @Column(name="BATCH_PERIOD")
    @ApiParam(value ="组炉区间")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
    private String batchPeriod;
 }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java
@ -37,6 +37,12 @@ public class ImportProject extends BaseAPS {
    @FieldAnnotation(relation = "Link", notEmpty = true)
    private Long linkId;

+    @ApiParam(value ="当前执行的明细序号")
+    private transient Integer curDetailNumber;
+
+    @ApiParam(value ="当前执行的明细名称")
+    private transient String curDetailName;
+
    public DataLink getLink() {
        return BeanRelation.get(this, EImportProject.Link);
    }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java
@ -139,6 +139,7 @@ public class Material extends BaseAPS {

    @Column(name="ORDER_BATCH_PERIOD")
    @ApiParam(value ="订单合并期间")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
    private String orderBatchPeriod;

    @JsonBackReference
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java
@ -74,6 +74,7 @@ public class ProductOrder extends BaseOrder {

    @Column(name="SPECIFY_LEAD_TIME")
    @ApiParam(value ="指定提前期")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
    private String specifyLeadTime;

    @Column(name="CALC_LEAD_TIME")
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java
@ -3,6 +3,7 @@ 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.base.enumutil.ApsEnumUtil;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@ -40,6 +41,7 @@ public class PurchaseOrder extends BaseOrder {

    @Column(name="SPECIFY_LEAD_TIME")
    @ApiParam(value ="指定提前期")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
    private String specifyLeadTime;

    @Column(name="CALC_LEAD_TIME")
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java
@ -60,10 +60,12 @@ public class Resource extends BaseAPS {

    @Column(name="PREV_BUFFER")
    @ApiParam(value ="前缓冲时间")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
    private String prevBuffer;

    @Column(name="POST_BUFFER")
    @ApiParam(value ="后缓冲时间")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
    private String postBuffer;

    @Column(name="MAX_PRODUCE_BATCH", columnDefinition = "decimal(18,8)")
@ -80,14 +82,17 @@ public class Resource extends BaseAPS {

    @Column(name="MAX_PREV_SD_TIME")
    @ApiParam(value ="最大前设置中断时间")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
    private String maxPrevSdTime;

    @Column(name="MAX_PRODUCE_SD_TIME")
    @ApiParam(value ="最大生产中断时间")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
    private String maxProduceSdTime;

    @Column(name="MAX_POST_SD_TIME")
    @ApiParam(value ="最大后设置中断时间")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
    private String maxPostSdTime;

    @Column(name="ROUND_TYPE")
@ -117,6 +122,7 @@ public class Resource extends BaseAPS {

    @Column(name="LOCK_TIME")
    @ApiParam(value ="锁定时间长度")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
    private String lockTime;

    @JsonBackReference
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java
@ -37,6 +37,12 @@ public class RuleGroup extends BaseAPS {
    @ApiParam(value ="序号")
    private Integer orderNumber;

+    @ApiParam(value ="当前执行的规则序号")
+    private transient Integer curDetailNumber;
+
+    @ApiParam(value ="当前执行的规则名称")
+    private transient String curDetailName;
+
    @JsonBackReference
    public List<RuleDetail> getDetails() { return BeanRelation.list(this, ERuleGroup.Details); }
 }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java
@ -3,6 +3,7 @@ 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.base.enumutil.ApsEnumUtil;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@ -41,6 +42,7 @@ public class SalesOrder extends BaseOrder {

    @Column(name="SPECIFY_LEAD_TIME")
    @ApiParam(value ="指定提前期")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
    private String specifyLeadTime;

    @Column(name="CALC_LEAD_TIME")
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java
@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
+import org.springframework.util.StringUtils;

 import java.io.IOException;
 import java.text.ParseException;
@ -15,10 +16,12 @@ public class CustomDateDeserializer extends JsonDeserializer<Date> {

    @Override
    public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-        try {
-            return DATETIME_FORMATOR.parse(jsonParser.getText());
-        } catch (ParseException e) {
-            e.printStackTrace();
+        String text = jsonParser.getText();
+        if (!StringUtils.isEmpty(text)) {
+            try {
+                return DATETIME_FORMATOR.parse(text);
+            } catch (ParseException e) {
+            }
        }
        return null;
    }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java
@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import lombok.Data;
+
+/**
+ * @Description : 进度条显示信息。
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-01-21
+ * @Modify:
+ **/
+@Data
+public class RuleGroupProgress {
+    private String message;
+    private Long progress;
+}
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
@ -62,7 +62,7 @@ public abstract class BaseBean implements Serializable {
        this.id = id;
    }

-    @Column(name="ORGANIZE_CODE")
+    @Column(name="ORGANIZE_CODE", nullable = false)
    @ApiParam(value ="组织代码")
    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2)
 //    @AnnoOutputColumn(hidden = true)
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@ -4945,4 +4945,42 @@ public class WmsEnumUtil {
            return tmp;
        }
    }
+
+    /**
+     * 领料看板执行状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PICKING_EXECUTE_STATUS {
+        IN_PROGRESS(1, "执行中"), EXPIRED(2, "已超期"), NORMAL(3, "正常");
+
+        private int value;
+        private String description;
+
+        PICKING_EXECUTE_STATUS(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);
+        }
+    }
 }
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java
@ -22,11 +22,15 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")})
+@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")
+}, uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"})
+    }
+)
@Api("包装规格")
 public class MesPackage extends BaseBean implements Serializable {
    private static final long serialVersionUID = 2292859018089339608L;
-    @Column(name = "PACKAGE_NO")
+    @Column(name = "PACKAGE_NO", nullable = false)
    @ApiParam("包装编号")
    private String packageNo;

--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java
@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;

-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;

 /**
@ -25,16 +22,20 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")})
+@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")
+}, uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"})
+    }
+)
@Api("包装规格明细")
 public class MesPackageDetail extends BaseBean implements Serializable {

    private static final long serialVersionUID = 8162606304720621672L;
-    @Column(name = "PACKAGE_NO")
+    @Column(name = "PACKAGE_NO", nullable = false)
    @ApiParam("包装编码")
    private String packageNo;

-    @Column(name = "SERIAL_NUMBER")
+    @Column(name = "SERIAL_NUMBER", nullable = false)
    @ApiParam("过程条码")
    private String serialNumber;

--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java
@ -24,11 +24,15 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")})
+@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")
+}, uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"})
+    }
+)
@Api("生产主计划")
 public class MesPlanOrder extends BaseBean implements Serializable {
    private static final long serialVersionUID = 8571104279843276872L;
-    @Column(name = "ORDER_NO")
+    @Column(name = "ORDER_NO", nullable = false)
    @ApiParam("生产计划单号")
    private String orderNo;

--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java
@ -27,14 +27,15 @@ import java.io.Serializable;
        @Index(columnList = "PRODUCT_SN"),
        @Index(columnList = "CREATE_DATE_TIME")
 }, uniqueConstraints = {
-        @UniqueConstraint(columnNames = {"SERIAL_NUMBER"})}
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER"})
+    }
 )
@Api("产品条码表")
 public class MesProduceSn extends BaseBean implements Serializable {

    private static final long serialVersionUID = 6641051790330191326L;

-    @Column(name = "SERIAL_NUMBER")
+    @Column(name = "SERIAL_NUMBER", nullable = false)
    @ApiParam("过程条码")
    private String serialNumber;

--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java
@ -25,11 +25,14 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_ORDER", indexes = {
        @Index(columnList = "CUST_FLAG_NO")
-})
+}, uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"})
+    }
+)
@Api("生产队列主表")
 public class MesQueueOrder extends BaseBean implements Serializable {
    private static final long serialVersionUID = 6538031118299400711L;
-    @Column(name = "ORDER_NO")
+    @Column(name = "ORDER_NO", nullable = false)
    @ApiParam("主队列编号")
    private String orderNo;

--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java
@ -25,15 +25,18 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = {
        @Index(columnList = "ORDER_NO")
-})
+}, uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"})
+    }
+)
@Api("生产队列明细")
 public class MesQueueOrderDetail extends BaseBean implements Serializable {
    private static final long serialVersionUID = 1548933241804083457L;
-    @Column(name = "ORDER_NO")
+    @Column(name = "ORDER_NO", nullable = false)
    @ApiParam("主队列编号")
    private String orderNo;

-    @Column(name = "PART_NO")
+    @Column(name = "PART_NO", nullable = false)
    @ApiParam("物料号")
    private String partNo;

--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java
@ -24,15 +24,19 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")})
+@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")
+}, uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"})
+    }
+)
@Api("生产工单")
 public class MesWorkOrder extends BaseBean implements Serializable {
    private static final long serialVersionUID = 8065877030194822855L;
-    @Column(name = "ORDER_NO")
+    @Column(name = "ORDER_NO", nullable = false)
    @ApiParam("工单号")
    private String orderNo;

-    @Column(name = "PART_NO")
+    @Column(name = "PART_NO", nullable = false)
    @ApiParam("物料号")
    private String partNo;

--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java
@ -23,12 +23,15 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_CUST_ORDER", indexes = {@Index(columnList = "ORDER_NO")})
+@Table(name = "MES_CUST_ORDER", indexes = {@Index(columnList = "ORDER_NO")
+}, uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"})
+})
@Api("客户信息")
 public class MesCustOrder extends BaseBean implements Serializable {

    private static final long serialVersionUID = 4990079075654538033L;
-    @Column(name = "ORDER_NO")
+    @Column(name = "ORDER_NO", nullable = false)
    @ApiParam("订单号")
    private String orderNo;

--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java
@ -27,12 +27,14 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_EQU_TASK", indexes = {
        @Index(columnList = "TASK_NO")
+}, uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "TASK_NO"})
 })
@Api("设备作业任务")
 public class MesEquTask extends BaseBean implements Serializable {

    private static final long serialVersionUID = -3351277499164455197L;
-    @Column(name = "TASK_NO")
+    @Column(name = "TASK_NO", nullable = false)
    @ApiParam("作业任务编号")
    private String taskNo;

--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java
@ -27,16 +27,18 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_EQU_TASK_DETAIL", indexes = {
        @Index(columnList = "EQUIPMENT_CODE")
+}, uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "TASK_NO", "EQUIPMENT_CODE"})
 })
@Api("设备作业任务明细")
 public class MesEquTaskDetail extends BaseBean implements Serializable {

    private static final long serialVersionUID = 3317290109159353376L;
-    @Column(name = "TASK_NO")
+    @Column(name = "TASK_NO", nullable = false)
    @ApiParam("作业任务编号")
    private String taskNo;

-    @Column(name = "EQUIPMENT_CODE")
+    @Column(name = "EQUIPMENT_CODE", nullable = false)
    @ApiParam("设备代码")
    private String equipmentCode;

--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
@ -22,11 +22,14 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")})
+@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")
+}, uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"})
+})
@Api("包装规格")
 public class MesPackage extends BaseBean implements Serializable {
    private static final long serialVersionUID = 5275923991324889995L;
-    @Column(name = "PACKAGE_NO")
+    @Column(name = "PACKAGE_NO", nullable = false)
    @ApiParam("包装编号")
    private String packageNo;

--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java
@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;

-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;

 /**
@ -25,16 +22,19 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")})
+@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")
+}, uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"})
+})
@Api("包装规格明细")
 public class MesPackageDetail extends BaseBean implements Serializable {

    private static final long serialVersionUID = 6980459490465566975L;
-    @Column(name = "PACKAGE_NO")
+    @Column(name = "PACKAGE_NO", nullable = false)
    @ApiParam("包装编码")
    private String packageNo;

-    @Column(name = "SERIAL_NUMBER")
+    @Column(name = "SERIAL_NUMBER", nullable = false)
    @ApiParam("过程条码")
    private String serialNumber;

--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java
@ -24,11 +24,14 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")})
+@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")
+}, uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"})
+})
@Api("生产主计划")
 public class MesPlanOrder extends BaseBean implements Serializable {
    private static final long serialVersionUID = 6773005820598583458L;
-    @Column(name = "ORDER_NO")
+    @Column(name = "ORDER_NO", nullable = false)
    @ApiParam("生产计划单号")
    private String orderNo;

--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java
@ -10,10 +10,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.format.annotation.DateTimeFormat;

-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;

 /**
@ -33,11 +30,14 @@ import java.io.Serializable;
        @Index(columnList = "KP_SN"),
        @Index(columnList = "CREATE_DATE_TIME"),
        @Index(columnList = "ITEM_PART_NO")
+}, uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER", "KP_SN"})
 })
@Api("产品绑定记录表")
 public class MesProdBindRecord extends BaseBean implements Serializable {
    private static final long serialVersionUID = -6984193022328810942L;
-    @Column(name = "SERIAL_NUMBER")
+    // 联合唯一索引必须加:, nullable = false
+    @Column(name = "SERIAL_NUMBER", nullable = false)
    @ApiParam(value = "产品条码")
    private String serialNumber;

@ -65,7 +65,7 @@ public class MesProdBindRecord extends BaseBean implements Serializable {
    @ApiParam("原材料零件号")
    private String itemPartNo;

-    @Column(name = "KP_SN")
+    @Column(name = "KP_SN", nullable = false)
    @ApiParam("原材料条码")
    private String kpSn;

--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
@ -29,12 +29,13 @@ import java.math.BigDecimal;
        @Index(columnList = "CREATE_DATE_TIME"),
        @Index(columnList = "PART_NO")
 }, uniqueConstraints = {
-        @UniqueConstraint(columnNames = {"SERIAL_NUMBER"})})
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER"})
+})
@Api("产品条码表")
 public class MesProduceSn extends BaseBean implements Serializable {

    private static final long serialVersionUID = -1630924042562178494L;
-    @Column(name = "SERIAL_NUMBER")
+    @Column(name = "SERIAL_NUMBER", nullable = false)
    @ApiParam("过程条码")
    private String serialNumber;

--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java
@ -29,11 +29,13 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_ORDER", indexes = {
        @Index(columnList = "CUST_FLAG_NO")
+}, uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"})
 })
@Api("生产队列主表")
 public class MesQueueOrder extends BaseBean implements Serializable {
    private static final long serialVersionUID = -7459452106180601417L;
-    @Column(name = "ORDER_NO")
+    @Column(name = "ORDER_NO", nullable = false)
    @ApiParam("主队列编号")
    private String orderNo;

--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
@ -25,15 +25,17 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = {
        @Index(columnList = "ORDER_NO")
+}, uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"})
 })
@Api("生产队列明细")
 public class MesQueueOrderDetail extends BaseBean implements Serializable {
    private static final long serialVersionUID = 7840873844253353896L;
-    @Column(name = "ORDER_NO")
+    @Column(name = "ORDER_NO", nullable = false)
    @ApiParam("主队列编号")
    private String orderNo;

-    @Column(name = "PART_NO")
+    @Column(name = "PART_NO", nullable = false)
    @ApiParam("物料号")
    private String partNo;

--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
@ -24,15 +24,19 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")})
+@Table(name = "MES_WORK_ORDER", indexes = {
+        @Index(columnList = "ORDER_NO")
+}, uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"})
+})
@Api("生产工单")
 public class MesWorkOrder extends BaseBean implements Serializable {
    private static final long serialVersionUID = -3566003375267865064L;
-    @Column(name = "ORDER_NO")
+    @Column(name = "ORDER_NO", nullable = false)
    @ApiParam("工单号")
    private String orderNo;

-    @Column(name = "PART_NO")
+    @Column(name = "PART_NO", nullable = false)
    @ApiParam("物料号")
    private String partNo;

--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java
@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.model.wms;

+import cn.estsh.i3plus.pojo.wms.bean.WmsCSAdjustRange;
 import cn.estsh.i3plus.pojo.wms.bean.WmsCSOrderMaster;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@ -19,6 +20,9 @@ public class WmsCSOrderMasterModel implements Serializable {
    @ApiParam("盘点订单主表")
    public List<WmsCSOrderMaster> wmsCSOrderMasterList;

+    @ApiParam("盘点调差表")
+    public List<WmsCSAdjustRange>  wmsCSAdjustRangeList;
+
    @ApiParam("工厂代码")
    public String  organizeCode;

--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLogInfoSendToMqModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLogInfoSendToMqModel.java
@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.model.wms;

 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogData;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

@ -16,6 +18,7 @@ public class WmsLogInfoSendToMqModel implements Serializable {
    private int handleType;
    @ApiParam("日志对象DAO层")
    private String baseRepository;
+    @JsonDeserialize(as = WmsActionLogData.class)
    @ApiParam("日志对象（新增）")
    private BaseBean logBean;
    @ApiParam("查询条件名称（修改）")
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java
@ -110,4 +110,33 @@ public class QadBop  implements Serializable {
    @Column(name="CREATE_DATE_TIME")
    @ApiParam("创建时间")
    public String createDateTime;
+
+    @Transient
+    @ApiParam("收货时是供应商编号，发运时是客户发往地")
+    public String inAddr;
+
+    @Transient
+    @ApiParam("工厂代码")
+    public String inSite;
+
+    public QadBop(){
+
+    }
+
+    public QadBop(String bopCode, String bopDesc, String bopDomain, String parentPart, String parentReturnPart, String bopdwQty, String subBopCode, String subBopPart, String subItemPart, String subQty, String subUnit, String createDateTime, String inAddr, String inSite) {
+        this.bopCode = bopCode;
+        this.bopDesc = bopDesc;
+        this.bopDomain = bopDomain;
+        this.parentPart = parentPart;
+        this.parentReturnPart = parentReturnPart;
+        this.bopdwQty = bopdwQty;
+        this.subBopCode = subBopCode;
+        this.subBopPart = subBopPart;
+        this.subItemPart = subItemPart;
+        this.subQty = subQty;
+        this.subUnit = subUnit;
+        this.createDateTime = createDateTime;
+        this.inAddr = inAddr;
+        this.inSite = inSite;
+    }
 }
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
@ -151,6 +151,11 @@ public class WmsDocMovementDetails extends BaseBean {
    @Column(name = "LOT_NO")
    @ApiParam("批次")
    public String lotNo;
+
+    @Column(name="SRC_ITEM", columnDefinition="varchar(50) default ''",nullable=false)
+    @ApiParam("源单行号")
+    public String srcItem;
+
    @Transient
    @ApiParam("实际批次")
    private String actualLot;
@ -218,6 +223,11 @@ public class WmsDocMovementDetails extends BaseBean {
    @ApiParam(value = "汇总拣货数量", example = "0")
    public Double sumPickQty;

+    @Transient
+    @ApiParam("执行状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_EXECUTE_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer executeStatus;
+
    public String getRecommondLot() {
        return recommondLot == null ? "无" : this.recommondLot;
    }
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
@ -118,4 +118,12 @@ public class WmsDocMovementSn extends BaseBean {
    @Transient
    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
    public Integer itemStatus;
+
+    @Transient
+    @ApiParam("客户零件号")
+    private String customerPartNo;
+
+    @Transient
+    @ApiParam("父层级packcode对应的可回用零件号")
+    private String parentReturnPart;
 }
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java
@ -146,6 +146,10 @@ public class WmsPoSn extends BaseBean {
    @ApiParam(value = "特殊批次")
    private String fixLotNo = "";

+    @Transient
+    @ApiParam("父层级packcode对应的可回用零件号")
+    private String parentReturnPart;
+
    public WmsPoSn(){}

    public WmsPoSn(String orderNo,String earliestReceTime,String latestReceTime){
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@ -1295,6 +1295,7 @@ public class WmsHqlPack {
        DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
        DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
        DdlPreparedPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result);
+        DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getCustSn(), "custSn", result);
        DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
        DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
        if (wmsStockSn.getIsValid() != null) {