完成排产（测试过了）

klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java

@@ -5,9 +5,9 @@ import java.util.Map;
 import java.util.Arrays;
 import java.util.stream.Collectors;
 
-import com.klp.common.core.domain.AjaxResult;
 import com.klp.domain.vo.WmsMaterialCoilExportVo;
 import com.klp.domain.vo.WmsMaterialCoilDeliveryExportVo;
+import com.klp.domain.vo.WmsMaterialCoilLocationGridVo;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
@@ -50,6 +50,20 @@ public class WmsMaterialCoilController extends BaseController {
         return iWmsMaterialCoilService.queryPageList(bo, pageQuery);
     }
 
+    /**
+     * 原料钢卷库位分布查询（先库位，再钢卷映射）
+     */
+    @GetMapping("/locationGrid")
+    public R<WmsMaterialCoilLocationGridVo> locationGrid(
+        @RequestParam @NotNull(message = "库区ID不能为空") Long actualWarehouseId,
+        @RequestParam(required = false, defaultValue = "raw_material") String itemType,
+        @RequestParam(required = false) String enterCoilNo,
+        @RequestParam(required = false) String currentCoilNo,
+        @RequestParam(required = false) String manufacturer
+    ) {
+        return R.ok(iWmsMaterialCoilService.queryLocationGrid(actualWarehouseId, itemType, enterCoilNo, currentCoilNo, manufacturer));
+    }
+
     /**
      * 导出钢卷物料表列表（完整字段版本）
      */

klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilLocationGridVo.java

@@ -0,0 +1,21 @@
+package com.klp.domain.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 原料钢卷库位分布响应
+ */
+@Data
+public class WmsMaterialCoilLocationGridVo {
+
+    /** 库位列表（用于绘制库位网格） */
+    private List<WmsActualWarehouseVo> warehouses;
+
+    /** 钢卷列表（用于映射到库位） */
+    private List<WmsMaterialCoilVo> coils;
+
+    /** 钢卷总数 */
+    private Integer total;
+}

klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java

@@ -1,6 +1,7 @@
 package com.klp.service;
 
 import com.klp.domain.vo.WmsMaterialCoilDeliveryExportVo;
+import com.klp.domain.vo.WmsMaterialCoilLocationGridVo;
 import com.klp.domain.vo.WmsMaterialCoilVo;
 import com.klp.domain.bo.WmsMaterialCoilBo;
 import com.klp.common.core.page.TableDataInfo;
@@ -215,15 +216,16 @@ public interface IWmsMaterialCoilService {
 
     Map<String, Object> cancelSpecialSplit(@NotNull(message = "待操作记录ID不能为空") Long pendingActionId);
 
-    /**
-     * 钢卷退货操作
-     * 将钢卷退货到退货仓，创建新钢卷记录，将原钢卷设置为历史钢卷
-     *
-     * @param coilId 原钢卷ID
-     * @return 退货后的新钢卷信息
-     */
-WmsMaterialCoilVo returnCoil(@NotNull(message = "钢卷ID不能为空") Long coilId);
-
     List<CoilTrimStatisticsVo> getCoilTrimStatistics();
+    WmsMaterialCoilVo returnCoil(@NotNull(message = "钢卷ID不能为空") Long coilId);
+
+    /**
+     * 原料钢卷库位分布查询：先返回库位，再返回该库位下钢卷
+     */
+    WmsMaterialCoilLocationGridVo queryLocationGrid(Long actualWarehouseId,
+                                                    String itemType,
+                                                    String enterCoilNo,
+                                                    String currentCoilNo,
+                                                    String manufacturer);
 }
 

klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java

@@ -856,6 +856,39 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
             }
         }
     }
+    @Override
+    public WmsMaterialCoilLocationGridVo queryLocationGrid(Long actualWarehouseId,
+                                                            String itemType,
+                                                            String enterCoilNo,
+                                                            String currentCoilNo,
+                                                            String manufacturer) {
+        WmsMaterialCoilLocationGridVo result = new WmsMaterialCoilLocationGridVo();
+        if (actualWarehouseId == null) {
+            result.setWarehouses(Collections.emptyList());
+            result.setCoils(Collections.emptyList());
+            result.setTotal(0);
+            return result;
+        }
+
+        WmsActualWarehouseBo warehouseBo = new WmsActualWarehouseBo();
+        warehouseBo.setParentId(actualWarehouseId);
+        List<WmsActualWarehouseVo> warehouses = actualWarehouseService.queryList(warehouseBo);
+
+        WmsMaterialCoilBo coilBo = new WmsMaterialCoilBo();
+        coilBo.setActualWarehouseId(actualWarehouseId);
+        coilBo.setItemType(StringUtils.isBlank(itemType) ? "raw_material" : itemType);
+        coilBo.setEnterCoilNo(enterCoilNo);
+        coilBo.setCurrentCoilNo(currentCoilNo);
+        coilBo.setItemManufacturer(manufacturer);
+        coilBo.setDataType(1);
+        List<WmsMaterialCoilVo> coils = this.queryList(coilBo);
+
+        result.setWarehouses(warehouses);
+        result.setCoils(coils);
+        result.setTotal(coils.size());
+        return result;
+    }
+
     /**
      * 查询钢卷物料表列表
      */