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

whycq

2024-05-29 265483cb46b5e951e3f6f9b6ed4ecdc94e6b371d

 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();