java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

修改自提选择包件查询

training
caoyizhong 1 year ago
parent
6446020824
commit
8e8957633c
12 changed files with 150 additions and 72 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java
  2. 20
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java
  3. 7
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionBillLadingDTO.java
  4. 10
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
  5. 22
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
  6. 57
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml
  7. 8
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java
  8. 5
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillLadingService.java
  9. 6
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillStockService.java
  10. 31
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
  11. 24
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
  12. 31
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

1
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java
Unescape View File

@ -39,6 +39,7 @@ public class DistributionParcelListVO extends DistributionParcelListEntity {
private Date stockupDate;
private String stockupArea;
private String goodsAllocation;
private Boolean choice; //是否选择
/**
* 包件状态名称
*/

20
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java
Unescape View File

@ -149,16 +149,16 @@ public class DistributionParcelListController extends BladeController {
}
// /**
// *
// */
// @GetMapping("/zeroMaterial")
// @ApiOperationSupport(order = 2)
// @ApiOperation(value = "查询零担物料数据", notes = "传入distributionParcelList")
// public R<List<DistributionParcelListZeroVO>> getZeroMaterial(@ApiIgnore @RequestParam Map<String, Object> distributionParcelList, Query query) {
// List<DistributionParcelListZeroVO> pages = distributionParcelListService.getZeroMaterial(distributionParcelList);
// return R.data(pages);
// }
/**
* 查询自提包件
*/
@GetMapping("/pickupPack")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "查询自提包件信息", notes = "传入distributionParcelList")
public R<List<DistributionParcelListVO>> getPickupPack(@ApiIgnore @RequestParam Map<String, Object> distributionParcelList, Query query) {
List<DistributionParcelListVO> list = distributionParcelListService.getPickupPack(distributionParcelList);
return R.data(list);
}
/**
* 修改零担在库数量

7
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionBillLadingDTO.java
Unescape View File

@ -145,10 +145,15 @@ public class DistrilbutionBillLadingDTO extends DistrilbutionBillLadingEntity {
private List<DistributionStockArticleEntity> stockArticleList;
/**
* 自提包件数据
* 自提新增包件数据
*/
private List<DistrilbutionBillPackageEntity> billPackageEntityList;
/**
* 自提取消包件数据
*/
private List<DistrilbutionBillPackageEntity> unBillPackageEntityList;
private List<Print> printList;
private List<Long> warehouseIdList;

10
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
Unescape View File

@ -195,7 +195,8 @@
from logpm_warehouse_updown_goods
where association_id = ldpl.id
) positionCode,lds.allocation_id allocationId
from logpm_distribution_parcel_list ldpl
from logpm_distrilbution_bill_package ldbp
LEFT JOIN logpm_distribution_parcel_list ldpl on ldbp.parce_list_id = ldpl.id and ldbp.packet_bar_status in (1,3) and ldbp.packet_bar_code is not null
LEFT JOIN logpm_distribution_stock lds on lds.parcel_list_id = ldpl.id
<where>
@ -222,7 +223,8 @@
from logpm_warehouse_updown_goods
where association_id = ldpl.id
) positionCode,lds.allocation_id allocationId
from logpm_distribution_parcel_list ldpl
from logpm_distrilbution_bill_package ldbp
LEFT JOIN logpm_distribution_parcel_list ldpl on ldbp.parce_list_id = ldpl.id and ldbp.packet_bar_status in (1,3) and ldbp.packet_bar_code is not null
LEFT JOIN logpm_distribution_stock lds on lds.parcel_list_id = ldpl.id
<where>
@ -258,8 +260,8 @@
) AS pallet,
lds.coding stockupStatus,lds.create_time stockupDate ,lds.stockup_area stockupArea
from logpm_distribution_stockup_info ldsi
LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldsi.reservation_id = ldbs.bill_lading_id
LEFT JOIN logpm_distribution_parcel_list ldpl on ldbs.stock_article_id =ldpl.stock_article_id
LEFT JOIN logpm_distrilbution_bill_package ldbp on ldsi.reservation_id = ldbp.bill_lading_id and ldbp.packet_bar_status in (1,3) and ldbp.packet_bar_code is not null
LEFT JOIN logpm_distribution_parcel_list ldpl on ldbp.parce_list_id =ldpl.id
LEFT JOIN logpm_distribution_stock lds on ldpl.id = lds.parcel_list_id and lds.stockup_id = ldsi.stockup_id
<where>
ldsi.stockup_id = #{id} and ldpl.conditions = '1' and ldpl.order_package_code is not null

22
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
Unescape View File

@ -467,24 +467,22 @@
<select id="selectStockupDetails" resultType="com.logpm.distribution.vo.DistributionStockupSelfVO">
select lds.stockup_area goodsAreaName,
(
select GROUP_CONCAT(DISTINCT ldsa.mall_name SEPARATOR ',')
( select GROUP_CONCAT(DISTINCT ldsa.mall_name SEPARATOR ',')
from logpm_distrilbution_bill_stock ldbs
LEFT JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldbs.stock_article_id
LEFT JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldbs.stock_article_id
where ldbs.bill_lading_id = ldsi.reservation_id
) consignee,
(
select COUNT(ldpl.id)
from logpm_distrilbution_bill_stock ldbs
LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id
where ldbs.bill_lading_id = ldsi.reservation_id and ldpl.order_package_code is not null and ldpl.conditions = '1'
) planNum,(
( SELECT COUNT( ldp.id )
FROM logpm_distrilbution_bill_package ldp
WHERE ldp.bill_lading_id = ldsi.reservation_id AND ldp.packet_bar_code IS NOT NULL AND ldp.packet_bar_status IN ( 1, 3 )
) planNum,
(
select COUNT(id)
from logpm_distribution_stock
where parcel_list_id in (
select ldpl.id
from logpm_distrilbution_bill_stock ldbs
LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id and ldpl.order_package_code is not null
LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id and ldpl.order_package_code is not null
where ldbs.bill_lading_id = ldsi.reservation_id
) and bill_lading_id = ldsi.reservation_id
) scanNum
@ -800,8 +798,8 @@
) AS goodsAllocation,
(
SELECT COUNT(*)
FROM logpm_distribution_parcel_list dpl
WHERE dpl.stock_article_id = ldbs.stock_article_id and dpl.conditions = '1'
FROM logpm_distrilbution_bill_package dp
WHERE dp.stock_article_id = ldbs.stock_article_id and dp.packet_bar_status in (1,3) and dp.packet_bar_code is not null
) AS reservationNum
from logpm_distribution_stockup_info ldsi
LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldsi.reservation_id = ldbs.bill_lading_id

57
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml
Unescape View File

@ -6,11 +6,20 @@
<resultMap id="distrilbutionBillStockResultMap" type="com.logpm.distribution.entity.DistrilbutionBillStockEntity">
</resultMap>
<select id="listPackageSelf" resultType="com.logpm.distribution.vo.DistributionStockPackageVO">
select ldpl.id parcelListId,ldpl.order_package_code packetBarCode,ldbs.stock_article_id stockArticleId,ldbs.bill_lading_id reservationId,ldpl.order_code orderCode
SELECT
ldpl.id parcelListId,
ldpl.order_package_code packetBarCode,
ldbp.stock_article_id stockArticleId,
ldbp.bill_lading_id reservationId,
ldpl.order_code orderCode
FROM logpm_distrilbution_bill_package ldbp
LEFT JOIN logpm_distribution_parcel_list ldpl ON ldbp.parce_list_id = ldpl.id
AND ldpl.order_package_status != '70'
<where>
ldbp.bill_lading_id = #{reservationId} and ldpl.order_package_code is NOT null and ldpl.conditions = '1'
and ldbp.packet_bar_status in (1,3)
</where>
from logpm_distrilbution_bill_stock ldbs
LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id and ldpl.order_package_status != '70'
where ldbs.bill_lading_id = #{reservationId} and ldpl.order_package_code is NOT null and ldpl.conditions = '1'
</select>
<select id="selectDistrilbutionBillStockPage" resultMap="distrilbutionBillStockResultMap">
@ -68,8 +77,8 @@
where lwtg.association_id = ldpl.id and lwtg.association_type = 3
) trays,ldpl.id parcelListId,lds.allocation_id lwugId
from logpm_distribution_stockup_info ldsi
LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldsi.reservation_id = ldbs.bill_lading_id
LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id and ldpl.order_package_grounding_status = 10
LEFT JOIN logpm_distrilbution_bill_package ldbp on ldsi.reservation_id = ldbp.bill_lading_id and ldbp.packet_bar_status in (1,3) and ldbp.packet_bar_code is not null
LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.id = ldbp.parce_list_id and ldpl.order_package_grounding_status = 10
LEFT JOIN logpm_distribution_stock lds on lds.stockup_id =ldsi.stockup_id and lds.parcel_list_id = ldpl.id
<!-- LEFT JOIN logpm_warehouse_updown_goods_log lwugl on ldpl.id = lwugl.association_id and lwugl.binding_type = 2 and lwugl.create_time >= DATE_SUB(NOW(), INTERVAL 10 MINUTE)-->
<where>
@ -82,25 +91,24 @@
GROUP BY ldpl.id,lds.allocation_id
</select>
<select id="selectDistrilbutionBillPackWuSelf" resultType="com.logpm.distribution.vo.DistributionStockupSelfVO">
select DISTINCT (
SELECT COUNT(lt.id)
select COALESCE( (
SELECT lt.stock_quantity
FROM logpm_distribution_stock lt
WHERE lt.parcel_list_id = ldpl.id and lt.stockup_id = ldsi.stockup_id and lt.bill_lading_id = ldsi.reservation_id
) scanNum,(
WHERE lt.parcel_list_id = ldbp.parce_list_id and lt.stockup_id = ldsi.stockup_id and lt.bill_lading_id = ldsi.reservation_id
) , 0) scanNum,(
select stockup_area
from logpm_distribution_stockup
where id = ldsi.stockup_id
) consignee,(
SELECT GROUP_CONCAT(lwtg.tray_code SEPARATOR ',')
FROM logpm_warehouse_tray_goods lwtg
where lwtg.association_id = ldpl.id and lwtg.association_type = 3
) trays,ldbs.stock_article_id stockArticleId,ldpl.id parcelListId,lds.allocation_id allocationId
where lwtg.association_id = ldbp.parce_list_id and lwtg.association_type = 3
) trays,ldbp.stock_article_id stockArticleId,ldbp.parce_list_id parcelListId,lds.allocation_id allocationId
from logpm_distribution_stockup_info ldsi
LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldsi.reservation_id = ldbs.bill_lading_id
LEFT JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldbs.stock_article_id and ldsa.is_zero = '0'
LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldsa.id
LEFT JOIN logpm_distribution_stock lds on ldpl.id = lds.parcel_list_id
where ldsi.stockup_id = #{stockupId} and ldsi.reservation_id = #{reservationId} and ldsa.is_zero = '0' and ldpl.conditions = '1'
LEFT JOIN logpm_distrilbution_bill_package ldbp on ldbp.bill_lading_id = ldsi.reservation_id and ldbp.packet_bar_status in (1,3) and ldbp.packet_bar_code is not null
LEFT JOIN logpm_distribution_stock lds on ldbp.parce_list_id = lds.parcel_list_id
where ldsi.stockup_id = #{stockupId} and ldsi.reservation_id = #{reservationId}
</select>
<select id="exportDistrilbutionBillStock" resultType="com.logpm.distribution.excel.DistrilbutionBillStockExcel">
@ -173,15 +181,14 @@
LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = lwug.association_id
where ldbs.bill_lading_id = #{reservationId} -->
select DISTINCT CONCAT( lwug.position_code ) allocation ,lwug.allocation_id allocationId , lwtg.tray_code pallet,lwtg.tray_id trayId,lwug.area_id areaId,
lwug.shelf_id shelfId,ldpl.order_code orderCode,ldpl.stock_article_id stockArticleId ,ldpl.id parcelListId,lds.id stockId,lds.stock_quantity stockQuantity
lwug.shelf_id shelfId,ldsa.order_code orderCode,ldsa.id stockArticleId ,ldbp.parce_list_id parcelListId,lds.id stockId,lds.stock_quantity stockQuantity
from logpm_distrilbution_bill_stock ldbs
LEFT JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldbs.stock_article_id
LEFT JOIN logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id
LEFT JOIN logpm_warehouse_updown_goods lwug on ldpl.id = lwug.association_id
LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
LEFT JOIN logpm_distribution_stock lds on lds.parcel_list_id = ldpl.id and lds.bill_lading_id = ldbs.bill_lading_id
where ldbs.bill_lading_id = #{reservationId} and ldsa.is_zero = #{isZero} and ldpl.conditions = '1'
from logpm_distrilbution_bill_package ldbp
LEFT JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldbp.stock_article_id
LEFT JOIN logpm_warehouse_updown_goods lwug on ldbp.parce_list_id = lwug.association_id
LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldbp.parce_list_id
LEFT JOIN logpm_distribution_stock lds on lds.parcel_list_id = ldbp.parce_list_id and lds.bill_lading_id = ldbp.bill_lading_id
where ldbp.bill_lading_id = #{reservationId} and ldsa.is_zero = #{isZero} and ldbp.packet_bar_status in (1,3)
</select>

8
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java
Unescape View File

@ -147,4 +147,12 @@ public interface IDistributionParcelListService extends BaseService<Distribution
* @return
*/
R packageTransferStock(Map<String, Object> distributionParcelList);
/**
* 查询自提包件
*
* @param distributionParcelList
* @return
*/
List<DistributionParcelListVO> getPickupPack(Map<String, Object> distributionParcelList);
}

5
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillLadingService.java
Unescape View File

@ -56,6 +56,11 @@ public interface IDistrilbutionBillLadingService extends BaseService<Distrilbuti
*/
List<DistrilbutionBillLadingExcel> exportDistrilbutionBillLading(Wrapper<DistrilbutionBillLadingEntity> queryWrapper);
/**
* 提货单 新增或修改
* @param distrilbutionBillLading
* @return
*/
Boolean ownSaveOrUpdate(DistrilbutionBillLadingDTO distrilbutionBillLading);
IPage<DistrilbutionBillLadingVO> pageList(IPage<Object> page, Map<String, Object> distrilbutionBillLading);

6
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillStockService.java
Unescape View File

@ -63,6 +63,12 @@ public interface IDistrilbutionBillStockService extends BaseService<Distrilbutio
IPage<DistributionBillOrderPackVO> getBillOrderPack(Map<String, Object> distrilbutionBillStock, IPage<Object> page);
/**
* 查询客户数据 自提
* @param reservationId
* @param isZero
* @return
*/
List<DistributionStockupOrderListVO> selectDistrilbutionBillSelf(Long reservationId,String isZero);
/**

31
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
Unescape View File

@ -39,7 +39,6 @@ import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient;
import lombok.AllArgsConstructor;
import org.springblade.common.constant.DictBizConstant;
import org.springblade.common.constant.order.OrderStockupStatusConstant;
import org.springblade.common.constant.orderpackage.OrderPackageGroundingStatusConstant;
import org.springblade.common.utils.CommonUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
@ -493,6 +492,36 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
return R.fail("没有可用数据！");
}
/**
* 查询自提包件
*
* @param distributionParcelList
* @return
*/
@Override
public List<DistributionParcelListVO> getPickupPack(Map<String, Object> distributionParcelList) {
Object o = distributionParcelList.get("stockArticleId");
Object reservationId = distributionParcelList.get("reservationId");
List<DistributionParcelListEntity> distributionParcelListEntities = baseMapper.selectList(Wrappers.<DistributionParcelListEntity>query().lambda()
.eq(DistributionParcelListEntity::getStockArticleId, o)
.eq(DistributionParcelListEntity::getConditions, "1")
);
List<DistributionParcelListVO> list = new ArrayList<>();
distributionParcelListEntities.forEach( i ->{
DistributionReservationZeroPackageEntity one = reservationZeroPackageService.getOne(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
.eq(DistributionReservationZeroPackageEntity::getStockArticleId, i.getStockArticleId())
.eq(DistributionReservationZeroPackageEntity::getReservationId, reservationId)
.eq(DistributionReservationZeroPackageEntity::getParcelListId, i.getId())
.apply("zero_package_status in (1,3)")
);
DistributionParcelListVO parcelListVO = new DistributionParcelListVO();
BeanUtils.copyProperties(i,parcelListVO);
parcelListVO.setChoice(ObjectUtils.isNotNull(one) ? true : false);
list.add(parcelListVO);
});
return list;
}
/**
* @param distributionParcelList 包件信息

24
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
Unescape View File

@ -2135,6 +2135,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
}
//把数据取出来
List<StockupZeroVO> zeroStockUpData;;
QueryWrapper<DistributionStockEntity> queryWrapper = new QueryWrapper<>();
if(stockupDTO.getTypeService().equals("3")){
//自提
if(ObjectUtils.isNull(stockupDTO.getAllocationId())){
@ -2145,7 +2146,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
//有
zeroStockUpData = distributionStockupService.getZeroStockUpDataYouSelf(stockupDTO);
}
queryWrapper.eq("bill_lading_id",stockupDTO.getReservationId());
} else {
//商 ，市
if(ObjectUtils.isNull(stockupDTO.getAllocationId())){
@ -2155,22 +2156,25 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
//有
zeroStockUpData = distributionStockupService.getZeroStockUpDataYou(stockupDTO);
}
queryWrapper.eq("reservation_id",stockupDTO.getReservationId());
}
int xiugai= 0;
List<StockupZeroVO> collect = zeroStockUpData.stream().filter( //可以
a -> stockupDTO.getList().stream().anyMatch(q -> a.getStockArticleId().equals(q.getStockArticleId()) && q.getQuantity() <= a.getQuantity() && q.getQuantity() > 0)
List<StockupZeroVO> collect = stockupDTO.getList().stream().filter( //可以
a -> zeroStockUpData.stream().anyMatch(q -> q.getStockArticleId().equals(a.getStockArticleId()) && a.getQuantity() <= q.getQuantity() && a.getQuantity() > 0)
).collect(Collectors.toList());
//添加备货信息
List<DistributionStockEntity> stockEntityList = new ArrayList<>();
for (StockupZeroVO i : collect) {
//查询是不是当前包件
DistributionReservationZeroPackageEntity byId1 = reservationZeroPackageService.getById(i.getId());
if(ObjectUtils.isNull(byId1)){
continue;
}
//查询有没有备货过
DistributionStockEntity one = distributionStockService.getOne(Wrappers.<DistributionStockEntity>query().lambda()
.eq(DistributionStockEntity::getStockArticle, i.getStockArticleId())
.eq(DistributionStockEntity::getStockupId, stockupDTO.getStockupId())
.eq(DistributionStockEntity::getReservationId, stockupDTO.getReservationId())
.eq(DistributionStockEntity::getParcelListId, i.getParcelListId())
);
queryWrapper.eq("stock_article",i.getStockArticleId());
queryWrapper.eq("stockup_id",stockupDTO.getStockupId());
queryWrapper.eq("parcel_list_id", byId1.getParcelListId());
DistributionStockEntity one = distributionStockService.getOne(queryWrapper );
//查询备货数量
DistributionReservationZeroPackageEntity byId = reservationZeroPackageService.getById(i.getId());
if(i.getQuantity() > byId.getQuantity()){

31
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
Unescape View File

@ -128,6 +128,11 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
return distrilbutionBillLadingList;
}
/**
* 提货单 新增或修改
* @param distrilbutionBillLading
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean ownSaveOrUpdate(DistrilbutionBillLadingDTO distrilbutionBillLading) {
@ -137,6 +142,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
//修改
this.updateById(distrilbutionBillLading);
if(!distrilbutionBillLading.getBillPackageEntityList().isEmpty()){
//修改新增包件
//todo 还没有改
updateBillPackeg(distrilbutionBillLading);
}
//修改零担数据
@ -456,7 +463,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
}
/**
* 修改提货包件数据
* 添加提货包件数据
* @return
*/
public Boolean updateBillPackeg(DistrilbutionBillLadingDTO distrilbutionBillLading){
@ -479,14 +486,14 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
if(i.getParceListId().equals(next.getParceListId())){
//存在
iterator.remove();
cz = true;
continue;
// cz = true;
// continue;
}
}
if(!cz){
//删除
sc.add(i.getId());
}
// if(!cz){
// //删除
// sc.add(i.getId());
// }
});
//新增包件
@ -501,8 +508,14 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
distrilbutionBillPackageService.saveBatch(packageEntityList);
}
//删除包件
if(!sc.isEmpty()){
distrilbutionBillPackageService.deleteLogic(sc);
if(!distrilbutionBillLading.getUnBillPackageEntityList().isEmpty()){
List<Long> collect = distrilbutionBillLading.getUnBillPackageEntityList().stream().map(e -> e.getParceListId()).collect(Collectors.toList());
boolean update = distrilbutionBillPackageService.update(Wrappers.<DistrilbutionBillPackageEntity>update()
.in("parce_list_id", collect)
.set("packet_bar_status", 2));
if(!update){
throw new ServiceException("修改失败！！！");
}
}
});
return true;

Write Preview
Loading…
Cancel
Save