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/model/AndonBoardModel.java

@@ -86,6 +86,9 @@ public class AndonBoardModel implements Serializable {
     @ApiParam(value = "事件原因描述")
     public String ecNameRdd;
 
+    @ApiParam(value = "具体事件原因描述")
+    public String ecDesc;
+
     @ApiParam(value = "小时")
     public String hour;
 

modules/i3plus-pojo-screen/pom.xml

@@ -6,6 +6,7 @@
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
         <version>1.0-TEST-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

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

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;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.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;
 import javax.persistence.Transient;
 import java.util.List;
@@ -72,6 +72,10 @@ public class BasImportTemplate extends BaseBean{
     @ApiParam(value = "起始行", example = "0")
     private Integer startRow;
 
+    @Column(name = "REMARK")
+    @ApiParam(value = "备注")
+    private String remark;
+
     @Transient
     @ApiParam("模板明细列表")
     private List<BasImportTemplateDetails> templateDetailsList;

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

@@ -122,4 +122,8 @@ public class BasImportTemplateDetails extends BaseBean{
     @Column(name = "IS_EXPORT_TITLE")
     @ApiParam("是否导出表头")
     private Integer isExportTitle;
+
+    @Column(name = "ANNOTATE_COMMENT")
+    @ApiParam("批注")
+    private String annotateComment;
 }

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> {
+}