货单下的运单列表增加接单时间和完成时间字段

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

@@ -30,4 +30,12 @@ public class OrderChildPCVO {
 
     @ApiModelProperty("司机手机号")
     private String driverMobile;
+
+
+    @ApiModelProperty("接单时间")
+    private String createTime;
+
+    @ApiModelProperty("完成时间")
+    private String finishTime;
+
 }
\ No newline at end of file

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

@@ -2014,7 +2014,10 @@ public class OrderChildServiceImpl implements OrderChildService {
             orderGoodsStatus = orderGoods.getOrderGoodsStatus();
         }
         if (dif.compareTo(BigDecimal.ZERO) != 0) {
-
+            BigDecimal orderResidueWeight = orderWeightService.getOrderResidueWeight(orderGoods.getOrderNo());
+            if(orderResidueWeight.compareTo(dif) < 0){
+               throw new ServiceSystemException(ORDER_WEIGHT_LACK);
+            }
             //运单修改装车吨数，从货单进行扣减
             log.info("货单号：{}，运单号 ：{},扣减吨数：{}",orderGoods.getOrderGoodsNo(),childNo, dif);
             orderGoodsDao.updateOrderGoodsReduceWeightAndStatus(orderGoods.getId(), dif, orderGoodsStatus);