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

feat(all): 作业广播消息 

1 删除重复字段
fix-sign
zhaoqiaobo 5 months ago
parent
8764a17532
commit
c4b811debd
6 changed files with 16 additions and 21 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-biz-common/src/main/java/org/springblade/common/model/PackageData.java
  2. 4
      blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java
  3. 2
      blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAyscServiceImpl.java
  4. 18
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java
  5. 2
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
  6. 6
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java

5
blade-biz-common/src/main/java/org/springblade/common/model/PackageData.java
Unescape View File

@ -8,7 +8,6 @@ import org.springblade.common.enums.PackageTypeEnums;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.List;
/**
* 提送数据
@ -75,10 +74,6 @@ public class PackageData implements Serializable {
*/
private Integer number;
/**
* 数量
*/
private Integer num;
/**
* 重量
*/

4
blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java
Unescape View File

@ -331,7 +331,7 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
packageData.setWaybillNumber(orderCode);
packageData.setProductId(goodsId);
packageData.setProductName(zeroPackageDTO.getGoodsName());
packageData.setNum(packageEnterNum);
packageData.setNumber(packageEnterNum);
packageData.setPackageType(PackageTypeEnums.INV);
packageDataList.add(packageData);
});
@ -405,7 +405,7 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
packageData.setWaybillNumber(orderCode);
packageData.setProductId(goodsId);
packageData.setProductName(goodsName);
packageData.setNum(packageNum);
packageData.setNumber(packageNum);
packageData.setPackageType(PackageTypeEnums.INV);
packageDataList.add(packageData);

2
blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAyscServiceImpl.java
Unescape View File

@ -62,7 +62,7 @@ public class AftersalesAyscServiceImpl implements IAftersalesAyscService {
orderPackageCodeList.forEach(packageCode -> {
PackageData packageData = new PackageData();
packageData.setPackageCode(packageCode);
packageData.setNum(1);
packageData.setNumber(1);
packageData.setPackageType(PackageTypeEnums.CMP);
packageDataList.add(packageData);
});

18
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java
Unescape View File

@ -724,7 +724,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
packageData.setPackageCode(entity.getScanCode());
packageData.setOrderCode(entity.getOrderCode());
packageData.setWaybillNumber(entity.getWaybillNo());
packageData.setNum(entity.getNum());
packageData.setNumber(entity.getNum());
packageData.setPackageType(PackageTypeEnums.CMP);
packageDataList.add(packageData);
});
@ -742,7 +742,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
PackageData packageData = new PackageData();
packageData.setOrderCode(carsLoadScanEntity.getOrderCode());
packageData.setNum(zeroDetailVO.getLoadingNum());
packageData.setNumber(zeroDetailVO.getLoadingNum());
packageData.setPackageType(PackageTypeEnums.LTL);
packageData.setWaybillNumber(carsLoadScanEntity.getWaybillNo());
packageData.setProductId(zeroDetailVO.getGoodsId());
@ -801,7 +801,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
packageData.setPackageCode(entity.getScanCode());
packageData.setOrderCode(entity.getOrderCode());
packageData.setWaybillNumber(entity.getWaybillNo());
packageData.setNum(entity.getNum());
packageData.setNumber(entity.getNum());
packageData.setPackageType(PackageTypeEnums.CMP);
packageDataList.add(packageData);
});
@ -819,7 +819,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
PackageData packageData = new PackageData();
packageData.setOrderCode(carsLoadScanEntity.getOrderCode());
packageData.setNum(zeroDetailVO.getLoadingNum());
packageData.setNumber(zeroDetailVO.getLoadingNum());
packageData.setPackageType(PackageTypeEnums.LTL);
packageData.setWaybillNumber(carsLoadScanEntity.getWaybillNo());
packageData.setProductId(zeroDetailVO.getGoodsId());
@ -871,7 +871,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
packageData.setPackageCode(entity.getScanCode());
packageData.setOrderCode(entity.getOrderCode());
packageData.setWaybillNumber(entity.getWaybillNo());
packageData.setNum(entity.getNum());
packageData.setNumber(entity.getNum());
packageData.setPackageType(PackageTypeEnums.CMP);
packageDataList.add(packageData);
});
@ -889,7 +889,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
PackageData packageData = new PackageData();
packageData.setOrderCode(carsLoadScanEntity.getOrderCode());
packageData.setNum(zeroDetailVO.getLoadingNum());
packageData.setNumber(zeroDetailVO.getLoadingNum());
packageData.setPackageType(PackageTypeEnums.LTL);
packageData.setWaybillNumber(carsLoadScanEntity.getWaybillNo());
packageData.setProductId(zeroDetailVO.getGoodsId());
@ -931,7 +931,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
orderPackageCodeList.forEach(packageCode -> {
PackageData packageData = new PackageData();
packageData.setPackageCode(packageCode);
packageData.setNum(1);
packageData.setNumber(1);
packageData.setPackageType(PackageTypeEnums.CMP);
packageDataList.add(packageData);
});
@ -967,7 +967,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
sendList.forEach(zeroDetailVO -> {
PackageData packageData = new PackageData();
packageData.setOrderCode(carsLoadScanEntity.getOrderCode());
packageData.setNum(zeroDetailVO.getUnloadNum());
packageData.setNumber(zeroDetailVO.getUnloadNum());
packageData.setPackageType(PackageTypeEnums.LTL);
packageData.setWaybillNumber(carsLoadScanEntity.getWaybillNo());
packageData.setProductId(zeroDetailVO.getGoodsId());
@ -1006,7 +1006,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
scanEntityList.forEach(scanEntity -> {
PackageData packageData = new PackageData();
packageData.setPackageCode(scanEntity.getScanCode());
packageData.setNum(1);
packageData.setNumber(1);
packageData.setPackageType(PackageTypeEnums.CMP);
packageDataList.add(packageData);
});

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

@ -1104,7 +1104,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
packageData.setOrderCode(detailEntity.getWaybillNo());
packageData.setProductId(detailEntity.getProductId());
packageData.setProductName(detailEntity.getProductName());
packageData.setNum(detailEntity.getNum());
packageData.setNumber(detailEntity.getNum());
packageData.setWeight(detailEntity.getWeight());
packageData.setVolume(detailEntity.getVolume());
packageData.setPackageType(PackageTypeEnums.LTL);

6
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java
Unescape View File

@ -426,7 +426,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
packageData.setMaterialId(detailEntity.getMaterialId());
packageData.setMaterialCode(detailEntity.getMaterialCode());
packageData.setMaterialName(detailEntity.getMaterialName());
packageData.setNum(detailEntity.getQuantity());
packageData.setNumber(detailEntity.getQuantity());
packageData.setWeight(detailEntity.getWeight());
packageData.setVolume(detailEntity.getVolume());
packageData.setPackageType(PackageTypeEnums.CMP);
@ -477,7 +477,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
packageData.setPackageCode(detailEntity.getOrderPackageCode());
packageData.setOrderCode(detailEntity.getOrderCode());
packageData.setServiceNo(detailEntity.getServiceNum());
packageData.setNum(detailEntity.getQuantity());
packageData.setNumber(detailEntity.getQuantity());
packageData.setWeight(detailEntity.getWeight());
packageData.setVolume(detailEntity.getVolume());
packageData.setPackageType(PackageTypeEnums.CMP);
@ -525,7 +525,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
packageData.setPackageCode(detailEntity.getOrderPackageCode());
packageData.setOrderCode(detailEntity.getOrderCode());
packageData.setServiceNo(detailEntity.getServiceNum());
packageData.setNum(detailEntity.getQuantity());
packageData.setNumber(detailEntity.getQuantity());
packageData.setWeight(detailEntity.getWeight());
packageData.setVolume(detailEntity.getVolume());
packageData.setPackageType(PackageTypeEnums.CMP);

Write Preview
Loading…
Cancel
Save