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

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

@@ -309,6 +309,10 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {
     @ApiParam(value ="故障字符串")
     private String faultStr;
 
+    @Transient
+    @ApiParam(value ="百分比")
+    private Integer propagation;
+
     // 是否转呼
     public Integer getIsShiftCall() {
         return this.isShiftCall == null ? 0 : this.isShiftCall;

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

@@ -1085,7 +1085,6 @@ public class ImppEnumUtil {
         WORK_WECHAT(8, "企业微信配置"),
         SMS(9, "短信配置"),
         SSO(10, "单点登录配置"),
-        PASSWORD_EXPIRE(11, "密码过期策略"),
         DINGTALK_REDIRECT(12, "钉钉授权跳转");
 
         private final int value;

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

@@ -1908,6 +1908,84 @@ public class WmsEnumUtil {
     }
 
     /**
+     * PO 单据质检状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PO_QC_STATUS {
+        INQUALITY(10, "INQUALITY", "质检中"),
+        NORMAL(20, "NORMAL", "合格"),
+        ABNORMAL(30, "ABNORMAL", "不合格");
+        private int value;
+        private String code;
+        private String description;
+
+        private PO_QC_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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 codeOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public static PO_QC_STATUS codeOfs(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
      * 质检业务类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -64,4 +64,8 @@ public class MesExtendObjectCfg extends BaseBean implements Serializable {
     @Column(name = "FIELD_DESC")
     @ApiParam("扩展字段描述")
     private String fieldDesc;
+
+    @Column(name = "ORIGINAL_FIELD_CODE")
+    @ApiParam("原始字段代码")
+    private String originalFieldCode;
 }

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

@@ -192,7 +192,7 @@ public class MesProduceSnTravel extends BaseBean implements Serializable {
 
     @Transient
     @ApiParam("节拍时间")
-    private Integer cycleTime;
+    private Integer cycleTime = 0;
 
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;

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

@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Dominic
+ * @CreateDate: 2019\11\28 19:50
+ * @Modify:
+ **/
+@Data
+public class CosmaDefectModel {
+    @ApiParam("工厂代码")
+    private String organizeCode;
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @ApiParam("类型")
+    private String type;
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("缺陷代码集合")
+    private List<String> defectCodeList;
+
+    @ApiParam("缺陷位置")
+    private String location;
+
+    @ApiParam("操作人")
+    private String userName;
+
+    @ApiParam("报废原因")
+    private String scrapCode;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java

@@ -87,6 +87,8 @@ public class MgnBjBoardModel implements Serializable {
 
     private Map<String, Object> resultMap;
 
+    private Object obj;
+
     @ApiParam("显示数据")
     private List<MgnBjBoardSeriesModel> seriesModels;
 }

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

@@ -58,4 +58,7 @@ public class TransSnModle extends BaseComponetsParam implements Serializable {
 
     @ApiParam("关联单据行号")
     public String refItem;
+
+    @ApiParam("打印状态")
+    public Integer isPrinted;
 }

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

@@ -6,8 +6,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -15,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Index;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.util.List;
@@ -198,6 +198,14 @@ public class WmsASNMaster extends BaseBean {
     @Transient
     private List<String> orderNoList;
 
+    @Transient
+    @ApiParam(value = "窗口开始时间")
+    public String windowStartTime;
+
+    @Transient
+    @ApiParam(value = "窗口结束时间")
+    public String windowEndTime;
+
     public WmsASNMaster() {
     }
 

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

@@ -6,8 +6,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
@@ -16,6 +14,8 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Index;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.util.List;
@@ -170,6 +170,10 @@ public class WmsCSOrderDetails extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class, refForeignKey = "value", value = "description")
     public List<Integer> differenceTypeList;
 
+    @ApiParam(value = "状态 (10-创建 20-开启盘点  30-盘点中  40-盘点完成  50-已解冻 60-已关闭)", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ORDER_STATUS.class, refForeignKey = "value", value = "description")
+    public Integer orderStatus;
+
     public Integer getDifferenceTypeVal() {
         return this.differenceType == null ?
         -1: this.differenceType;

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

@@ -8,14 +8,14 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
@@ -56,11 +56,20 @@ public class WmsQCMaster extends BaseBean {
      * 状态:1=创建,5=待处理,10=已完成,90=已关闭,91=已取消
      */
     @Column(name = "ORDER_STATUS")
-    @ApiParam(value = "状态", example = "1")
+    @ApiParam(value = "单据状态", example = "1")
     @AnnoOutputColumn(refClass = WmsEnumUtil.QC_INFO_STATUS.class, refForeignKey = "value", value = "description")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "MASTER_ORDER_STATUS")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "QC_INFO_STATUS")
     public Integer orderStatus;
 
+    /**
+     * 状态:10=质检中,20=合格,30=不合格
+     */
+    @Column(name = "QC_STATUS")
+    @ApiParam(value = "质检状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.PO_QC_STATUS.class, refForeignKey = "value", value = "description")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PO_QC_STATUS")
+    public Integer qcStatus;
+
     @Column(name = "REMARK")
     @ApiParam("备注")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)

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

@@ -4,10 +4,6 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
@@ -16,6 +12,8 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Index;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.persistence.Version;
@@ -93,6 +91,11 @@ public class WmsStockQuan extends BaseBean {
     @ApiParam(value = "库位信息")
     private WmsLocate wmsLocate;
 
+    @Transient
+    @ApiParam(value = "库位名称")
+    private String locateName;
+
+
 
     @Column(name = "QTY", columnDefinition = "decimal(18,8) default 0", nullable = false)
     @ApiParam(value = "可用数量")

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

@@ -369,6 +369,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam("是否寄售 1-是 2-否")
     private Integer consignation;
 
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    public String remark;
+
     @Transient
     @ApiParam(value = "是否最早批次")
     public String isFifo;
@@ -575,7 +579,7 @@ public class WmsStockSn extends BaseBean {
     @Transient
     @ApiParam("泊位")
     private String zdoc;
-    
+
     @ApiParam("打印类型")
     private Integer printType;
 
@@ -905,6 +909,67 @@ public class WmsStockSn extends BaseBean {
         this.orderNo = orderNo;
     }
 
+    public WmsStockSn(String organizeCode, Long id, String sn, String partNo, String partNameRdd, String unit, Integer snStatus,
+                      Integer qcStatus, Double qty, String locateNo, String zoneNo, String whNo, String lotNo,
+                      String dateCode, String leftCode, String fixLotNo, String vendorNo, String vendorNameRdd,
+                      String qualityDate, String custNo, String custSn, String sn2d,
+                      String packageNo, String createDatetime, String createUser, String modifyDatetime, String modifyUser,
+                      String parentPositionNo, Date pdate, Integer printed, String refSrc, String refType,
+                      String shippingFlag, String workCenterCode, Integer snType,
+                      String packagePartNo, Integer useCount, Integer seqNo,
+                      String whNameRdd, String locateNameRdd, String zoneNameRdd, String partTypeDesc,
+                      String prodCfgTypeName, String custNameRdd, String workOrderCode, String color, String orderNo, String serialNumber) {
+        this.organizeCode = organizeCode;
+        this.id = id;
+        this.sn = sn;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.unit = unit;
+        this.snStatus = snStatus;
+        this.qcStatus = qcStatus;
+        this.qty = qty;
+        this.locateNo = locateNo;
+        this.zoneNo = zoneNo;
+        this.whNo = whNo;
+        this.lotNo = lotNo;
+        this.dateCode = dateCode;
+        this.leftCode = leftCode;
+        this.fixLotNo = fixLotNo;
+        this.vendorNo = vendorNo;
+        this.vendorNameRdd = vendorNameRdd;
+        this.qualityDate = qualityDate;
+        this.custNo = custNo;
+        this.custSn = custSn;
+        this.sn2d = sn2d;
+        this.packageNo = packageNo;
+        this.createDatetime = createDatetime;
+        this.createUser = createUser;
+        this.modifyDatetime = modifyDatetime;
+        this.modifyUser = modifyUser;
+        this.parentPositionNo = parentPositionNo;
+        this.pdate = pdate;
+        this.printed = printed;
+        this.refSrc = refSrc;
+        this.refType = refType;
+        this.shippingFlag = shippingFlag;
+        this.workCenterCode = workCenterCode;
+        this.snType = snType;
+        this.packagePartNo = packagePartNo;
+        this.useCount = useCount;
+        this.seqNo = seqNo;
+
+        this.whNameRdd = whNameRdd;
+        this.locateNameRdd = locateNameRdd;
+        this.zoneNameRdd = zoneNameRdd;
+        this.partTypeDesc = partTypeDesc;
+        this.prodCfgTypeName = prodCfgTypeName;
+        this.custNameRdd = custNameRdd;
+        this.workOrderCode = workOrderCode;
+        this.color = color;
+        this.orderNo = orderNo;
+        this.serialNumber = serialNumber;
+    }
+
     public WmsStockSn(String packageNo, Double qty, String qualityDate, String lotNo, String dateCode, String leftCode, String fixLotNo) {
         this.packageNo = packageNo;
         this.qty = qty;

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

@@ -4,14 +4,14 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import javax.persistence.Table;
 
 /**
@@ -117,4 +117,9 @@ public class BasImportTemplateDetails extends BaseBean{
     @Column(name="SHEET_NAME")
     @ApiParam("工作薄名称")
     private String sheetName;
+
+
+    @Column(name = "IS_EXPORT_TITLE")
+    @ApiParam("是否导出表头")
+    private Integer isExportTitle;
 }

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

@@ -3218,9 +3218,9 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlBasImportTemplateDetails(BasImportTemplateDetails details) {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(details.getTemplateCode(), "templateCode", result);
-        if (details.getIsRequire() != null) {
+/*        if (details.getIsRequire() != null) {
             DdlPreparedPack.getNumEqualPack(details.getIsRequire(), "isRequire", result);
-        }
+        }*/
         getStringBuilderPack(details, result);
         DdlPreparedPack.getOrderByPack(
                 new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()},