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/AndonManageQueue.java

@@ -298,9 +298,21 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {
     private Integer brokenTime;
 
     @Transient
+    @ApiParam(value ="响应时长(分钟)")
+    private Double sumDowntime;
+
+    @Transient
+    @ApiParam(value ="故障时长(分钟)")
+    private Double sumBrokenTime;
+
+    @Transient
     @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/MesPcnEnumUtil.java

@@ -6654,4 +6654,74 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * 工位等级
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_WORK_CELL_GRADE {
+        ORDINARY(10, "普通工位"),
+        MONITOR(20, "监听工位");
+
+        private int value;
+        private String description;
+
+        MES_WORK_CELL_GRADE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOfDescription(Integer value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 质检取值字段类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QC_FILED_TYPE {
+        NUMBER(10, "数字"),
+        STRING(20, "字符串");
+
+        private int value;
+        private String description;
+
+        QC_FILED_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOfDescription(Integer value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
 }

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/IfPackageDetail.java

@@ -122,4 +122,9 @@ public class IfPackageDetail extends BaseBean  implements Serializable {
     @Column(name = "CUSTOMER_CODE")
     @ApiParam("客户代码")
     private String customerCode;
+
+    //枚举：MesPcnEnumUtil.IF_SYNC_STATUS
+    @Column(name = "SYNC_FLAG")
+    @ApiParam("同步标识(同步工具使用)")
+    private Integer syncFlag;
 }

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

@@ -107,4 +107,9 @@ public class IfQcOrder extends BaseBean  implements Serializable {
     @ApiParam("客户发运地")
     private String custDelieryLocation;
 
+    //枚举：MesPcnEnumUtil.IF_SYNC_STATUS
+    @Column(name = "SYNC_FLAG")
+    @ApiParam("同步标识(同步工具使用)")
+    private Integer syncFlag;
+
 }

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

@@ -35,14 +35,6 @@ public class MesDataMigrationCfg extends BaseBean implements Serializable {
     @ApiParam("描述")
     private String remark;
 
-//    @Column(name = "MIGRATION_CYCLE")
-//    @ApiParam("迁移周期")
-//    private String migrationCycle;
-//
-//    @Column(name = "NEXT_EXECUTION_TIME")
-//    @ApiParam("下次执行时间")
-//    private String nextExecutionTime;
-
     @Column(name = "SRC_TABLE_NAME")
     @ApiParam("来源表名")
     private String srcTableName;
@@ -66,7 +58,7 @@ public class MesDataMigrationCfg extends BaseBean implements Serializable {
     //枚举：CommonEnumUtil.DATA_SOURCE_TYPE
     @Column(name = "DATASOURCE_TYPE")
     @ApiParam(value = "数据源类型")
-    private Integer dataSourceType;
+    private String dataSourceType;
 
     @Column(name = "LAST_EXECUTION_TIME")
     @ApiParam("末次迁移时间")
@@ -76,10 +68,6 @@ public class MesDataMigrationCfg extends BaseBean implements Serializable {
     @ApiParam(value = "末次迁移记录数", example = "0")
     private Integer lastMigrationQty;
 
-    @Column(name = "ERROR_MESSAGE")
-    @ApiParam("执行错误日志")
-    private String errorMessage;
-
 
     @Transient
     @ApiParam(value = "开始时间")
@@ -89,20 +77,4 @@ public class MesDataMigrationCfg extends BaseBean implements Serializable {
     @ApiParam(value = "结束时间")
     private String mcEndTime;
 
-    /*public MesDataMigrationCfg(String migName, String remark, String migrationCycle, String nextExecutionTime, String srcTableName, String srcQueryConditions, Integer processQty, String destTableName, Integer isPhysicalDelete, String lastExecutionTime, Integer lastMigrationQty, String errorMessage, String mcStartTime, String mcEndTime) {
-        this.migName = migName;
-        this.remark = remark;
-        this.migrationCycle = migrationCycle;
-        this.nextExecutionTime = nextExecutionTime;
-        this.srcTableName = srcTableName;
-        this.srcQueryConditions = srcQueryConditions;
-        this.processQty = processQty;
-        this.destTableName = destTableName;
-        this.isPhysicalDelete = isPhysicalDelete;
-        this.lastExecutionTime = lastExecutionTime;
-        this.lastMigrationQty = lastMigrationQty;
-        this.errorMessage = errorMessage;
-        this.mcStartTime = mcStartTime;
-        this.mcEndTime = mcEndTime;
-    }*/
 }

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

@@ -33,10 +33,6 @@ public class MesDbCheckRecord extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = 6727925715356900171L;
 
-    @Column(name = "SERIAL_NUMBER")
-    @ApiParam("过程条码")
-    private String serialNumber;
-
     @Column(name = "WORK_CELL_CODE")
     @ApiParam("工作单元代码")
     private String workCellCode;
@@ -45,32 +41,31 @@ public class MesDbCheckRecord extends BaseBean implements Serializable {
     @ApiParam("工作中心代码")
     private String workCenterCode;
 
-    //DB复核项：10=物料为空复核。20=零件工单匹对复核。30=过程条码重复复核。40=过程条码为空复核。50=产品二维码重复复核。60=产品二维码为空复核。70=质量关键字段为空复核。80=缺陷类型连续超过设定数复核。
-    @Column(name = "DB_CHECK_ITEM")
-    @ApiParam("DB复核项")
-    private String dbCheckItem;
-
     @Column(name = "ERROR_FILED_CODE")
     @ApiParam("异常取值字段")
     private String errorFiledCode;
 
-    @Column(name = "ERROR_DESC")
-    @ApiParam("异常描述")
-    private String errorDesc;
+    @Column(name = "ERROR_FILED_DESC")
+    @ApiParam("异常取值字段描述")
+    private String errorFiledDesc;
+
+    //10数字、20字符串
+    @Column(name = "ERROR_FILED_TYPE")
+    @ApiParam("异常取值字段类型")
+    private String errorFiledType;
+
+    @Column(name = "ERROR_FILED_VALUE")
+    @ApiParam("异常取值字段值")
+    private String errorFiledValue;
 
-    @Column(name = "PRODUCT_DATA_ID")
-    @ApiParam("生产记录表主键ID")
-    private Long productDataId;
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码（第三方库表名）")
+    private String objectCode;
 
-    //是否停线：1=是，2=否
-    @Column(name = "IS_STOP_LINE")
-    @ApiParam("是否停线")
-    private Integer isStopLine;
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
 
-    //审批状态：10=待审批，20=已审批
-    @Column(name = "STATUS")
-    @ApiParam("审批状态")
-    private Integer status;
 
     @Transient
     @ApiParam("按钮名称")

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

@@ -40,33 +40,29 @@ public class MesDbDataCheck extends BaseBean implements Serializable {
     @ApiParam("工作中心代码")
     private String workCenterCode;
 
-    //DB复核项：10=物料为空复核。20=零件工单匹对复核。30=过程条码重复复核。40=过程条码为空复核。50=产品二维码重复复核。60=产品二维码为空复核。70=质量关键字段为空复核。80=缺陷类型连续超过设定数复核。
-    @Column(name = "DB_CHECK_ITEM")
-    @ApiParam("DB复核项")
-    private Integer dbCheckItem;
-
     @Column(name = "OBJECT_CODE")
-    @ApiParam("对象代码")
+    @ApiParam("对象代码（第三方库表名）")
     private String objectCode;
 
-    //是否停线：1=是，2=否
-    @Column(name = "IS_STOP_LINE")
-    @ApiParam("是否停线")
-    private Integer isStopLine;
-
-    @Column(name = "KEY_DATA_FILED")
-    @ApiParam("质量关键字段")
-    private String keyDataFiled;
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
 
     @Column(name = "QC_FILED_CODE")
-    @ApiParam("缺陷类型字段")
+    @ApiParam("质检取值字段")
     private String qcFiledCode;
 
+    @Column(name = "QC_FILED_DESC")
+    @ApiParam("质检取值字段描述")
+    private String qcFiledDesc;
+
+    @Column(name = "QC_FILED_TYPE")
+    @ApiParam("质检取值字段类型")
+    private String qcFiledType;
+
     @Column(name = "QC_FILED_VALUE")
     @ApiParam("缺陷类型合格值")
     private String qcFiledValue;
 
-    @Column(name = "QC_FAIL_MAX_COUNT")
-    @ApiParam("缺陷连续不合格预警次数")
-    private String qcFailMaxCount;
+
 }

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/bean/MesQcOrder.java

@@ -125,7 +125,7 @@ public class MesQcOrder extends BaseBean implements Serializable {
 
     @Column(name = "ON_SITE_FREQUENCY")
     @ApiParam("巡检次数")
-    private Integer onSiteFrequency = 0;
+    private Integer onSiteFrequency = 1;
 
     @Deprecated
     @ApiParam(value = "检测结果")

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-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -3815,4 +3815,14 @@ public class MesHqlPack {
         DdlPreparedPack.getNumEqualPack(mesPartSpecific.getIsValid(), "isValid", packBean);
         return packBean;
     }
+
+    public static DdlPackBean getMesDbDataCheck(MesDbDataCheck mesDbDataCheck) {
+        DdlPackBean packBean = getAllBaseData(mesDbDataCheck.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(mesDbDataCheck.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesDbDataCheck.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(mesDbDataCheck.getObjectCode(), "objectCode", packBean);
+        DdlPreparedPack.getStringLikerPack(mesDbDataCheck.getQcFiledCode(), "qcFiledCode", packBean);
+        DdlPreparedPack.getNumEqualPack(mesDbDataCheck.getIsValid(), "isValid", packBean);
+        return packBean;
+    }
 }

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

@@ -341,7 +341,7 @@ public class MesPcnHqlPack {
         return packBean;
     }
 
-    public static DdlPackBean getDbCheckRecord(MesDbCheckRecord dbCheckRecord, String organizeCode) {
+    /*public static DdlPackBean getDbCheckRecord(MesDbCheckRecord dbCheckRecord, String organizeCode) {
         DdlPackBean packBean = getAllBaseData(organizeCode);
         if (!StringUtils.isEmpty(dbCheckRecord.getSerialNumber())) {
             DdlPreparedPack.getStringLikerPack(dbCheckRecord.getSerialNumber(), "serialNumber", packBean);
@@ -362,7 +362,7 @@ public class MesPcnHqlPack {
             DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getStatus(), "status", packBean);
         }
         return packBean;
-    }
+    }*/
 
     /**
      * 按条件分页查询产品条码补打印数据

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/WmsBom.java

@@ -16,10 +16,7 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 
 /**
  * @Description :
@@ -30,7 +27,9 @@ import javax.persistence.Transient;
  **/
 @Data
 @Entity
-@Table(name = "WMS_BOM")
+@Table(name = "WMS_BOM", indexes = {
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "ITEM_PART_NO")})
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)

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/WmsDocMovementMaster.java

@@ -136,6 +136,21 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam("备注")
     private String remark;
 
+    @Column(name = "REASON")
+    @ApiParam("原因")
+    public String reason;
+
+    @Column(name = "DEPARTMENT")
+    @ApiParam(value = "部门")
+    private String department;
+
+    @Column(name = "RECEIVER")
+    @ApiParam("领用人")
+    private String receiver;
+
+    @Column(name = "PROD_DFG_TYPE_CODE")
+    @ApiParam("项目号")
+    private String prodCfgTypeCode;
 
     @Transient
     private List<WmsDocMovementDetails> movementDetailsList;

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()},