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

Merge branch 'dev' into pre-production

master
汤建军 7 months ago
parent
ad9299845a 929e4e0e04
commit
9a313131af
3 changed files with 80 additions and 28 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/WorkNodeEnums.java
  2. 62
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
  3. 44
      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/WorkNodeEnums.java
Unescape View File

@ -62,7 +62,7 @@ public enum WorkNodeEnums implements Serializable {
CANCEL_DELIVERY(301030, "计划取消"), CANCEL_DELIVERY(301030, "计划取消"),
PLAN_BILLOFLADING(301040, "计划自提"), PLAN_BILLOFLADING(301040, "计划自提"),
CANCEL_BILLOFLADING(301050, "取消自提"), CANCEL_BILLOFLADING(301050, "取消自提"),
SIGN_BILLOFLADING(301050, "自提签收"), SIGN_BILLOFLADING(301080, "自提签收"),
PLAN_DISTRIBUTION(301060, "计划配车"), PLAN_DISTRIBUTION(301060, "计划配车"),
CANCEL_DISTRIBUTION(301070, "取消配车"), CANCEL_DISTRIBUTION(301070, "取消配车"),

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

@ -519,30 +519,46 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
v.stream().forEach(i -> { v.stream().forEach(i -> {
//查询有没有打托数据 //查询有没有打托数据
//查询包件有没有物料 // //查询包件有没有物料
List<DistributionParcelDetailsEntity> list = distributionParcelDetailsService.list(Wrappers.<DistributionParcelDetailsEntity>query().lambda() // List<DistributionParcelDetailsEntity> list = distributionParcelDetailsService.list(Wrappers.<DistributionParcelDetailsEntity>query().lambda()
.eq(DistributionParcelDetailsEntity::getParcelListId, i.getId()) // .eq(DistributionParcelDetailsEntity::getParcelListId, i.getId())
); // );
if (!list.isEmpty()) { // if (!list.isEmpty()) {
//有 // //有
list.stream().collect(Collectors.groupingBy(DistributionParcelDetailsEntity::getEncoded)) // list.stream().collect(Collectors.groupingBy(DistributionParcelDetailsEntity::getEncoded))
.forEach((kk, vv) -> { // .forEach((kk, vv) -> {
DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity(); // DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
BeanUtil.copyProperties(vv.get(0), parcelListEntity); // BeanUtil.copyProperties(vv.get(0), parcelListEntity);
parcelListEntity.setQuantity(sum); // parcelListEntity.setQuantity(sum);
parcelListEntity.setMaterialName(vv.get(0).getName()); // parcelListEntity.setMaterialName(vv.get(0).getName());
parcelListEntity.setMaterialCode(vv.get(0).getEncoded()); // parcelListEntity.setMaterialCode(vv.get(0).getEncoded());
parcelListEntity.setMaterialUnit(vv.get(0).getUnit()); // parcelListEntity.setMaterialUnit(vv.get(0).getUnit());
// 添加库存品信息 // // 添加库存品信息
//查询在库订单信息 // //查询在库订单信息
DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleMapper.selectById(parcelListEntity.getStockArticleId()); // DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleMapper.selectById(parcelListEntity.getStockArticleId());
if (ObjectUtil.isEmpty(distributionStockArticleEntity.getMallId())) { // if (ObjectUtil.isEmpty(distributionStockArticleEntity.getMallId())) {
throw new ServiceException("订单的客户数据异常，无法转换！！"); // throw new ServiceException("订单的客户数据异常，无法转换！！");
} // }
addStockList(distributionStockArticleEntity, parcelListEntity, 1); // addStockList(distributionStockArticleEntity, parcelListEntity, 1);
}); // });
// }
DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
BeanUtil.copyProperties(v, parcelListEntity);
parcelListEntity.setQuantity(sum);
parcelListEntity.setMaterialName(i.getMaterialName());
parcelListEntity.setMaterialCode(i.getMaterialCode());
parcelListEntity.setMaterialUnit(i.getMaterialUnit());
// 添加库存品信息
//查询在库订单信息
DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleMapper.selectById(parcelListEntity.getStockArticleId());
if (ObjectUtil.isEmpty(distributionStockArticleEntity.getMallId())) {
throw new ServiceException("订单的客户数据异常，无法转换！！");
} }
//修改状态 addStockList(distributionStockArticleEntity, parcelListEntity, 1);
// //修改状态
DistributionParcelListEntity parcelList = new DistributionParcelListEntity(); DistributionParcelListEntity parcelList = new DistributionParcelListEntity();
parcelList.setId(i.getId()); parcelList.setId(i.getId());
parcelList.setConditions(2); parcelList.setConditions(2);

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

@ -1136,11 +1136,16 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
return R.fail(403, "未授权!!"); return R.fail(403, "未授权!!");
} }
if (Objects.isNull(distrilbutionBillLading.getId())) { if (Objects.isNull(distrilbutionBillLading.getId())) {
log.error(method + "参数缺少Id:{}", distrilbutionBillLading); log.error(method + "参数缺少Id:{}", distrilbutionBillLading.getId());
return R.fail("请联系管理员处理"); return R.fail("请联系管理员处理");
} }
if (Objects.isNull(distrilbutionBillLading.getPackageIds())) { if (Objects.isNull(distrilbutionBillLading.getPackageIds())) {
log.error(method + "参数缺少PackageIds:{}", distrilbutionBillLading); log.error(method + "参数缺少PackageIds:{}", distrilbutionBillLading.getPackageIds());
return R.fail("请联系管理员处理");
}
DistrilbutionBillLadingEntity billLadingEntity = this.getById(distrilbutionBillLading.getId());
if (Objects.isNull(billLadingEntity)) {
log.error(method + "查询自提错误:{}", distrilbutionBillLading.getId());
return R.fail("请联系管理员处理"); return R.fail("请联系管理员处理");
} }
@ -1162,17 +1167,40 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
//进行订制品和零担的区分 //进行订制品和零担的区分
Map<Integer, List<DistributionParcelListEntity>> packageMap = distributionParcelListEntities.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getConditions)); Map<Integer, List<DistributionParcelListEntity>> packageMap = distributionParcelListEntities.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getConditions));
List<DistributionBillLadingScanEntity> ladingScanEntities = new ArrayList<>(); List<DistributionBillLadingScanEntity> ladingScanEntities = new ArrayList<>();
StringBuilder builder = new StringBuilder();
List<JSONObject> logList = new ArrayList<>();
if (!packageMap.isEmpty()) { if (!packageMap.isEmpty()) {
ladingScanEntities = handleSignPackage(packageMap, distrilbutionBillLading.getId(), myCurrentWarehouse); ladingScanEntities = handleSignPackage(packageMap, distrilbutionBillLading.getId(), myCurrentWarehouse);
if (!ladingScanEntities.isEmpty()) { if (!ladingScanEntities.isEmpty()) {
// String orderPackageCodes = ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getPacketBarCode).collect(Collectors.joining(","));
List<String> orderPackageCodeList = ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getPacketBarCode).collect(Collectors.toList());
for (String orderPackageCode : orderPackageCodeList) {
builder.append(orderPackageCode).append(",");
String content = "包件在" + myCurrentWarehouse.getName() + "由" + AuthUtil.getNickName() + "后台签收,自提任务号:" + billLadingEntity.getPickupBatch() ;
JSONObject aaa = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), orderPackageCode, content, WorkNodeEnums.SIGN_BILLOFLADING.getCode());
logList.add(aaa);
// orderPackageCodes.add(orderPackageCode);
}
// 进行签收扫描数据补录 // 进行签收扫描数据补录
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);
} }
if (Func.isNotEmpty(builder)){
String string = builder.deleteCharAt(builder.length() - 1).toString();
warehouseUpdownTypeClient.downPackageOrDelTray(string, myCurrentWarehouse.getId(), "签收下架解托");
}
if (!logList.isEmpty()) {
trunklinePackageTrackLogClient.addPackageTrackLog(logList);
}
} }
//维护自提单状态 //维护自提单状态
distrilbutionBillLading.setConditions(BillLadingStatusConstant.yitihuo.getValue()); distrilbutionBillLading.setConditions(BillLadingStatusConstant.yitihuo.getValue());
distributionBillLadingScanService.list(Wrappers.<DistributionBillLadingScanEntity>query().lambda() distributionBillLadingScanService.list(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
@ -3389,6 +3417,14 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
if (n.get()) { if (n.get()) {
distributionBillLadingScanService.save(distributionBillLadingScan); distributionBillLadingScanService.save(distributionBillLadingScan);
//进行下架解托
warehouseUpdownTypeClient.downPackageOrDelTray(distributionBillLadingScan.getPacketBarCode(),myCurrentWarehouse.getId(),"自提下架解托");
String content = "包件在" + myCurrentWarehouse.getName() + "由" + AuthUtil.getNickName() + "扫描签收,自提任务号:" + billLadingEntity.getPickupBatch() ;
//日志记录
List<JSONObject> logList = new ArrayList<>();
JSONObject aaa = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), distributionBillLadingScan.getPacketBarCode(), content, WorkNodeEnums.SIGN_BILLOFLADING.getCode());
logList.add(aaa);
trunklinePackageTrackLogClient.addPackageTrackLog(logList);
} else { } else {
return Resp.scanFail("当前订单，包件不存在！！", "当前订单，包件不存在！！"); return Resp.scanFail("当前订单，包件不存在！！", "当前订单，包件不存在！！");
} }

Write Preview
Loading…
Cancel
Save