diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.java
index 06a43c3..cf5140a 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.java
@@ -70,4 +70,8 @@ public class MesProduceErrorRecord extends BaseBean {
     @ApiParam("异常内容")
     private String errorMessage;
 
+    @Column(name = "NOTICE_SIGN")
+    @ApiParam("通知标识")
+    private Integer noticeSign = 10;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/PartConsumeCountModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/PartConsumeCountModel.java
new file mode 100644
index 0000000..8a27541
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/PartConsumeCountModel.java
@@ -0,0 +1,24 @@
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 零件消耗数量模型
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2021/7/1 14:40
+ * @Modify:
+ **/
+@Data
+public class PartConsumeCountModel {
+
+    @ApiParam("零件号")
+    private String partNo;
+
+    @ApiParam("消耗数量")
+    private Integer consumeQty;
+
+    @ApiParam("需求数量")
+    private Integer demandQty;
+}
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AccountExportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AccountExportModel.java
index 740c511..f5a4e92 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AccountExportModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AccountExportModel.java
@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.model.platform;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiParam;
@@ -39,12 +41,13 @@ public class AccountExportModel implements Serializable {
     @ApiModelProperty(value ="部门名称" , access ="部门名称")
     private String departmentNameRdd;
 
-    @ApiParam(value = "登录次数", example = "0")
+    @ApiModelProperty(value = "登录次数", example = "0")
     private Integer userLoginNum;
 
-    @ApiParam(value = "账号最后登录时间")
+    @ApiModelProperty(value = "账号最后登录时间")
     private String userLoginLastDateTime;
 
-    @ApiParam(value = "账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)", example = "-1")
+    @ApiModelProperty(value ="账号状态" , example ="-1")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.USER_STATUS.class)
     private Integer userStatus;
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java
index 1acf77d..e2fd57e 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java
@@ -100,6 +100,14 @@ public class WmsBomTotal extends BaseBean {
     @ApiParam(value = "是否虚阶物料")
     private String category;
 
+    @Column(name = "PURCHASE_TYPE")
+    @ApiParam(value = "采购类型")
+    private String purchaseType;
+
+    @Column(name = "SPECIAL_PURCHASE_TYPE")
+    @ApiParam(value = "特殊采购类型")
+    private String specialPurchaseType;
+
     /**
      * 是否包含子阶
      * @return
diff --git 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
index f17dccb..a65a085 100644
--- 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
@@ -517,6 +517,14 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("完成时间")
     public String complateDateTime;
 
+    @Transient
+    @ApiParam("供应商名称")
+    public String vendorName;
+
+    @Transient
+    @ApiParam(value = "供应商编号")
+    private String vendorNo;
+
 
 
 
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsECartOrderNoBuild.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsECartOrderNoBuild.java
new file mode 100644
index 0000000..cd58ed5
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsECartOrderNoBuild.java
@@ -0,0 +1,67 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : WmsECartOrderNoBuild
+ * @Author :gsz
+ * @Date 2021/7/5 19:06
+ * @Modify
+ **/
+@Data
+@Entity
+@Table(name="WMS_ECARD_ORDERNO_BUILD")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Api(value="南非看板订单号",description = "南非看板订单号")
+@NoArgsConstructor
+public class WmsECartOrderNoBuild extends BaseBean {
+
+    private static final long serialVersionUID = 7332606009041273554L;
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNo;
+
+    @Column(name = "CREATE_DATE")
+    @ApiParam(value = "创建日期")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String createDate;
+
+    @Column(name = "SERIAL_NO")
+    @ApiParam(value = "序列号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Integer serialNo;
+
+    @Column(name = "DEST_LOCATE_NO")
+    @ApiParam(value = "目标库位")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String destLocateNo;
+
+    @Column(name = "SRC_ZONE_NO")
+    @ApiParam(value = "源存储区")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String srcZoneNo;
+
+    public WmsECartOrderNoBuild(String partNo, String createDate, Integer serialNo, String destLocateNo, String srcZoneNo) {
+        this.partNo = partNo;
+        this.createDate = createDate;
+        this.serialNo = serialNo;
+        this.destLocateNo = destLocateNo;
+        this.srcZoneNo = srcZoneNo;
+    }
+
+}
\ No newline at end of file
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java
index 0a500ac..c493171 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java
@@ -67,6 +67,11 @@ public class WmsLocatePart extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     private Double max;
 
+    @Column(name = "WARN", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "预警值", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Double warn;
+
     @Column(name = "MIN", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "最小值", example = "0")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
@@ -127,6 +132,10 @@ public class WmsLocatePart extends BaseBean {
         return this.max ==null?0:this.max.doubleValue();
     }
 
+    public double getWarnValue() {
+        return this.warn ==null?0:this.warn.doubleValue();
+    }
+
     public double getMinValue(){
         return this.min ==null?0:this.min.doubleValue();
     }
@@ -153,4 +162,21 @@ public class WmsLocatePart extends BaseBean {
         this.whNo = whNo;
         this.stockUnit = stockUnit;
     }
+
+    public WmsLocatePart(String locateNo, String partNo, String partNameRdd, Double pullQty, Double max, Double warn, Double min,
+                         Integer isGeneratePicklist, Double safetyStock, Double moq, String zoneNo, String whNo, String stockUnit) {
+        this.locateNo = locateNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.pullQty = pullQty;
+        this.max = max;
+        this.warn = warn;
+        this.min = min;
+        this.isGeneratePicklist = isGeneratePicklist;
+        this.safetyStock = safetyStock;
+        this.moq = moq;
+        this.zoneNo = zoneNo;
+        this.whNo = whNo;
+        this.stockUnit = stockUnit;
+    }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
index b194f43..157e3ca 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
@@ -38,8 +38,8 @@ import javax.persistence.Version;
         @Index(columnList = "ORDER_NO"),
         @Index(columnList = "ITEM_STATUS"),
         @Index(columnList = "SN"),
-        @Index(columnList = "VENDOR_NO"),
-        @Index(columnList = "PACKAGE_NO"),
+        //@Index(columnList = "VENDOR_NO"),
+        //@Index(columnList = "PACKAGE_NO"),
         @Index(columnList = "ORGANIZE_CODE")
 })
 @Api("库存移动单条码信息")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
index 6ee40bf..6060bdd 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
@@ -36,17 +36,17 @@ import java.util.List;
 @Table(name = "WMS_STOCK_SN", indexes = {
         @Index(columnList = "PACKAGE_NO"),
         @Index(columnList = "PART_NO"),
-        @Index(columnList = "REF_SRC"),
+        //@Index(columnList = "REF_SRC"),
         @Index(columnList = "SN"),
-        @Index(columnList = "SN_2D"),
-        @Index(columnList = "WH_NO"),
+        //@Index(columnList = "SN_2D"),
+        //@Index(columnList = "WH_NO"),
         @Index(columnList = "ZONE_NO"),
         @Index(columnList = "LOCATE_NO"),
-        @Index(columnList = "LOT_NO"),
-        @Index(columnList = "FIX_LOT_NO"),
-        @Index(columnList = "DATE_CODE"),
-        @Index(columnList = "VENDOR_NO"),
-        @Index(columnList = "ORGANIZE_CODE")
+       //@Index(columnList = "LOT_NO"),
+        //@Index(columnList = "FIX_LOT_NO"),
+        //@Index(columnList = "DATE_CODE"),
+        //@Index(columnList = "VENDOR_NO"),
+        //@Index(columnList = "ORGANIZE_CODE")
 })
 @DynamicInsert
 @DynamicUpdate
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpFgDetailsSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpFgDetailsSnapshot.java
new file mode 100644
index 0000000..14eeefb
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpFgDetailsSnapshot.java
@@ -0,0 +1,67 @@
+package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.ApiParam;
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+/**
+ * @Description : ERP fgDetail表
+ * @Reference :
+ * @Author : junsheng.li
+ * @CreateDate 2021/7/5 9:31
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "WMS_ERP_FG_DETAILS_SNAPSHOT", indexes = {@Index(columnList = "PART_NO"), @Index(columnList = "AREA_NO"), @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "SNAPSHOT_TIME")})
+public class WmsErpFgDetailsSnapshot extends BaseBean {
+    private static final long serialVersionUID = -4095444692227226944L;
+
+    @Column(name = "SNAPSHOT_TIME")
+    @ApiParam("快照时间")
+    public String snapshotTime;
+
+    @Column(name = "PART_NO")
+    @ApiParam("零件号")
+    private String partNo;
+
+    @Column(name = "AREA_NO")
+    @ApiParam("库存地点")
+    private String areaNo;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Double qty;
+
+    @Column(name = "UNIT")
+    @ApiParam("单位")
+    private String unit;
+
+    @Column(name = "ITEM_PART_NO")
+    @ApiParam("子零件号")
+    private String itemPartNo;
+
+    @Column(name = "VIN_CODE")
+    @ApiParam("vin号")
+    private String vinCode;
+
+    @Column(name = "ITEM_PART_QTY")
+    @ApiParam("子零件数量")
+    private Double itemPartQty;
+
+    @ApiParam("存储区")
+    private String zoneNo;
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsFinePunchWarehouseWarningDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsFinePunchWarehouseWarningDto.java
new file mode 100644
index 0000000..a4f7dfb
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsFinePunchWarehouseWarningDto.java
@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : WmsFinePunchWarehouseWarningDto
+ * @Author :gsz
+ * @Date 2021/7/5 11:03
+ * @Modify
+ **/
+@Data
+@Api("中航WMS看板－精冲库存预警看板(出参)")
+public class WmsFinePunchWarehouseWarningDto {
+
+    @ApiParam(value = "零件号")
+    private String partNo;
+
+    @ApiParam(value = "零件号名称")
+    private String partNameRdd;
+
+    @ApiParam(value = "库存地")
+    private String areaNo;
+
+    @ApiParam(value = "库存数")
+    private Double qty;
+
+    @ApiParam(value = "最大库存值")
+    private Double maxqty;
+
+    @ApiParam(value = "预警值")
+    private Double warnValue;
+
+    @ApiParam(value = "最小库存值")
+    private Double minqty;
+
+    @ApiParam(value = "库存状态")
+    private String stockStatus;
+
+    @ApiParam(value = "颜色")
+    private String color;
+
+    public WmsFinePunchWarehouseWarningDto(String partNo, String partNameRdd, String areaNo, Double qty, Double maxqty, Double warnValue, Double minqty, String stockStatus, String color) {
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.areaNo = areaNo;
+        this.qty = qty;
+        this.maxqty = maxqty;
+        this.warnValue = warnValue;
+        this.minqty = minqty;
+        this.stockStatus = stockStatus;
+        this.color = color;
+    }
+
+    public WmsFinePunchWarehouseWarningDto() {
+    }
+}
\ No newline at end of file
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java
index ba061d6..5e1a1cd 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java
@@ -44,6 +44,9 @@ public class WmsStockSnDto {
     @ApiParam(value = "存储区")
     private String zoneNo;
 
+    @ApiParam(value = "库存地代码")
+    private String areaNo;
+
     public WmsStockSnDto(String locateNo, String partNo, String partNameRdd, Double qty, String dateCode) {
         this.locateNo = locateNo;
         this.partNo = partNo;
@@ -71,6 +74,17 @@ public class WmsStockSnDto {
         this.zoneNo = zoneNo;
     }
 
+    public WmsStockSnDto(String locateNo, String partNo, String partNameRdd, Double qty, String dateCode, String partSpec, String zoneNo, String areaNo) {
+        this.locateNo = locateNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qty = qty;
+        this.dateCode = dateCode;
+        this.partSpec = partSpec;
+        this.zoneNo = zoneNo;
+        this.areaNo = areaNo;
+    }
+
     public WmsStockSnDto() {
     }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsErpFgDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsErpFgDetailsRepository.java
new file mode 100644
index 0000000..f3d4a4e
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsErpFgDetailsRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.erp.WmsErpFgDetailsSnapshot;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description : 库存信息快照
+* @Reference :
+* @author: amy.liu
+* @date: 2019/9/19 14:22
+* @Modify:
+*/
+
+@Repository
+public interface IWmsErpFgDetailsRepository extends BaseRepository<WmsErpFgDetailsSnapshot,Long> {
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsECartOrderNoBuildRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsECartOrderNoBuildRepository.java
new file mode 100644
index 0000000..bc11275
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsECartOrderNoBuildRepository.java
@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsECartOrderNoBuild;
+
+/**
+ * @Description : WmsECartOrderNoBuildRepository
+ * @Author :gsz
+ * @Date 2021/7/6 9:56
+ * @Modify
+ **/
+public interface WmsECartOrderNoBuildRepository  extends BaseRepository<WmsECartOrderNoBuild, Long> {
+}