Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev

 Conflicts:

	modules/i3plus-pojo-screen/pom.xml

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java

@@ -120,16 +120,16 @@ public class WorkPlan extends BaseAPS {
     @ApiParam(value ="打印时间")
     private Date printTime;
 
+    @Column(name="HAS_COMINBED")
+    @ApiParam(value ="是否组炉")
+    private Boolean hasCominbed = false;
+
     @ApiParam(value ="资源生产结束")
     @FieldAnnotation(display = false)
     @Transient
     @RippleAnnotation(dependence = {"PostPlan.resProduceEnd"}, method = "calcReverse")
     private Date resProduceEnd;
 
-    @Transient
-    @FieldAnnotation(property = false)
-    private boolean hasCominbed = false;
-
     public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); }
 
     public void setWork(Work work) {

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java

@@ -394,7 +394,6 @@ public class BeanRelation {
      * @param index
      * @param <T>
      */
-    @SuppressWarnings("unchecked")
     private final static <T extends BaseBean> void recursionImpl(BaseBean bean, Predicate<T> fun,
                                                                       Enum<?>[] holders, int index) {
         if (index >= holders.length) {
@@ -411,38 +410,4 @@ public class BeanRelation {
             }
         }
     }
-
-    /**
-     * 判断target是否为bean为起点的以holders路径上的点。
-     * @param bean
-     * @param target
-     * @param holders
-     * @return
-     */
-    public static boolean recursionContains(BaseBean bean, BaseBean target, Enum<?>... holders) {
-        if (holders.length == 0) {
-            return false;
-        }
-
-        return recursionContainsImpl(bean, target, holders, 0);
-    }
-
-    private final static boolean recursionContainsImpl(BaseBean bean, BaseBean target,
-                                                                 Enum<?>[] holders, int index) {
-        if (index >= holders.length) {
-            if (target == bean) {
-                return true;
-            }
-            index = 0;
-        }
-
-        List<BaseBean> relaBeans = list(bean, holders[index]);
-        for (BaseBean relaBean : relaBeans) {
-            if (recursionContainsImpl(relaBean, target, holders, index + 1)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
 }

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 = "VENDOR_NO"),
-        @Index(columnList = "PACKAGE_NO"),
+        //@Index(columnList = "PACKAGE_NO"),
         @Index(columnList = "ORGANIZE_CODE")
 })
 @Api("库存移动单条码信息")

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 = "SN_2D"),
-        @Index(columnList = "WH_NO"),
+        //@Index(columnList = "WH_NO"),
         @Index(columnList = "ZONE_NO"),
         @Index(columnList = "LOCATE_NO"),
-        @Index(columnList = "LOT_NO"),
+       //@Index(columnList = "LOT_NO"),
-        @Index(columnList = "FIX_LOT_NO"),
+        //@Index(columnList = "FIX_LOT_NO"),
-        @Index(columnList = "DATE_CODE"),
+        //@Index(columnList = "DATE_CODE"),
-        @Index(columnList = "VENDOR_NO"),
+        //@Index(columnList = "VENDOR_NO"),
-        @Index(columnList = "ORGANIZE_CODE")
+        //@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/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> {
+}