运单备注

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

@@ -324,6 +324,11 @@ public class OrderInfo extends BaseModel<OrderInfo> {
      * 保险公司代码
      */
     private String insuranceCompanyCode;
+    /**
+     * 备注
+     */
+    private String remark;
+
 
     @TableField(exist = false)
     private List<OrderInfo> orderInfoList;

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

@@ -1,6 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
 import com.yh.saas.common.support.util.IdGenerator;

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

@@ -385,7 +385,7 @@ public class MonitoringSystemReporting {
         dispatch.setBusinessTypeCode(orderInfo.getBusinessTypeCode());
         dispatch.setDespatchActualDateTime(f.format(orderInfo.getDeliveryTime()));
         dispatch.setGoodsReceiptDateTime(f.format(orderInfo.getReceivingTime()));
-        dispatch.setRemark("备注");
+        dispatch.setRemark(orderInfo.getRemark() != null ? orderInfo.getRemark() : "");
         DecimalFormat df = new DecimalFormat("0.000");
         dispatch.setTotalMonetaryAmount(df.format(orderInfo.getActualFreight()));
         setConsignorInfo(dispatch, orderInfo);
@@ -432,8 +432,9 @@ public class MonitoringSystemReporting {
     public static void setInsuranceInformation(Dispatch dispatch, OrderInfo orderInfo) {
         List<InsuranceInformation> insuranceInformations = new ArrayList<>();
         InsuranceInformation insuranceInformation = new InsuranceInformation();
-        insuranceInformation.setPolicyNumber(orderInfo.getPolicyNo());
-        insuranceInformation.setInsuranceCompanyCode(orderInfo.getInsuranceCompanyCode());
+        //todo
+        insuranceInformation.setPolicyNumber(orderInfo.getPolicyNo() != null ? orderInfo.getPolicyNo() : "none");
+        insuranceInformation.setInsuranceCompanyCode(orderInfo.getInsuranceCompanyCode() != null ? orderInfo.getInsuranceCompanyCode() : "none");
         insuranceInformations.add(insuranceInformation);
         dispatch.setInsuranceInformation(insuranceInformations);
     }
@@ -475,8 +476,9 @@ 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()));
+        //todo 体积，件数
+        goodsInfo1.setCube(df1.format(orderInfo.getVolume() != null ? orderInfo.getVolume() : "0"));
+        goodsInfo1.setTotalNumberOfPackages(String.valueOf(orderInfo.getPackageNumber() != null ? orderInfo.getPackageNumber() : "0"));
         goodsInfos.add(goodsInfo1);
         vehicleInfo.setGoodsInfo(goodsInfos);
         vehicleInfos.add(vehicleInfo);

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/OrderInfoMapper.xml

@@ -523,6 +523,7 @@
         h.account_number as cargoOwnerPhone,
         d.account_number as driverPhone,
         o.freight,
+        o.remark,
         o.advance_charge as advanceCharge,
         case when o.invoicing = 1 then '已开' else '未开' end as invoicing,
         o.driver_contract_url as driverContractUrl,