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/inAndOutReturn/index.vue

@@ -82,6 +82,7 @@
             </el-select>
           </el-form-item>-->
           <el-form-item label="物料">
+            <label slot="label">物&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;料:</label>
             <el-input
               v-model="query.material_search"
               size="mini"
@@ -91,6 +92,7 @@
             />
           </el-form-item>
           <el-form-item label="批次">
+            <label slot="label">批&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;次:</label>
             <el-input
               v-model="query.pcsn"
               size="mini"
@@ -100,6 +102,7 @@
             />
           </el-form-item>
           <el-form-item label="SAP批次">
+            <label slot="label">SAP批&nbsp;次:</label>
             <el-input
               v-model="query.sap_pcsn"
               size="mini"
@@ -108,6 +111,26 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item label="箱号">
+            <label slot="label">箱&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号:</label>
+            <el-input
+              v-model="query.box_no"
+              size="mini"
+              clearable
+              placeholder="箱号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="交货单">
+            <label slot="label">交&nbsp;货&nbsp;单:</label>
+            <el-input
+              v-model="query.vbeln"
+              size="mini"
+              clearable
+              placeholder="交货单"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
           <el-form-item label="单据日期">
             <el-date-picker
               v-model="query.createTime"
@@ -119,24 +142,6 @@
               @change="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="箱号">
-            <el-input
-              v-model="query.box_no"
-              size="mini"
-              clearable
-              placeholder="箱号"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="交货单">
-            <el-input
-              v-model="query.vbeln"
-              size="mini"
-              clearable
-              placeholder="交货单"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
           <el-form-item label="模糊查询">
             <el-input
               v-model="query.bill_code"
@@ -171,7 +176,7 @@
         <el-button
           slot="right"
           class="filter-item"
-          type="success"
+          type="primary"
           icon="el-icon-position"
           size="mini"
           @click="upload"
@@ -191,7 +196,7 @@
         <el-button
           slot="right"
           class="filter-item"
-          type="success"
+          type="info"
           icon="el-icon-position"
           size="mini"
           @click="uploadSAP"
@@ -201,7 +206,7 @@
         <el-button
           slot="right"
           class="filter-item"
-          type="success"
+          type="warning"
           icon="el-icon-position"
           size="mini"
           @click="disupload"
@@ -212,7 +217,7 @@
           slot="right"
           class="filter-item"
           type="success"
-          icon="el-icon-thumb"
+          icon="el-icon-download"
           size="mini"
           :loading="showDtlLoading"
           :disabled="crud.selections.length !== 1"

lms/nladmin-ui/src/views/wms/st/inStor/productscrap/index.vue

@@ -80,6 +80,19 @@
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="warning"
+          :permission="permission"
+          :disabled="work_flag"
+          :loading="loading_button"
+          icon="el-icon-check"
+          size="mini"
+          @click="onSubmit"
+        >
+          提交
+        </el-button>
         <el-button
           slot="right"
           class="filter-item"
@@ -259,6 +272,16 @@ export default {
     checkboxT(row) {
       return row.bill_status !== '99'
     },
+    onSubmit() {
+      this.loading_button = true
+      productscrap.onSubmit(this.currentRow).then(res => {
+        this.crud.toQuery()
+        this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.loading_button = false
+      }).catch(() => {
+        this.loading_button = false
+      })
+    },
     auditPass() {
       this.loading_button = true
       productscrap.auditPass(this.currentRow).then(res => {

lms/nladmin-ui/src/views/wms/st/inStor/productscrap/productscrap.js

@@ -52,4 +52,11 @@ export function auditOut(data) {
     data
   })
 }
-export default { add, edit, del, getOutBillDtl, auditPass, auditOut }
+export function onSubmit(data) {
+  return request({
+    url: '/api/productscrap/onSubmit',
+    method: 'post',
+    data
+  })
+}
+export default { add, edit, del, getOutBillDtl, auditPass, auditOut, onSubmit }

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
+      }
     }
   }
 }