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

 Conflicts:

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

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

@@ -74,6 +74,10 @@ public class MesWorkCell extends BaseBean implements Serializable {
     @ApiParam("目标合格率")
     private Double targetPassRate;
 
+    @Column(name = "STAND_TAKT")
+    @ApiParam("标准节拍")
+    private Integer standTakt;
+
     @Transient
     @ApiParam(value = "子集列表")
     private List<MesEquipment> childTreeList;

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

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/9/2 5:00 下午
+ * @Modify:
+ */
+@Data
+public class AssistModuleModel {
+
+    @ApiParam("标准节拍")
+    private Integer standTakt;
+
+    @ApiParam("x坐标内容")
+    private List<String> xAxis;
+
+    @ApiParam("y坐标内容")
+    private List<String> yAxis;
+}

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

@@ -88,6 +88,9 @@ public class GenSerialNoModel {
     @ApiParam("零件号后4位")
     private String partNoAfterFour;
 
+    @ApiParam("客户工厂代码")
+    private String custProdLineCode;
+
 
     public GenSerialNoModel(String ruleCode) {
         this.ruleCode = ruleCode;

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

@@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 车辆信息
@@ -84,4 +85,13 @@ public class WmsCar extends BaseBean {
     @ApiParam("经纬度")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String mapLocation;
+
+    @Column(name = "VOLUME", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "容积", example = "1")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    private Double volume;
+
+    @ApiParam(value = "需要(辆)")
+    @Transient
+    private Integer carQty;
 }

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

@@ -404,7 +404,9 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("产线代码")
     private String workCenterCode;
 
-
+    @Transient
+    @ApiParam("箱数")
+    private Double boxQty;
 
     public WmsDocMovementDetails () {
 
@@ -424,8 +426,7 @@ public class WmsDocMovementDetails extends BaseBean {
         this.priority = priority;
         this.orderNo = orderNo;
     }
-
-    public WmsDocMovementDetails (String partNo,String orderNo) {
+public WmsDocMovementDetails (String partNo,String orderNo) {
         this.partNo = partNo;
         this.orderNo = orderNo;
     }
@@ -519,4 +520,18 @@ public class WmsDocMovementDetails extends BaseBean {
         this.planTime = planTime;
         this.orderStatus = orderStatus;
     }
+
+    public WmsDocMovementDetails (WmsDocMovementDetails wmsDocMovementDetails, Double boxQty) {
+        this.id = wmsDocMovementDetails.getId();
+        this.orderNo = wmsDocMovementDetails.getOrderNo();
+        this.partNo = wmsDocMovementDetails.getPartNo();
+        this.partNameRdd = wmsDocMovementDetails.getPartNameRdd();
+        this.qty = wmsDocMovementDetails.getQty();
+        this.unit = wmsDocMovementDetails.getUnit();
+        this.srcZoneNo = wmsDocMovementDetails.getSrcZoneNo();
+        this.destLocateNo = wmsDocMovementDetails.getDestLocateNo();
+        this.createDatetime = wmsDocMovementDetails.getCreateDatetime();
+        this.organizeCode = wmsDocMovementDetails.getOrganizeCode();
+        this.boxQty = boxQty;
+    }
 }

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

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description : 推荐车辆信息model
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-09-02 11:17
+ * @Modify:
+ **/
+@Data
+@Api("推荐车辆信息model")
+public class WmsRecommendCarModel extends BaseBean implements Serializable {
+
+    @ApiParam(value = "计划日期")
+    String planTimeStart;
+    @ApiParam(value = "待发物料总数")
+    String partNo;
+    @ApiParam(value = "标准包装")
+    String snp;
+    @ApiParam(value = "单包装体积(m3)")
+    Double vol;
+    @ApiParam(value = "物料体积(m3)")
+    Double partTotalVol;
+
+//    @ApiParam(value = "车辆编号")
+//    String carNo;
+//    @ApiParam(value = "车辆名称")
+//    String carDesc;
+//    @ApiParam(value = "容积(m3)")
+//    Double volume;
+//    @ApiParam(value = "需要(辆)")
+//    Integer carQty;
+
+
+}

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