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

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

@@ -220,6 +220,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
         return this.qty == null ? 0.0d : this.qty;
     }
 
+    public double getFinsihQtyVal() {
+        return this.finsihQty == null ? 0.0d : this.finsihQty;
+    }
+
     public int getStatusVal() {
         return this.status == null ? 0 : this.status;
     }

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

@@ -119,6 +119,15 @@ public class QueueOrderModel implements Serializable {
     public QueueOrderModel() {
     }
 
+    public double getQtyVal() {
+        return this.qty == null ? 0.0d : this.qty;
+    }
+
+    public double getFinsihQtyVal() {
+        return this.finsihQty == null ? 0.0d : this.finsihQty;
+    }
+
+
     public QueueOrderModel(Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
                            String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) {
         this.queueSeq = queueSeq;

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

@@ -1,8 +1,11 @@
 package cn.estsh.i3plus.pojo.model.wms;
 
+import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -42,4 +45,14 @@ public class WmsStockFifoModel {
 
     @ApiParam("同批次")
     private boolean fifoSameBatch;
+
+    @ApiParam("FIFO查询获取方式")
+    private Integer fifoSnByLood;
+
+    @ApiParam("物料条码信息")
+    Map<String, List<WmsStockSn>> snMap = new HashMap<>();
+
+    @ApiParam("所有推荐条码信息")
+    List<WmsStockSn> wmsStockSnAllList = new ArrayList<>();
+
 }

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

@@ -9,11 +9,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.Index;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.util.List;
 
 /**
@@ -119,6 +115,11 @@ public class WmsStockQuan extends BaseBean {
     @ApiParam(value = "报废数量")
     private Double scrapQty;
 
+//    @Version
+//    @Column(name = "LOCK_VERSION")
+//    @ApiParam(value = "乐观锁", example = "1")
+//    public Integer lockVersion;
+
     @Transient
     @ApiParam(value = "总数量")
     private Double totalQty;

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

@@ -14,11 +14,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.util.Date;
 import java.util.List;
 
@@ -229,6 +225,11 @@ public class WmsStockSn extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer seqNo;
 
+//    @Version
+//    @Column(name = "LOCK_VERSION")
+//    @ApiParam(value = "乐观锁", example = "1")
+//    public Integer lockVersion;
+
     @ApiParam(value = "仓库名称")
     @Transient
     public String whNameRdd;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java

@@ -21,4 +21,11 @@ public interface WmsConfigRepository extends BaseRepository<WmsConfig, Long> {
      * @return 配置信息
      */
     WmsConfig getFirstByOrganizeCodeAndConfigCode(String organizeCode, String configCode);
+
+    /**
+     * 按照配置代码查询配置信息
+     * @param configCode 配置代码
+     * @return 配置信息
+     */
+    WmsConfig getFirstByConfigCode(String configCode);
 }