Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1

Junjie

2023-12-13 d02a6b2cf6f0030456fd7ea568570f3df0dd7291

 src/main/java/com/zy/asrs/controller/LocRuleController.java

@@ -121,7 +121,7 @@
        locRule.setUpdateTime(new Date());
        locRuleService.updateById(locRule);
        Integer locType2 = 1;//单品区域
        if (locRule.getMixed() == 0) {
        if (Cools.isEmpty(locRule.getMixed()) || locRule.getMixed() == 0) {
            locRuleService.updateKeepGoByMatnr(locRule.getMatnr(), locRule.getKeepGo());
        }else {//混载
            locRuleService.updateKeepGoByMixed(locRule.getKeepGo());