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

lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java

@@ -249,7 +249,7 @@ public class StorPublicServiceImpl implements StorPublicService {
                         throw new BadRequestException("输入数据异常，请检查");
                     }
                     if (jo_in.getDoubleValue("frozen_qty") < 0) {
-                        throw new BadRequestException("冻结数不允许为负数！");
+                        throw new BadRequestException("库存冻结数异常，请联系管理员分析处理单据！");
                     }
                     wql.update(jo_in, "stockrecord_id='" + jo_in.getString("stockrecord_id") + "'");
                 } else {