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

bfwms

2025-06-27 541343ce5f5a3c438875f26418957360f779c004

 src/main/java/com/zy/common/service/CommonService.java

@@ -201,10 +201,10 @@
                }
            }

            if (matNos.size() > 1 && matType == 1) {
                //物料为单品类型，且物料种类超过1(实际为高频混放)，则禁止入库
                throw new CoolException("物料类型和实际种类不一致");
            }
//            if (matNos.size() > 1 && matType == 1) {
//                //物料为单品类型，且物料种类超过1(实际为高频混放)，则禁止入库
//                throw new CoolException("物料类型和实际种类不一致");
//            }
        }

        if (!sign && matType != null) {