Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java

lms/nladmin-ui/src/views/wms/st/outbill/MoneyDialog.vue

@@ -267,11 +267,30 @@ export default {
       // this.crud.resetQuery(true)
     },
     moneySubmit() {
+      var isTest = this.isTest(this.formMst.order_number)
+      if (isTest) {
+        if (this.formMst.car_type === '') {
+          this.crud.notify('请选择车型！', CRUD.NOTIFICATION_TYPE.INFO)
+          return
+        }
+      }
       checkoutbill.moneySubmit(this.formMst).then(res => {
         this.crud.notify('保存成功！', CRUD.NOTIFICATION_TYPE.INFO)
         this.crud.toQuery()
         this.close()
       })
+    },
+    isTest(val) {
+      // 包含至少一个数字和字母正则
+      const regPost1 = /^(?![^a-zA-Z]+$)(?!\D+$)/g
+      // 包含至少一个汉字正则
+      const regPost2 = /.*[\u4e00-\u9fa5]+.*$/g
+
+      if (regPost1.test(val) && regPost2.test(val)) {
+        return true
+      } else {
+        return false
+      }
     }
   }
 }