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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -4762,6 +4762,55 @@ public class WmsEnumUtil {
         }
     }
 
+
+    /**
+     * 客户发运 发运数量控制逻辑
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum LOCK_FIFO_SN_TYPE {
+        SHIP_FLAG(10, "客户发运"),
+        OVER_SEND(20, "多发"),
+        CONSISTENT(30, "一致"),
+        NO_CONTROL(40, "不控制"),
+        OVER_ONE_BOX(50, "多一箱");
+
+
+        private int value;
+        private String description;
+
+        LOCK_FIFO_SN_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static LOCK_FIFO_SN_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        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;
+        }
+    }
+
     /**
      * 拉动方式维护
      * 默认为 10

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

@@ -91,7 +91,22 @@ public class WmsCar extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double volume;
 
-    @ApiParam(value = "需要(辆)")
     @Transient
+    @ApiParam(value = "需要(辆)")
     private Integer carQty;
+
+    @Transient
+    @ApiParam(value = "车辆序号")
+    private Integer seq;
+
+    public WmsCar() {
+    }
+
+    public WmsCar(WmsCar car, Integer seq, String carDesc) {
+        this.id = car.id;
+        this.organizeCode = car.organizeCode;
+        this.volume = car.volume;
+        this.carNo = seq.toString();
+        this.carDesc = carDesc;
+    }
 }

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

@@ -510,6 +510,17 @@ public WmsDocMovementDetails (String partNo,String orderNo) {
         this.color = color;
     }
 
+    public WmsDocMovementDetails(String orderNo, Double qty, Double pickQty, String modifyDateTime, String createDateTime, String planDate, String planTime, Integer orderStatus) {
+        this.orderNo = orderNo;
+        this.qty = qty;
+        this.pickQty = pickQty;
+        this.modifyDatetime = modifyDateTime;
+        this.createDatetime = createDateTime;
+        this.planDate = planDate;
+        this.planTime = planTime;
+        this.orderStatus = orderStatus;
+    }
+
     public WmsDocMovementDetails (WmsDocMovementDetails wmsDocMovementDetails, Double boxQty) {
         this.id = wmsDocMovementDetails.getId();
         this.orderNo = wmsDocMovementDetails.getOrderNo();

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

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -26,66 +27,80 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_QC_SN_ERROR_LIST")
+@Table(name="WMS_QC_SN_ERROR_LIST",
+        indexes = {
+                @Index(columnList = "ORGANIZE_CODE"),
+                @Index(columnList = "ORDER_NO"),
+                @Index(columnList = "PART_NO"),
+                @Index(columnList = "SN")
+})
 @Api("质检单条码质检不良清单表")
 public class WmsQCSNErrorList extends BaseBean {
+    private static final long serialVersionUID = 4905945381732744790L;
 
-    private static final long serialVersionUID = 7779401323803118985L;
     @Column(name="ORDER_NO")
     @ApiParam("单号")
-    public String orderNo;
+    private String orderNo;
 
     @Column(name="ITEM")
     @ApiParam("行号")
-    public String item;
+    private String item;
 
     /**
-     * 状态:1=创建,10=已处理
+     * 状态:10=创建,20=已处理
      */
     @Column(name="ITEM_STATUS")
     @ApiParam(value = "状态", example = "1")
-    public Integer itemStatus;
+    private Integer itemStatus;
 
     @Column(name="REMARK")
     @ApiParam("备注")
-    public String remark;
+    private String remark;
 
-    @Column(name="PASS_QTY", nullable = false)
-    @ApiParam("合格数量")
+    @Column(name="SAMPLE_QTY", nullable = false)
+    @ApiParam("检验数量")
     @ColumnDefault("0")
-    public double passQty;
+    private double sampleQty;
 
     @Column(name="REJECT_QTY", nullable = false)
     @ApiParam("不合格数量")
     @ColumnDefault("0")
-    public double rejectQty;
+    private double rejectQty;
 
     @Column(name="UNIT")
     @ApiParam("单位")
-    public String unit;
+    private String unit;
 
     @Column(name="PART_NO")
     @ApiParam("物料编码")
-    public String partNo;
+    private String partNo;
 
     @Column(name="PART_NAME_RDD")
     @ApiParam("物料名称")
-    public String partNameRdd;
+    private String partNameRdd;
 
     @Column(name="SN")
     @ApiParam("条码")
-    public String sn;
+    private String sn;
 
     @Column(name = "QC_USER")
     @ApiParam("检验员")
-    public String qcUser;
+    private String qcUser;
 
     @Column(name = "QC_TIME")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "检验时间", example = "2000-01-01 01:00:00")
-    public String qcTime;
+    private String qcTime;
 
     @Column(name = "VENDOR_NO")
     @ApiParam(value = "供应商编码")
-    public String vendorNo;
+    private String vendorNo;
+
+    @Column(name = "ERROR_CODE")
+    @ApiParam("不良代码")
+    private String errorCode;
+
+    @Column(name = "ERROR_DESC_RDD")
+    @ApiParam("不良描述")
+    private String errorDescRdd;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsRecommendCarModel.java

@@ -21,15 +21,29 @@ public class WmsRecommendCarModel extends BaseBean implements Serializable {
     @ApiParam(value = "计划日期")
     String planTimeStart;
     @ApiParam(value = "待发物料总数")
-    String partNo;
+    Double partNoSum;
     @ApiParam(value = "标准包装")
-    String snp;
+    Double snp;
     @ApiParam(value = "单包装体积(m3)")
     Double vol;
     @ApiParam(value = "物料体积(m3)")
     Double partTotalVol;
+    @ApiParam(value = "物料号")
+    String partNo;
+
+    public WmsRecommendCarModel(String partNo, Double partNoSum,  Double vol, Double snp,Double partTotalVol,
+                                String organizeCode,Long id,String planTimeStart) {
+        this.partNo = partNo;
+        this.partNoSum = partNoSum;
+        this.vol = vol;
+        this.snp = snp;
+        this.partTotalVol = partTotalVol;
+        this.organizeCode = organizeCode;
+        this.id = id;
+        this.planTimeStart = planTimeStart;
+    }
 
-//    @ApiParam(value = "车辆编号")
+    //    @ApiParam(value = "车辆编号")
 //    String carNo;
 //    @ApiParam(value = "车辆名称")
 //    String carDesc;

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsQCSNErrorList;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 质检单条码不良操作类
+ * @Reference :
+ * @Author : rock.yu
+ * @CreateDate : 2020-09-02 21:06
+ * @Modify:
+ **/
+@Repository
+public interface WmsQCSNErrorListRepository extends BaseRepository<WmsQCSNErrorList, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -265,7 +265,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
-        DdlPreparedPack.getStringEqualPack(wmsPOMaster.getShipmentNoteNumber(), "shipmentNoteNumber", result);
+        DdlPreparedPack.getStringEqualPack(wmsPOMaster.getErpSrcNo(), "erpSrcNo", result);
         DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getContainerNo(), "containerNo", result);
         if (wmsPOMaster.getPriorRC() != null && wmsPOMaster.getPriorRC() == WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) {
             ArrayList<Integer> numList = new ArrayList<>();