Showing
1 changed file
with
9 additions
and
2 deletions
| @@ -30,8 +30,10 @@ import com.lframework.starter.web.inner.service.system.SysUserRoleService; | @@ -30,8 +30,10 @@ import com.lframework.starter.web.inner.service.system.SysUserRoleService; | ||
| 30 | import com.lframework.starter.web.inner.service.system.SysUserService; | 30 | import com.lframework.starter.web.inner.service.system.SysUserService; |
| 31 | import com.lframework.xingyun.sc.entity.DelayedShipment; | 31 | import com.lframework.xingyun.sc.entity.DelayedShipment; |
| 32 | import com.lframework.xingyun.sc.entity.DelayedShipmentDetail; | 32 | import com.lframework.xingyun.sc.entity.DelayedShipmentDetail; |
| 33 | +import com.lframework.xingyun.sc.entity.PurchaseOrderInfo; | ||
| 33 | import com.lframework.xingyun.sc.handlers.TransactorHandler; | 34 | import com.lframework.xingyun.sc.handlers.TransactorHandler; |
| 34 | import com.lframework.xingyun.sc.mappers.DelayedShipmentMapper; | 35 | import com.lframework.xingyun.sc.mappers.DelayedShipmentMapper; |
| 36 | +import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService; | ||
| 35 | import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService; | 37 | import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService; |
| 36 | import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService; | 38 | import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService; |
| 37 | import com.lframework.xingyun.sc.service.shipments.delay.DelayedShipmentDetailService; | 39 | import com.lframework.xingyun.sc.service.shipments.delay.DelayedShipmentDetailService; |
| @@ -68,6 +70,8 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen | @@ -68,6 +70,8 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen | ||
| 68 | private TransactorHandler transactorHandler; | 70 | private TransactorHandler transactorHandler; |
| 69 | @Resource | 71 | @Resource |
| 70 | private FlowTaskWrapperMapper flowTaskWrapperMapper; | 72 | private FlowTaskWrapperMapper flowTaskWrapperMapper; |
| 73 | + @Resource | ||
| 74 | + private PurchaseOrderInfoService purchaseOrderInfoService; | ||
| 71 | 75 | ||
| 72 | @Override | 76 | @Override |
| 73 | public PageResult<DelayedShipment> query(Integer pageIndex, Integer pageSize, QueryDelayedShipmentVo vo) { | 77 | public PageResult<DelayedShipment> query(Integer pageIndex, Integer pageSize, QueryDelayedShipmentVo vo) { |
| @@ -115,8 +119,11 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen | @@ -115,8 +119,11 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen | ||
| 115 | 119 | ||
| 116 | DelayedShipment data = new DelayedShipment(); | 120 | DelayedShipment data = new DelayedShipment(); |
| 117 | data.setId(IdUtil.getId()); | 121 | data.setId(IdUtil.getId()); |
| 118 | - if (!StringUtil.isBlank(vo.getDeptId())) { | ||
| 119 | - data.setDeptId(vo.getDeptId()); | 122 | + if (CollectionUtil.isNotEmpty(vo.getDelayedShipmentDetailList())) { |
| 123 | + CreateDelayedShipmentDetailVo vo1 = vo.getDelayedShipmentDetailList().get(0); | ||
| 124 | + String orderId = vo1.getOrderId(); | ||
| 125 | + PurchaseOrderInfo orderInfo = purchaseOrderInfoService.findById(orderId); | ||
| 126 | + data.setDeptId(orderInfo.getDeptId()); | ||
| 120 | } | 127 | } |
| 121 | if (vo.getApplyDate() != null) { | 128 | if (vo.getApplyDate() != null) { |
| 122 | data.setApplyDate(vo.getApplyDate()); | 129 | data.setApplyDate(vo.getApplyDate()); |