Merge branch 'master_after20' into master_cj_zq

@@ -41,6 +41,7 @@ import com.lframework.xingyun.sc.vo.shipments.car.CreateDraftRequestCarTicketVo;
 import com.lframework.xingyun.sc.vo.shipments.car.CreateRequestCarTicketVo;
 import com.lframework.xingyun.sc.vo.shipments.car.CreateRequestCarTicketVo;
 import com.lframework.xingyun.sc.vo.shipments.order.*;
 import com.lframework.xingyun.sc.vo.shipments.order.*;
 import com.lframework.xingyun.sc.vo.shipments.plan.QueryShipmentsPlanDetailVo;
 import com.lframework.xingyun.sc.vo.shipments.plan.QueryShipmentsPlanDetailVo;
+import com.lframework.xingyun.sc.vo.shipments.plan.UpdateShipmentsPlanDetailVo;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.collections4.MapUtils;
@@ -343,6 +344,17 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             if (CollectionUtils.isEmpty(detailList)) {
             if (CollectionUtils.isEmpty(detailList)) {
                 throw new DefaultClientException("发货明细数据不存在！");
                 throw new DefaultClientException("发货明细数据不存在！");
             }
             }
+            // 校验数据完整性
+            for (ShipmentsPlanDetail detail : detailList) {
+                LocalTime shipmentsTime = detail.getShipmentsTime();
+                if (shipmentsTime == null) {
+                    throw new DefaultClientException("发货时点不能为空！");
+                }
+                UpdateShipmentsPlanDetailVo detailVo = new UpdateShipmentsPlanDetailVo();
+                detailVo.setId(detail.getId());
+                detailVo.setCanShipments(Boolean.TRUE);
+                shipmentsPlanDetailService.update(detailVo);
+            }
             List<List<ShipmentsPlanDetail>> batchList = CommonUtil.partition(detailList, 8);
             List<List<ShipmentsPlanDetail>> batchList = CommonUtil.partition(detailList, 8);
             handleBatchData(batchList, planId);
             handleBatchData(batchList, planId);
         }
         }

@@ -135,6 +135,9 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
         if (ObjectUtil.isNull(data)) {
         if (ObjectUtil.isNull(data)) {
             throw new DefaultClientException("发货计划明细不存在！");
             throw new DefaultClientException("发货计划明细不存在！");
         }
         }
+        if (vo.getShipmentsTime() != null) {
+            vo.setCanShipments(Boolean.TRUE);
+        }
 
 
         LambdaUpdateWrapper<ShipmentsPlanDetail> updateWrapper = Wrappers.lambdaUpdate(ShipmentsPlanDetail.class)
         LambdaUpdateWrapper<ShipmentsPlanDetail> updateWrapper = Wrappers.lambdaUpdate(ShipmentsPlanDetail.class)
                 .set(vo.getShipmentsTime() != null, ShipmentsPlanDetail::getShipmentsTime, vo.getShipmentsTime())
                 .set(vo.getShipmentsTime() != null, ShipmentsPlanDetail::getShipmentsTime, vo.getShipmentsTime())
@@ -463,7 +466,7 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
                 if (!preShipments && shipmentsTime == null) {
                 if (!preShipments && shipmentsTime == null) {
                     throw new DefaultClientException("发货时点不能为空！");
                     throw new DefaultClientException("发货时点不能为空！");
                 }
                 }
-                if (!preShipments && canShipments == null) {
+                if (preShipments && canShipments == null) {
                     throw new DefaultClientException("是否可发货不能为空！");
                     throw new DefaultClientException("是否可发货不能为空！");
                 }
                 }
             }
             }