添加智能分架最小分架尺寸，和手机app报表

guoyujie

2025-10-29 cd12e547ba398c74370e24d08ae8228af7d49efa

添加智能分架最小分架尺寸，和手机app报表

 north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue

@@ -172,10 +172,10 @@
      spacerThickness: 0,
      inWeight: 4000,
      inMaxQuantity: 20,
      inLenMin:350,
      inLenMin:400,
      inLenMax:3500,
      inShortMax:2500,
      inShortMin:350
      inShortMin:400
    },
    rules:{
      shelfThickness: [

 north-glass-erp/src/main/java/com/example/erp/controller/AppController.java

@@ -2,6 +2,7 @@

import com.example.erp.common.Result;
import com.example.erp.entity.sd.Order;
import com.example.erp.service.mm.MaterialInventoryService;
import com.example.erp.service.sd.DeliveryService;
import com.example.erp.service.sd.OrderService;
import io.swagger.annotations.Api;
@@ -22,6 +23,7 @@
public class AppController {
    private final OrderService orderService;
    private final DeliveryService deliveryService;
    private final MaterialInventoryService materialInventoryService;

    @ApiOperation("订单报表")
    @PostMapping("/getOrderList")
@@ -34,4 +36,11 @@
    public Result getDeliveryList(@RequestBody List<String> dates) {
        return Result.success(deliveryService.appGetDeliveryList(dates));
    }

    @ApiOperation("原片库存报表")
    @PostMapping("/getStockList")
    public Result getStockList() {

        return Result.success(materialInventoryService.appGetStockList());
    }
}

 north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialInventoryMapper.java

@@ -284,4 +284,6 @@
    Boolean updateMaterialInventoryAll(@Param("materialInventoryId") Long materialInventoryId,@Param("materialInventory") MaterialInventory materialInventory);

    Boolean updateMaterialInventoryOne(@Param("materialInventoryId") Long materialInventoryId,@Param("materialInventory") MaterialInventory materialInventory);

    List<MaterialInventory> selectGetStockList();
}

 north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java

@@ -1315,4 +1315,24 @@

    }

    public Object appGetStockList() {
        List<MaterialInventory> materialInventoryList = materialInventoryMapper.selectGetStockList();
        Map<String, Object> totalSum  = new HashMap<>();
        Integer inventoryQuantity = 0;
        Integer availableQuantity = 0;
        Double totalArea = 0.00;
        for (MaterialInventory materialInventory : materialInventoryList) {
            inventoryQuantity += materialInventory.getInventoryQuantity();
            availableQuantity += materialInventory.getAvailableQuantity();
            totalArea += materialInventory.getTotalArea();
        }
        totalSum.put("inventoryQuantity",inventoryQuantity);
        totalSum.put("availableQuantity",availableQuantity);
        totalSum.put("totalArea",totalArea);


        Map<String, Object> map = new HashMap<>();
        map.put("glassStock", materialInventoryList);
        return map;
    }
}

 north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml

@@ -1387,4 +1387,9 @@
        where id=#{materialInventoryId}
    </update>

    <select id="selectGetStockList">
        select * from mm.material_inventory
        where inventory_quantity>0
    </select>

</mapper>