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

Merge branch 'dev' into pre-production

master
汤建军 6 months ago
parent
462550170d a85659e1c2
commit
196a0f98b5
4 changed files with 118 additions and 115 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java
  2. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml
  3. 64
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvalueServiceImpl.java
  4. 164
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

2
blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java
Unescape View File

@ -9,7 +9,7 @@ public interface ModuleNameConstant {
/** /**
* 如果不需要 "" * 如果不需要 ""
*/ */
public static final String DEVAUTH =""; public static final String DEVAUTH ="-tjj";
/** /**
* 工厂对接服务名称 * 工厂对接服务名称

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

@ -471,6 +471,9 @@
LEFT JOIN logpm_distribution_stock lds on lds.stock_article = ldbs.stock_article_id AND ldbl.id = lds.bill_lading_id LEFT JOIN logpm_distribution_stock lds on lds.stock_article = ldbs.stock_article_id AND ldbl.id = lds.bill_lading_id
WHERE WHERE
ldbs.is_deleted = 0 and ldbs.bill_lading_id = #{id} and ldbs.order_status in (1,3) ldbs.is_deleted = 0 and ldbs.bill_lading_id = #{id} and ldbs.order_status in (1,3)
GROUP BY
ldsa.id
</select> </select>
</mapper> </mapper>

64
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvalueServiceImpl.java
Unescape View File

@ -397,7 +397,11 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
@Override @Override
@Transactional @Transactional
public R savePCAddvalueInfo(DistributionAppAddvalueDTO distributionAppAddvalueDTO) { public R savePCAddvalueInfo(DistributionAppAddvalueDTO distributionAppAddvalueDTO) {
List<DistributionAddvaluePackageDTO> packageEntityList = distributionAppAddvalueDTO.getPackageEntityList(); List<DistributionAddvaluePackageDTO> packageEntityList = new ArrayList<>();
if (!Func.isEmpty(distributionAppAddvalueDTO.getPackageEntityList())){
packageEntityList = distributionAppAddvalueDTO.getPackageEntityList();
}
//查询是否重复添加 //查询是否重复添加
DistributionAddvalueEntity addvalueEntity = distributionAddvalueMapper.selectOne(Wrappers.<DistributionAddvalueEntity>query().lambda() DistributionAddvalueEntity addvalueEntity = distributionAddvalueMapper.selectOne(Wrappers.<DistributionAddvalueEntity>query().lambda()
@ -409,11 +413,6 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
return Resp.scanFail("操作失败", "存在该类型增值服务项,如需更改请编辑"); return Resp.scanFail("操作失败", "存在该类型增值服务项,如需更改请编辑");
} }
DistributionAddvalueDetailEntity distributionAddvalueDetailEntity = new DistributionAddvalueDetailEntity(); DistributionAddvalueDetailEntity distributionAddvalueDetailEntity = new DistributionAddvalueDetailEntity();
// if (Func.isEmpty(distributionAppAddvalueDTO.getNum())) {
// return Resp.scanFail("添加失败", "错误的包件数量");
// } else {
// distributionAddvalueDetailEntity.setNum(distributionAppAddvalueDTO.getNum());
// }
DistributionReservationEntity reservationEntity = distributionReservationMapper.selectById(distributionAppAddvalueDTO.getReservationId()); DistributionReservationEntity reservationEntity = distributionReservationMapper.selectById(distributionAppAddvalueDTO.getReservationId());
if (Func.isEmpty(reservationEntity)) { if (Func.isEmpty(reservationEntity)) {
return Resp.scanFail("添加失败", "客户信息错误"); return Resp.scanFail("添加失败", "客户信息错误");
@ -428,7 +427,7 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
} else { } else {
distributionAddvalueDetailEntity.setFloolNum(distributionAppAddvalueDTO.getFloolNum()); distributionAddvalueDetailEntity.setFloolNum(distributionAppAddvalueDTO.getFloolNum());
} }
packageEntityList = distributionAppAddvalueDTO.getPackageEntityList();
break; break;
case "2": case "2":
if (Func.isEmpty(distributionAppAddvalueDTO.getDistance())) { if (Func.isEmpty(distributionAppAddvalueDTO.getDistance())) {
@ -439,7 +438,7 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
if (Func.isEmpty(distributionAppAddvalueDTO.getFee())){ if (Func.isEmpty(distributionAppAddvalueDTO.getFee())){
return Resp.scanFail("添加失败", "请输入超区费用"); return Resp.scanFail("添加失败", "请输入超区费用");
}else { }else {
totalFee.add(distributionAppAddvalueDTO.getFee()); totalFee = totalFee.add(distributionAppAddvalueDTO.getFee());
} }
Map<String, Object> addValueDTO = new HashMap<>(); Map<String, Object> addValueDTO = new HashMap<>();
addValueDTO.put("reservationId",distributionAppAddvalueDTO.getReservationId().toString()); addValueDTO.put("reservationId",distributionAppAddvalueDTO.getReservationId().toString());
@ -467,7 +466,7 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
if (Func.isEmpty(distributionAppAddvalueDTO.getFee())){ if (Func.isEmpty(distributionAppAddvalueDTO.getFee())){
return Resp.scanFail("添加失败", "请输入专车费用"); return Resp.scanFail("添加失败", "请输入专车费用");
}else { }else {
totalFee.add(distributionAppAddvalueDTO.getFee()); totalFee = totalFee.add(distributionAppAddvalueDTO.getFee());
} }
List<DistributionAddvaluePackageDTO> specialCarList = distributionSignforService.checkAddValuePCPackageList(distributionAppAddvalueDTO.getReservationId()); List<DistributionAddvaluePackageDTO> specialCarList = distributionSignforService.checkAddValuePCPackageList(distributionAppAddvalueDTO.getReservationId());
if (!Func.isEmpty(specialCarList)){ if (!Func.isEmpty(specialCarList)){
@ -612,8 +611,9 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
} }
}); });
if (!addvaluePackageEntities.isEmpty()) { if (!addvaluePackageEntities.isEmpty()) {
BigDecimal finalTotalFee = totalFee;
addvaluePackageEntities.forEach(p ->{ addvaluePackageEntities.forEach(p ->{
totalFee.add(p.getFee()); finalTotalFee.add(p.getFee());
}); });
distributionAddvalueDetailEntity.setFee(totalFee); distributionAddvalueDetailEntity.setFee(totalFee);
distributionAddvalueDetailService.updateById(distributionAddvalueDetailEntity); distributionAddvalueDetailService.updateById(distributionAddvalueDetailEntity);
@ -710,6 +710,10 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
if (Func.isNotEmpty(parcelListEntities)) { if (Func.isNotEmpty(parcelListEntities)) {
parcelListEntities.stream().forEach(p -> { parcelListEntities.stream().forEach(p -> {
p.setRecordType("1"); p.setRecordType("1");
//进行客户信息完善
}); });
} }
if (Func.isNotEmpty(zeroPackageList)) { if (Func.isNotEmpty(zeroPackageList)) {
@ -717,18 +721,6 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
p.setRecordType("1"); p.setRecordType("1");
}); });
} }
// List<DistributionAddvaluePackageEntity> entityList = null;
// if (Func.isNotEmpty(packageEntityList)) {
// entityList = parcelListEntities.stream().filter(p1 -> packageEntityList.stream().noneMatch(p2 -> p2.equals(p1.getId()))).collect(Collectors.toList());
// if (Func.isEmpty(entityList)) {
// log.error("################该客户下库存品包件信息:{}", detailEntities);
// log.error("################该客户下包件信息:{}", parcelListEntities);
// }
// } else {
// entityList = parcelListEntities;
// }
return parcelListEntities; return parcelListEntities;
} }
@ -942,25 +934,33 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
} }
AtomicReference<BigDecimal> newFee = new AtomicReference<>(BigDecimal.ZERO); AtomicReference<BigDecimal> newFee = new AtomicReference<>(BigDecimal.ZERO);
List<Long> packageIds = packageEntityList.stream().map(DistributionAddvaluePackageDTO::getPackageId).collect(Collectors.toList()); List<Long> packageIds = packageEntityList.stream().map(DistributionAddvaluePackageDTO::getPackageId).collect(Collectors.toList());
packageEntityList.forEach(p->{ // packageEntityList.forEach(p->{
newFee.set(distributionAddvalueDetailEntity.getFee().subtract(p.getUnitPrice())); // newFee.set(distributionAddvalueDetailEntity.getFee().subtract(p.getUnitPrice()));
//
}); // });
List<DistributionAddvaluePackageEntity> addvaluePackageEntities = distributionAddvaluePackageMapper.selectList(Wrappers.<DistributionAddvaluePackageEntity>query().lambda() List<DistributionAddvaluePackageEntity> addvaluePackageEntities = distributionAddvaluePackageMapper.selectList(Wrappers.<DistributionAddvaluePackageEntity>query().lambda()
.eq(DistributionAddvaluePackageEntity::getReservationId, distributionAppAddvalueDTO.getReservationId()) .eq(DistributionAddvaluePackageEntity::getReservationId, distributionAppAddvalueDTO.getReservationId())
.eq(DistributionAddvaluePackageEntity::getAddvalueDetailId, distributionAppAddvalueDTO.getAddvalueDetailId()) .eq(DistributionAddvaluePackageEntity::getAddvalueDetailId, distributionAppAddvalueDTO.getAddvalueDetailId())
); );
if (!addvaluePackageEntities.isEmpty()) {
List<DistributionAddvaluePackageEntity> entityList = addvaluePackageEntities.stream().filter(f -> packageIds.contains(f.getPackageId())).collect(Collectors.toList());
entityList.forEach(l->{
newFee.set(distributionAddvalueDetailEntity.getFee().subtract(l.getUnitPrice()));
});
}
int sum = packageEntityList.stream().mapToInt(DistributionAddvaluePackageEntity::getQuantity).sum();
//维护详情的件数和金额
distributionAddvalueDetailEntity.setFee(newFee.get());
distributionAddvalueDetailEntity.setNum(distributionAddvalueDetailEntity.getNum() - sum);
distributionAddvalueDetailMapper.updateById(distributionAddvalueDetailEntity);
if (Objects.equals(packageIds.size(),addvaluePackageEntities.size())){ if (Objects.equals(packageIds.size(),addvaluePackageEntities.size())){
//此增值服务项进行全部取消 //此增值服务项进行全部取消
//这里就需要对整个增值服务项进行删除 //这里就需要对整个增值服务项进行删除
distributionAddvalueDetailMapper.deleteAddvalueDetailById(distributionAppAddvalueDTO.getAddvalueDetailId()); distributionAddvalueDetailMapper.deleteAddvalueDetailById(distributionAppAddvalueDTO.getAddvalueDetailId());
distributionAddvalueMapper.deleteAddvalue(distributionAppAddvalueDTO.getReservationId(), distributionAppAddvalueDTO.getAddvalueType()); distributionAddvalueMapper.deleteAddvalue(distributionAppAddvalueDTO.getReservationId(), distributionAppAddvalueDTO.getAddvalueType());
}else {
int sum = packageEntityList.stream().mapToInt(DistributionAddvaluePackageEntity::getQuantity).sum();
//维护详情的件数和金额
distributionAddvalueDetailEntity.setFee(newFee.get());
distributionAddvalueDetailEntity.setNum(distributionAddvalueDetailEntity.getNum() - sum);
distributionAddvalueDetailMapper.updateById(distributionAddvalueDetailEntity);
} }
//查看取消增值服务的保健是否存在该项增值服务中，存在才能继续执行 //查看取消增值服务的保健是否存在该项增值服务中，存在才能继续执行
boolean isExistence = packageIds.stream().allMatch(id -> addvaluePackageEntities.stream().map(DistributionAddvaluePackageEntity::getPackageId).collect(Collectors.toList()).contains(id)); boolean isExistence = packageIds.stream().allMatch(id -> addvaluePackageEntities.stream().map(DistributionAddvaluePackageEntity::getPackageId).collect(Collectors.toList()).contains(id));

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

@ -217,8 +217,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
private IDistributionNodeWorkService iDistributionNodeWorkService; private IDistributionNodeWorkService iDistributionNodeWorkService;
@Override @Override
public IPage<DistrilbutionBillLadingVO> selectDistrilbutionBillLadingPage(IPage<DistrilbutionBillLadingVO> page, DistrilbutionBillLadingVO distrilbutionBillLading) { public IPage<DistrilbutionBillLadingVO> selectDistrilbutionBillLadingPage(IPage<DistrilbutionBillLadingVO> page, DistrilbutionBillLadingVO distrilbutionBillLading) {
return page.setRecords(baseMapper.selectDistrilbutionBillLadingPage(page, distrilbutionBillLading)); return page.setRecords(baseMapper.selectDistrilbutionBillLadingPage(page, distrilbutionBillLading));
@ -665,7 +663,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
JSONObject js = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), distrilbutionBillPackageEntity.getOrderPackageCode(), content, WorkNodeEnums.PLAN_BILLOFLADING.getCode()); JSONObject js = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), distrilbutionBillPackageEntity.getOrderPackageCode(), content, WorkNodeEnums.PLAN_BILLOFLADING.getCode());
logs.add(js); logs.add(js);
} }
sendFactoryPlan(packageMap.get(Long.parseLong(s)),myCurrentWarehouse, distrilbutionBillLading); sendFactoryPlan(packageMap.get(Long.parseLong(s)), myCurrentWarehouse, distrilbutionBillLading);
} else { } else {
//没有进行包件的勾选，默认添加所有可用包件至计划下 //没有进行包件的勾选，默认添加所有可用包件至计划下
List<DistributionParcelListEntity> parcelListEntities = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda() List<DistributionParcelListEntity> parcelListEntities = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
@ -898,7 +896,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
// 包件按品牌分组 // 包件按品牌分组
try { try {
Map<String, List<DistributionParcelListEntity>> parcelListMap = parcelListEntities.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getBrandName)); Map<String, List<DistributionParcelListEntity>> parcelListMap = parcelListEntities.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getBrandName));
if(CollUtil.isNotEmpty(parcelListMap)){ if (CollUtil.isNotEmpty(parcelListMap)) {
for (Map.Entry<String, List<DistributionParcelListEntity>> entry : parcelListMap.entrySet()) { for (Map.Entry<String, List<DistributionParcelListEntity>> entry : parcelListMap.entrySet()) {
String key = entry.getKey(); String key = entry.getKey();
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
@ -908,22 +906,22 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
jsonObject.put("receiveTel", distrilbutionBillLading.getCustomerTelephone()); jsonObject.put("receiveTel", distrilbutionBillLading.getCustomerTelephone());
jsonObject.put("planDeliveryDate", DateUtil.formatDateTime(distrilbutionBillLading.getPickUpTime())); jsonObject.put("planDeliveryDate", DateUtil.formatDateTime(distrilbutionBillLading.getPickUpTime()));
List<DistributionParcelListEntity> listEntities = entry.getValue(); List<DistributionParcelListEntity> listEntities = entry.getValue();
NodePushMsg msg = new NodePushMsg(); NodePushMsg msg = new NodePushMsg();
msg.setNode(WorkNodeEnums.PLAN_BILLOFLADING); msg.setNode(WorkNodeEnums.PLAN_BILLOFLADING);
msg.setBrand(BrandEnums.getByValue(key)); msg.setBrand(BrandEnums.getByValue(key));
msg.setOperator(AuthUtil.getNickName()); msg.setOperator(AuthUtil.getNickName());
msg.setOperatorTime(new Date()); msg.setOperatorTime(new Date());
msg.setMain(jsonObject.toString()); msg.setMain(jsonObject.toString());
msg.setContent(listEntities.stream().map(item->{ msg.setContent(listEntities.stream().map(item -> {
return PushData.builder() return PushData.builder()
.orderCode(item.getOrderCode()) .orderCode(item.getOrderCode())
.packageCode(item.getOrderPackageCode()) .packageCode(item.getOrderPackageCode())
.warehouseName(myCurrentWarehouse.getName()) .warehouseName(myCurrentWarehouse.getName())
.waybillNumber(item.getWaybillNumber()) .waybillNumber(item.getWaybillNumber())
.build(); .build();
}).collect(Collectors.toList())); }).collect(Collectors.toList()));
log.info("推送工厂数据：{}", JSONUtil.toJsonStr(msg)); log.info("推送工厂数据：{}", JSONUtil.toJsonStr(msg));
factoryDataMessageSender.sendNodeDataByBrand(msg); factoryDataMessageSender.sendNodeDataByBrand(msg);
} }
} }
@ -1135,7 +1133,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
// 进行签收扫描数据补录 // 进行签收扫描数据补录
distributionBillLadingScanService.saveBatch(ladingScanEntities); distributionBillLadingScanService.saveBatch(ladingScanEntities);
String collect = ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getPacketBarCode).collect(Collectors.joining(",")); String collect = ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getPacketBarCode).collect(Collectors.joining(","));
warehouseUpdownTypeClient.downPackageAndDelTrayAndIsUpdate(collect,myCurrentWarehouse.getId(),"后台PC自提签收下架",false); warehouseUpdownTypeClient.downPackageAndDelTrayAndIsUpdate(collect, myCurrentWarehouse.getId(), "后台PC自提签收下架", false);
} }
} }
@ -1259,7 +1257,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
if (!list.isEmpty()) { if (!list.isEmpty()) {
for (Long l : list) { for (Long l : list) {
DistrilbutionBillLadingEntity billLadingEntity = this.getById(l); DistrilbutionBillLadingEntity billLadingEntity = this.getById(l);
BasicdataWarehouseEntity entityWarehouse= warehouseClient.getEntityWarehouseId(billLadingEntity.getWarehouseId()); BasicdataWarehouseEntity entityWarehouse = warehouseClient.getEntityWarehouseId(billLadingEntity.getWarehouseId());
distributionAsyncService.sendFactorySignforInfo(l + "", entityWarehouse, AuthUtil.getUser()); distributionAsyncService.sendFactorySignforInfo(l + "", entityWarehouse, AuthUtil.getUser());
} }
@ -1396,7 +1394,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
// ---------------------------------2023-09-09 包件签收调整--------------------------------------------------------------- // ---------------------------------2023-09-09 包件签收调整---------------------------------------------------------------
String singleTime = simpleDateFormat.format(new Date()); String singleTime = simpleDateFormat.format(new Date());
// 推送自提作业节点数据 // 推送自提作业节点数据
sendNodeWorkDataBroadcast(parcelListEntity,id,singleTime,myCurrentWarehouse); sendNodeWorkDataBroadcast(parcelListEntity, id, singleTime, myCurrentWarehouse);
packageLockIds.add(parcelListEntity.getId()); packageLockIds.add(parcelListEntity.getId());
} }
break; break;
@ -1684,9 +1682,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
.set("order_package_reservation_status", OrderPackageReservationStatusConstant.yiyueyue.getValue()) .set("order_package_reservation_status", OrderPackageReservationStatusConstant.yiyueyue.getValue())
); );
// 推送工厂 // 推送工厂
if(CollUtil.isNotEmpty(collect)){ if (CollUtil.isNotEmpty(collect)) {
List<DistributionParcelListEntity> distributionParcelListEntities = distributionParcelListService.listByIds(collect); List<DistributionParcelListEntity> distributionParcelListEntities = distributionParcelListService.listByIds(collect);
if(CollUtil.isNotEmpty(distributionParcelListEntities)){ if (CollUtil.isNotEmpty(distributionParcelListEntities)) {
sendFactoryPlan(distributionParcelListEntities, warehouse, distrilbutionBillLading); sendFactoryPlan(distributionParcelListEntities, warehouse, distrilbutionBillLading);
} }
} }
@ -1758,15 +1756,16 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
// List<Long> ids = null; // List<Long> ids = null;
List<DistributionStockArticleEntity> stockArticleList = distrilbutionBillLadingDTO.getStockArticleList(); List<DistributionStockArticleEntity> stockArticleList = distrilbutionBillLadingDTO.getStockArticleList();
Map<Long, List<DistributionStockArticleEntity>> collect = stockArticleList.stream().collect(Collectors.groupingBy(DistributionStockArticleEntity::getId)); Map<Long, List<DistributionStockArticleEntity>> collect = stockArticleList.stream().collect(Collectors.groupingBy(DistributionStockArticleEntity::getId));
List<DistributionParcelListDTO> newPackageEntityList = new ArrayList<>();
List<DistributionParcelListDTO> parcelLisList = distrilbutionBillLadingDTO.getParcelLisList();//品类信息 List<DistributionParcelListDTO> parcelLisList = distrilbutionBillLadingDTO.getParcelLisList();//品类信息
//对原计划进行匹配
if (!list.isEmpty()) { if (!list.isEmpty()) {
List<Long> longs = new ArrayList<>(); List<Long> longs = new ArrayList<>();
//存在的 //存在的
list.forEach(i -> { list.forEach(i -> {
boolean b = false; boolean b = false;
if (!Func.isEmpty(parcelLisList)){ if (!Func.isEmpty(parcelLisList)) {
b = parcelLisList.stream().anyMatch(ii -> ii.getId().equals(i.getParcelListId())); b = parcelLisList.stream().anyMatch(ii -> ii.getId().equals(i.getParcelListId()));
} }
if (b) { if (b) {
//有数据 //有数据
@ -1823,41 +1822,42 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
} }
}); });
if (!longs.isEmpty()) { if (!longs.isEmpty()) {
// distributionZeroPackageService.deleteLogic(longs);
//进行零担在库数量恢复 //进行零担在库数量恢复
distributionZeroPackageService.recoverZeroPackage(distrilbutionBillLadingDTO.getId(), longs); distributionZeroPackageService.recoverZeroPackage(distrilbutionBillLadingDTO.getId(), longs);
// distributionZeroPackageService.cancelZeroPackage(longs);
} }
//收集需要进行新增的包件信息
newPackageEntityList = parcelLisList.stream().filter(p -> !list.stream().map(DistributionReservationZeroPackageEntity::getParcelListId).collect(Collectors.toList()).contains(p.getId())).collect(Collectors.toList());
} else { }
// TODo 添加新的品类 // TODo 添加新的品类
List<DistributionReservationZeroPackageEntity> packageEntityList = new ArrayList<>(); if (Func.isNotEmpty(newPackageEntityList)) {
if (Func.isNotEmpty(parcelLisList)){ List<DistributionReservationZeroPackageEntity> zeroPackageEntityList = new ArrayList<>();
parcelLisList.forEach(w -> { newPackageEntityList.forEach(w -> {
DistributionReservationZeroPackageEntity zeroPackageEntity = new DistributionReservationZeroPackageEntity(); DistributionReservationZeroPackageEntity zeroPackageEntity = new DistributionReservationZeroPackageEntity();
zeroPackageEntity.setParcelListId(w.getId()); zeroPackageEntity.setParcelListId(w.getId());
zeroPackageEntity.setStockArticleId(w.getStockArticleId()); zeroPackageEntity.setStockArticleId(w.getStockArticleId());
zeroPackageEntity.setReservationId(distrilbutionBillLadingDTO.getId()); zeroPackageEntity.setReservationId(distrilbutionBillLadingDTO.getId());
zeroPackageEntity.setQuantity(w.getTiQuantity()); zeroPackageEntity.setQuantity(w.getTiQuantity());
zeroPackageEntity.setZeroPackageStatus("3"); zeroPackageEntity.setZeroPackageStatus("3");
zeroPackageEntity.setCategoryName(w.getFirsts()); zeroPackageEntity.setCategoryName(w.getFirsts());
zeroPackageEntity.setType("3"); zeroPackageEntity.setType("3");
zeroPackageEntity.setRealityQuantity(0); zeroPackageEntity.setRealityQuantity(0);
packageEntityList.add(zeroPackageEntity); zeroPackageEntityList.add(zeroPackageEntity);
//进行零担冻结数量维护 //进行零担冻结数量维护
distributionParcelNumberService.update(Wrappers.<DistributionParcelNumberEntity>update().lambda() distributionParcelNumberService.update(Wrappers.<DistributionParcelNumberEntity>update().lambda()
.setSql("delivery_quantity = delivery_quantity +"+zeroPackageEntity.getQuantity()) .setSql("delivery_quantity = delivery_quantity +" + zeroPackageEntity.getQuantity())
.eq(DistributionParcelNumberEntity::getParcelListId,zeroPackageEntity.getParcelListId()) .eq(DistributionParcelNumberEntity::getParcelListId, zeroPackageEntity.getParcelListId())
.eq(DistributionParcelNumberEntity::getStockArticleId,zeroPackageEntity.getStockArticleId()) .eq(DistributionParcelNumberEntity::getStockArticleId, zeroPackageEntity.getStockArticleId())
); );
}); });
} if (!zeroPackageEntityList.isEmpty()) {
if (!packageEntityList.isEmpty()) { distributionZeroPackageService.saveBatch(zeroPackageEntityList);
distributionZeroPackageService.saveBatch(packageEntityList); } else {
}else {
log.warn("没有品类数据"); log.warn("没有品类数据");
return 0; return 0;
} }
@ -1943,7 +1943,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
.set(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.daiyuyue.getValue()) .set(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.daiyuyue.getValue())
); );
} }
}else { } else {
List<DistributionReservationZeroPackageEntity> reservationZeroPackageEntities = distributionZeroPackageService.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda() List<DistributionReservationZeroPackageEntity> reservationZeroPackageEntities = distributionZeroPackageService.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
.eq(DistributionReservationZeroPackageEntity::getReservationId, distrilbutionBillStock.getBillLadingId()) .eq(DistributionReservationZeroPackageEntity::getReservationId, distrilbutionBillStock.getBillLadingId())
.eq(DistributionReservationZeroPackageEntity::getStockArticleId, distrilbutionBillStock.getStockArticleId()) .eq(DistributionReservationZeroPackageEntity::getStockArticleId, distrilbutionBillStock.getStockArticleId())
@ -1953,9 +1953,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
for (DistributionReservationZeroPackageEntity reservationZeroPackageEntity : reservationZeroPackageEntities) { for (DistributionReservationZeroPackageEntity reservationZeroPackageEntity : reservationZeroPackageEntities) {
//进行预约数量回退 //进行预约数量回退
distributionParcelNumberService.update(Wrappers.<DistributionParcelNumberEntity>update().lambda() distributionParcelNumberService.update(Wrappers.<DistributionParcelNumberEntity>update().lambda()
.setSql("delivery_quantity = delivery_quantity -"+ reservationZeroPackageEntity.getQuantity()) .setSql("delivery_quantity = delivery_quantity -" + reservationZeroPackageEntity.getQuantity())
.eq(DistributionParcelNumberEntity::getId,reservationZeroPackageEntity.getParcelListId()) .eq(DistributionParcelNumberEntity::getId, reservationZeroPackageEntity.getParcelListId())
.eq(DistributionParcelNumberEntity::getStockArticleId,reservationZeroPackageEntity.getStockArticleId()) .eq(DistributionParcelNumberEntity::getStockArticleId, reservationZeroPackageEntity.getStockArticleId())
); );
@ -2302,7 +2302,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
} }
IPage<DistrilbutionBillLadingVO> distrilbutionBillLadingVOIPage = baseMapper.pageList(page, distrilbutionBillLadingDTO,collect); IPage<DistrilbutionBillLadingVO> distrilbutionBillLadingVOIPage = baseMapper.pageList(page, distrilbutionBillLadingDTO, collect);
List<DistrilbutionBillLadingVO> records = distrilbutionBillLadingVOIPage.getRecords(); List<DistrilbutionBillLadingVO> records = distrilbutionBillLadingVOIPage.getRecords();
// 获取所有的提货单ID // 获取所有的提货单ID
@ -2414,7 +2414,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
//新增 //新增
List<DistributionPrintEntity> list2 = new ArrayList<>(); List<DistributionPrintEntity> list2 = new ArrayList<>();
distrilbutionBillLadingDTO.getPrintList().forEach(print -> { distrilbutionBillLadingDTO.getPrintList().forEach(print -> {
if (!print.getUrl().contains("blob")){ if (!print.getUrl().contains("blob")) {
DistributionPrintEntity distributionPrintEntity = new DistributionPrintEntity(); DistributionPrintEntity distributionPrintEntity = new DistributionPrintEntity();
distributionPrintEntity.setBillLadingId(distrilbutionBillLadingDTO.getId()); distributionPrintEntity.setBillLadingId(distrilbutionBillLadingDTO.getId());
distributionPrintEntity.setGenre(Integer.parseInt(print.getState())); distributionPrintEntity.setGenre(Integer.parseInt(print.getState()));
@ -2423,7 +2423,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
list2.add(distributionPrintEntity); list2.add(distributionPrintEntity);
} }
}); });
if (!list2.isEmpty()){ if (!list2.isEmpty()) {
flag.set(distributionPrintService.saveBatch(list2)); flag.set(distributionPrintService.saveBatch(list2));
} }
return flag.get(); return flag.get();
@ -2531,7 +2531,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
if (entityList.isEmpty()) { if (entityList.isEmpty()) {
mainVO.setList(null); mainVO.setList(null);
return mainVO; return mainVO;
}else { } else {
List<DistrilbutionBillPackageEntity> packageEntities = distrilbutionBillPackageService.list(Wrappers.<DistrilbutionBillPackageEntity>query().lambda() List<DistrilbutionBillPackageEntity> packageEntities = distrilbutionBillPackageService.list(Wrappers.<DistrilbutionBillPackageEntity>query().lambda()
.eq(DistrilbutionBillPackageEntity::getBillLadingId, billLadingId) .eq(DistrilbutionBillPackageEntity::getBillLadingId, billLadingId)
.ne(DistrilbutionBillPackageEntity::getPacketBarStatus, ReservationPackageStatusConstant.quxiao.getValue()) .ne(DistrilbutionBillPackageEntity::getPacketBarStatus, ReservationPackageStatusConstant.quxiao.getValue())
@ -2540,17 +2540,17 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
List<Long> packageIds = packageEntities.stream().map(DistrilbutionBillPackageEntity::getParceListId).collect(Collectors.toList()); List<Long> packageIds = packageEntities.stream().map(DistrilbutionBillPackageEntity::getParceListId).collect(Collectors.toList());
List<DistributionParcelListEntity> distributionParcelListEntities = distributionParcelListService.listByIds(packageIds); List<DistributionParcelListEntity> distributionParcelListEntities = distributionParcelListService.listByIds(packageIds);
if (!distributionParcelListEntities.isEmpty()) { if (!distributionParcelListEntities.isEmpty()) {
List<Map<String,Object>> mapList = new ArrayList<>(); List<Map<String, Object>> mapList = new ArrayList<>();
distributionParcelListEntities.forEach(p->{ distributionParcelListEntities.forEach(p -> {
Map<String,Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("orderPackageCode",p.getOrderPackageCode()); map.put("orderPackageCode", p.getOrderPackageCode());
map.put("isSign",p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())); map.put("isSign", p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue()));
map.put("thirdProduct",p.getThirdProduct()); map.put("thirdProduct", p.getThirdProduct());
map.put("fisrt",p.getThirdProduct()); map.put("fisrt", p.getThirdProduct());
map.put("second",p.getSecond()); map.put("second", p.getSecond());
map.put("materiel",p.getMaterialName()); map.put("materiel", p.getMaterialName());
map.put("orderId",p.getStockArticleId()); map.put("orderId", p.getStockArticleId());
map.put("num",p.getQuantity()); map.put("num", p.getQuantity());
mapList.add(map); mapList.add(map);
}); });
if (!mapList.isEmpty()) { if (!mapList.isEmpty()) {
@ -3151,9 +3151,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
String content = "包件在" + warehouse.getName() + "由" + AuthUtil.getNickName() + "自提扫描签收,操作方式:扫描签收,自提批次号:" + pickupBatch; String content = "包件在" + warehouse.getName() + "由" + AuthUtil.getNickName() + "自提扫描签收,操作方式:扫描签收,自提批次号:" + pickupBatch;
JSONObject js = handleLogJSONObject(warehouse, AuthUtil.getUser(), coding, content, WorkNodeEnums.SIGN_BILLOFLADING.getCode()); JSONObject js = handleLogJSONObject(warehouse, AuthUtil.getUser(), coding, content, WorkNodeEnums.SIGN_BILLOFLADING.getCode());
aaa.add(js); aaa.add(js);
trunklinePackageTrackLogClient.addPackageTrackLog(aaa); trunklinePackageTrackLogClient.addPackageTrackLog(aaa);
distributionBillLadingScanService.save(distributionBillLadingScan); distributionBillLadingScanService.save(distributionBillLadingScan);
distributionStockListMapper.deductionQuantityStock(matchedPackage.getStockListId(), matchedPackage.getNum()); distributionStockListMapper.deductionQuantityStock(matchedPackage.getStockListId(), matchedPackage.getNum());
Map<Long, List<DistrilbutionBillLadingInventoryAppVO>> stockListMap = inventoryAppVO.stream().collect(Collectors.groupingBy(DistrilbutionBillLadingInventoryAppVO::getStockListId)); Map<Long, List<DistrilbutionBillLadingInventoryAppVO>> stockListMap = inventoryAppVO.stream().collect(Collectors.groupingBy(DistrilbutionBillLadingInventoryAppVO::getStockListId));
@ -3191,7 +3191,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
DistrilbutionBillLadingEntity billLadingEntity = this.getById(billLadingId); DistrilbutionBillLadingEntity billLadingEntity = this.getById(billLadingId);
// 查询订单是否已签收 // 查询订单是否已签收
List<DistributionParcelListEntity> list4 = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query() List<DistributionParcelListEntity> list4 = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query()
.lambda() .lambda()
@ -3327,11 +3326,11 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
//订单 //订单
distributionBillLadingScan.setStockArticleId(one.getId()); distributionBillLadingScan.setStockArticleId(one.getId());
distributionBillLadingScan.setQuantity(1); distributionBillLadingScan.setQuantity(1);
distributionBillLadingScan.setBillLadingId( billLadingId); distributionBillLadingScan.setBillLadingId(billLadingId);
packageLockIds.add(distributionParcelListEntity.getId()); packageLockIds.add(distributionParcelListEntity.getId());
String signTime=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.sss").format(new Date()); String signTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.sss").format(new Date());
sendNodeWorkDataBroadcast(distributionParcelListEntity,billLadingId,signTime, myCurrentWarehouse); sendNodeWorkDataBroadcast(distributionParcelListEntity, billLadingId, signTime, myCurrentWarehouse);
//推送梦天 //推送梦天
// if (distributionParcelListEntity.getBrandName().equals("梦天")){ // if (distributionParcelListEntity.getBrandName().equals("梦天")){
@ -3388,6 +3387,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
/** /**
* 自提签收节点作业推送 * 自提签收节点作业推送
*
* @param parcelListEntity * @param parcelListEntity
* @param billLadingId * @param billLadingId
* @param singleTime * @param singleTime
@ -3962,7 +3962,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
} }
DistrilbutionBillLadingEntity billLadingEntity = this.getById(billLadingAppDTO.getBillLadingId()); DistrilbutionBillLadingEntity billLadingEntity = this.getById(billLadingAppDTO.getBillLadingId());
if (Func.isEmpty(billLadingEntity)) { if (Func.isEmpty(billLadingEntity)) {
log.error("自提签收零担异常:{}",billLadingAppDTO.getBillLadingId()); log.error("自提签收零担异常:{}", billLadingAppDTO.getBillLadingId());
throw new ServiceException("请勿重复提交！！！"); throw new ServiceException("请勿重复提交！！！");
} }
redis.setEx(lockKey, billLadingAppDTO.getBillLadingId(), 5L); redis.setEx(lockKey, billLadingAppDTO.getBillLadingId(), 5L);

Write Preview
Loading…
Cancel
Save