diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java
index 4ce6d89a5..28dfdd544 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java
@@ -56,6 +56,7 @@ public interface IWarehouseUpdownTypeClient {
@GetMapping(TOP + "/downPackageOrDelTray")
R downPackageOrDelTray(@RequestParam("orderPackageCodes") String orderPackageCodes, @RequestParam("warehouseId") Long warehouseId);
-
+ @GetMapping(TOP + "/downTray")
+ R downTray(@RequestParam("trayCode") String trayCode, @RequestParam("warehouseId") Long warehouseId);
}
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml
index 17a4eba76..c69ebd65d 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml
@@ -84,6 +84,9 @@
and tray.pallet_code like concat('%',#{po.palletCode},'%')
+
+ and tray.pallet_name like concat('%',#{po.palletName},'%')
+
order by tray.create_time desc
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 3ed9fac91..4542ad4e1 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
@@ -23,7 +23,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.google.gson.JsonObject;
import com.logpm.basic.entity.BasicPrintTemplateEntity;
import com.logpm.basic.feign.IBasicPrintTemplateClient;
import com.logpm.basicdata.entity.BasicdataDriverArteryEntity;
@@ -5626,13 +5625,23 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl> spaclOrderList = buildSpaclOrders(distributionReservationEntity, 1);
map.put("定制品集合", spaclOrderList);
- map.put("定制品合计", spaclOrderList.stream().mapToInt(map1 -> Integer.parseInt(map1.get("数量").toString())).sum());
+ Integer spaclNum = 0;
+ for (Map m:spaclOrderList){
+ Integer num = (Integer) m.get("数量");
+ spaclNum = spaclNum + num;
+ }
+ map.put("定制品合计", spaclNum);
// 通过预约单查询预约下面的订单 --1 或者 库存品 --2
List> spaclStockList = buildSpaclOrders(distributionReservationEntity, 2);
if (spaclStockList.size() > 0 && !spaclStockList.isEmpty()) {
map.put("库存品集合", spaclStockList);
- map.put("库存品合计", spaclStockList.stream().mapToInt(map1 -> Integer.parseInt(map1.get("数量").toString())).sum());
+ Integer spaclStockNum = 0;
+ for (Map m:spaclStockList){
+ Integer num = (Integer) m.get("数量");
+ spaclStockNum = spaclStockNum + num;
+ }
+ map.put("库存品合计", spaclStockNum);
}
@@ -5789,11 +5798,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl allocationList = distributionReservationMapper.getStockListAllocation(distributionStockListEntity.getId(), distributionReservationEntity.getId());
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
index c9fee32af..8c3e0d416 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
@@ -1808,7 +1808,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl