朱园亮 / xingyun-erp · Commits

Commit ba15ee6bf9583ad29c04f089a1e83223d49381a9

Authored by 房远帅
1 parent 866d8ab0

发货计划：去除延期发货审核中的数据

Inline Side-by-side
Showing 5 changed files with 56 additions and 0 deletions
@@ -147,6 +147,12 @@ public class GetPurchaseOrderLineBo extends BaseBo<PurchaseOrderLine> { @@ -147,6 +147,12 @@ public class GetPurchaseOrderLineBo extends BaseBo<PurchaseOrderLine> {
147 @ApiModelProperty("包装费") 147 @ApiModelProperty("包装费")
148 private BigDecimal packagingFee; 148 private BigDecimal packagingFee;
149 149
  150 + /**
  151 + * 是否已发货
  152 + */
  153 + @ApiModelProperty("是否已发货")
  154 + private Boolean shipment;
  155 +
150 public GetPurchaseOrderLineBo() { 156 public GetPurchaseOrderLineBo() {
151 157
152 } 158 }
@@ -27,7 +27,10 @@ import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService; @@ -27,7 +27,10 @@ import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
27 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService; 27 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
28 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService; 28 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
29 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanService; 29 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanService;
  30 +import com.lframework.xingyun.sc.service.shipments.delay.DelayedShipmentDetailService;
  31 +import com.lframework.xingyun.sc.service.shipments.delay.DelayedShipmentService;
30 import com.lframework.xingyun.sc.utils.CommonUtil; 32 import com.lframework.xingyun.sc.utils.CommonUtil;
  33 +import com.lframework.xingyun.sc.vo.shipments.delay.QueryDelayedShipmentVo;
31 import com.lframework.xingyun.sc.vo.shipments.plan.*; 34 import com.lframework.xingyun.sc.vo.shipments.plan.*;
32 import org.apache.commons.collections4.CollectionUtils; 35 import org.apache.commons.collections4.CollectionUtils;
33 import org.apache.commons.lang3.StringUtils; 36 import org.apache.commons.lang3.StringUtils;
@@ -61,6 +64,11 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP @@ -61,6 +64,11 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
61 private SysRoleService sysRoleService; 64 private SysRoleService sysRoleService;
62 @Resource 65 @Resource
63 private SysUserDeptService sysUserDeptService; 66 private SysUserDeptService sysUserDeptService;
  67 + @Resource
  68 + private DelayedShipmentService delayedShipmentService;
  69 + @Resource
  70 + private DelayedShipmentDetailService delayedShipmentDetailService;
  71 +
64 72
65 73
66 @Override 74 @Override
@@ -208,12 +216,36 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP @@ -208,12 +216,36 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
208 existOrderSpecIds.addAll(orderSpecIds); 216 existOrderSpecIds.addAll(orderSpecIds);
209 } 217 }
210 } 218 }
  219 + //延期发货单中审核中、审核驳回的数据不可被选择
  220 + QueryDelayedShipmentVo vo1 = new QueryDelayedShipmentVo();
  221 + vo1.setStatus("AUDIT");
  222 + List<DelayedShipment> query = delayedShipmentService.query(vo1);
  223 + List<String> ids = new ArrayList<>();
  224 + if (CollectionUtils.isNotEmpty(query)) {
  225 + ids = query.stream().map(DelayedShipment::getId).collect(Collectors.toList());
  226 + }
  227 + QueryDelayedShipmentVo vo2 = new QueryDelayedShipmentVo();
  228 + vo2.setStatus("REFUSE");
  229 + List<DelayedShipment> query1 = delayedShipmentService.query(vo2);
  230 + if (CollectionUtils.isNotEmpty(query1)) {
  231 + ids.addAll(query.stream().map(DelayedShipment::getId).collect(Collectors.toList()));
  232 + }
  233 + List<String> orderSpecIdList = new ArrayList<>();
  234 + if (CollectionUtils.isNotEmpty(ids)) {
  235 + List<DelayedShipmentDetail> delayedShipmentDetails = delayedShipmentDetailService.queryByList(ids);
  236 + if (CollectionUtils.isNotEmpty(delayedShipmentDetails)) {
  237 + orderSpecIdList = delayedShipmentDetails.stream().map(DelayedShipmentDetail::getOrderSpecId).collect(Collectors.toList());
  238 + }
  239 + }
211 List<String> orderSpecIds = vo.getOrderSpecIds(); 240 List<String> orderSpecIds = vo.getOrderSpecIds();
212 if (CollectionUtils.isNotEmpty(orderSpecIds)) { 241 if (CollectionUtils.isNotEmpty(orderSpecIds)) {
213 orderSpecIds.addAll(existOrderSpecIds); 242 orderSpecIds.addAll(existOrderSpecIds);
214 } else { 243 } else {
215 orderSpecIds = existOrderSpecIds; 244 orderSpecIds = existOrderSpecIds;
216 } 245 }
  246 + if (CollectionUtils.isNotEmpty(orderSpecIdList)) {
  247 + orderSpecIds.addAll(orderSpecIdList);
  248 + }
217 vo.setOrderSpecIds(orderSpecIds); 249 vo.setOrderSpecIds(orderSpecIds);
218 // 业务员做权限控制 250 // 业务员做权限控制
219 List<String> userIds = new ArrayList<>(); 251 List<String> userIds = new ArrayList<>();
1 package com.lframework.xingyun.sc.impl.shipments.delay; 1 package com.lframework.xingyun.sc.impl.shipments.delay;
2 2
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
3 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; 4 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
4 import com.baomidou.mybatisplus.core.toolkit.Wrappers; 5 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
5 import com.github.pagehelper.PageInfo; 6 import com.github.pagehelper.PageInfo;
@@ -48,6 +49,14 @@ public class DelayedShipmentDetailServiceImpl extends BaseMpServiceImpl<DelayedS @@ -48,6 +49,14 @@ public class DelayedShipmentDetailServiceImpl extends BaseMpServiceImpl<DelayedS
48 } 49 }
49 50
50 @Override 51 @Override
  52 + public List<DelayedShipmentDetail> queryByList(List<String> delayedShipmentIds) {
  53 + LambdaQueryWrapper<DelayedShipmentDetail> lambdaQueryWrapper = Wrappers.lambdaQuery(DelayedShipmentDetail.class);
  54 + lambdaQueryWrapper.in(DelayedShipmentDetail::getDelayedShipmentId, delayedShipmentIds);
  55 +
  56 + return getBaseMapper().selectList(lambdaQueryWrapper);
  57 + }
  58 +
  59 + @Override
51 public DelayedShipmentDetail findById(String id) { 60 public DelayedShipmentDetail findById(String id) {
52 61
53 return getBaseMapper().findById(id); 62 return getBaseMapper().findById(id);
@@ -27,6 +27,13 @@ public interface DelayedShipmentDetailService extends BaseMpService<DelayedShipm @@ -27,6 +27,13 @@ public interface DelayedShipmentDetailService extends BaseMpService<DelayedShipm
27 List<DelayedShipmentDetail> query(QueryDelayedShipmentDetailVo vo); 27 List<DelayedShipmentDetail> query(QueryDelayedShipmentDetailVo vo);
28 28
29 /** 29 /**
  30 + * 根据延期发货单ids，查询
  31 + * @param delayedShipmentIds
  32 + * @return
  33 + */
  34 + List<DelayedShipmentDetail> queryByList(List<String> delayedShipmentIds);
  35 +
  36 + /**
30 * 根据ID查询 37 * 根据ID查询
31 * @param id 38 * @param id
32 * @return 39 * @return
@@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
25 <result column="show_order" property="showOrder"/> 25 <result column="show_order" property="showOrder"/>
26 <result column="assessment_exceeds_agreement" property="assessmentExceedsAgreement"/> 26 <result column="assessment_exceeds_agreement" property="assessmentExceedsAgreement"/>
27 <result column="packaging_fee" property="packagingFee"/> 27 <result column="packaging_fee" property="packagingFee"/>
  28 + <result column="shipment" property="shipment"/>
28 <result column="create_by_id" property="createById"/> 29 <result column="create_by_id" property="createById"/>
29 <result column="create_by" property="createBy"/> 30 <result column="create_by" property="createBy"/>
30 <result column="update_by_id" property="updateById"/> 31 <result column="update_by_id" property="updateById"/>
@@ -57,6 +58,7 @@ @@ -57,6 +58,7 @@
57 tb.show_order, 58 tb.show_order,
58 tb.assessment_exceeds_agreement, 59 tb.assessment_exceeds_agreement,
59 tb.packaging_fee, 60 tb.packaging_fee,
  61 + tb.shipment,
60 tb.create_by_id, 62 tb.create_by_id,
61 tb.create_by, 63 tb.create_by,
62 tb.update_by_id, 64 tb.update_by_id,