司机上报优化

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportNoTakeOrderAbnormalSaveParam.java

@@ -12,9 +12,9 @@ import javax.validation.constraints.NotBlank;
 @NoArgsConstructor
 public class CollectLineReportNoTakeOrderAbnormalSaveParam {
 
-    @ApiModelProperty(value = "运单编号")
-    @NotBlank(message = "运单编号不能为空")
-    private String childNo;
+    @ApiModelProperty(value = "货单编号")
+    @NotBlank(message = "货单不能为空")
+    private String orderGoods;
 
     @ApiModelProperty(value = "没有接单原因", example = "车辆问题")
     @NotBlank(message = "没有接单原因不能为空")

performance-api/src/main/java/com/clx/performance/vo/pc/collect/CollectLineReportVO.java

@@ -39,6 +39,8 @@ public class CollectLineReportVO {
     private String truckNo;
     @ApiModelProperty(value = "运单编号", example = "")
     private String childNo;
+    @ApiModelProperty(value = "货单单编号", example = "")
+    private String orderGoodsNo;
 
     @ApiModelProperty(value = "发货地址id", example = "")
     private Integer sendAddressId;

performance-web/src/main/java/com/clx/performance/model/collect/CollectLineReport.java

@@ -31,6 +31,7 @@ public class CollectLineReport implements HasKey<Integer> {
     private String name;                            //用户姓名
     private String mobile;                          //手机号码
     private String truckNo;                         //车牌号
+    private String orderGoodsNo;                    //货单编号
     private String childNo;                         //运单编号
     private Integer addressId;                      //地址id
     private String address;                         //详细地址

performance-web/src/main/java/com/clx/performance/service/impl/collect/CollectLineReportServiceImpl.java

@@ -224,7 +224,7 @@ public class CollectLineReportServiceImpl implements CollectLineReportService {
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
         Long userNo = loginUserInfo.getUserNo();
 
-        OrderChild orderChild = orderChildDao.getByChildNo(param.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        OrderChild orderChild = orderChildDao.getByChildNo(param.getOrderGoods()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
         CollectLineReport collectLineReport = new CollectLineReport();
         collectLineReport.setUserNo(userNo);
@@ -232,7 +232,7 @@ public class CollectLineReportServiceImpl implements CollectLineReportService {
         collectLineReport.setMobile(loginUserInfo.getUserMobile());
         collectLineReport.setTruckNo(orderChild.getTruckNo());
 
-        collectLineReport.setChildNo(param.getChildNo());
+        collectLineReport.setOrderGoodsNo(param.getOrderGoods());
         collectLineReport.setSendAddressId(orderChild.getSendAddressId());
         collectLineReport.setSendAddress(orderChild.getSendAddress());
         collectLineReport.setReceiveAddressId(orderChild.getReceiveAddressId());