Merge remote-tracking branch 'origin/phyzasrs-erp-4' into phyzasrs-erp-4

zhangc

2024-12-20 78ff74dfc9c42ee12993ac01c43063d0432231e3

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

@@ -10,6 +10,8 @@

    List<LocRule> find(String matnr);

    List<LocRule> findCode(String matnr, String other);

    //找混载库位规则
    List<LocRule> findMixed();