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

1.修复老系统推送数据订单包件逻辑 

2.同步订单数据逻辑修改
training
zhenghaoyu 1 year ago
parent
fc7f591e2e
commit
8359604bda
2 changed files with 46 additions and 24 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. 62
      blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
  2. 8
      blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java

62
blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
Unescape View File

@ -518,6 +518,10 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
logger.warn("#################handleDataToPlatform: 保存订单信息失败 orderSelfNum={}", orderSelfNum); logger.warn("#################handleDataToPlatform: 保存订单信息失败 orderSelfNum={}", orderSelfNum);
throw new CustomerException(405, "保存订单信息失败"); throw new CustomerException(405, "保存订单信息失败");
} }
}else{
distributionStockArticleEntity.setTotalNumber(total);
distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity);
} }
//保存包件信息 //保存包件信息
@ -532,27 +536,27 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
// logger.error("################handleDataToPlatform: unitNo={} 打托失败",unitNo); // logger.error("################handleDataToPlatform: unitNo={} 打托失败",unitNo);
// } // }
String waybillNumber = distributionStockArticleEntity.getWaybillNumber(); // String waybillNumber = distributionStockArticleEntity.getWaybillNumber();
if(!waybillNumber.contains(waybillNoNum)){ // if(!waybillNumber.contains(waybillNoNum)){
waybillNumber = waybillNumber+","+waybillNoNum; // waybillNumber = waybillNumber+","+waybillNoNum;
} // }
distributionStockArticleEntity.setWaybillNumber(waybillNumber); // distributionStockArticleEntity.setWaybillNumber(waybillNumber);
//
// 修改入库状态 // // 修改入库状态
distributionStockArticleEntity.setHandQuantity(distributionStockArticleEntity.getHandQuantity() +1); // distributionStockArticleEntity.setHandQuantity(distributionStockArticleEntity.getHandQuantity() +1);
String orderStatus = checkDistributionStockArticleOrderStatus(distributionStockArticleEntity); // String orderStatus = checkDistributionStockArticleOrderStatus(distributionStockArticleEntity);
distributionStockArticleEntity.setOrderStatus(orderStatus); // distributionStockArticleEntity.setOrderStatus(orderStatus);
//
// 修改收货 // // 修改收货
if(distributionStockArticleEntity.getOrderStatus().equals(OrderStatusConstant.ruku.getValue())){ // if(distributionStockArticleEntity.getOrderStatus().equals(OrderStatusConstant.ruku.getValue())){
distributionStockArticleEntity.setOrderReceiveStatus(OrderReceiveStatusConstant.yishouhuo.getValue()); // distributionStockArticleEntity.setOrderReceiveStatus(OrderReceiveStatusConstant.yishouhuo.getValue());
// 更新齐套状态 // // 更新齐套状态
// todo 这里需要多仓齐套的查询条件 // // todo 这里需要多仓齐套的查询条件
distributionStockArticleEntity.setCompleteSet(1); // distributionStockArticleEntity.setCompleteSet(1);
} // }
// 修改最新的入库时间 // // 修改最新的入库时间
distributionStockArticleEntity.setWarehouseEntryTimeEnd(new Date()); // distributionStockArticleEntity.setWarehouseEntryTimeEnd(new Date());
distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity); // distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity);
// 包件保存成功去修改订单的数量 // 包件保存成功去修改订单的数量
// distributionStockArticleClient.addHandQuantity(id, 1); // distributionStockArticleClient.addHandQuantity(id, 1);
@ -732,6 +736,22 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
if (!b) { if (!b) {
logger.warn("#################handleDataToPlatform: 保存包件信息失败 orderCode={}", entity.getOrderCode()); logger.warn("#################handleDataToPlatform: 保存包件信息失败 orderCode={}", entity.getOrderCode());
throw new CustomerException(405, "保存包件信息失败"); throw new CustomerException(405, "保存包件信息失败");
}else{
logger.info("################handleDataToPlatform: 保存包件成功 OrderPackageCode={}",vo.getPacketBarCode());
Integer handQuantity = distributionStockArticleEntity.getHandQuantity();
Integer totalNumber = distributionStockArticleEntity.getTotalNumber();
if(handQuantity+1 >= totalNumber){
distributionStockArticleEntity.setCompleteSet(1);
distributionStockArticleEntity.setOrderReceiveStatus(OrderReceiveStatusConstant.yishouhuo.getValue());
distributionStockArticleEntity.setOrderStatus(OrderStatusConstant.ruku.getValue());
}else{
distributionStockArticleEntity.setCompleteSet(0);
distributionStockArticleEntity.setOrderReceiveStatus(OrderReceiveStatusConstant.bufenshouhuo.getValue());
distributionStockArticleEntity.setOrderStatus(OrderStatusConstant.bufenruku.getValue());
}
distributionStockArticleEntity.setHandQuantity(handQuantity + 1);
distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity);
} }
} }
} }

8
blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java
Unescape View File

@ -1334,6 +1334,8 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
} }
}else{ }else{
id = distributionStockArticleEntity.getId(); id = distributionStockArticleEntity.getId();
distributionStockArticleEntity.setTotalNumber(total);
distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity);
} }
//保存包件信息 //保存包件信息
@ -1387,9 +1389,9 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
// if(3==carsType||4 == carsType){ // if(3==carsType||4 == carsType){
// entity.setOrderPackageStatus(OrderPackageStatusConstant.yichuku.getValue()); // entity.setOrderPackageStatus(OrderPackageStatusConstant.yichuku.getValue());
// } // }
if(2 == signState){ // if(2 == signState){
entity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue()); // entity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue());
} // }
entity.setOrderPackageFreezeStatus(OrderPackageFreezeStatusConstant.weidongjie.getValue()); entity.setOrderPackageFreezeStatus(OrderPackageFreezeStatusConstant.weidongjie.getValue());
entity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue()); entity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());
entity.setOrderPackageGroundingStatus(OrderPackageGroundingStatusConstant.daishangjia.getValue()); entity.setOrderPackageGroundingStatus(OrderPackageGroundingStatusConstant.daishangjia.getValue());

Write Preview
Loading…
Cancel
Save