Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs

pjb

2024-12-31 c4e8e814d2c9e0d03f6449860b70e58657fd7dc2

 src/main/java/com/zy/asrs/service/LocDetlService.java

@@ -39,6 +39,8 @@
    Page<LocDetl> getStockStatis(Page<LocDetl> page);
    Page<LocDetlAll> getStockStatisAll(Page<LocDetlAll> page);

    Page<LocDetlAll> getWarningNumPage(Page<LocDetlAll> page);

    Double sumAll();

    Double getSumAnfme(String matnr);
@@ -54,7 +56,7 @@
    // --------------------------------------------------

    List<LocDetl> queryStock(String matnr, String batch,int owner);
    List<LocDetl> queryStock2(String matnr, String batch,int owner);
    List<LocDetl> queryStock2(String matnr, String batch);

    Double queryStockAnfme(String matnr, String batch);