【2712 子 09 1.2.1.1.1客户发运车辆推荐 / 09 1.2.1.1.1客户发运车辆推荐 -后端】

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

@@ -400,7 +400,9 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("产线代码")
     private String workCenterCode;
 
-
+    @Transient
+    @ApiParam("箱数")
+    private Double boxQty;
 
     public WmsDocMovementDetails () {
 
@@ -420,8 +422,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;
     }
@@ -504,4 +505,18 @@ public class WmsDocMovementDetails extends BaseBean {
         this.organizeCode = wmsDocMovementDetails.getOrganizeCode();
         this.color = color;
     }
+
+    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/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;
+
+
+}