@logwire/logwire-wms-pda-ui 3.4.0 → 3.5.0

package/src/views/wms/page/outbound/pick/notAlone/index.vue

@@ -12,23 +12,26 @@
     :pick-data="pickData"
     :show-bottom-bar="container.confirm"
     :pick-container="container.value"
-    :lack-confirm-fn="lackConfirm"
-    :abn-confirm-fn="abnConfirm"
+    :lack-confirm-fn="mixinAloneLackConfirm"
+    :abn-confirm-fn="mixinAloneAbnConfirm"
     :get-data="getData"
     @pickConfirm="pickConfirm"
   >
 
     <div
       style="margin-bottom: 10px"
-      class="lw-global-model-box"
+      class="lw-global-model-box lw-global-model-box-3px"
     >
       <lw-input
         :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.unljebyh','拣选容器号')"
         v-model="container.value"
         :get-focus.sync="container.focus"
         :disabled="container.confirm"
+        :create-rule="$lwScanRule.create('非独立件拣选-拣选容器号','CONTAINER')"
         rule-key="container"
+        :rule-serve-query="nowPickData"
         required
+        :show-bottom-border="false"
         @confirm="containerBtnClick"
       >
         <template #button>
@@ -46,15 +49,15 @@
       </lw-input>
     </div>
 
-    <!-- 左右切换滚动到顶部的锚点 -->
     <template v-if="container.confirm">
+      <!-- 左右切换滚动到顶部的锚点 -->
       <div id="tab-top"></div>
       <lw-tab-box>
         <van-tabs
           type="card"
           animated
           v-model="tabActive"
-          @change="goTop"
+          @change="mixinAllGoTop"
         >
 
           <!-- 正在拣选 -->
@@ -70,11 +73,12 @@
               />
 
               <!-- 托盘号 -->
-              <lw-title-value-cell
+              <exchange-pick-container
                 v-if="nowPickData.fromLpn"
-                :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.gpsjuyqm','托盘号')"
-                :value="nowPickData.fromLpn"
-                val-bold
+                :item="nowPickData"
+                :pick-container="container.value"
+                :pick-id="pickData.pickId"
+                @exchangeSuccess="mixinAlonePickSuccessCheck"
               />
 
               <!-- 箱号 -->
@@ -87,12 +91,15 @@
 
               <!-- 库位 -->
               <lw-input
+                v-if="mixinNeedInputLoc"
                 :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.riqyoozc','拣选库位')"
                 v-model="locationCode.value"
                 :get-focus.sync="locationCode.focus"
                 required
                 rule-key="location"
-                @confirm="locationCodeConfirm"
+                :create-rule="$lwScanRule.create('非独立件拣选-拣选库位','LOCATION')"
+                :rule-serve-query="nowPickData"
+                @confirm="mixinAloneLocationCodeConfirm"
               />
 
               <!-- 托盘号 -->
@@ -103,7 +110,9 @@
                 :get-focus.sync="lpn.focus"
                 required
                 rule-key="lpn"
-                @confirm="lpnConfirm"
+                :create-rule="$lwScanRule.create('非独立件拣选-托盘号','LPN')"
+                :rule-serve-query="nowPickData"
+                @confirm="mixinAloneLpnConfirm"
               />
 
               <!-- 箱号 -->
@@ -115,66 +124,85 @@
                 required
                 rule-key="case"
                 :create-rule="$lwScanRule.create('非独立件拣选-箱号','CASE')"
-                @confirm="boxConfirm"
+                :rule-serve-query="nowPickData"
+                @confirm="mixinAloneBoxConfirm"
               />
 
               <!-- 商品号 -->
               <lw-input
+                v-if="mixinNeedInputSku"
                 :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.wunzopak','商品号')"
                 v-model="sku.value"
                 :get-focus.sync="sku.focus"
                 required
                 rule-key="sku"
+                :disabled="disabledSku"
+                :create-rule="$lwScanRule.create('非独立件拣选-商品号','SKU')"
+                :rule-serve-query="nowPickData"
+                :owner-id="nowPickData.ownerId"
+                :need-show-clear="!sn.list.length"
                 @confirm="skuConfirm"
               />
-
-              <!-- 当前扫描 -->
-              <lw-title-value-cell
-                :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.index.cdcvlscf','当前扫描')"
-                :value="nowScan.value || '-'"
-                val-bold
-              />
-
+              <!-- 序列号 -->
               <template v-if="nowPickData.needHandleSn">
                 <lw-input
+                  ref="snInp"
                   :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.index.gwtjldug','序列号')"
                   v-model="sn.value"
                   :get-focus.sync="sn.focus"
                   required
-                  :create-rule="$lwScanRule.create('拣选-混箱件-SN','SN')"
+                  :create-rule="$lwScanRule.create('非独立件拣选-序列号','SN')"
                   rule-key="sn"
-                  @confirm="snConfirm"
+                  :rule-serve-query="nowPickData"
+                  :owner-id="nowPickData.ownerId"
+                  @confirm="mixinAloneSnConfirm"
                 />
                 <lw-scan-data-list-module
+                  row-type="sn"
+                  row-id="notAlone"
+                  total-type="sn"
+                  total-type-id="notAlone"
                   class="lw-global-row"
                   v-model="sn.list"
+                  start-bright
                 />
               </template>
-              <lw-input
-                v-else
-                :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.rwiwdjks','数量')"
-                v-model="qty.value"
-                :get-focus.sync="qty.focus"
-                required
-                type="digit"
-                @confirm="qtyConfirm"
-              >
-                <template #button>
-                  <lw-button
-                    v-if="!qty.disabled"
-                    mini
-                    round
-                    @click="qtyConfirm"
-                  >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.cwcxalqk', '确认') }}
-                  </lw-button>
-                </template>
-              </lw-input>
+              <!-- 数量 -->
+              <template v-else>
+
+                <!-- 当前扫描 -->
+                <lw-title-value-cell
+                  :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.index.cdcvlscf','当前扫描')"
+                  :value="nowScanVal || '-'"
+                  val-bold
+                />
+
+
+                <lw-get-qty-by-type
+                  v-if="showUomQty"
+                  ref="qty"
+                  :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.wrqohiqb','数量')"
+                  :owner-id="nowPickData.ownerId"
+                  :sku-id="nowPickData.skuId"
+                  :uom-type-list="uomList"
+                  @confirm="qtyConfirm"
+                >
+                  <template #button>
+                    <lw-button
+                      mini
+                      round
+                      @click="qtyConfirm"
+                    >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.ursidwbt', '确认') }}
+                    </lw-button>
+                  </template>
+                </lw-get-qty-by-type>
+              </template>
 
 
               <lw-cut-card
                 v-model="taskIndex"
                 :length="pickData.pendingPickLineList.length"
-                :cut-start="cutStart"
+                :cut-start="mixinAloneCutStart"
                 :cut-end="cutEnd"
               />
 
@@ -184,26 +212,18 @@
 
           <!-- 拣选明细行 -->
           <van-tab
-            :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.gzyjrunq','拣选明细行')"
+            :title="$lwLanguage.get('','待拣列表')"
             name="wait"
           >
 
-            <div
-              v-for="(i,k) in pickData.allLineList"
+            <wait-pick-collapse-item
+              class="lw-global-animation-out"
+              v-for="(i,k) in pickData.waitPickList"
               :key="k"
-              :class="[
-                'lw-global-model-box',
-                'lw-global-animation-out',
-                i.pickStatus !== '300' ? 'lw-global-click-style' : ''
-              ]"
-              :style="{
-                animationDelay: 50 * k + 'ms',
-                background: i.pickStatus === '300' ? '#ddd' : ''
-              }"
-              @click="allPickClick(i)"
-            >
-              <sku-location-info :item="i"/>
-            </div>
+              :style="{animationDelay: 50 * k + 'ms'}"
+              :item="i"
+              @skuClick="mixinAllWaitPickSkuClick"
+            />
 
 
           </van-tab>
@@ -217,8 +237,8 @@
     <split-put-down
       v-model="splitPopup.show"
       :item="splitPopup.data.splitDownData"
-      @splitConfirm="splitConfirm"
-      @closed="splitOff"
+      @splitConfirm="mixinAloneSplitConfirm"
+      @closed="mixinAloneSplitOff"
     />
 
 
@@ -234,6 +254,7 @@
         v-model="container.popup.value"
         :get-focus.sync="container.popup.focus"
         rule-key="cutContainer"
+        :create-rule="$lwScanRule.create('非独立件拣选-新容器','CONTAINER')"
         @confirm="containerConfirm"
       />
 
@@ -252,6 +273,8 @@
 import dataLookAndChange from './../components/dataLookAndChange/index.vue'
 import skuLocationInfo from './../components/skuLocationInfo/index.vue'
 import splitPutDown from './../components/splitPutDown/index.vue'
+import exchangePickContainer from './../components/exchangePickContainer.vue'
+import waitPickCollapseItem from './../components/waitPickCollapseItem.vue'
 import {all} from "../mixin/all";
 import {aloneAndNotAlone} from "../mixin/aloneAndNotAlone";
 import {
@@ -259,30 +282,17 @@ import {
   projectWmsOutboundPickCheckContainer,
   projectWmsOutboundStandardPick
 } from "../../../../api/outbound/pick/notAlone";
-import {projectWmsOutboundPickCheckSn} from "../../../../api/outbound/pick/alone";
 
 export default {
   name: "lwOutboundPickNotAloneActionPage",
   components: {
     dataLookAndChange,
     skuLocationInfo,
-    splitPutDown
+    splitPutDown,
+    exchangePickContainer,
+    waitPickCollapseItem,
   },
   mixins: [all, aloneAndNotAlone],
-  computed: {
-    // 是否有lpn
-    hasLpn() {
-      return !this.nowPickData.fromCase && this.nowPickData.fromLpn
-    },
-
-    // 当前拣选数据
-    nowPickData() {
-      if (this.pickData.pendingPickLineList && this.pickData.pendingPickLineList.length) {
-        return this.pickData.pendingPickLineList[this.taskIndex]
-      }
-      return {}
-    }
-  },
   data() {
     return {
       // 是否显示底部操作栏
@@ -300,63 +310,6 @@ export default {
         }
       },
 
-      // 当前任务索引
-      taskIndex: 0,
-
-      // 拣选数据
-      pickData: {},
-
-      // 拣选库位
-      locationCode: {
-        value: '',
-        focus: false
-      },
-
-      // 托盘号
-      lpn: {
-        value: '',
-        focus: false
-      },
-
-      // 箱号
-      box: {
-        value: '',
-        focus: false
-      },
-
-      // 商品
-      sku: {
-        value: '',
-        focus: false
-      },
-
-      // 当前扫描的商品
-      nowScan: {
-        value: ''
-      },
-
-      // 序列号
-      sn: {
-        value: '',
-        focus: false,
-        list: []
-      },
-
-      // 商品数量
-      qty: {
-        value: '',
-        focus: false,
-        disabled: false
-      },
-
-      // 拆板下架弹出层
-      splitPopup: {
-        show: false,
-        // 后端返回的全部数据
-        data: {},
-      },
-
-      printData: {}
     }
   },
   mounted() {
@@ -390,6 +343,8 @@ export default {
         this.container.popup.show = false
         this.container.value = container
         this.container.confirm = true
+
+        this.mixinAllInitGetFocus()
       })
     },
     // 校验拣选容器号
@@ -414,230 +369,87 @@ export default {
     getData() {
       projectQueryStandardPickData({
         pickId: this.$route.query.lwPickId
-      }).then(res => {
-        this.pickData = this.formatData(res)
-        this.checkTaskIndex(this.pickData.pendingPickLineList.length)
-      }).catch(() => history.go(-1))
-    },
-
-
-    // 拣选库位确认
-    locationCodeConfirm() {
-      if (this.locationCodeCheck()) {
-        if (this.hasLpn) {
-          this.lpn.focus = true
-        } else if (this.nowPickData.fromCase) {
-          this.box.focus = true
-        } else {
-          this.sku.focus = true
-        }
-      }
-    },
-    // 检查拣选库位
-    locationCodeCheck() {
-
-      return this.inputCheck({
-        key: 'locationCode',
-        checkVal: this.nowPickData.fromLocationCode,
-      })
-    },
-
-    // 托盘号确认
-    lpnConfirm() {
-      if (this.lpnCheck()) this.sku.focus = true
-    },
-    // 托盘号校验
-    lpnCheck() {
-
-      if (!this.hasLpn) return true
-
-      return this.inputCheck({
-        key: 'lpn',
-        needCheck: false
-      })
-    },
-
-    // 箱号确认
-    boxConfirm() {
-      if (this.boxCheck()) this.sku.focus = true
-    },
-    // 箱号校验
-    boxCheck() {
-
-      if (!this.nowPickData.fromCase) return true
-
-      return this.inputCheck({
-        key: 'box',
-        needCheck: false
+      }).then(this.mixinAloneFormatData).catch((e) => {
+        console.log(e)
+        history.go(-1)
       })
     },
 
     // 商品确认
     skuConfirm(val, {data}) {
 
-      if (!this.skuCheck()) return
+      if (!this.mixinAloneSkuCheck()) return
 
-      this.nowScan.value = this.sku.value
+      this.nowScanVal = this.sku.value
 
       if (this.nowPickData.needHandleSn) {
         this.sn.focus = true
-      } else {
-        let newQty = 0
-        // 如果条码解析成功，并且能解析出数量就加法运算
-        if (data.qty) {
-          newQty = data.qty
+        this.sku.disabled = true
+        if (data.sn) {
+          this.sn.value = data.sn
+          this.$refs.snInp.confirm()
         }
-
-        newQty = Number(this.nowPickData.uomQty)
-        this.qty.value = Number(this.qty.value || 0) + newQty
-
-        /*const waitQty = Number(this.nowPickData.totalQty || 0) - Number(this.nowPickData.pickQty || 0)
-        if (this.qty.value === waitQty) {
-          this.pickConfirm()
-          return;
-        }*/
-
-        this.sku.value = ''
-        this.sku.focus = true
+        return;
       }
-    },
-    // 商品检查
-    skuCheck() {
-      return this.inputCheck({
-        key: 'sku',
-        checkVal: this.nowPickData.skuCode,
-      })
-    },
-
-    // 序列号确认
-    snConfirm(val, {data}) {
 
-      if (!data.key) {
-        this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.index.xazaxefu', '序列号不能为空')
-        this.sn.focus = true
-        return
-      }
 
-      if (this.sn.list.some(item => item.sn === data.key)) {
-        this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.index.sjmbdggh', '当前序列号已存在扫描列表中')
-        this.sn.value = ''
-        this.sn.focus = true
-        return
-      }
+      const newQty = data.qty ? data.qty : this.nowPickData.uomQty
+      const {success, total} = this.mixinAloneCheckPickQtyByQty(newQty)
+      if (success) {
+        // 如果条码解析成功，并且能解析出数量就回填数量
+        this.$refs.qty.setQty(total)
 
-      const item = this.nowPickData
-      projectWmsOutboundPickCheckSn({
-        ownerId: item.ownerId,
-        skuId: item.skuId,
-        sn: data.key,
-        qty: data.qty || 0
-      }).then(res => {
-        this.sn.list.unshift(res)
-        this.sn.focus = true
-        this.sn.value = ''
-
-        // 如果拣选量复核要求就自动提交
-        let qty = 0
-        this.sn.list.forEach(item => {
-          qty = qty + item.qty
-        })
-        if (qty === (item.totalQty - item.pickQty)) {
-          this.pickConfirm()
+        if (data.qty) {
+          this.sku.value = ''
+          this.sku.focus = true
+        } else {
+          this.$refs.qty.getFocus()
         }
-      })
-    },
-
-    // 数量确认
-    qtyConfirm() {
-      if (this.qtyCheck()) this.pickConfirm()
-    },
-    // 数量校验
-    qtyCheck() {
-      const qty = Number(this.qty.value || 0)
-      if (!qty) {
-        this.qty.focus = true
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.reczyytt', '拣选数量不能为空，且应当是大于0的整数')
-        )
-        this.qty.value = ''
-        return false
       }
 
-      const item = this.nowPickData
-      const uomQty = Number(item.uomQty || 0)
-
-      if (uomQty === 0) {
-        console.warn(this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.jhatfwzc', '拣选最小单位数据异常，值为：'), uomQty)
-        return true
-      }
-
-      if (qty % item.uomQty !== 0) {
-        this.qty.focus = true
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.qlwquwbn', '拣选数量应当为') + item.uomLabel.top + this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.ectkxfbd', '的倍数')
-        )
-        this.qty.value = ''
-        return false
-      }
-
-      const waitQty = Number(item.totalQty || 0) - Number(item.pickQty || 0)
-      if (qty > waitQty) {
-        this.qty.focus = true
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.priuzexu', '拣选数量不能大于待拣量')
-        )
-        this.qty.value = ''
-        return false
-      }
-
-      return true
     },
 
-    // 任务行切换前
-    cutStart() {
-      return this.checkInputVal(
-        ['locationCode', 'lpn', 'box', 'sku', 'qty', 'sn'],
-      )
 
-    },
-    // 任务行切换后
+    // 切换后
     cutEnd() {
-      this.clearInputVal(
-        this.getCheckInputKeyArr(this.nowPickData.fromCase),
-        ['sku', 'nowScan', 'qty', 'sn'],
-        true
-      )
+      this.mixinAloneCutEnd()
+    },
+
+    // 数量确认
+    qtyConfirm() {
+      if (this.mixinAllCheckQty()) this.pickConfirm()
     },
 
 
     // 确认拣选
     async pickConfirm() {
-      const item = this.nowPickData
 
-      if (!(
-        this.locationCodeCheck() &&
-        this.lpnCheck() &&
-        this.boxCheck() &&
-        this.nowScan.value &&
-        (item.needHandleSn || this.qtyCheck())
-      )) return
+      if (!this.checkAllInput() || !this.mixinAllCheckQty()) return
+
+      const item = this.nowPickData
 
       let data = {}
       if (item.needHandleSn) {
-        let qty = 0
-        this.sn.list.forEach(item => {
-          qty += Number(item.qty || 0)
-        })
+
+        if (!this.sn.list.length) {
+          this.sn.focus = true
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.index.xazaxefu', '序列号不能为空')
+          )
+          return
+        }
+
         data = {
-          currentPickQty: qty,
+          currentPickQty: this.sn.list.reduce((t, i) => Number(i.qty || 0) + t, 0),
           snList: this.sn.list
         }
       } else {
         data = {
-          currentPickQty: this.qty.value,
+          currentPickQty: this.mixinAllGetQty(),
         }
       }
 
+
       const res = await projectWmsOutboundStandardPick({
         pickId: this.pickData.pickId,
         pickNo: this.pickData.pickNo,
@@ -657,29 +469,8 @@ export default {
         ...data
       })
 
-      this.sn.list = []
-
-      // 判断是否需要打印箱票
-      try {
-        await this.$refs.dataLookAndChange.print(res)
-      } catch (e) {
-        console.warn('独立件打印箱票失败：', e)
-      }
-
-      this.splitPopup.data = res
-
-      this.$lwToast.success(
-        this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.bxmfgbup', '拣选成功')
-      )
-
-      // 是否需要拆板下架
-      if (res.needSplitDown) {
-        this.splitPopup.show = true
-        this.splitPopup.container.focus = true
-        return
-      }
+      await this.mixinAlonePickSuccessCheck(res)
 
-      this.splitOff()
     },
   }
 }