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

1.干线bug修复

fix-sign
zhenghaoyu 3 months ago
parent
8586eb67f7
commit
cdd57524e2
4 changed files with 70 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
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadAllOrderVO.java
  2. 2
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
  3. 52
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
  4. 39
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

1
blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadAllOrderVO.java
Unescape View File

@ -42,5 +42,6 @@ public class CarsLoadAllOrderVO implements Serializable {
private String productName;//品类
private String type;//类型
private Date warehouseEntryTimeEnd;//入库时间
private Date warehouseEntryTimeStart;//入库时间
}

2
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
Unescape View File

@ -260,6 +260,7 @@
t.waybill_id waybillId,
t.waybill_number waybillNo,
t.entry_time_end warehouseEntryTimeEnd,
t.entry_time_start warehouseEntryTimeStart,
t.tray_name trayName,
lww.document_making_time createTime,
lww.destination destination,
@ -284,6 +285,7 @@
ldsa.is_zero,
IF(ldsa.is_zero = 1,ldsa.hand_quantity,count(ldpl.id)) stock_num,
max(ldpl.warehouse_entry_time_end) entry_time_end,
min(ldpl.warehouse_entry_time_end) entry_time_start,
IF(ldsa.is_zero = 1,ldsa.trays,GROUP_CONCAT(DISTINCT ldpl.pallet)) tray_name
from logpm_distribution_stock_article ldsa
left join logpm_distribution_parcel_list ldpl on ldsa.order_code = ldpl.order_code

52
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
Unescape View File

@ -763,6 +763,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
List<TrunklineAdvanceDetailEntity> updateAdvanceDetailList = openOrderDTO.getUpdateAdvanceDetailList();
//把updateAdvanceDetailList转化成以orderPackageCode为key的Map
Map<String, TrunklineAdvanceDetailEntity> advanceDetailEntityMap = updateAdvanceDetailList.stream().collect(Collectors.toMap(TrunklineAdvanceDetailEntity::getOrderPackageCode, Function.identity()));
List<String> orderPackageCodes = new ArrayList<>();
String finalWaybillNo = waybillNo;
@ -790,6 +793,11 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
Set<Long> stockArticleIds = new TreeSet<>();
parcelListEntities.forEach(parcelListEntity -> {
TrunklineAdvanceDetailEntity trunklineAdvanceDetailEntity = advanceDetailEntityMap.get(parcelListEntity.getOrderPackageCode());
if(!Objects.isNull(trunklineAdvanceDetailEntity)){
parcelListEntity.setWeight(trunklineAdvanceDetailEntity.getWeight());
parcelListEntity.setVolume(trunklineAdvanceDetailEntity.getVolume());
}
Long packageWarehouseId = parcelListEntity.getWarehouseId();
parcelListEntity.setWaybillId(waybillId);
parcelListEntity.setWaybillNumber(finalWaybillNo);
@ -2320,6 +2328,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
updateMaterialEntity.setFirstPackName(importStandardOuPaiDTO.getFirstsName());
updateMaterialEntity.setSecondPackName(importStandardOuPaiDTO.getSencodsName());
updateMaterialEntity.setThirdPackName(importStandardOuPaiDTO.getThirdsName());
updateMaterialEntity.setVolume(new BigDecimal(importStandardOuPaiDTO.getVolume()));
updateMaterialList.add(updateMaterialEntity);
});
@ -2530,11 +2539,11 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
advanceDetailModel.setServiceNum(advanceEntity.getServiceNum());
advanceDetailModel.setPackageStatus("0");
String volume1 = importStandardOuPaiDTO.getVolume();
if (StringUtil.isBlank(volume1)) {
volume1 = "0";
}
advanceDetailModel.setVolume(new BigDecimal(volume1));
// String volume1 = importStandardOuPaiDTO.getVolume();
// if (StringUtil.isBlank(volume1)) {
// volume1 = "0";
// }
// advanceDetailModel.setVolume(new BigDecimal(volume1));
String materialName = StringUtil.isNotBlank(importStandardOuPaiDTO.getMaterialName()) ? importStandardOuPaiDTO.getMaterialName() : "";
@ -2543,23 +2552,28 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
advanceDetailModel.setMaterialCode(materialCode);
advanceDetailModel.setMaterialName(materialName);
BigDecimal volume1 = advanceDetailModel.getVolume();
if(volume1.compareTo(BigDecimal.ZERO) == 0){
BasicMaterialEntity basicMaterialEntity = materialEntityMap.get(materialCode + "&&" + materialName);
if (!Objects.isNull(basicMaterialEntity)) {
advanceDetailModel.setMaterialId(basicMaterialEntity.getId());
String weight = basicMaterialEntity.getWeight();
if (StringUtil.isBlank(weight)) {
weight = "0";
}
String volume2 = basicMaterialEntity.getVolume();
if (StringUtil.isBlank(volume2)) {
volume2 = "0";
}
advanceDetailModel.setWeight(new BigDecimal(weight));
advanceDetailModel.setVolume(new BigDecimal(volume2));
}
}
BasicMaterialEntity basicMaterialEntity = materialEntityMap.get(materialCode + "&&" + materialName);
if (!Objects.isNull(basicMaterialEntity)) {
advanceDetailModel.setMaterialId(basicMaterialEntity.getId());
String weight = basicMaterialEntity.getWeight();
if (StringUtil.isBlank(weight)) {
weight = "0";
}
String volume2 = basicMaterialEntity.getVolume();
if (StringUtil.isBlank(volume2)) {
volume2 = "0";
}
advanceDetailModel.setWeight(new BigDecimal(weight));
advanceDetailModel.setVolume(new BigDecimal(volume2));
}
// if (StringUtil.isNotBlank(materialCode) && StringUtil.isNotBlank(materialName)) {
// Long materialId = materialMap.get(materialCode);

39
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
Unescape View File

@ -4157,6 +4157,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
difficult = enterNum;
distributionStockArticleClient.submitHandleNumByOrderId(enterNum, articleId);
} else {
Integer num = carsLoadScanEntity.getNum();
@ -9776,11 +9777,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
if(myCurrentWarehouse == null){
return R.fail(405, "仓库信息不存在 ，请选择入库仓库");
}
if(NumberUtil.equals(myCurrentWarehouse.getId(),warehouseId)){
if(NumberUtil.equals(myCurrentWarehouse.getId(),unloadNodeId)){
return R.fail(405, "包件已入库！");
}
DistributionStockArticleEntity stockArticleEntity = getDistributionStockArticle(orderCode,warehouseId,myCurrentWarehouse.getName(),scanCode);
DistributionStockArticleEntity stockArticleEntity = getDistributionStockArticle(orderCode,unloadNodeId,myCurrentWarehouse.getName(),scanCode);
BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(unloadNodeId);
DistributionParcelListEntity newParcelList = new DistributionParcelListEntity();
BeanUtil.copy(parcelListEntity, newParcelList);
@ -9810,8 +9811,36 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
return R.success("同步成功");
} else {
log.warn("###############syncIncomingPackage: 同步失败");
return R.fail(405, "同步数据失败");
Long incomingWarehouseId = advanceDetailEntity.getIncomingWarehouseId();
String incomingWarehouseName = advanceDetailEntity.getIncomingWarehouseName();
DistributionParcelListEntity parcelListEntity1 = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(scanCode, incomingWarehouseId);
DistributionStockArticleEntity stockArticleEntity = getDistributionStockArticle(orderCode,unloadNodeId,incomingWarehouseName,scanCode);
BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(unloadNodeId);
DistributionParcelListEntity newParcelList = new DistributionParcelListEntity();
BeanUtil.copy(parcelListEntity, newParcelList);
newParcelList.setId(null);
newParcelList.setWarehouseId(unloadNodeId);
newParcelList.setWarehouse(warehouseEntity.getName());
Long acceptWarehouseId = newParcelList.getAcceptWarehouseId();
if(NumberUtil.equals(unloadNodeId,acceptWarehouseId)){
newParcelList.setIsTransfer(0);
}else{
newParcelList.setIsTransfer(1);
}
newParcelList.setTrainNumber(loadCode);
newParcelList.setStockArticleId(stockArticleEntity.getId());
distributionParcelListClient.add(newParcelList);
parcelListEntity.setOrderPackageStatus("60");
distributionParcelListClient.update(parcelListEntity);
carsLoadScanEntity.setWaybillNo(waybillNo);
carsLoadScanEntity.setOrderCode(orderCode);
carsLoadScanEntity.setIsData(1);
carsLoadScanEntity.setIsSupple(1);
trunklineCarsLoadScanService.updateById(carsLoadScanEntity);
return R.success("同步成功");
}
}
}
@ -9825,7 +9854,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
TrunklineAdvanceDetailEntity entityByOrderPackageCode = trunklineAdvanceDetailService.findEntityByOrderPackageCode(scanCode);
if(Objects.isNull(entityByOrderPackageCode)){
if(!Objects.isNull(entityByOrderPackageCode)){
stockArticleByOrderCodeAndWarehouseId = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, entityByOrderPackageCode.getNowWarehouseId());

Write Preview
Loading…
Cancel
Save