add：退货出库/烘干出库

wms/nladmin-ui/src/views/wms/basedata/group/index.vue

@@ -108,7 +108,7 @@
 
             <el-col :span="8">
               <el-form-item label="焊材批号" prop="pcsn">
-                <el-input v-model="form.pcsn" disabled placeholder="由系统自动生成" style="width: 200px;" />
+                <el-input v-model="form.pcsn" style="width: 200px;" />
               </el-form-item>
             </el-col>
 
@@ -335,6 +335,9 @@ export default {
         storagevehicle_code: [
           { required: true, message: '载具不能为空', trigger: 'blur' }
         ],
+        pcsn: [
+          { required: true, message: '批次不能为空', trigger: 'blur' }
+        ],
         supp_code: [
           { required: true, message: '供应商不能为空', trigger: 'blur' }
         ],

wms/nladmin-ui/src/views/wms/pdm/callmaterial/callmaterial.js

@@ -24,4 +24,12 @@ export function edit(data) {
   })
 }
 
-export default { add, edit, del }
+export function confirm(data) {
+  return request({
+    url: 'api/bomCallMaterial/confirm',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, confirm }

wms/nladmin-ui/src/views/wms/pdm/callmaterial/index.vue

@@ -59,7 +59,19 @@
       </div>
       <rrOperation />
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          :disabled="crud.selections.length !== 1"
+          @click="confirm"
+        >
+          强制确认
+        </el-button>
+      </crudOperation>
       <el-dialog
         :close-on-click-modal="false"
         :before-close="crud.cancelCU"
@@ -117,6 +129,7 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
+        <el-table-column type="selection" width="55" />
         <el-table-column show-overflow-tooltip prop="bom_code" width="150" label="叫料单号">
           <template slot-scope="scope">
             <el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.bom_code }}</el-link>
@@ -248,6 +261,17 @@ export default {
     toView(index, row) {
       this.openParam = row
       this.ViewDialog = true
+    },
+    confirm() {
+      const data = this.$refs.table.selection[0]
+      if (data.bom_status < '3') {
+        this.crud.notify('当前状态不允许强制确认!！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      crudCallMaterial.confirm(data).then(res => {
+        this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
+      })
     }
   }
 }

wms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue

@@ -262,15 +262,6 @@ export default {
         this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
         return false
       }
-      if (this.form.bill_type !== '1004') {
-        this.form.out_stor_id = ''
-      }
-      if (this.form.bill_type === '1004') {
-        if (!this.form.out_stor_id) {
-          this.crud.notify('移入仓库不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
-          return false
-        }
-      }
     },
     [CRUD.HOOK.afterToEdit]() {
       checkoutbill.getOutBillDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {

wms/nladmin-ui/src/views/wms/st/selectout/ViewDialog.vue

@@ -155,7 +155,7 @@ export default {
       this.$emit('update:dialogShow', false)
     },
     open() {
-      crudSectout.getSelectDis({}).then(res => {
+      crudSectout.getSelectDis({ 'iostorinvdtl_id': this.formMst.iostorinvdtl_id }).then(res => {
         this.tabledis = res
       })
     }

wms/nladmin-ui/src/views/wms/st/selectout/WeighDialog.vue

@@ -204,8 +204,8 @@ export default {
         this.crud.notify('拣选批次不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
         return
       }
-      this.formMst.weigh_qty = '51'
-      this.formMst.select_qty = '30'
+      this.formMst.weigh_qty = '40'
+      this.formMst.select_qty = '10'
      /* crudSectout.getWeigh(this.current).then(res => {
         this.formMst.weigh_qty = res.weigh_qty
         this.formMst.select_qty = res.select_qty