1

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyCarrierInfo.java

@@ -71,6 +71,14 @@ public class HyCarrierInfo extends BaseModel<HyCarrierInfo> {
      * 装车净重（吨）
      */
     private Double loadingWeight;
+    /**
+     * 体积（立方米）
+     */
+    private Double volume;
+    /**
+     * 件数
+     */
+    private Double packageNumber;
     /**
      * 卸车净重（吨）
      */

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/OrderInfo.java

@@ -701,6 +701,16 @@ public class OrderInfo extends BaseModel<OrderInfo> {
      */
     @TableField(exist = false)
     private String unsendLatitude;
+    /**
+     * 体积（立方米）
+     */
+    @TableField(exist = false)
+    private Double volume;
+    /**
+     * 件数
+     */
+    @TableField(exist = false)
+    private Double packageNumber;
     /**
      * 管局上报列表状态(1未上报2上报失败3上报成功)
      */

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/OrderInfoServiceImpl.java

@@ -1035,6 +1035,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                         orderInfo1.setDeliveryTime(hyCarrierInfo.getLoadingDate());
                         orderInfo1.setReceivingTime(hyCarrierInfo.getUnloadingDate());
                         orderInfo1.setGrossWeight(hyCarrierInfo.getLoadingGrossWeight());
+                        orderInfo1.setVolume(hyCarrierInfo.getVolume());
+                        orderInfo1.setPackageNumber(hyCarrierInfo.getPackageNumber());
                     }
                     //3.查询托运人信息
                     HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<HyCargoOwnerInfo>()

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/MonitoringSystemReporting.java

@@ -437,6 +437,7 @@ public class MonitoringSystemReporting {
     public static void setVehicleInfo(Dispatch dispatch, OrderInfo orderInfo) {
         SimpleDateFormat f = new SimpleDateFormat("yyyyMMddHHmmss");//设置日期格式
         DecimalFormat df = new DecimalFormat("0.000");
+        DecimalFormat df1 = new DecimalFormat("0.0000");
 
         List<VehicleInfo> vehicleInfos = new ArrayList<>();
         //车辆信息
@@ -470,6 +471,8 @@ public class MonitoringSystemReporting {
         goodsInfo1.setDescriptionOfGoods(orderInfo.getGoodsName());
         goodsInfo1.setCargoTypeClassificationCode(orderInfo.getGoodsTypeKey());
         goodsInfo1.setGoodsItemGrossWeight(df.format(orderInfo.getGrossWeight() * 1000));
+        goodsInfo1.setCube(df1.format(orderInfo.getVolume()));
+        goodsInfo1.setTotalNumberOfPackages(String.valueOf(orderInfo.getPackageNumber()));
         goodsInfos.add(goodsInfo1);
         vehicleInfo.setGoodsInfo(goodsInfos);
         vehicleInfos.add(vehicleInfo);