楚江erp:发货日期bug修复

@@ -297,6 +297,8 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
                 .eq(ShipmentsOrderInfo::getId, vo.getId());
 
         getBaseMapper().update(updateWrapper);
+
+        data.setNewShipmentDate(vo.getNewShipmentDate());
         // 判断当前日期是否大于等于发货日期
         LocalDate now = LocalDate.now();
         LocalDate newShipmentDate = vo.getNewShipmentDate();

@@ -158,11 +158,9 @@ public class CarRequestPlanServiceImpl extends BaseMpServiceImpl<CarRequestPlanM
                 , (v1, v2) -> v2));
         for (PurchaseOrderInfo orderInfo : orderInfoList) {
             // 生成要车计划
-            LocalDate requestCarDate = LocalDate.now();
+            LocalDate requestCarDate = shipmentsOrderInfo.getShipmentsDate();
             CreateCarRequestPlanVo planCreateVo = new CreateCarRequestPlanVo();
-            if (BooleanUtils.isTrue(shipmentsOrderInfo.getOnTimeShipment())) {
-                requestCarDate = shipmentsOrderInfo.getShipmentsDate();
-            } else if (BooleanUtils.isFalse(shipmentsOrderInfo.getOnTimeShipment())) {
+            if (BooleanUtils.isFalse(shipmentsOrderInfo.getOnTimeShipment())) {
                 requestCarDate = shipmentsOrderInfo.getNewShipmentDate();
             }
             planCreateVo.setRequestCarDate(requestCarDate);
@@ -179,11 +177,7 @@ public class CarRequestPlanServiceImpl extends BaseMpServiceImpl<CarRequestPlanM
             ticketVo.setPurchaseOrderId(orderInfo.getId());
             ticketVo.setRequestCarDate(requestCarDate);
             ticketVo.setDeptId(orderInfo.getDeptId());
-            if (BooleanUtils.isFalse(shipmentsOrderInfo.getOnTimeShipment())) {
-                ticketVo.setDeliveryDate(shipmentsOrderInfo.getNewShipmentDate());
-            } else {
-                ticketVo.setDeliveryDate(shipmentsOrderInfo.getShipmentsDate());
-            }
+            ticketVo.setDeliveryDate(requestCarDate);
             ticketVo.setWorkshopId(orderInfo.getWorkshopId());
             ticketVo.setOrderNo(orderInfo.getOrderNo());
             ticketVo.setOrderingUnit(orderInfo.getOrderingUnit());