代码合并

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

@@ -117,7 +117,7 @@
 <!--        <el-table-column prop="source_bill_type" label="源单类型" align="center" width="130px" :formatter="invtypeFormat" />-->
         <el-table-column show-overflow-tooltip prop="vbeln" label="交货单" align="center" />
         <el-table-column show-overflow-tooltip prop="source_bill_code" label="源单编号" align="center" />
-        <el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" align="center" />
+        <el-table-column show-overflow-tooltip prop="width" label="幅宽" align="center" width="100" />
       </el-table>
     </el-card>
     <div class="crud-opts2">
@@ -163,7 +163,7 @@
       <span class="crud-opts-right2">
         <!--左侧插槽-->
         <slot name="left" />
-        <el-button
+    <!--    <el-button
           slot="left"
           class="filter-item"
           type="warning"
@@ -173,6 +173,17 @@
           @click="setPoint()"
         >
           设置站点
+        </el-button>-->
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-check"
+          size="mini"
+          :disabled="button4"
+          @click="oneSetPoint"
+        >
+          设置站点
         </el-button>
       </span>
     </div>
@@ -493,21 +504,6 @@ export default {
         this.crud.notify('任务已生成！', CRUD.NOTIFICATION_TYPE.INFO)
         return
       }
-      // 根据此仓位的 ‘相同块、相同排、相同层’ 判断上一个任务是否生成
-      const tab = this.tabledis
-      for (let i = 0; i < tab.length; i++) {
-        const item = tab[i]
-        if (this.currentDis.block_num === item.block_num && this.currentDis.row_num === item.row_num && this.currentDis.layer_num === item.layer_num) {
-          const out_order_seq = parseInt(this.currentDis.out_order_seq) - 1
-          if (parseInt(item.out_order_seq) === out_order_seq) {
-            if (item.work_status === '00') {
-              this.crud.notify('请先生成上一个任务：' + item.struct_code, CRUD.NOTIFICATION_TYPE.INFO)
-              return
-            }
-          }
-        }
-      }
-
       if (this.currentDis.iostorinvdis_id !== null) {
         this.currentDis.point_code = this.form2.point_code
         checkoutbill.setPoint(this.currentDis).then(res => {
@@ -515,6 +511,26 @@ export default {
         })
       }
     },
+    oneSetPoint() {
+      if (this.form2.point_code === '') {
+        this.crud.notify('请先选择站点！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      if (this.currentDis.point_code) {
+        this.crud.notify('站点已设置！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      if (this.currentDis.work_status !== '00') {
+        this.crud.notify('任务已生成！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      if (this.currentDis.iostorinvdis_id !== null) {
+        this.currentDis.point_code = this.form2.point_code
+        checkoutbill.oneSetPoint(this.currentDis).then(res => {
+          this.queryTableDdis(this.currentDis.iostorinvdtl_id)
+        })
+      }
+    },
     queryTableDtl() {
       checkoutbill.getOutBillDtl({ 'iostorinv_id': this.mstrow.iostorinv_id }).then(res => {
         this.tableDtl = res