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

fix：修复签收日志没用签收人名称

pre-production
pref_mail@163.com 2 weeks ago
parent
e424afe340
commit
5b5b230708
2 changed files with 1 additions and 147 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. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
  2. 146
      blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OrderStatusHandler.java

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

@ -8140,7 +8140,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
//更新签收人
distributionSignforMapper.updateSignUser(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), user);
//维护订单状态
String content = "包件在" + myCurrentWarehouse.getName() + "由" + loadscanEntity.getSigningUser() + "扫描签收,装车方式:扫描装车,配送车次号:" + deliveryListEntity.getTrainNumber() + "预约任务号:" + reservationEntity.getReservationCode();
String content = "包件在" + myCurrentWarehouse.getName() + "由" + distributionLoadscanEntity.getSigningUser() + "扫描签收,装车方式:扫描装车,配送车次号:" + deliveryListEntity.getTrainNumber() + "预约任务号:" + reservationEntity.getReservationCode();
JSONObject trunklinePackageTrackLog = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), parcelListEntity.getOrderPackageCode(), content, WorkNodeEnums.DISTRIBUTION_SIGN_FOR.getCode(), deliveryListEntity.getId().toString(), parcelListEntity.getWarehouseEntryTimeEnd());
aaa.add(trunklinePackageTrackLog);
} else {

146
blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OrderStatusHandler.java
Unescape View File

@ -158,151 +158,5 @@ public class OrderStatusHandler {
log.info("##################orderStatusHandler: 未知品牌 type={}", type);
}
// String status = orderStatusDTO.getStatus();
// if("2".equals(status)){
// String currentWarehouse = orderStatusDTO.getCurrentWarehouse();
// BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getWarehouseByOldId(Integer.parseInt(currentWarehouse));
// if(Objects.isNull(basicdataWarehouseEntity)){
// log.warn("####################orderStatusHandler: 仓库信息为空 basicdataWarehouseEntity={}",basicdataWarehouseEntity);
// return;
// }
// Long warehouseId = basicdataWarehouseEntity.getId();
// Integer oldId = basicdataWarehouseEntity.getOldId();
//
// Integer trayId = orderStatusDTO.getTrayId();
// if(Objects.isNull(trayId)){
// log.warn("####################orderStatusHandler: 托盘id为空 trayId={}",trayId);
// return;
// }
// BasicdataTrayEntity basicdataTrayEntity = basicdataTrayClient.getTrayByTrayCode("T" + trayId);
// if(Objects.isNull(basicdataTrayEntity)){
// log.info("############syncTrayTypeData: 托盘信息不存在");
// //如果托盘不存在就去同步该托盘
// TrayEntity trayEntity = trayClient.getTrayById(trayId);
// basicdataTrayEntity = new BasicdataTrayEntity();
// basicdataTrayEntity.setTenantId("627683");
// basicdataTrayEntity.setCreateUser(1714696768639311873L);
// basicdataTrayEntity.setUpdateUser(1714696768639311873L);
// basicdataTrayEntity.setCreateDept(1649331096241836033L);
// basicdataTrayEntity.setPalletName(trayEntity.getTrayNo());
// basicdataTrayEntity.setPalletCode("T"+trayEntity.getId());
// basicdataTrayEntity.setWarehouseId(warehouseId);
// basicdataTrayEntity.setTrayStatus(trayEntity.getStatus()+"");
// basicdataTrayEntity.setType(1);
// basicdataTrayEntity.setOldId(trayId);
//// basicdataTrayEntity.setNowWarehouseId(nowNewWarehouseId);
// Long aLong = basicdataTrayClient.addTray(basicdataTrayEntity);
// basicdataTrayEntity.setId(aLong);
// }
//
// TrayScanDesEntity trayScanDesEntity = trayScanDesClient.findScanTypeId(trayId, unitNo, oldId);
// if(Objects.isNull(trayScanDesEntity)){
// log.warn("####################orderStatusHandler: 没有打托数据 trayId={}",trayId);
// return;
// }
// Integer trayScanId = trayScanDesEntity.getTrayScanId();
// TrayScanEntity trayScanEntity = trayScanClient.getEntityByTrayScanId(trayScanId);
// if(Objects.isNull(trayScanEntity)){
// log.warn("####################orderStatusHandler: 没有打托方式数据 trayScanId={}",trayScanId);
// return;
// }
// Integer trayType = trayScanEntity.getType();
//
// String newTrayType = "100";
// if(1==trayType){
// newTrayType = "60";
// }else if(2==trayType){
// newTrayType = "30";
// }else if(3==trayType){
// newTrayType = "50";
// }else if(4==trayType){
// newTrayType = "100";
// }else if(5==trayType){
// newTrayType = "10";
// }else if(6==trayType){
// newTrayType = "20";
// }
//
// //判断托盘是否有上架
// Long allocationId = taryAllocationClient.findAllocationByTrayId(basicdataTrayEntity.getId());
// if(Objects.isNull(allocationId)){
// //没有上架就直接打托
// Map<String,Object> m = new HashMap<>();
// m.put("trayType",newTrayType);
// m.put("trayCode","T"+trayId);
// m.put("warehouseId",warehouseId);
// m.put("orderPackageCode",unitNo);
//
// R response = warehouseTrayTypeClient.orderScanOrderPackageCodeReturnR(m);
// int code = response.getCode();
// if(code == 4001){
// log.info("####################orderStatusHandler: 包件已在当前托盘打托 unitNo={} trayCode={}",unitNo,"T"+trayId);
// }else if(code == 4002){
// log.info("####################orderStatusHandler: 包件已在其他托盘打托 unitNo={} ",unitNo);
// WarehouseTrayGoodsEntity trayGoodsEntity = warehouseTrayGoodsClient.findTrayCodeByOrderPackageCode(unitNo);
// if(Objects.isNull(trayGoodsEntity)){
// log.warn("####################orderStatusHandler: 包件未打托 unitNo={}",unitNo);
// }else{
// String oldTrayCode = trayGoodsEntity.getTrayCode();
// Long trayGoodsId = trayGoodsEntity.getId();
// Long wid = trayGoodsEntity.getWarehouseId();
// BasicdataTrayEntity oldTrayEntity = basicdataTrayClient.getTrayByTrayCode(oldTrayCode);
// Long oldTrayId = oldTrayEntity.getId();
// //判断托盘是否有上架
// Long oldAllocationId = taryAllocationClient.findAllocationByTrayId(oldTrayId);
// if (Objects.isNull(oldAllocationId)){
// //没有上架
// //直接解绑托盘
// warehouseTrayGoodsClient.delTrayGoodsById(trayGoodsId,wid);
// }else{
// //有上架
// //下架
// updownTypeClient.downPackage(unitNo,wid);
// }
// }
//
// boolean b1 = warehouseTrayTypeClient.orderScanOrderPackageCode(m);
// if(!b1){
// log.warn("####################orderStatusHandler: 二次打托失败 unitNo={} trayCode={}",unitNo,"T"+trayId);
// }else{
// log.info("####################orderStatusHandler: 二次打托成功 unitNo={} trayCode={}",unitNo,"T"+trayId);
// }
// }else if(code == 4003){
// log.info("####################orderStatusHandler: 包件未打托已上架 unitNo={} ",unitNo);
// WarehouseUpdownGoodsEntity updownGoodsEntity = warehouseUpdownGoodsClient.findEntityByOrderPackageCode(unitNo);
// if(Objects.isNull(updownGoodsEntity)){
// log.warn("####################orderStatusHandler: 包件未上架 unitNo={}",unitNo);
// }else{
// Long wid = updownGoodsEntity.getWarehouseId();
// updownTypeClient.downPackage(unitNo,wid);
// }
// boolean b1 = warehouseTrayTypeClient.orderScanOrderPackageCode(m);
// if(!b1){
// log.warn("####################orderStatusHandler: 二次打托失败 unitNo={} trayCode={}",unitNo,"T"+trayId);
// }else{
// log.info("####################orderStatusHandler: 二次打托成功 unitNo={} trayCode={}",unitNo,"T"+trayId);
// }
// }else if(code == 4004){
// log.info("####################orderStatusHandler: 包件打托方式不正确 unitNo={} ",unitNo);
// //先去空置托盘再打托
// warehouseTrayTypeClient.trayToNull("T"+trayId);
// boolean b1 = warehouseTrayTypeClient.orderScanOrderPackageCode(m);
// if(!b1){
// log.warn("####################orderStatusHandler: 二次打托失败 unitNo={} trayCode={}",unitNo,"T"+trayId);
// }
// }else{
// String msg1 = r.getMsg();
// int code1 = r.getCode();
// log.warn("######################orderStatusHandler: 打托失败 msg={} code={}",msg1,code1);
// log.warn("######################orderStatusHandler: 打托失败 unitNo={} trayCode={}",unitNo,"T"+trayId);
// }
//
// }else{
// //有上架就上架
// updownTypeClient.upShelfPackage(unitNo,allocationId,warehouseId);
// }
// }
}
}

Write Preview
Loading…
Cancel
Save