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

package/src/views/wms/page/outbound/pickConsole/orderAction/index.vue

@@ -13,7 +13,7 @@
       <order-head-data
         :order-data="orderData"
         edit-path="/outbound/pickConsole/lwCreateOrder"
-        @allocateSuccess="res=>dataFormat(res, true)"
+        @allocateSuccess="init"
       />
 
       <!-- 拣选tab页 -->
@@ -22,16 +22,38 @@
           type="card"
           animated
           v-model="tabActive"
+          @change="tabChange"
         >
 
-          <template v-if="showWait && tabShowType">
+          <template v-if="allPickLoc.list.length">
             <!-- 正在拣选 -->
             <van-tab
               name="ing"
               :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.dofvaabs','正在拣选')"
             >
 
-              <template v-if="orderData.currentPickList.length">
+              <template v-if="pickSku.list.length">
+
+                <lw-cut-card
+                  class="lw-global-model-box"
+                  style="padding-top: 10px"
+                  v-model="allPickLoc.index"
+                  :length="allPickLoc.list.length"
+                  :cut-start="cutStart"
+                  :cut-end="locCutEnd"
+                >
+
+                  <template #numLast>
+                    <lw-title-value-cell
+                      :title="$lwLanguage.get('', '库位')"
+                      :value="nowPickLoc.code"
+                      val-bold
+                      :is-row="false"
+                    />
+                  </template>
+
+                </lw-cut-card>
+
 
                 <div class="lw-global-model-box">
 
@@ -92,8 +114,8 @@
                   />
 
                   <lw-title-value-cell
-                    :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.oshdtmho','推荐数量')"
-                    :value="nowPickData.totalQty"
+                    :title="$lwLanguage.get('','待拣量')"
+                    :value="nowPickData.totalQtyLabel"
                     val-bold
                   />
 
@@ -117,47 +139,119 @@
                     style="padding: 0 10px 8px 10px"
                   >
 
-                    <div
-                      style="align-items: flex-start"
+                    <lw-sku-info-module
                       v-for="(i,k) in nowPickData.skuList"
                       :key="k"
-                      :class="[
-                      'lw-global-flex-between',
-                       getRowClass(k)
-                    ]"
-                    >
-
-                      <div>
-                        <div class="lw-global-value-bold">{{ i.skuCode }}</div>
-                        <div class="lw-global-title">{{ i.skuName }}</div>
-                      </div>
-
-                      <div class="lw-global-value-bold-red">{{ i.qty }}</div>
-
-                    </div>
+                      :sku-code="i.skuCode"
+                      :sku-name="i.skuName"
+                      :qty="i.qtyLabel"
+                      is-row
+                      :is-row-last="(k+1)===nowPickData.skuList.length"
+                    />
 
                   </div>
 
                   <lw-cut-card
-                    v-model="nowPickIndex"
-                    :length="orderData.currentPickList.length"
+                    v-model="pickSku.index"
+                    :length="pickSku.list.length"
                     :cut-start="cutStart"
                     :cut-end="cutEnd"
                   />
 
                 </div>
 
-                <!-- 输入框模块 -->
+                <!-- 货主物料、客户物料输入框 -->
+                <template v-if="orderData.needCheckPartySku">
+
+                  <div
+                    class="lw-global-model-top-radius"
+                    style="margin-top: 10px;padding: 3px 10px"
+                  >
+                    <lw-input
+                      :title="$lwLanguage.get('', '货主物料')"
+                      v-model="ownerSku.value"
+                      :get-focus.sync="ownerSku.focus"
+                      required
+                      rule-key="ownerSku"
+                      :create-rule="$lwScanRule.create('出库拣选控制台-执行拣选-货主物料','SKU')"
+                      :rule-serve-query="orderData"
+                      :owner-id="orderData.ownerId"
+                      :disabled="ownerSku.disabled"
+                      need-show-clear
+                      @confirm="ownerSkuConfirm"
+                      @clear="ownerSku.disabled = false"
+                    />
+                    <lw-input
+                      :title="$lwLanguage.get('', '客户物料')"
+                      v-model="customerSku.value"
+                      :get-focus.sync="customerSku.focus"
+                      :show-bottom-border="false"
+                      required
+                      rule-key="customerSku"
+                      :create-rule="$lwScanRule.create('出库拣选控制台-执行拣选-客户物料','SKU')"
+                      :rule-serve-query="orderData"
+                      :owner-id="orderData.ownerId"
+                      @confirm="customerSkuConfirm"
+                    />
+                  </div>
+                  <!-- 校验显示 -->
+                  <div
+                    class="lw-global-flex-between sku-check-row"
+                    :class="{'lw-global-model-bottom-radius':!ownerSkuCheckList.length}"
+                  >
+                    <div class="lw-global-title" style="color: #fff">
+                      {{ $lwLanguage.get('', '已验证物料数') }}
+                    </div>
+                    <div
+                      class="lw-global-value-bold"
+                      style="font-size: 16px"
+                    >
+                      <span style="color: #D50000">{{ ownerSkuCheckList.length }}</span>
+                      <span style="color: #fff">{{ ' / ' + needCheckSkuQty }}</span>
+                    </div>
+                  </div>
+                  <div
+                    v-if="ownerSkuCheckList.length"
+                    class="lw-global-model-bottom-radius"
+                  >
+
+                    <div
+                      v-for="(i,k) in ownerSkuCheckList"
+                      :key="k"
+                      :class="$lwUtils.getCellClass(k,ownerSkuCheckList.length)"
+                    >
+                      <lw-title-value-cell
+                        :title="$lwLanguage.get('', '货主物料')"
+                        value-more
+                        :value="i.ownerSkuCode"
+                        :value2="i.ownerSkuName"
+                        :is-row="false"
+                      />
+                      <lw-title-value-cell
+                        :title="$lwLanguage.get('', '客户物料')"
+                        value-more
+                        :value="i.customerSkuCode"
+                        :value2="i.customerSkuName"
+                        :is-row="false"
+                      />
+                    </div>
+
+                  </div>
+
+                </template>
+                <!-- 托盘号、外托号、箱号、商品号、序列号输入 -->
                 <div class="lw-global-model-box lw-global-model-box-3px">
 
                   <!-- 整托拣选 - 外托号 -->
                   <lw-input
-                    v-if="nowPickData.pickUom === 'LPN'"
+                    v-if="nowPickData.pickUom==='LPN' && orderData.needScanExtLpn"
                     :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.ragtvybg','外托号')"
                     v-model="extLpn.value"
                     :get-focus.sync="extLpn.focus"
                     :create-rule="$lwScanRule.create('出库拣选控制台-执行拣选-外托号','LPN')"
                     rule-key="extLpn"
+                    :owner-id="orderData.ownerId"
+                    :rule-serve-query="nowPickData"
                     required
                     @confirm="extLpnConfirm"
                   />
@@ -170,6 +264,8 @@
                     :get-focus.sync="lpn.focus"
                     :create-rule="$lwScanRule.create('出库拣选控制台-执行拣选-托盘号','LPN')"
                     rule-key="lpn"
+                    :owner-id="orderData.ownerId"
+                    :rule-serve-query="nowPickData"
                     required
                     :show-bottom-border="nowPickIsEa"
                     @confirm="lpnConfirm"
@@ -183,6 +279,8 @@
                     :get-focus.sync="caseNum.focus"
                     :create-rule="$lwScanRule.create('出库拣选控制台-执行拣选-托盘号','CASE')"
                     rule-key="box"
+                    :owner-id="orderData.ownerId"
+                    :rule-serve-query="nowPickData"
                     required
                     :show-bottom-border="nowPickIsEa"
                     @confirm="caseNumConfirm"
@@ -199,19 +297,20 @@
                       :get-focus.sync="sn.focus"
                       :create-rule="$lwScanRule.create('出库拣选控制台-执行拣选-序列号','SN')"
                       rule-key="sn"
+                      :owner-id="orderData.ownerId"
+                      :rule-serve-query="nowPickData"
                       required
                       :show-bottom-border="false"
                       auto-clear-val
                       @confirm="snConfirm"
                     />
                     <!-- 数量 -->
-                    <lw-input
+                    <lw-get-qty-by-type
                       v-else
                       :title="$lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.wtxeolpv','数量')"
-                      v-model="qty.value"
-                      :get-focus.sync="qty.focus"
-                      type="digit"
-                      required
+                      ref="qty"
+                      :owner-id="nowPickData.ownerId"
+                      :sku-id="nowPickData.skuId"
                       :show-bottom-border="false"
                       @confirm="submitPick"
                     />
@@ -283,16 +382,22 @@
 
             <!-- 待拣任务 -->
             <van-tab
-              name="task"
+              name="wait"
               :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.kuergxiy','待拣任务')"
             >
               <wait-over-task-item
-                v-for="(i,k) in orderData.pendingList"
+                v-for="(i,k) in wait.data"
                 :key="k"
                 :item="i"
-                @itemClick="waitItemClick(k,i)"
+                @itemClick="waitItemClick(i)"
               />
-              <lw-not-data v-if="!orderData.pendingList.length"/>
+              <lw-pagination
+                v-model="wait.pageNum"
+                :page-size.sync="wait.pageSize"
+                :page-total="wait.pageTotal"
+                @change="getTabItemData('wait')"
+              />
+              <lw-not-data v-if="!wait.pageTotal"/>
             </van-tab>
           </template>
 
@@ -303,14 +408,51 @@
             :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.yapvdhzk','已拣明细')"
           >
             <wait-over-task-item
-              v-for="(i,k) in orderData.pickedList"
+              v-for="(i,k) in over.data"
               :key="k"
               :item="i"
               type="over"
-              :show-back="showWait"
-              @backSuccess="dataFormat"
+              :show-back="showBack"
+              @backSuccess="init"
+            />
+            <lw-pagination
+              v-model="over.pageNum"
+              :page-size.sync="over.pageSize"
+              :page-total="over.pageTotal"
+              @change="getTabItemData('over')"
+            />
+            <lw-not-data v-if="!over.pageTotal"/>
+          </van-tab>
+
+          <!-- 全部 -->
+          <van-tab
+            name="all"
+            :title="$lwLanguage.get('','全部')"
+          >
+            <div
+              class="lw-global-model-box"
+              v-for="(i,k) in all.data"
+              :key="k"
+            >
+              <lw-sku-info-module
+                :sku-name="i.skuName"
+                :sku-code="i.skuCode"
+                :show-right="false"
+                is-row-first
+              />
+              <lw-label-value-group
+                :list="getGroupData(i)"
+                label-key="fieldCode"
+                value-key="qtyLabel"
+              />
+            </div>
+            <lw-pagination
+              v-model="all.pageNum"
+              :page-size.sync="all.pageSize"
+              :page-total="all.pageTotal"
+              @change="getTabItemData('all')"
             />
-            <lw-not-data v-if="!orderData.pickedList.length"/>
+            <lw-not-data v-if="!all.pageTotal"/>
           </van-tab>
 
         </van-tabs>
@@ -318,7 +460,7 @@
 
     </div>
 
-    <lw-bottom-bar v-if="orderData.currentPickList.length && tabActive==='ing'">
+    <lw-bottom-bar v-if="pickSku.list.length && tabActive==='ing'">
 
       <lw-button @click="submitPick">
         {{ $lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.amljfwvg', '确认拣选') }}
@@ -326,7 +468,7 @@
 
     </lw-bottom-bar>
 
-    <lw-bottom-bar v-if="orderData.pendingList.length && tabActive==='task'">
+    <lw-bottom-bar v-if="wait.data.length && tabActive==='wait'">
 
       <lw-button @click="cancelPickTask">
         {{
@@ -341,9 +483,15 @@
 
 <script>
 import {
-  projectWmsOutboundPDASoCancelPickTask, projectWmsOutboundPDASoCasePick,
-  projectWmsOutboundPDASoLoadData,
-  projectWmsOutboundPDASoPick,
+  projectWmsOutboundPDASoCancelPickTask,
+  projectWmsOutboundPDASoCasePick,
+  projectWmsOutboundPDASoLoadDataV2,
+  projectWmsOutboundPDASoPick, projectWmsOutboundPDASoPickCheck,
+  projectWmsOutboundPDASoPickedQueryLocPageTask,
+  projectWmsOutboundPDASoPickingQueryLocPageTask,
+  projectWmsOutboundPDASoPickingQueryLocs,
+  projectWmsOutboundPDASoPickingQueryLocTask,
+  projectWmsOutboundPDASoQuerySkuPage,
   projectWmsOutboundPDASoSkuPick
 } from "../../../../api/outbound/pickConsole/orderPick";
 import waitOverTaskItem from "./../../../../components/consoleAndPick/waitOverTaskItem.vue";
@@ -358,16 +506,59 @@ export default {
   },
   data() {
     return {
-      orderData: {
-        currentPickList: [],
-        pendingList: [],
-        pickedList: [],
-        totalQty: 0,
-        pickQty: 0,
-      },
+      orderData: {},
 
       tabActive: 'ing',
-      nowPickIndex: 0,
+
+      // 全部待拣库位列表
+      allPickLoc: {
+        list: [],
+        index: 0
+      },
+      // 指定库位下的待拣明细
+      pickSku: {
+        list: [],
+        index: 0
+      },
+
+      // 待拣
+      wait: {
+        data: [],
+        pageNum: 1,
+        pageSize: 10,
+        pageTotal: 0,
+      },
+      // 已拣
+      over: {
+        data: [],
+        pageNum: 1,
+        pageSize: 10,
+        pageTotal: 0,
+      },
+      // 全部
+      all: {
+        data: [],
+        pageNum: 1,
+        pageSize: 10,
+        pageTotal: 0,
+      },
+
+      // 是否显示货主、客户物料输入框
+      showOwnerCustomerInput: true,
+      // 货主物料
+      ownerSku: {
+        value: '',
+        name: '',
+        focus: false,
+        disabled: false,
+      },
+      // 客户物料
+      customerSku: {
+        value: '',
+        focus: false
+      },
+      // 货主物料、客户物料商品验证的数据
+      ownerSkuCheckList: [],
 
       lpn: {
         value: '',
@@ -394,19 +585,18 @@ export default {
     }
   },
   computed: {
+    // 当前拣选的仓库
+    nowPickLoc() {
+      return this.allPickLoc.list[this.allPickLoc.index] || {}
+    },
     nowPickData() {
-      return this.orderData.currentPickList[this.nowPickIndex] || {}
+      return this.pickSku.list[this.pickSku.index] || {}
     },
-    // 显示拣货中和带拣货
-    showWait() {
+    // 是否显示撤销按钮
+    showBack() {
       const {billStatus} = this.orderData
       return billStatus !== '550' && billStatus !== '600'
     },
-    tabShowType() {
-      const {totalQty, pickQty} = this.orderData
-      const t = Number(totalQty || 0) - Number(pickQty || 0)
-      return !!t
-    },
 
     // 是否需要录入托盘号：如果是整托盘拣选必须输入托盘号；非整托拣选和非箱拣选时，有托盘无箱需要录入托盘号
     hasLpn() {
@@ -424,46 +614,166 @@ export default {
     nowPickIsEa() {
       const pickUom = this.nowPickData.pickUom
       return !(pickUom === 'LPN' || pickUom === 'CASE')
-    }
+    },
 
-  },
-  watch: {
-    tabShowType: {
-      handler(n) {
-        this.$nextTick(() => this.tabActive = n ? 'ing' : 'over')
-      }
+    // 需要验证的商品数
+    needCheckSkuQty() {
+      return this.nowPickData.skuList?.length || 1
+    },
+
+    // 货主商品检查通过
+    ownerSkuCheckPass() {
+      return this.ownerSkuCheckList.length === this.needCheckSkuQty
     }
+
   },
   mounted() {
-    this.getOrderData()
+    this.init()
   },
   methods: {
-    // 数据格式化
-    dataFormat(res, cutEnd) {
-      this.orderData = res
-      this.nowPickIndex = this.$lwUtils.cutCardIndexCount(this.nowPickIndex, this.orderData.pendingList.length)
-      cutEnd && this.cutEnd()
+    // 全部统计数据组格式化
+    getGroupData(item) {
+      return [[
+        {
+          child: item.labeledQtyList.map(i => {
+            return {
+              type: 'LV',
+              valBold: true,
+              valRed: true,
+              ...i
+            }
+          }),
+          type: 'JOIN'
+        }
+      ]]
+    },
+
+    formatData() {
+      this.$nextTick(async () => {
+        if (this.allPickLoc.list.length) {
+          await this.getLocPickSku(this.nowPickLoc.id)
+          this.$nextTick(() => this.tabActive = 'ing')
+        } else {
+          this.tabActive = 'over'
+          this.tabChange()
+        }
+      })
+    },
+
+    async init() {
+      this.allPickLoc.index = 0
+      this.allPickLoc.list = []
+
+      this.pickSku.index = 0
+      this.pickSku.list = []
+
+      this.wait.pageNum = 1
+      this.wait.pageTotal = 0
+      this.wait.data = []
+
+      this.over.pageNum = 1
+      this.over.pageTotal = 0
+      this.over.data = []
+
+      this.all.pageNum = 1
+      this.all.pageTotal = 0
+      this.all.data = []
+
+      await this.getOrderData()
+      await this.getPickLocList()
+      this.formatData()
+    },
+
+    // tab切换
+    tabChange() {
+      if (this.tabActive === 'ing') return
+
+      this.getTabItemData(this.tabActive)
     },
 
     // 获取出库单信息
-    getOrderData() {
-      projectWmsOutboundPDASoLoadData({
-        soId: this.$route.query.lwOrderId
-      }).then(res => {
-        this.dataFormat(res, true)
-      }).catch(() => {
+    async getOrderData() {
+      try {
+        this.orderData = await projectWmsOutboundPDASoLoadDataV2({
+          soId: this.$route.query.lwOrderId
+        })
+      } catch {
         history.go(-1)
+      }
+    },
+    // 获取全部待拣库位列表
+    async getPickLocList(locCode) {
+      const res = await projectWmsOutboundPDASoPickingQueryLocs({
+        soId: this.$route.query.lwOrderId,
       })
+      if (locCode) {
+        for (let i = 0; i < res.length; i++) {
+          if (res[i].code === locCode) {
+            this.allPickLoc.index = i
+            break
+          }
+        }
+      } else {
+        this.allPickLoc.index = 0
+      }
+      this.allPickLoc.list = res
     },
+    // 获取指定库位的待拣明细
+    async getLocPickSku(locId) {
+      const res = await projectWmsOutboundPDASoPickingQueryLocTask({
+        soId: this.$route.query.lwOrderId,
+        locId
+      })
+
+      if (!res || !res.length) {
+        this.allPickLoc.list = []
+        this.formatData()
+        return
+      }
+      this.pickSku.list = res
+      this.pickSku.index = 0
 
-    // 行样式
-    getRowClass(index) {
-      if ((index + 1) === this.nowPickData.skuList.length) return 'lw-global-row-end'
-      if (index === 0) return 'lw-global-row-start'
-      return 'lw-global-row'
+      // 判断当前库位是否是返回的库位
+      if (this.nowPickLoc.code !== res[0].fromLocationCode) {
+        await this.getPickLocList(res[0].fromLocationCode)
+      }
     },
 
+    // 获取tan项数据
+    getTabItemData(key) {
+      let api = null
+      switch (key) {
+        case 'wait':
+          api = projectWmsOutboundPDASoPickingQueryLocPageTask
+          break;
+        case 'over':
+          api = projectWmsOutboundPDASoPickedQueryLocPageTask
+          break;
+        case 'all':
+          api = projectWmsOutboundPDASoQuerySkuPage
+          break;
+        default:
+          api = null
+      }
+
+      if (api === null) return
+
+      api({
+        soId: this.$route.query.lwOrderId,
+        pageNum: this[key].pageNum,
+        pageSize: this[key].pageSize,
+      }).then(res => {
+        this[key].data = res.datas || []
+        this[key].pageTotal = res.total || 0
+      })
+    },
 
+
+    // 库位切换后
+    async locCutEnd() {
+      await this.getLocPickSku(this.nowPickLoc.id)
+      this.cutEnd()
+    },
     // 数据切换前
     cutStart() {
 
@@ -493,7 +803,8 @@ export default {
       }
 
       this.snScanData = []
-
+      this.ownerSkuCheckList = []
+      this.clearOwnerCustomerInput()
 
       // 让输入框获取焦点
       switch (this.nowPickData.pickUom) {
@@ -519,12 +830,139 @@ export default {
             return
           }
 
-          this.qty.focus = true
+          this.$nextTick(() => this.$refs.qty?.getFocus())
           return
       }
 
     },
 
+    // 清空货主物料、客户物料输入框
+    clearOwnerCustomerInput(focus) {
+      this.ownerSku.value = ''
+      this.ownerSku.name = ''
+      this.ownerSku.disabled = false
+      this.customerSku.value = ''
+      focus && this.$nextTick(() => {
+        this.ownerSku.focus = true
+      })
+    },
+    // 货主物料 - 清空输入框显示错误信息并获取焦点
+    ownerSkuErrorFn(msg) {
+      this.ownerSku.focus = true
+      msg && this.$lwShowErrorMsg(msg)
+      this.ownerSku.value = ''
+      return false
+    },
+    // 货主物料 - 校验
+    ownerSkuCheck() {
+      const ownerSkuCode = this.ownerSku.value
+
+      if (!ownerSkuCode) return this.ownerSkuErrorFn(
+        this.$lwLanguage.get('', '货主物料不能为空')
+      )
+
+      const pickSkuList = this.nowPickData.skuList || [this.nowPickData]
+      // 校验当前扫描数据是否是当前需要拣选的商品
+      if (!pickSkuList.some(item => item.skuCode === ownerSkuCode)) return this.ownerSkuErrorFn(
+        this.$lwLanguage.get('', '扫描/输入的货主物料不在当前拣选商品中！')
+      )
+
+      // 校验是否重复校验
+      if (this.ownerSkuCheckList.some(item => item.ownerSkuCode === ownerSkuCode)) return this.ownerSkuErrorFn(
+        this.$lwLanguage.get('', '扫描/输入的货主物料已存在校验数据，不允许重复校验')
+      )
+
+      return true
+
+    },
+    // 货主物料 - 确认
+    ownerSkuConfirm(val, {data}) {
+      if (!this.ownerSkuCheck()) return
+
+      // 查看解析数据是否包含托、箱
+      switch (this.nowPickData.pickUom) {
+        case 'LPN':
+          this.lpn.value = data.lpn || ''
+          break;
+        case 'CASE':
+          this.caseNum.value = data.case || ''
+      }
+      this.ownerSku.name = data.skuName
+      this.ownerSku.disabled = true
+      this.customerSku.focus = true
+    },
+    // 客户物料 - 确认
+    customerSkuConfirm(val, {data}) {
+      if (!this.ownerSkuCheck()) return
+
+
+      const customerSkuCode = this.customerSku.value
+      if (!customerSkuCode) {
+        this.customerSku.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '客户物料不能为空')
+        )
+        return
+      }
+
+      const ownerSkuCode = this.ownerSku.value
+      projectWmsOutboundPDASoPickCheck({
+        soId: this.orderData.soId,
+        currentTask: this.nowPickData,
+        args: {
+          ownerSkuCode,
+          customerSkuCode,
+        }
+      }).then(() => {
+
+        if (this.ownerSkuCheckList.some(item => item.ownerSkuCode === ownerSkuCode)) {
+          this.ownerSkuErrorFn(
+            this.$lwLanguage.get('', '扫描/输入的货主物料已存在校验数据，不允许重复校验')
+          )
+          return
+        }
+
+        this.$lwToast.success(
+          this.$lwLanguage.get('', '校验成功')
+        )
+
+        this.ownerSkuCheckList.unshift({
+          ownerSkuCode,
+          ownerSkuName: this.ownerSku.name,
+          customerSkuCode,
+          customerSkuName: data.skuName,
+        })
+
+        // 如果需要外托号就回填
+        if (this.orderData.needScanExtLpn) {
+          this.extLpn.value = data.lpn || ''
+        }
+
+        // 验证完成后
+        if (this.ownerSkuCheckPass) {
+          this.$lwToast.success({
+            message: this.$lwLanguage.get('', '商品已全部验证'),
+            forbidClick: false,
+            duration: 1000
+          })
+
+          if (this.orderData.needScanExtLpn) {
+            this.extLpn.focus = true
+            return
+          }
+
+          if (this.hasLpn) {
+            this.lpn.focus = true
+            return
+          }
+
+          this.caseNum.focus = true
+        }
+
+        this.clearOwnerCustomerInput(!this.ownerSkuCheckPass)
+      })
+    },
+
     // 托盘校验
     lpnCheck() {
       if (this.lpn.value) return true
@@ -547,7 +985,7 @@ export default {
         if (needHandleSn) {
           this.sn.focus = true
         } else {
-          this.qty.focus = true
+          this.$refs.qty?.getFocus()
         }
       }
 
@@ -555,7 +993,11 @@ export default {
 
     // 外托盘校验
     extLpnCheck() {
-      if (this.extLpn.value) return true
+      if (
+        !this.nowPickData.pickUom !== 'LPN' ||
+        !this.orderData.needScanExtLpn ||
+        this.extLpn.value
+      ) return true
 
       this.extLpn.focus = true
       this.$lwShowErrorMsg(
@@ -589,7 +1031,7 @@ export default {
         if (needHandleSn) {
           this.sn.focus = true
         } else {
-          this.qty.focus = true
+          this.$refs.qty?.getFocus()
         }
         return
       }
@@ -598,13 +1040,25 @@ export default {
     },
     // 数量校验
     qtyCheck() {
-      if (Number(this.qty.value || 0)) return true
+      const qty = this.$refs.qty?.getQty()
+      if (!qty) {
+        this.$refs.qty?.getFocus()
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.ezkenfkg', '数量不能为空，且应当是大于0的正整数')
+        )
+        return false
+      }
 
-      this.qty.focus = true
-      this.$lwShowErrorMsg(
-        this.$lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.ezkenfkg', '数量不能为空，且应当是大于0的正整数')
-      )
-      return false
+      if (Number(this.nowPickData.totalQty || 0) < qty) {
+        this.$refs.qty?.getFocus()
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '数量不能大于待拣量')
+        )
+        return false
+      }
+
+
+      return true
     },
 
     // 序列号输入确认
@@ -634,10 +1088,14 @@ export default {
         sn: key,
         qty
       }).then(res => {
-        this.snScanData.unshift({
+        const sn = {
           sn: res.sn,
           qty: res.qty || 1
-        })
+        }
+        if (this.checkQtyBySn(sn)) {
+          this.snScanData.unshift(sn)
+        }
+
         this.sn.focus = true
       })
 
@@ -654,11 +1112,33 @@ export default {
       }).catch(() => {
       })
     },
+    // 序列号数量校验
+    checkQtyBySn(sn) {
+      const waitPickQty = Number(this.nowPickData.totalQty || 0)
+      const total = this.snScanData.reduce((t, i) => t + Number(i.qty), 0)
+      const waitQty = waitPickQty - total
+      const now = Number(sn.qty)
+      if (now > waitQty) {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '当前拣选量{now}大于剩余待拣量{waitQty}，拣选失败！', {now: now, waitQty})
+        )
+        return false
+      }
+      return true
+    },
 
     // 提交拣选
     submitPick() {
-
       const pickUom = this.nowPickData.pickUom
+
+      if (this.orderData.needCheckPartySku && !this.ownerSkuCheckPass) {
+        this.ownerSku.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '请验证物料！')
+        )
+        return
+      }
+
       switch (pickUom) {
         // 整托盘拣选校验
         case 'LPN':
@@ -670,15 +1150,11 @@ export default {
         // 零散拣选校验
         default:
           this.skuSubmit()
-        /*default:
-          this.$lwShowErrorMsg(
-            this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.wwzuhorm', '未指定拣选类型（{pickUom}），请联系系统管理员', {pickUom})
-          )*/
       }
     },
     // 整托拣选提交
     lpnSubmit() {
-      if (!this.lpnCheck() || !this.extLpnCheck()) return
+      if (!this.extLpnCheck() || !this.lpnCheck()) return
 
       const {pickId, fromLpn, fromLocationId} = this.nowPickData
       projectWmsOutboundPDASoPick({
@@ -718,7 +1194,7 @@ export default {
       if (needHandleSn) {
         currentPickQty = this.snScanData.reduce((a, b) => a + Number(b.qty), 0)
       } else {
-        currentPickQty = this.qty.value
+        currentPickQty = this.$refs.qty?.getQty()
       }
 
       projectWmsOutboundPDASoSkuPick({
@@ -740,27 +1216,58 @@ export default {
       this.$lwToast.success(
         this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.jcvxtjmd', '操作成功')
       )
-      this.dataFormat(res, true)
+      // 拣选完一条就删除一条
+      this.pickSku.list.splice(this.pickSku.index, 1)
+
+      // 检查是否还有没有拣选的商品
+      if (!this.pickSku.list.length) {
+        this.allPickLoc.index++
+        if (this.allPickLoc.index > (this.allPickLoc.list.length - 1)) {
+          this.init()
+          return
+        }
+        this.locCutEnd()
+      }
+      // 判断当前索引是否满足数据长度
+      this.orderData = res
+      this.pickSku.index = this.$lwUtils.cutCardIndexCount(this.pickSku.index, this.pickSku.list.length)
+
+      this.formatData()
+
+      this.cutEnd()
     },
 
     // 待拣选任务项点击
-    waitItemClick(index, item) {
-      let k = index
-      if (this.checkPickIsEa(item.pickUom)) {
-        const waitPick = this.orderData.currentPickList
-        for (let i = 0; i < waitPick.length; i++) {
-          const pick = waitPick[i]
-          if (
-            this.checkPickIsEa(pick.pickUom) &&
-            pick.skuCode === item.skuCode &&
-            pick.fromLocationCode === item.fromLocationCode
-          ) {
-            k = i
+    async waitItemClick(item) {
+      await this.getLocPickSku(item.fromLocationId)
+
+      for (let i = 0; i < this.pickSku.list.length; i++) {
+        const pick = this.pickSku.list[i]
+        console.log(pick)
+        if (pick.pickUom !== item.pickUom) continue
+
+        if (item.pickUom === 'LPN') {
+          if (pick.fromLpn === item.fromLpn) {
+            this.pickSku.index = i
             break
           }
+          continue
+        }
+
+        if (item.pickUom === 'CASE') {
+          if (pick.fromCaseNum === item.fromCaseNum) {
+            this.pickSku.index = i
+            break
+          }
+          continue
+        }
+
+        if (pick.skuCode === item.skuCode) {
+          this.pickSku.index = i
+          break
         }
       }
-      this.nowPickIndex = k
+
       this.tabActive = "ing"
       this.cutEnd()
     },
@@ -775,18 +1282,15 @@ export default {
         projectWmsOutboundPDASoCancelPickTask({
           soId: this.orderData.soId
         }).then(res => {
-          this.dataFormat(res)
+          this.orderData = res
           this.$lwToast.success(
             this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.qzjlmywj', '已取消')
           )
+          this.init()
         })
       })
     },
 
-    // 校验数据是否为零散拣选
-    checkPickIsEa(pickUom) {
-      return !(pickUom === 'LPN' || pickUom === 'CASE')
-    }
   }
 }
 </script>
@@ -794,6 +1298,16 @@ export default {
 <style scoped lang="less">
 @import "../../../../../../assets/css/var.less";
 
+
+.sku-check-row {
+  background: rgb(41, 133, 225);
+  padding: 5px 10px;
+
+  > div {
+    //color: #fff !important;
+  }
+}
+
 .sn-data-head {
   margin-top: 10px;
   background: @baseColor;