Merge remote-tracking branch 'origin/master'

廖井涛

2025-08-25 fec9f42e00f2df68a2a20cbf132b17bdeed8e63a

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

@@ -22,7 +22,9 @@
                                                      @Param("pageSize") Integer pageSize,
                                                      @Param("finishedGoodsInventory") FinishedGoodsInventory finishedGoodsInventory);

    Map<String,Integer> getPageTotal(Integer offset, Integer pageSize, FinishedGoodsInventory finishedGoodsInventory);
    Map<String,Integer> getPageTotal(@Param("offset") Integer offset,
                                     @Param("pageSize") Integer pageSize,
                                     @Param("finishedGoodsInventory") FinishedGoodsInventory finishedGoodsInventory);

    FlowCard getSelectWarehousingByProcessId(@Param("order_id") String order_id,
                                        @Param("order_number") Integer order_number,
@@ -148,7 +150,7 @@

    Integer findOrderNumberdContainercount(String orderId, Integer orderNumber, String container);

    List<Map<String, String>> getPrintTitleByBox(Integer customerId, String project, String boxNo);
    List<Map<String, String>> getPrintTitleByBox(Integer customerId, String project, String boxNo,String orderId);

    List<Map<String, Object>> getorderProductByBoxNo(String orderId, String boxNo);