Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2024-02-02 decd9f8bf3e6119efce34e6bbc0c320a2a2446c1

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

@@ -29,14 +29,61 @@

    Integer getseletwarehousingPageTotal(Integer offset, Integer pageSize,FlowCard flowCard);

    Integer findOrderNumberdcount(Integer orderNumber);
    Integer findOrderNumberdcount(@Param("orderId") String orderId,
                                  @Param("orderNumber") Integer orderNumber);

    Boolean updateInventory(FlowCard flowCard);
    Integer finishedGoodsInventorybycount(@Param("orderId") String orderId,
                                  @Param("orderNumber") Integer orderNumber);

    Integer findOrderQuantity(String orderId);

    Integer findOrderNumberdsum(String orderId);

    Boolean updateInventory(@Param("flowCard") FlowCard flowCard,
                            @Param("storageRegion") String storageRegion,
                            @Param("remark") String remark);

    Boolean updateInventoryquantityavailable(@Param("orderDetail") OrderDetail orderDetail);
    Boolean updateflowcard(FlowCard flowCard);

    Boolean updateIntOrderNumberConut( @Param("orderId") String orderId,
                                       @Param("orderNumber") Integer orderNumber,
                                       @Param("quantity") Integer quantity);

    Boolean updateOutOrderNumberConut( @Param("orderId") String orderId,
                                       @Param("orderNumber") Integer orderNumber,
                                       @Param("quantity") Integer quantity);


    Boolean updateOrderWarehousingState(String orderId,Integer state);

    Boolean updateOrderDeliveryState(String orderId,Integer state);

    Boolean updateDeliveryDetailState(OrderDetail orderDetail,Integer state);

    Boolean insertFinishedGoodsInventory(@Param("flowCard") FlowCard flowCard,
                                         @Param("storageRegion") String storageRegion,
                                         @Param("remark") String remark);


    List<OrderDetail> getseletdeliveryDetail(@Param("offset") Integer offset,
                                                      @Param("pageSize") Integer pageSize,
                                                      @Param("orderDetail") OrderDetail orderDetail);

    Integer getseletdeliveryDetailPageTotal(Integer offset, Integer pageSize,OrderDetail orderDetail);

    List<OrderDetail> getSelectAllocate(@Param("offset") Integer offset,
                                        @Param("pageSize") Integer pageSize,
                                        @Param("orderDetail") OrderDetail orderDetail);

    Integer getSelectAllocatePageTotal(Integer offset, Integer pageSize,OrderDetail orderDetail);

    Boolean updateInventoryquantityAllocateOut(@Param("orderId") String orderId,
                                               @Param("orderNumber") Integer orderNumber,
                                               @Param("quantity") Integer quantity);
    Boolean updateInventoryquantityAllocateInt(@Param("orderId") String orderId,
                                               @Param("orderNumber") Integer orderNumber,
                                               @Param("quantity") Integer quantity);
}