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

修改包件转库存品

training
caoyizhong 1 year ago
parent
09fa2152ec
commit
44f3c27907
3 changed files with 85 additions and 56 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/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
  2. 16
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
  3. 124
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java

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

@ -436,6 +436,7 @@
</if>
<if test="param.stockArticleIdsLike != null and param.stockArticleIdsLike != ''" >and ldpl.stock_article_id = #{param.stockArticleIdsLike} </if>
<if test="param.stockArticleId != null and param.stockArticleId != ''" >and ldpl.stock_article_id = #{param.stockArticleId} </if>
<if test="param.conditions != null and param.conditions != ''" >and ldpl.conditions = #{param.conditions} </if>
</where>

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

@ -416,18 +416,18 @@
<if test=" param.availableQuantity != null ">and ldsa.available_quantity like
concat('%',#{param.availableQuantity},'%')
</if>
<if test=" param.groundingStatus != null ">and ldsa.grounding_status = #{param.groundingStatus}</if>
<if test=" param.genre != null ">and ldsa.genre = #{param.genre}</if>
<if test=" param.freezeStatus != null ">and ldsa.freeze_status = #{param.freezeStatus}</if>
<if test=" param.orderStatus != null ">and ldsa.order_status = #{param.orderStatus}</if>
<if test=" param.reservationStatus != null ">and ldsa.reservation_status = #{param.reservationStatus}</if>
<if test=" param.stockupStatus != null ">and ldsa.stockup_status = #{param.stockupStatus}</if>
<if test=" param.orderReceiveStatus != null ">and ldsa.order_receive_status =
<if test=" param.groundingStatus != null and param.groundingStatus != '' ">and ldsa.grounding_status = #{param.groundingStatus}</if>
<if test=" param.genre != null and param.groundingStatus != '' ">and ldsa.genre = #{param.genre}</if>
<if test=" param.freezeStatus != null and param.groundingStatus != '' ">and ldsa.freeze_status = #{param.freezeStatus}</if>
<if test=" param.orderStatus != null and param.groundingStatus != '' ">and ldsa.order_status = #{param.orderStatus}</if>
<if test=" param.reservationStatus != null and param.groundingStatus != '' ">and ldsa.reservation_status = #{param.reservationStatus}</if>
<if test=" param.stockupStatus != null and param.groundingStatus != '' ">and ldsa.stockup_status = #{param.stockupStatus}</if>
<if test=" param.orderReceiveStatus != null and param.groundingStatus != '' ">and ldsa.order_receive_status =
#{param.orderReceiveStatus}
</if>
<if test=" param.completeSet != null ">and ldsa.complete_set like concat('%',#{param.completeSet},'%')
</if>
<if test=" param.typeService != null ">and ldsa.type_service like concat('%',#{param.typeService},'%')
<if test=" param.typeService != null and param.groundingStatus != '' ">and ldsa.type_service like concat('%',#{param.typeService},'%')
</if>
<if test=" param.customerName != null and param.customerName != '' ">and ldsa.customer_name like
concat('%',#{param.customerName},'%')

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

@ -395,6 +395,10 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
if(ObjectUtils.isNull(o)){
return R.fail("参数不完整！");
}
BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
if(ObjectUtils.isNull(myCurrentWarehouse)){
throw new ServiceException("请选择仓库！");
}
QueryWrapper<DistributionParcelListEntity> queryWrapper = new QueryWrapper<>();
String s = String.valueOf(o);
if(s.contains(",")){
@ -403,55 +407,79 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
}else{
queryWrapper.eq("id",o);
}
queryWrapper.eq("conditions",1);
List<DistributionParcelListEntity> list1 = baseMapper.selectList(queryWrapper);
// if (!list1.isEmpty()) {
// list1.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getMaterialId))
// .forEach((k ,v) ->{
// int sum = v.stream().mapToInt(DistributionParcelListEntity::getQuantity).sum();
// v.stream().forEach( i -> {
// //查询有没有打托数据
//
// //查询包件有没有物料
// List<DistributionParcelDetailsEntity> list = distributionParcelDetailsService.list(Wrappers.<DistributionParcelDetailsEntity>query().lambda()
// .eq(DistributionParcelDetailsEntity::getParcelListId, i.getId())
// );
// if (!list.isEmpty()) {
// //有
// list.stream().collect(Collectors.groupingBy(DistributionParcelDetailsEntity::getEncoded))
// .forEach((kk,vv) ->{
// DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
// BeanUtil.copyProperties(vv.get(0),parcelListEntity);
// parcelListEntity.setQuantity(sum);
// parcelListEntity.setMaterialName(vv.get(0).getName());
// parcelListEntity.setMaterialCode(vv.get(0).getEncoded());
// parcelListEntity.setMaterialUnit(vv.get(0).getUnit());
// // 添加库存品信息
// addStockList(parcelListEntity, 1);
// });
// }
// DistributionParcelListEntity parcelList = new DistributionParcelListEntity();
// parcelList.setId(i.getId());
// parcelList.setConditions(2);
// baseMapper.updateById(parcelList);
//
// });
// DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
// BeanUtil.copyProperties(v.get(0),parcelListEntity);
// parcelListEntity.setQuantity(sum);
// // 添加库存品信息
// addStockList(parcelListEntity, 1);
// });
//
//// for (int i = 0; i < split.length; i++) {
//// //修改订单状态
//// DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity();
//// stockArticleEntity.setId(Long.parseLong(split[i]));
//// stockArticleEntity.setGenre(2);
//// baseMapper.updateById(stockArticleEntity);
//// }
// return R.success("操作成功！");
// }
return null;
if (!list1.isEmpty()) {
Set<Long> listString = new HashSet<>();
list1.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getMaterialId))
.forEach((k ,v) ->{
int sum = v.stream().mapToInt(DistributionParcelListEntity::getQuantity).sum();
v.stream().forEach( i -> {
//查询有没有打托数据
//查询包件有没有物料
List<DistributionParcelDetailsEntity> list = distributionParcelDetailsService.list(Wrappers.<DistributionParcelDetailsEntity>query().lambda()
.eq(DistributionParcelDetailsEntity::getParcelListId, i.getId())
);
if (!list.isEmpty()) {
//有
list.stream().collect(Collectors.groupingBy(DistributionParcelDetailsEntity::getEncoded))
.forEach((kk,vv) ->{
DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
BeanUtil.copyProperties(vv.get(0),parcelListEntity);
parcelListEntity.setQuantity(sum);
parcelListEntity.setMaterialName(vv.get(0).getName());
parcelListEntity.setMaterialCode(vv.get(0).getEncoded());
parcelListEntity.setMaterialUnit(vv.get(0).getUnit());
// 添加库存品信息
addStockList(parcelListEntity, 1);
});
}
//修改状态
DistributionParcelListEntity parcelList = new DistributionParcelListEntity();
parcelList.setId(i.getId());
parcelList.setConditions(2);
baseMapper.updateById(parcelList);
listString.add(i.getStockArticleId());
});
DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
BeanUtil.copyProperties(v.get(0),parcelListEntity);
parcelListEntity.setQuantity(sum);
// 添加库存品信息
addStockList(parcelListEntity, 1);
});
listString.forEach( oo -> {
DistributionStockArticleEntity stockArticleEntity1 = distributionStockArticleMapper.selectById(oo);
if(ObjectUtils.isNull(stockArticleEntity1)){
throw new ServiceException("订单不存在！");
}
if(stockArticleEntity1.getTotalNumber().equals(list1.size())){
//修改订单状态
DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity();
//修改
stockArticleEntity.setId(oo);
stockArticleEntity.setGenre(2);
distributionStockArticleMapper.updateById(stockArticleEntity);
}
//查询库存品的订单
List<DistributionParcelListEntity> distributionParcelListEntities = baseMapper.selectList(Wrappers.<DistributionParcelListEntity>query().lambda()
.eq(DistributionParcelListEntity::getStockArticleId, oo)
.eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId())
.eq(DistributionParcelListEntity::getConditions, 2)
);
if(!distributionParcelListEntities.isEmpty() && stockArticleEntity1.getTotalNumber().equals(distributionParcelListEntities.size())){
//修改订单状态
DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity();
//修改
stockArticleEntity.setId(oo);
stockArticleEntity.setGenre(2);
distributionStockArticleMapper.updateById(stockArticleEntity);
}
});
return R.success("操作成功！");
}
return R.fail("没有可用数据！");
}

Write Preview
Loading…
Cancel
Save