排版

sd-business/src/main/java/com/sd/business/controller/inventory/InventoryController.java

@@ -5,7 +5,6 @@ import com.ruoyi.common.annotation.NonInterception;
 import com.sd.business.entity.inventory.dto.InventorySelectDto;
 import com.sd.business.entity.inventory.dto.QuantityByWarehouseDto;
 import com.sd.business.entity.inventory.dto.QuantityDto;
-import com.sd.business.entity.inventory.po.Inventory;
 import com.sd.business.entity.inventory.vo.InventoryVo;
 import com.sd.business.entity.inventory.vo.QuantityByWarehouseVo;
 import com.sd.business.service.inventory.InventoryService;
@@ -73,7 +72,7 @@ public class InventoryController {
      * 查询库存
      */
     @PostMapping("/getInventoryMap")
-    public Map<Long, List<Inventory>> getInventoryMap(@Validated @RequestBody QuantityDto dto) {
+    public Map<Long, List<InventoryVo>> getInventoryMap(@Validated @RequestBody QuantityDto dto) {
         return inventoryService.getInventoryMap(dto);
     }
 

sd-business/src/main/java/com/sd/business/service/inventory/InventoryService.java

@@ -58,6 +58,6 @@ public interface InventoryService extends BaseService<Inventory> {
     /**
      * 库存map
      */
-    Map<Long, List<Inventory>> getInventoryMap(QuantityDto dto);
+    Map<Long, List<InventoryVo>> getInventoryMap(QuantityDto dto);
 
 }

sd-business/src/main/java/com/sd/business/service/inventory/impl/InventoryServiceImpl.java

@@ -240,10 +240,18 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
     }
 
     @Override
-    public Map<Long, List<Inventory>> getInventoryMap(QuantityDto dto) {
-        return mapKGroup(Inventory::getBomSpecId, q -> q
+    public Map<Long, List<InventoryVo>> getInventoryMap(QuantityDto dto) {
+        List<InventoryVo> list = Sql.create(InventoryVo.class)
+                .selectAll(Inventory.class)
+                .selectAs(BomSpec::getName, InventoryVo::getBomSpecName)
+                .selectAs(BomSpec::getCode, InventoryVo::getBomSpecCode)
+                .from(Inventory.class)
+                .leftJoin(BomSpec.class, Inventory::getBomSpecId)
                 .eq(Inventory::getWarehouseId, dto.getWarehouseId())
-                .in(Inventory::getBomSpecId, dto.getBomSpecIdList()));
+                .in(Inventory::getBomSpecId, dto.getBomSpecIdList())
+                .list();
+
+        return list.stream().collect(Collectors.groupingBy(Inventory::getBomSpecId));
     }
 
     /**

sd-business/src/main/java/com/sd/business/service/work/impl/WorkOrderServiceImpl.java

@@ -517,7 +517,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
             workOrderDetail.setLength(BigDecimal.valueOf(item.getLength() - MaterialsConstant.RESERVE));
             workOrderDetail.setWidth(BigDecimal.valueOf(item.getWidth() - MaterialsConstant.RESERVE));
             workOrderDetail.setBleedingLength(BigDecimal.valueOf(item.getLength()));
-            workOrderDetail.setBleedingWidth(BigDecimal.valueOf(item.getLength()));
+            workOrderDetail.setBleedingWidth(BigDecimal.valueOf(item.getWidth()));
             workOrderDetail.setRotate(item.isRotate() ? StatusConstant.YES : StatusConstant.NO);
             return workOrderDetail;
         }).collect(Collectors.toList());