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

1.干线bug修复

fix-sign
zhenghaoyu 5 months ago
parent
e5d4f7368a
commit
27ec6bd452
3 changed files with 45 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. 1
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml
  2. 48
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
  3. 20
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

1
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml
Unescape View File

@ -55,6 +55,7 @@
select * select *
from logpm_basicdata_storage_services from logpm_basicdata_storage_services
where send_warehouse_id is null where send_warehouse_id is null
and is_deleted = 0
and client_id = #{clientId} and client_id = #{clientId}
</select> </select>

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

@ -2797,7 +2797,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
String consigneeName = waybillEntity.getConsigneeName(); String consigneeName = waybillEntity.getConsigneeName();
String consigneeAddress = waybillEntity.getConsigneeAddress(); String consigneeAddress = waybillEntity.getConsigneeAddress();
String consigneeMobile = waybillEntity.getConsigneeMobile(); String consigneeMobile = waybillEntity.getConsigneeMobile();
Long newDepartureWarehouseId = waybillEntity.getDepartureWarehouseId();
String departureWarehouseName = waybillEntity.getDepartureWarehouseName(); String departureWarehouseName = waybillEntity.getDepartureWarehouseName();
Long newDestinationWarehouseId = waybillEntity.getDestinationWarehouseId();
String destinationWarehouseName = waybillEntity.getDestinationWarehouseName(); String destinationWarehouseName = waybillEntity.getDestinationWarehouseName();
Integer totalCount = waybillEntity.getTotalCount(); Integer totalCount = waybillEntity.getTotalCount();
@ -2834,12 +2836,12 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
Long nowWarehouseId = parcelListEntity.getWarehouseId(); Long nowWarehouseId = parcelListEntity.getWarehouseId();
String orderPackageCode = parcelListEntity.getOrderPackageCode(); String orderPackageCode = parcelListEntity.getOrderPackageCode();
String orderPackageStatus = parcelListEntity.getOrderPackageStatus(); String orderPackageStatus = parcelListEntity.getOrderPackageStatus();
parcelListEntity.setSendWarehouseId(departureWarehouseId); parcelListEntity.setSendWarehouseId(newDepartureWarehouseId);
parcelListEntity.setSendWarehouseName(departureWarehouseName); parcelListEntity.setSendWarehouseName(departureWarehouseName);
parcelListEntity.setAcceptWarehouseId(destinationWarehouseId); parcelListEntity.setAcceptWarehouseId(newDestinationWarehouseId);
parcelListEntity.setAcceptWarehouseName(destinationWarehouseName); parcelListEntity.setAcceptWarehouseName(destinationWarehouseName);
if (nowWarehouseId.equals(destinationWarehouseId)) { if (nowWarehouseId.equals(newDestinationWarehouseId)) {
parcelListEntity.setIsTransfer(0); parcelListEntity.setIsTransfer(0);
if ("20".equals(orderPackageStatus)) { if ("20".equals(orderPackageStatus)) {
arriveWarehousePackageCode.add(orderPackageCode); arriveWarehousePackageCode.add(orderPackageCode);
@ -2913,9 +2915,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
stockArticleEntity.setConsigneePerson(consigneeName); stockArticleEntity.setConsigneePerson(consigneeName);
stockArticleEntity.setConsigneeAddress(consigneeAddress); stockArticleEntity.setConsigneeAddress(consigneeAddress);
stockArticleEntity.setConsigneeMobile(consigneeMobile); stockArticleEntity.setConsigneeMobile(consigneeMobile);
stockArticleEntity.setSendWarehouseId(departureWarehouseId); stockArticleEntity.setSendWarehouseId(newDepartureWarehouseId);
stockArticleEntity.setSendWarehouseName(departureWarehouseName); stockArticleEntity.setSendWarehouseName(departureWarehouseName);
stockArticleEntity.setAcceptWarehouseId(destinationWarehouseId); stockArticleEntity.setAcceptWarehouseId(newDestinationWarehouseId);
stockArticleEntity.setAcceptWarehouseName(destinationWarehouseName); stockArticleEntity.setAcceptWarehouseName(destinationWarehouseName);
String orderCode = stockArticleEntity.getOrderCode(); String orderCode = stockArticleEntity.getOrderCode();
if (orderCode.equals(waybillNo)) { if (orderCode.equals(waybillNo)) {
@ -2961,12 +2963,12 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
} }
updateNumberIds.add(id); updateNumberIds.add(id);
} }
parcelListEntity.setSendWarehouseId(departureWarehouseId); parcelListEntity.setSendWarehouseId(newDepartureWarehouseId);
parcelListEntity.setSendWarehouseName(departureWarehouseName); parcelListEntity.setSendWarehouseName(departureWarehouseName);
parcelListEntity.setAcceptWarehouseId(destinationWarehouseId); parcelListEntity.setAcceptWarehouseId(newDestinationWarehouseId);
parcelListEntity.setAcceptWarehouseName(destinationWarehouseName); parcelListEntity.setAcceptWarehouseName(destinationWarehouseName);
if (nowWarehouseId.equals(destinationWarehouseId)) { if (nowWarehouseId.equals(newDestinationWarehouseId)) {
parcelListEntity.setIsTransfer(0); parcelListEntity.setIsTransfer(0);
} else { } else {
parcelListEntity.setIsTransfer(1); parcelListEntity.setIsTransfer(1);
@ -3015,11 +3017,11 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
entity.setIsZero("1"); entity.setIsZero("1");
entity.setAdvanceId(waybillDetailDTO.getId()); entity.setAdvanceId(waybillDetailDTO.getId());
entity.setWarehouseEntryTimeEnd(new Date()); entity.setWarehouseEntryTimeEnd(new Date());
entity.setSendWarehouseId(departureWarehouseId); entity.setSendWarehouseId(newDepartureWarehouseId);
entity.setSendWarehouseName(departureWarehouseName); entity.setSendWarehouseName(departureWarehouseName);
entity.setAcceptWarehouseId(destinationWarehouseId); entity.setAcceptWarehouseId(newDestinationWarehouseId);
entity.setAcceptWarehouseName(destinationWarehouseName); entity.setAcceptWarehouseName(destinationWarehouseName);
if (departureWarehouseId.equals(destinationWarehouseId)) { if (warehouseId1.equals(newDestinationWarehouseId)) {
entity.setIsTransfer(0); entity.setIsTransfer(0);
} else { } else {
entity.setIsTransfer(1); entity.setIsTransfer(1);
@ -5168,18 +5170,18 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
waybillEntity.setDestinationWarehouseId(newDestinationWarehouseId); waybillEntity.setDestinationWarehouseId(newDestinationWarehouseId);
waybillEntity.setDestinationWarehouseName(newDestinationWarehouseName); waybillEntity.setDestinationWarehouseName(newDestinationWarehouseName);
//查询所有该运单的包件 //查询所有该运单的包件
List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListClient.findListByWaybillId(waybillId); // List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListClient.findListByWaybillId(waybillId);
parcelListEntityList.forEach(parcelListEntity -> { // parcelListEntityList.forEach(parcelListEntity -> {
Long warehouseId = parcelListEntity.getWarehouseId(); // Long warehouseId = parcelListEntity.getWarehouseId();
parcelListEntity.setAcceptWarehouseId(newDestinationWarehouseId); // parcelListEntity.setAcceptWarehouseId(newDestinationWarehouseId);
parcelListEntity.setAcceptWarehouseName(newDestinationWarehouseName); // parcelListEntity.setAcceptWarehouseName(newDestinationWarehouseName);
if (warehouseId.equals(newDestinationWarehouseId)) { // if (warehouseId.equals(newDestinationWarehouseId)) {
parcelListEntity.setIsTransfer(0); // parcelListEntity.setIsTransfer(0);
} else { // } else {
parcelListEntity.setIsTransfer(1); // parcelListEntity.setIsTransfer(1);
} // }
}); // });
distributionParcelListClient.updateList(parcelListEntityList); // distributionParcelListClient.updateList(parcelListEntityList);
} }
Long newShipperId = openOrderDTO.getShipperId(); Long newShipperId = openOrderDTO.getShipperId();
String newShipper = openOrderDTO.getShipper(); String newShipper = openOrderDTO.getShipper();

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

@ -10850,6 +10850,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
//没有包件数据 //没有包件数据
TrunklineAdvanceDetailEntity advanceDetailEntity = trunklineAdvanceDetailService.findEntityByOrderPackageCode(orderPackageCode); TrunklineAdvanceDetailEntity advanceDetailEntity = trunklineAdvanceDetailService.findEntityByOrderPackageCode(orderPackageCode);
if(!Objects.isNull(advanceDetailEntity)){ if(!Objects.isNull(advanceDetailEntity)){
Long advanceId = advanceDetailEntity.getAdvanceId();
TrunklineAdvanceEntity advanceEntity = advanceService.getById(advanceId);
String packageStatus = advanceDetailEntity.getPackageStatus(); String packageStatus = advanceDetailEntity.getPackageStatus();
if("0".equals(packageStatus)){ if("0".equals(packageStatus)){
InComingDTO inComingDTO = new InComingDTO(); InComingDTO inComingDTO = new InComingDTO();
@ -10881,6 +10883,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
trunklineCarsLoadScanEntity.setUnloadTime(new Date()); trunklineCarsLoadScanEntity.setUnloadTime(new Date());
trunklineCarsLoadScanEntity.setUnloadTrayCode(unloadTrayCode); trunklineCarsLoadScanEntity.setUnloadTrayCode(unloadTrayCode);
trunklineCarsLoadScanEntity.setUnloadTrayName(unloadTrayName); trunklineCarsLoadScanEntity.setUnloadTrayName(unloadTrayName);
trunklineCarsLoadScanEntity.setCustomerName(advanceEntity.getCustomerName());
trunklineCarsLoadScanEntity.setCustomerTelephone(advanceEntity.getCustomerPhone());
trunklineCarsLoadScanEntity.setCustomerAddress(advanceEntity.getCustomerAddress());
trunklineCarsLoadScanEntity.setFirsts(advanceDetailEntity.getFirstPackName());
trunklineCarsLoadScanEntity.setSenconds(advanceDetailEntity.getSecondPackName());
trunklineCarsLoadScanEntity.setThirds(advanceDetailEntity.getThirdPackName());
trunklineCarsLoadScanEntity.setMaterialCode(advanceDetailEntity.getMaterialCode());
trunklineCarsLoadScanEntity.setMaterialName(advanceDetailEntity.getMaterialName());
trunklineCarsLoadScanService.save(trunklineCarsLoadScanEntity); trunklineCarsLoadScanService.save(trunklineCarsLoadScanEntity);
loadScanId = trunklineCarsLoadScanEntity.getId(); loadScanId = trunklineCarsLoadScanEntity.getId();
@ -10924,6 +10934,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
trunklineCarsLoadScanEntity.setRemark("无装车记录卸车"); trunklineCarsLoadScanEntity.setRemark("无装车记录卸车");
trunklineCarsLoadScanEntity.setUnloadTrayCode(unloadTrayCode); trunklineCarsLoadScanEntity.setUnloadTrayCode(unloadTrayCode);
trunklineCarsLoadScanEntity.setUnloadTrayName(unloadTrayName); trunklineCarsLoadScanEntity.setUnloadTrayName(unloadTrayName);
trunklineCarsLoadScanEntity.setCustomerName(advanceEntity.getCustomerName());
trunklineCarsLoadScanEntity.setCustomerTelephone(advanceEntity.getCustomerPhone());
trunklineCarsLoadScanEntity.setCustomerAddress(advanceEntity.getCustomerAddress());
trunklineCarsLoadScanEntity.setFirsts(advanceDetailEntity.getFirstPackName());
trunklineCarsLoadScanEntity.setSenconds(advanceDetailEntity.getSecondPackName());
trunklineCarsLoadScanEntity.setThirds(advanceDetailEntity.getThirdPackName());
trunklineCarsLoadScanEntity.setMaterialCode(advanceDetailEntity.getMaterialCode());
trunklineCarsLoadScanEntity.setMaterialName(advanceDetailEntity.getMaterialName());
trunklineCarsLoadScanService.save(trunklineCarsLoadScanEntity); trunklineCarsLoadScanService.save(trunklineCarsLoadScanEntity);
loadScanId = trunklineCarsLoadScanEntity.getId(); loadScanId = trunklineCarsLoadScanEntity.getId();
@ -11361,7 +11379,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
stockArticleEntity.setCompleteSet(1); stockArticleEntity.setCompleteSet(1);
stockArticleEntity.setStockupStatus("10"); stockArticleEntity.setStockupStatus("10");
stockArticleEntity.setReservationStatus("10"); stockArticleEntity.setReservationStatus("10");
stockArticleEntity.setOrderStatus("10"); stockArticleEntity.setOrderStatus("20");
stockArticleEntity.setGroundingStatus("10"); stockArticleEntity.setGroundingStatus("10");
stockArticleEntity.setOrderReceiveStatus("10"); stockArticleEntity.setOrderReceiveStatus("10");
stockArticleEntity.setFreezeStatus("10"); stockArticleEntity.setFreezeStatus("10");

Write Preview
Loading…
Cancel
Save