朱园亮 / xingyun-erp · Commits

Commit 93ab32bd2a3808125735cc3ac22ac89f92d8c420

Authored by yeqianyong
1 parent eaa74e0d

楚江erp:发货日期bug修复

Inline Side-by-side
Showing 2 changed files with 5 additions and 9 deletions
@@ -297,6 +297,8 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr @@ -297,6 +297,8 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
297 .eq(ShipmentsOrderInfo::getId, vo.getId()); 297 .eq(ShipmentsOrderInfo::getId, vo.getId());
298 298
299 getBaseMapper().update(updateWrapper); 299 getBaseMapper().update(updateWrapper);
  300 +
  301 + data.setNewShipmentDate(vo.getNewShipmentDate());
300 // 判断当前日期是否大于等于发货日期 302 // 判断当前日期是否大于等于发货日期
301 LocalDate now = LocalDate.now(); 303 LocalDate now = LocalDate.now();
302 LocalDate newShipmentDate = vo.getNewShipmentDate(); 304 LocalDate newShipmentDate = vo.getNewShipmentDate();
@@ -158,11 +158,9 @@ public class CarRequestPlanServiceImpl extends BaseMpServiceImpl<CarRequestPlanM @@ -158,11 +158,9 @@ public class CarRequestPlanServiceImpl extends BaseMpServiceImpl<CarRequestPlanM
158 , (v1, v2) -> v2)); 158 , (v1, v2) -> v2));
159 for (PurchaseOrderInfo orderInfo : orderInfoList) { 159 for (PurchaseOrderInfo orderInfo : orderInfoList) {
160 // 生成要车计划 160 // 生成要车计划
161 - LocalDate requestCarDate = LocalDate.now(); 161 + LocalDate requestCarDate = shipmentsOrderInfo.getShipmentsDate();
162 CreateCarRequestPlanVo planCreateVo = new CreateCarRequestPlanVo(); 162 CreateCarRequestPlanVo planCreateVo = new CreateCarRequestPlanVo();
163 - if (BooleanUtils.isTrue(shipmentsOrderInfo.getOnTimeShipment())) {  
164 - requestCarDate = shipmentsOrderInfo.getShipmentsDate();  
165 - } else if (BooleanUtils.isFalse(shipmentsOrderInfo.getOnTimeShipment())) { 163 + if (BooleanUtils.isFalse(shipmentsOrderInfo.getOnTimeShipment())) {
166 requestCarDate = shipmentsOrderInfo.getNewShipmentDate(); 164 requestCarDate = shipmentsOrderInfo.getNewShipmentDate();
167 } 165 }
168 planCreateVo.setRequestCarDate(requestCarDate); 166 planCreateVo.setRequestCarDate(requestCarDate);
@@ -179,11 +177,7 @@ public class CarRequestPlanServiceImpl extends BaseMpServiceImpl<CarRequestPlanM @@ -179,11 +177,7 @@ public class CarRequestPlanServiceImpl extends BaseMpServiceImpl<CarRequestPlanM
179 ticketVo.setPurchaseOrderId(orderInfo.getId()); 177 ticketVo.setPurchaseOrderId(orderInfo.getId());
180 ticketVo.setRequestCarDate(requestCarDate); 178 ticketVo.setRequestCarDate(requestCarDate);
181 ticketVo.setDeptId(orderInfo.getDeptId()); 179 ticketVo.setDeptId(orderInfo.getDeptId());
182 - if (BooleanUtils.isFalse(shipmentsOrderInfo.getOnTimeShipment())) {  
183 - ticketVo.setDeliveryDate(shipmentsOrderInfo.getNewShipmentDate());  
184 - } else {  
185 - ticketVo.setDeliveryDate(shipmentsOrderInfo.getShipmentsDate());  
186 - } 180 + ticketVo.setDeliveryDate(requestCarDate);
187 ticketVo.setWorkshopId(orderInfo.getWorkshopId()); 181 ticketVo.setWorkshopId(orderInfo.getWorkshopId());
188 ticketVo.setOrderNo(orderInfo.getOrderNo()); 182 ticketVo.setOrderNo(orderInfo.getOrderNo());
189 ticketVo.setOrderingUnit(orderInfo.getOrderingUnit()); 183 ticketVo.setOrderingUnit(orderInfo.getOrderingUnit());