From 9efa90b82f48619224880bb2a7b9f8f73affd5ea Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Wed, 3 Jan 2024 13:59:25 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=B8=80=E9=94=AE=E8=A3=85?=
=?UTF-8?q?=E8=BD=A6=20=E6=89=98=E7=9B=98=E6=9C=AA=E8=A7=A3=E7=BB=91=20=20?=
=?UTF-8?q?=E6=9C=AA=E4=B8=8B=E6=9E=B6=E7=9A=84=E9=97=AE=E9=A2=98=202.?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AD=BE=E6=94=B6=20=E6=89=98=E7=9B=98?=
=?UTF-8?q?=E6=9C=AA=E8=A7=A3=E7=BB=91=20=20=E6=9C=AA=E4=B8=8B=E6=9E=B6?=
=?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/logpm/warehouse/vo/PackageListVO.java | 1 +
.../warehouse/vo/WarehouseUpdownGoodsVO.java | 3 +++
.../DistributionSignforAppController.java | 19 ++++++++++++-------
.../DistributionSignforController.java | 10 +++++-----
.../DistributionDeliveryListServiceImpl.java | 2 +-
.../impl/DistributionSignforServiceImpl.java | 4 +++-
.../mapper/WarehouseTrayGoodsMapper.xml | 3 ++-
.../mapper/WarehouseUpdownGoodsMapper.xml | 3 ++-
.../impl/WarehouseUpdownTypeServiceImpl.java | 7 +++++++
9 files changed, 36 insertions(+), 16 deletions(-)
diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/PackageListVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/PackageListVO.java
index 9810b9ada..1775340d6 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/PackageListVO.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/PackageListVO.java
@@ -7,6 +7,7 @@ import java.io.Serializable;
@Data
public class PackageListVO implements Serializable {
+ private Long packageId;
private String orderPackageCode;
private String waybillNo;
private String orderCode;
diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseUpdownGoodsVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseUpdownGoodsVO.java
index 3c473d9c0..89a19a80b 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseUpdownGoodsVO.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseUpdownGoodsVO.java
@@ -14,4 +14,7 @@ public class WarehouseUpdownGoodsVO extends WarehouseUpdownGoodsEntity {
private String warehouseName;
private String materialName;
+ private String trayCode;
+ private String trayName;
+
}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java
index 1155ba236..940389b4c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java
@@ -146,9 +146,15 @@ public class DistributionSignforAppController {
try{
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
List<String> packageCodes = (List<String>) r.getData();
+ String orderPackageCodes = null;
for (String packageCode : packageCodes) {
- updownTypeClient.downPackageOrDelTray(packageCode,myCurrentWarehouse.getId());
+ if(StringUtils.isBlank(orderPackageCodes)){
+ orderPackageCodes = packageCode;
+ }else{
+ orderPackageCodes = orderPackageCodes + "," + packageCode;
+ }
}
+ updownTypeClient.downPackageOrDelTray(orderPackageCodes,myCurrentWarehouse.getId());
}catch (Exception e){
log.error("#############signfor: 下架失败");
}
@@ -226,21 +232,20 @@ public class DistributionSignforAppController {
public R oneclick(@Valid @RequestBody DistributionSignforDTO distributionSignfor) {
distributionSignfor.setIsClerk(false);
R r = distributionSignforService.oneclick(distributionSignfor);
-
+ List<String> packageCodes = (List<String>)r.getData();
try{
- List<Long> packageIds = (List<Long>)r.getData();
String orderPackageCodes = null;
- for (Long packageId : packageIds) {
+ for (String packageCode : packageCodes) {
if(StringUtils.isBlank(orderPackageCodes)){
- orderPackageCodes = packageId+"";
+ orderPackageCodes = packageCode+"";
}else{
- orderPackageCodes = orderPackageCodes + "," +packageId;
+ orderPackageCodes = orderPackageCodes + "," +packageCode;
}
}
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
updownTypeClient.downPackageOrDelTray(orderPackageCodes,myCurrentWarehouse.getId());
}catch (Exception e){
- log.error("##############oneclick: 更新包件下架状态失败");
+ log.error("##############oneclick: 更新包件下架状态失败 packageCodes=()",packageCodes);
}
return r;
}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
index 2ee093eb0..2307ffa3f 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
@@ -269,20 +269,20 @@ public class DistributionSignforController extends BladeController {
public R oneclick(@Valid @RequestBody DistributionSignforDTO distributionSignfor) {
distributionSignfor.setIsClerk(true);
R r = distributionSignforService.oneclick(distributionSignfor);
- List<Long> packageIds = (List<Long>)r.getData();
+ List<String> packageCodes = (List<String>)r.getData();
try{
String orderPackageCodes = null;
- for (Long packageId : packageIds) {
+ for (String packageCode : packageCodes) {
if(StringUtils.isBlank(orderPackageCodes)){
- orderPackageCodes = packageId+"";
+ orderPackageCodes = packageCode+"";
}else{
- orderPackageCodes = orderPackageCodes + "," +packageId;
+ orderPackageCodes = orderPackageCodes + "," +packageCode;
}
}
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
updownTypeClient.downPackageOrDelTray(orderPackageCodes,myCurrentWarehouse.getId());
}catch (Exception e){
- log.error("##############oneclick: 更新包件下架状态失败 packageIds={}",packageIds);
+ log.error("##############oneclick: 更新包件下架状态失败 packageCodes={}",packageCodes);
}
return r;
}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index a2eb7bc50..1c36dd164 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -1790,7 +1790,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
// distributionAsyncService.updatepackageListLoadingStatus(updatePackageList,myCurrentWarehouse.getId());
if (Func.isNotEmpty(updatePackageList)){
String updownrOderPackages = updatePackageList.stream().map(DistributionParcelListEntity::getOrderPackageCode).collect(Collectors.joining(","));
- if (Func.isNotEmpty(orderPackages)){
+ if (Func.isNotEmpty(updownrOderPackages)){
warehouseUpdownTypeClient.downPackage(updownrOderPackages,myCurrentWarehouse.getId());
}
List<Long> packageIds = updatePackageList.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList());
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index 5a06377f7..f513e96fb 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -2514,6 +2514,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
}
List<Long> packageIds = new ArrayList<>();
+ List<String> packageCodes = new ArrayList<>();
List<String> orderCodes = new ArrayList<>();
log.info(">>>>>>>>>>> tag {}",8);
if (Func.isNotEmpty(parcelListEntityList)) {
@@ -2607,6 +2608,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
}
}
distributionAsyncService.sendFactory(parcelListEntity, signingTime, reservationEntity.getId(), reservationEntity.getReservationCode(), myCurrentWarehouse.getName());
+ packageCodes.add(parcelListEntity.getOrderPackageCode());
packageIds.add(parcelListEntity.getId());
orderCodes.add(parcelListEntity.getOrderCode());
@@ -2655,7 +2657,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
.set(!distributionSignfor.getIsClerk(), DistributionSignforEntity::getSjsigningTime, simpleDateFormat.format(new Date()));
boolean update = this.update(set);
- return R.data(packageIds);
+ return R.data(packageCodes);
}
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml
index 79fccd82e..fcdff55e6 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml
@@ -382,7 +382,8 @@
</select>
<select id="findPackageDetailList" resultType="com.logpm.warehouse.vo.PackageListVO">
- select lwtg.association_value orderPackageCode,
+ select ldpl.id packageId,
+ lwtg.association_value orderPackageCode,
ldpl.waybill_number waybillNo,
ldpl.order_code orderCode,
ldpl.warehouse warehouseName,
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml
index 4345188d3..69caccb9a 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml
@@ -426,7 +426,8 @@
<select id="findPackageDetailList" resultType="com.logpm.warehouse.vo.PackageListVO">
- select lwug.association_value orderPackageCode,
+ select ldpl.id packageId,
+ lwug.association_value orderPackageCode,
ldpl.waybill_number waybillNo,
ldpl.order_code orderCode,
ldpl.warehouse warehouseName,
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
index 856fff21b..4fd061586 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
@@ -1202,9 +1202,16 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
return R.fail(403,"包件信息不在当前库");
}
+ Long allocationId = updownGoodsEntity.getAllocationId();
+ BasicdataTrayEntity basicdataTrayEntity = warehouseTaryAllocationService.getTrayByAllocationId(allocationId);
+
WarehouseUpdownGoodsVO updownGoodsVO = new WarehouseUpdownGoodsVO();
BeanUtil.copy(updownGoodsEntity,updownGoodsVO);
updownGoodsVO.setOrderCode(parcelListEntity.getOrderCode());
+ if(!Objects.isNull(basicdataTrayEntity)){
+ updownGoodsVO.setTrayCode(basicdataTrayEntity.getPalletCode());
+ updownGoodsVO.setTrayName(basicdataTrayEntity.getPalletName());
+ }
return R.data(updownGoodsVO);
}