diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java
index 633d0bb2..4699d450 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java
@@ -755,10 +755,10 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService
     * 对物料相同的数据进行合并操作，并合计领料数
     * */
     public List<SysMakeorderPickDetail> mergeMakeorderPickDetails(List<SysMakeorderPickDetail> sysMakeorderPickDetails) {
-        Map<String, Long> materialMap = new HashMap<>();
+        Map<String, Integer> materialMap = new HashMap<>();
         for (SysMakeorderPickDetail detail : sysMakeorderPickDetails) {
             String materialNo = detail.getMaterialNo();
-            Long pickNum = detail.getPickNum();
+            Integer pickNum = detail.getPickNum();
             if (materialMap.containsKey(materialNo)) {
                 materialMap.put(materialNo, materialMap.get(materialNo) + pickNum);
             } else {
@@ -767,7 +767,7 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService
         }
 
         List<SysMakeorderPickDetail> mergedDetails = new ArrayList<>();
-        for (Map.Entry<String, Long> entry : materialMap.entrySet()) {
+        for (Map.Entry<String, Integer> entry : materialMap.entrySet()) {
             SysMakeorderPickDetail mergedDetail = new SysMakeorderPickDetail();
             mergedDetail.setMaterialNo(entry.getKey());
             mergedDetail.setPickNum(entry.getValue());