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

Merge branch 'dev' into pre-production

pre-production
pref_mail@163.com 1 month ago
parent
b49a5b8510 b3b03e306c
commit
2326a2b60b
4 changed files with 57 additions and 35 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. 5
      blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java
  2. 42
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionSignforAppController.java
  3. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
  4. 43
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

5
blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java
Unescape View File

@ -221,10 +221,11 @@ public class LogpmDataSearchServiceImpl implements ILogpmDataSearchService {
}
}
if(!nodeInfoVOList.isEmpty()){
nodeInfoVOList.sort(Comparator.comparing(NodeInfoVO::getOperateTime).reversed());
}
//对nodeInfoVOList集合中的作业时间 按照 时间倒序排序
nodeInfoVOList.sort(Comparator.comparing(NodeInfoVO::getOperateTime).reversed());
result.setNodeInfoVOList(nodeInfoVOList);
// 配送签收

42
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionSignforAppController.java
Unescape View File

@ -322,27 +322,27 @@ public class DistributionSignforAppController {
public R oneclick(@Valid @RequestBody DistributionSignforDTO distributionSignfor) {
distributionSignfor.setIsClerk(false);
R r = distributionSignforService.oneclickPDA(distributionSignfor);
// List<String> packageCodes = (List<String>) r.getData();
// try {
// String orderPackageCodes = null;
// for (String packageCode : packageCodes) {
// if (StringUtils.isBlank(orderPackageCodes)) {
// orderPackageCodes = packageCode;
// } else {
// orderPackageCodes = orderPackageCodes + "," + packageCode;
// }
// }
// log.info("##############oneclick: 开始执行下架:{}", packageCodes);
//
// BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
// if(orderPackageCodes!=null){
// updownTypeClient.downPackageOrDelTray(orderPackageCodes, myCurrentWarehouse.getId(), "司机一键签收下架解托");
// }
// log.info("##############oneclick: 结束执行下架:{}", packageCodes);
//
// } catch (Exception e) {
// log.warn("##############oneclick: 更新包件下架状态失败 packageCodes={}", packageCodes);
// }
List<String> packageCodes = (List<String>) r.getData();
try {
String orderPackageCodes = null;
for (String packageCode : packageCodes) {
if (StringUtils.isBlank(orderPackageCodes)) {
orderPackageCodes = packageCode;
} else {
orderPackageCodes = orderPackageCodes + "," + packageCode;
}
}
log.info("##############oneclick: 开始执行下架:{}", packageCodes);
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
if(orderPackageCodes!=null){
updownTypeClient.downPackageOrDelTray(orderPackageCodes, myCurrentWarehouse.getId(), "司机一键签收下架解托");
}
log.info("##############oneclick: 结束执行下架:{}", packageCodes);
} catch (Exception e) {
log.warn("##############oneclick: 更新包件下架状态失败 packageCodes={}", packageCodes);
}
return r;
}

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
Unescape View File

@ -3723,7 +3723,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
NodeFanoutMsg<DistributionTaskVO> nodeFanoutMsg = buildNodeFanoutMsgForPlan(deliveryListEntity, AuthUtil.getUser(), BizOperationEnums.MODIFY);
DistributionTaskVO main = nodeFanoutMsg.getMain();
List<ReservationVO> reservationVOList = main.getReservationVOList();
if (reservationVOList.isEmpty()) {
if (CollUtil.isNotEmpty(reservationVOList)) {
for (ReservationVO reservationVO : reservationVOList) {
NodeFanoutMsg<ReservationVO> msgByReservation = buildNodeFanoutMsgByReservation(reservationVO,BizOperationEnums.MODIFY,myCurrentWarehouse);
distributionNodeWorkService.planReservation(msgByReservation,AuthUtil.getUser());

43
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
Unescape View File

@ -6057,6 +6057,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
//distributionAsyncService.sendFactory(parcelListEntity, loadscanEntity.getSigningTime(), reservationEntity.getId(), reservationEntity.getReservationCode(), myCurrentWarehouse.getName(), user.getNickName());
sendNodeWorkDataBroadcast(parcelListEntity, reservationEntity, loadscanEntity.getSigningTime(), myCurrentWarehouse);
} else {
loadscanEntities.setMsg("司机一键签收数据补录");
if (!loadscanEntities.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())) {
//已经进行过装车 这里不需要进行订制品订单在库数量扣减
@ -6069,7 +6071,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
loadscanEntities.setSigningUserId(user.getUserId());
loadscanEntities.setReceivedQuantity(parcelListEntity.getQuantity());
loadscanEntities.setSigningTime(signingTime);
distributionLoadscanService.updateById(loadscanEntities);
DistributionLoadscanEntity update = getDistributionLoadscanEntity(loadscanEntities);
distributionLoadscanService.updateById(update);
distributionLoadscanEntityLists.add(loadscanEntities);
packageLockIds.add(loadscanEntities.getPackageId());
content = "包件在" + myCurrentWarehouse.getName() + "由" + loadscanEntities.getSigningUser() + "司机批量签收,装车方式:补录装车,配送车次号:" + distributionDeliveryListEntity.getTrainNumber() + "预约任务号:" + reservationEntity.getReservationCode();
@ -6089,16 +6093,16 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
if (Func.isNotEmpty(packageIds)) {
distributionAsyncService.handlPakcage(packageIds, myCurrentWarehouse.getId());
}
if (Func.isNotEmpty(packageCodes)) {
// if (Func.isNotEmpty(packageCodes)) {
//批量下架
String collected = packageCodes.stream().distinct().collect(Collectors.joining(","));
log.info(method + "司机批量签收进行包件下架:{}", collected);
Map<String, Object> map = new HashMap<>();
map.put("orderPackageCode", collected);
map.put("warehouseId", myCurrentWarehouse.getId());
warehouseUpdownTypeClient.downDeliveryPackage(map);
trunklinePackageTrackLogClient.addPackageTrackLog(aaa);
}
// String collected = packageCodes.stream().distinct().collect(Collectors.joining(","));
// log.info(method + "司机批量签收进行包件下架:{}", collected);
// Map<String, Object> map = new HashMap<>();
// map.put("orderPackageCode", collected);
// map.put("warehouseId", myCurrentWarehouse.getId());
// warehouseUpdownTypeClient.downDeliveryPackage(map);
// trunklinePackageTrackLogClient.addPackageTrackLog(aaa);
// }
}
//维护客户信息状态
// reservationEntity.setLoadingStatus(ReservationLoadingStatusConstant.yizhuangche.getValue());
@ -6154,7 +6158,24 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildNodeFanoutMsgByOneClick(distributionDeliveryListEntity, reservationEntity, distributionLoadscaninvnEntityLists, distributionLoadscanEntityLists);
distributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser());
Integer num = baseMapper.signforNum(distributionSignforEntity.getReservationId());
return Resp.scanSuccess(num + "件", num + "件");
return Resp.scanSuccessWithData(num + "件", num + "件",packageCodes);
}
@NotNull
private static DistributionLoadscanEntity getDistributionLoadscanEntity(DistributionLoadscanEntity loadscanEntities) {
DistributionLoadscanEntity update = new DistributionLoadscanEntity();
update.setId(loadscanEntities.getId());
update.setSignforState(loadscanEntities.getSignforState());
update.setReceivedQuantity(loadscanEntities.getReceivedQuantity());
update.setOneClick(loadscanEntities.getOneClick());
update.setOneQclick(loadscanEntities.getOneQclick());
update.setSignforType(loadscanEntities.getSignforType());
update.setSigningUser(loadscanEntities.getSigningUser());
update.setSigningUserId(loadscanEntities.getSigningUserId());
update.setReceivedQuantity(loadscanEntities.getReceivedQuantity());
update.setSigningTime(loadscanEntities.getSigningTime());
update.setMsg(loadscanEntities.getMsg());
return update;
}
private DistributionDeliverySelfEntity getDriver(DistributionDeliveryListEntity distributionDeliveryListEntity, BladeUser user,boolean isDriverFlag) {

Write Preview
Loading…
Cancel
Save