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

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

@@ -10,195 +10,11 @@
       :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.rvozzvrp','出库订单拣选')"/>
 
     <div class="lw-global-page-box">
-
-      <!-- 出库单信息 -->
-      <div class="lw-global-model-box lw-global-row-box">
-
-        <div class="lw-global-flex-between">
-
-          <div class="lw-global-value-bold">{{ orderData.soNo }}</div>
-
-          <lw-tag
-            round
-            plain
-          >
-            {{ orderData.billStatusLabel }}
-          </lw-tag>
-
-        </div>
-
-        <lw-title-value-cell
-          :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.gkjwymny','外部单号')"
-          :value="$lwCheckVal(orderData.extSoNo)"
-          val-bold
-          :is-row="false"
-        />
-
-        <lw-title-value-cell
-          :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.cqhcznpi','创建时间')"
-          :value="$lwDate.format(orderData.createTime,'yyyy-MM-dd hh:mm:ss')"
-          :is-row="false"
-        />
-
-        <lw-title-value-cell
-          :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.pglsnenh','客户')"
-          :value="$lwCheckVal(orderData.customerCode)+' / '+$lwCheckVal(orderData.customerName)"
-          :is-row="false"
-        />
-
-
-        <div class="button-row">
-
-          <lw-button
-            v-if="orderData.canCancel"
-            mini
-            type="last"
-            plain
-            @click="cancelOrder"
-          >
-            {{ $lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.xdnpczpg', '取消') }}
-          </lw-button>
-
-          <lw-button
-            v-if="orderData.canUpdate"
-            mini
-            plain
-            @click="changeOrder"
-          >
-            {{ $lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.hvxvdlvg','修改') }}
-          </lw-button>
-
-          <lw-button
-            v-if="orderData.canAllocate"
-            mini
-            round
-            @click="allocateOrder"
-          >
-            {{ $lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.jblboggh', '分配') }}
-          </lw-button>
-
-          <lw-button
-            v-if="orderData.canShip"
-            style="width: 25%"
-            round
-            mini
-            @click="canShipOrder"
-          >
-            {{
-              $lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.jqvpynqh', '确认发运')
-            }}
-          </lw-button>
-
-          <lw-button
-            v-if="showCanCancel"
-            style="width: 25%"
-            round
-            mini
-            @click="oneBtnShip"
-          >
-            {{
-              $lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.pmliebev','一键发运')
-            }}
-          </lw-button>
-
-        </div>
-
-
-      </div>
-
-      <!-- 数据看板 -->
-      <lw-data-look-bg style="margin: 10px 0">
-
-        <lw-data-look-item
-          :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.zuuuimoa','计划量')"
-          :value="orderData.totalQty"
-        />
-
-        <lw-data-look-item
-          :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.cejohifh','分配量')"
-          :value="orderData.allocateQty"
-        />
-
-        <lw-data-look-item
-          :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.zssbhdxn','已拣量')"
-          :value="orderData.pickQty"
-        />
-
-        <lw-data-look-item
-          :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.luyejthg','待拣量')"
-          :value="orderData.waitPickQty"
-        />
-
-      </lw-data-look-bg>
-
-      <!-- 待拣、已拣统计 -->
-      <div
-        v-if="hasLpnPick || hasCasePick || hasSkuPick"
-        class="lw-global-model-box"
-      >
-        <div class="lw-global-flex-start-start lw-global-row-start">
-
-          <div class="lw-global-title">
-            {{ $lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.ooonuwul','待拣') }}
-          </div>
-
-          <div
-            v-if="hasLpnPick"
-            class="lw-global-value-bold-red total-item"
-          >
-            {{ orderData.waitPickLpnCount || 0 }}
-            {{ $lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.aufourwa','托') }}
-          </div>
-
-          <div
-            v-if="hasCasePick"
-            class="lw-global-value-bold-red total-item"
-          >
-            {{ orderData.waitPickCaseCount || 0 }}
-            {{ $lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.pcvxrvqk','箱') }}
-          </div>
-
-          <div
-            v-if="hasSkuPick"
-            class="lw-global-value-bold-red total-item"
-          >
-            {{ orderData.waitPickSctQty || 0 }}
-            {{ $lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.fcbcjnpc','EA') }}
-          </div>
-
-        </div>
-        <div class="lw-global-flex-start-start lw-global-row-end">
-
-          <div class="lw-global-title">
-            {{ $lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.ctyeiuyb','已拣') }}
-          </div>
-
-          <div
-            v-if="hasLpnPick"
-            class="lw-global-value-bold total-item"
-          >
-            {{ orderData.pickLpnCount || 0 }}
-            {{ $lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.aufourwa','托') }}
-          </div>
-
-          <div
-            v-if="hasCasePick"
-            class="lw-global-value-bold total-item"
-          >
-            {{ orderData.pickCaseCount || 0 }}
-            {{ $lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.pcvxrvqk','箱') }}
-          </div>
-
-          <div
-            v-if="hasSkuPick"
-            class="lw-global-value-bold total-item"
-          >
-            {{ orderData.pickSctQty || 0 }}
-            {{ $lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.fcbcjnpc','EA') }}
-          </div>
-
-        </div>
-      </div>
+      <order-head-data
+        :order-data="orderData"
+        edit-path="/outbound/pickConsole/lwCreateOrder"
+        @allocateSuccess="init"
+      />
 
       <!-- 拣选tab页 -->
       <lw-tab-box style="margin-top: 10px">
@@ -206,22 +22,44 @@
           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">
 
                   <div class="lw-global-flex-between lw-global-row-start">
 
-                    <template v-if="nowPickData.pickType === '100'">
+                    <template v-if="nowPickData.pickUom === 'LPN'">
                       <div class="lw-global-value-bold">{{ nowPickData.fromLpn }}</div>
 
                       <lw-tag
@@ -235,7 +73,7 @@
 
                     </template>
 
-                    <template v-else-if="nowPickData.pickType === '200'">
+                    <template v-else-if="nowPickData.pickUom === 'CASE'">
                       <div class="lw-global-value-bold">{{ nowPickData.fromCaseNum }}</div>
 
                       <lw-tag
@@ -276,8 +114,22 @@
                   />
 
                   <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
+                  />
+
+                  <lw-title-value-cell
+                    v-if="nowPickData.pickUom !== 'LPN' && nowPickData.fromLpn"
+                    :title="$lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.mqxqompf','托盘号')"
+                    :value="nowPickData.fromLpn"
+                    val-bold
+                  />
+
+                  <lw-title-value-cell
+                    v-if="nowPickData.pickUom !== 'CASE' && nowPickData.fromCaseNum"
+                    :title="$lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.gyjpigyb','箱号')"
+                    :value="nowPickData.fromCaseNum"
                     val-bold
                   />
 
@@ -287,106 +139,242 @@
                     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>
-
-                  </div>
-                  <template v-else>
-
-
-                    <lw-title-value-cell
-                      v-if="nowPickData.fromLpn"
-                      :title="$lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.mqxqompf','托盘号')"
-                      :value="nowPickData.fromLpn"
-                      val-bold
+                      :sku-code="i.skuCode"
+                      :sku-name="i.skuName"
+                      :qty="i.qtyLabel"
+                      is-row
+                      :is-row-last="(k+1)===nowPickData.skuList.length"
                     />
 
-                    <lw-title-value-cell
-                      v-if="nowPickData.fromCaseNum"
-                      :title="$lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.gyjpigyb','箱号')"
-                      :value="nowPickData.fromCaseNum"
-                      val-bold
-                    />
-                  </template>
+                  </div>
 
                   <lw-cut-card
-                    v-model="nowPickIndex"
-                    :length="orderData.pendingList.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.pickType === '100'"
+                    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"
                   />
 
-                  <!-- 判断是否是整托或有无托号、箱号 -->
+                  <!-- 如果是整托盘拣选必须输入托盘号；非整托拣选和非箱拣选时，有托盘无箱需要录入托盘号 -->
                   <lw-input
-                    v-if="nowPickData.pickType === '100' || (nowPickData.fromLpn && !nowPickData.fromCaseNum)"
+                    v-if="hasLpn"
                     :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.kmqavizx','托盘号')"
                     v-model="lpn.value"
                     :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="false"
+                    :show-bottom-border="nowPickIsEa"
                     @confirm="lpnConfirm"
                   />
 
+                  <!-- 如果是整箱拣选必须输入箱号；非整托拣选和非箱拣选时，无托盘有箱需要录入箱号 -->
+                  <lw-input
+                    v-if="hasBox"
+                    :title="$lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.gyjpigyb','箱号')"
+                    v-model="caseNum.value"
+                    :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"
+                  />
+
                   <!-- 零散拣选 -->
-                  <template v-if="nowPickData.pickType === '300'">
+                  <template v-if="nowPickIsEa">
+
+                    <!-- 序列号 -->
                     <lw-input
-                      v-if="nowPickData.fromCaseNum"
-                      :title="$lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.gyjpigyb','箱号')"
-                      v-model="caseNum.value"
-                      :get-focus.sync="caseNum.focus"
-                      :create-rule="$lwScanRule.create('出库拣选控制台-执行拣选-托盘号','LPN')"
-                      rule-key="lpn"
+                      v-if="nowPickData.needHandleSn"
+                      :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.pzwemrzt', '序列号')"
+                      v-model="sn.value"
+                      :get-focus.sync="sn.focus"
+                      :create-rule="$lwScanRule.create('出库拣选控制台-执行拣选-序列号','SN')"
+                      rule-key="sn"
+                      :owner-id="orderData.ownerId"
+                      :rule-serve-query="nowPickData"
                       required
-                      @confirm="caseNumConfirm"
+                      :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"
                     />
+
                   </template>
+
                 </div>
+
+                <!-- 序列号拣选扫描结果显示 -->
+                <template v-if="snScanData.length">
+                  <div class="lw-global-model-top-radius lw-global-flex-between sn-data-head">
+
+                    <lw-title-value-cell
+                      :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.smefwuxh', '已扫序列号')"
+                      :value="snScanData.length"
+                      :title-style="{color:'#fff'}"
+                      val-color="#fff"
+                      :is-row="false"
+                      val-bold
+                      val-size="16px"
+                    />
+
+                    <lw-title-value-cell
+                      :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.wynmgtiy', '已扫数量')"
+                      :value="snScanData.reduce((t,n)=>t+Number(n.qty),0)"
+                      :title-style="{color:'#fff'}"
+                      val-color="#fff"
+                      :is-row="false"
+                      val-bold
+                      val-size="16px"
+                    />
+
+                  </div>
+                  <div class="lw-global-model-bottom-radius">
+
+                    <div
+                      v-for="(i,k) in snScanData"
+                      :key="k"
+                      :class="[
+                        'lw-global-flex-between',
+                        $lwUtils.getCellClass(k,snScanData.length)
+                      ]"
+                    >
+                      <div
+                        style="flex: 1;margin-right: 10px"
+                        class="lw-global-flex-between"
+                      >
+
+                        <div class="lw-global-value">{{ i.sn }}</div>
+                        <div class="lw-global-value-bold">{{ i.qty }}</div>
+
+                      </div>
+
+                      <van-icon
+                        style="flex-shrink: 0"
+                        name="delete-o"
+                        size="18px"
+                        color="#d50000"
+                        @click="delSn(i,k)"
+                      />
+                    </div>
+
+                  </div>
+                </template>
               </template>
               <lw-not-data v-else/>
 
@@ -394,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>
 
@@ -414,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"
-              @back="backClick(i)"
+              :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="!orderData.pickedList.length"/>
+            <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="!all.pageTotal"/>
           </van-tab>
 
         </van-tabs>
@@ -429,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', '确认拣选') }}
@@ -437,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">
         {{
@@ -447,106 +478,87 @@
 
     </lw-bottom-bar>
 
-    <!-- 撤销拣选弹框 -->
-    <lw-popup
-      :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.jtdifuye','撤销拣货')"
-      v-model="backPopup.show"
-      @opened="backPopup.loc.focus=true"
-    >
-
-      <div
-        class="lw-global-value-bold-red lw-global-row-start"
-        style="text-align: center;"
-      >
-        {{
-          $lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.ktptqryz', '请确认撤销后该商品存放的位置')
-        }}
-      </div>
-      <lw-input
-        :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.mhywgsuy','库位')"
-        v-model="backPopup.loc.value"
-        :get-focus.sync="backPopup.loc.focus"
-        :create-rule="$lwScanRule.create('出库拣选控制台-执行拣选-撤销库位','LOCATION')"
-        rule-key="LOC"
-        required
-        @confirm="backPopupLocConfirm"
-      />
-
-      <template #button>
-        <lw-button @click="backPopupLocConfirm">
-          {{ $lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.emosbuvm', '确认') }}
-        </lw-button>
-      </template>
-    </lw-popup>
-
-    <!-- 确认发运弹框弹框 -->
-    <lw-popup
-      :title="shipPopupTitleBtnLabel.title"
-      v-model="shipPopup.show"
-      :show-keyboard-placeholder="false"
-      @open="shipPopup.showImg=true"
-      @closed="shipPopupOff"
-    >
-
-      <div class="lw-global-flex-start-start">
-        <div class="lw-global-title" style="margin-right: 5px">
-          {{ $lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.cmzwibqq','发运图片') }}
-        </div>
-
-        <lw-img-upload
-          v-if="shipPopup.showImg"
-          v-model="shipPopup.imgList"
-        />
-      </div>
-
-      <template #button>
-
-        <lw-button
-          :color="shipPopupTitleBtnLabel.btnColor"
-          @click="shipPopupConfirm"
-        >
-          {{ shipPopupTitleBtnLabel.btn }}
-        </lw-button>
-
-      </template>
-
-    </lw-popup>
-
   </div>
 </template>
 
 <script>
 import {
-  projectWmsOutboundPDASoAllocate,
-  projectWmsOutboundPDASoCancel,
-  projectWmsOutboundPDASoCancelLpnPick,
   projectWmsOutboundPDASoCancelPickTask,
-  projectWmsOutboundPDASoCancelSkuPick,
-  projectWmsOutboundPDASoDirectShip,
-  projectWmsOutboundPDASoLoadData,
-  projectWmsOutboundPDASoPick,
-  projectWmsOutboundPDASoPickShip,
+  projectWmsOutboundPDASoCasePick,
+  projectWmsOutboundPDASoLoadDataV2,
+  projectWmsOutboundPDASoPick, projectWmsOutboundPDASoPickCheck,
+  projectWmsOutboundPDASoPickedQueryLocPageTask,
+  projectWmsOutboundPDASoPickingQueryLocPageTask,
+  projectWmsOutboundPDASoPickingQueryLocs,
+  projectWmsOutboundPDASoPickingQueryLocTask,
+  projectWmsOutboundPDASoQuerySkuPage,
   projectWmsOutboundPDASoSkuPick
 } from "../../../../api/outbound/pickConsole/orderPick";
-import waitOverTaskItem from "./../components/waitOverTaskItem.vue";
+import waitOverTaskItem from "./../../../../components/consoleAndPick/waitOverTaskItem.vue";
+import orderHeadData from "./../../../../components/consoleAndPick/orderHeadData.vue";
+import {projectWmsOutboundPickCheckSn} from "../../../../api/outbound/pick/alone";
 
 export default {
   name: "lwOutboundPickConsoleOrderAction",
   components: {
-    waitOverTaskItem
+    waitOverTaskItem,
+    orderHeadData,
   },
   data() {
     return {
-      orderData: {
-        currentPickList: [],
-        pendingList: [],
-        pickedList: [],
-        totalQty: 5,
-        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: '',
@@ -564,206 +576,204 @@ export default {
         value: '',
         focus: false
       },
-
-      backPopup: {
-        show: false,
-        loc: {
-          value: '',
-          focus: false
-        },
-        item: {}
+      sn: {
+        value: '',
+        focus: false
       },
-
-      // 发运弹框
-      shipPopup: {
-        type: '',
-        show: false,
-        imgList: [],
-        showImg: false
-      }
+      // 序列号扫描数据
+      snScanData: [],
     }
   },
   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
-    },
 
-    // 订单中是否包含 - 整托拣选
-    hasLpnPick() {
-      const {waitPickLpnCount, pickLpnCount} = this.orderData
-      return !!(Number(waitPickLpnCount || 0) || Number(pickLpnCount || 0))
+    // 是否需要录入托盘号：如果是整托盘拣选必须输入托盘号；非整托拣选和非箱拣选时，有托盘无箱需要录入托盘号
+    hasLpn() {
+      const {pickUom, fromLpn, fromCaseNum} = this.nowPickData
+      if (pickUom === 'LPN') return true
+      return !!(fromLpn && !fromCaseNum);
     },
-    // 订单中是否包含 - 整箱拣选
-    hasCasePick() {
-      const {pickCaseCount, waitPickCaseCount} = this.orderData
-      return !!(Number(pickCaseCount || 0) || Number(waitPickCaseCount || 0))
+    // 是否需要录入箱号：如果是整托盘拣选必须输入托盘号；非整托拣选和非箱拣选时，有托盘无箱需要录入托盘号
+    hasBox() {
+      const {pickUom, fromCaseNum} = this.nowPickData
+      if (pickUom === 'CASE') return true
+      return !!fromCaseNum
     },
-    // 订单中是否包含 - 零散拣选
-    hasSkuPick() {
-      const {pickSctQty, waitPickSctQty} = this.orderData
-      return !!(Number(pickSctQty || 0) || Number(waitPickSctQty || 0))
+    // 当前拣选是否是零散拣选
+    nowPickIsEa() {
+      const pickUom = this.nowPickData.pickUom
+      return !(pickUom === 'LPN' || pickUom === 'CASE')
     },
 
-    // 是否显示一键发运
-    showCanCancel() {
-      const {canCancel, type} = this.orderData
-      return canCancel && ['FP_RETURN', 'EMPTY_CONTAINER'].includes(type)
+    // 需要验证的商品数
+    needCheckSkuQty() {
+      return this.nowPickData.skuList?.length || 1
     },
 
-    // 发运弹框标题及按钮文字
-    shipPopupTitleBtnLabel() {
-      if (['all', 'oneBtn'].includes(this.shipPopup.type)) {
-        return {
-          title: this.$lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.kzxnrmcu','确认发运'),
-          btn: this.$lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.wwsfrjrr','发运')
-        }
-      }
-      return {
-        title: this.$lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.fwcrndpq', '部分发运确认'),
-        btn: this.$lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.cmnjemvo', '部分发运'),
-        btnColor: 'rgb(51, 51, 51)'
-      }
-    }
-  },
-  watch: {
-    tabShowType: {
-      handler(n) {
-        if (!n) this.tabActive = 'over'
-      }
+    // 货主商品检查通过
+    ownerSkuCheckPass() {
+      return this.ownerSkuCheckList.length === this.needCheckSkuQty
     }
+
   },
   mounted() {
-    this.getOrderData()
+    this.init()
   },
   methods: {
-    // tab显示项
-    /*tabShowType() {
-      const {totalQty, pickQty} = this.orderData
-      const t = Number(totalQty || 0) - Number(pickQty || 0)
-      if (!t) this.tabActive = 'over'
-      return t
-    },*/
-    // 数据格式化
-    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'
+        }
+      ]]
     },
 
-    // 获取出库单信息
-    getOrderData() {
-      projectWmsOutboundPDASoLoadData({
-        soId: this.$route.query.lwOrderId
-      }).then(res => {
-        this.dataFormat(res, true)
-      }).catch(() => {
-        history.go(-1)
+    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()
+        }
       })
     },
 
-    // 行样式
-    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'
+    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()
     },
 
-    // 取消订单
-    cancelOrder() {
-      this.$lwDialog.confirm({
-        title: this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.nbgyvupi', '警告'),
-        message: this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.ndikmcxi', '确认取消当前出库单？'),
-        type: 'warning'
-      }).then(() => {
-        projectWmsOutboundPDASoCancel({
-          soId: this.orderData.soId
-        }).then(() => {
-          this.$lwToast.success(
-            this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.qzjlmywj', '已取消')
-          )
-          history.go(-1)
-        }).catch(() => {
+    // tab切换
+    tabChange() {
+      if (this.tabActive === 'ing') return
+
+      this.getTabItemData(this.tabActive)
+    },
+
+    // 获取出库单信息
+    async getOrderData() {
+      try {
+        this.orderData = await projectWmsOutboundPDASoLoadDataV2({
+          soId: this.$route.query.lwOrderId
         })
-      })
+      } catch {
+        history.go(-1)
+      }
     },
-    // 修改订单
-    changeOrder() {
-      this.$router.push({
-        path: '/outbound/pickConsole/lwCreateOrder',
-        query: {
-          soId: this.orderData.soId
-        }
+    // 获取全部待拣库位列表
+    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
     },
-    // 分配订单
-    allocateOrder() {
-      projectWmsOutboundPDASoAllocate({
-        soId: this.orderData.soId
-      }).then(res => {
-        this.dataFormat(res, true)
-        let msg = ''
-        let type = ''
+    // 获取指定库位的待拣明细
+    async getLocPickSku(locId) {
+      const res = await projectWmsOutboundPDASoPickingQueryLocTask({
+        soId: this.$route.query.lwOrderId,
+        locId
+      })
 
-        if (res.currentAllocate) {
-          msg = this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.btshkndx', '已分配')
-          type = 'success'
-        } else {
-          msg = this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.yujosqpm', '当前没有满足分配的库存记录')
-          type = 'fail'
-        }
+      if (!res || !res.length) {
+        this.allPickLoc.list = []
+        this.formatData()
+        return
+      }
+      this.pickSku.list = res
+      this.pickSku.index = 0
 
-        this.$lwToast[type](msg)
-      })
+      // 判断当前库位是否是返回的库位
+      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
+      }
 
-    // 打开发运弹框
-    openShipPopup(type) {
-      this.shipPopup.type = type
-      this.shipPopup.show = true
-    },
-    // 发运
-    canShipOrder() {
-      const {totalQty, pickQty} = this.orderData
-      this.openShipPopup(Number(totalQty || 0) > Number(pickQty || 0) ? 'part' : 'all')
-    },
-    // 一键发运
-    oneBtnShip() {
-      this.openShipPopup('oneBtn')
-    },
-    // 发运弹框 - 关闭
-    shipPopupOff() {
-      this.shipPopup.imgList = []
-      this.shipPopup.showImg = false
-    },
-    // 发运弹框 - 确认提交
-    shipPopupConfirm() {
-      const api = this.shipPopup.type === 'oneBtn' ?
-        projectWmsOutboundPDASoDirectShip :
-        projectWmsOutboundPDASoPickShip
+      if (api === null) return
 
       api({
-        soId: this.orderData.soId,
-        shipImages: this.shipPopup.imgList.join('|')
-      }).then(() => {
-        this.$lwToast.success(
-          this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.zuzkrcnp', '已发运')
-        )
-        const step = Number(this.$route.query.lwBackStep || 1)
-        history.go(-step)
+        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() {
 
@@ -787,31 +797,170 @@ export default {
     },
     // 数据切换后
     cutEnd() {
-      const input = ['lpn', 'extLpn', 'caseNum', 'qty']
+      const input = ['lpn', 'extLpn', 'caseNum', 'qty', 'sn']
       for (const i of input) {
         this[i].value = ''
       }
 
+      this.snScanData = []
+      this.ownerSkuCheckList = []
+      this.clearOwnerCustomerInput()
+
+      // 让输入框获取焦点
+      switch (this.nowPickData.pickUom) {
+        case 'LPN':
+          this.extLpn.focus = true
+          return
+        case 'CASE':
+          this.caseNum.focus = true
+          return;
+        default:
+          if (this.nowPickData.fromCaseNum) {
+            this.caseNum.focus = true
+            return
+          }
+
+          if (this.nowPickData.fromLpn) {
+            this.lpn.focus = true
+            return
+          }
+
+          if (this.nowPickData.needHandleSn) {
+            this.sn.focus = true
+            return
+          }
 
-      if (this.nowPickData.pickType === '100') {
-        this.extLpn.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
       }
 
-      if (this.nowPickData.pickType === '300') {
+      const ownerSkuCode = this.ownerSku.value
+      projectWmsOutboundPDASoPickCheck({
+        soId: this.orderData.soId,
+        currentTask: this.nowPickData,
+        args: {
+          ownerSkuCode,
+          customerSkuCode,
+        }
+      }).then(() => {
 
-        if (this.nowPickData.fromCaseNum) {
-          this.caseNum.focus = true
+        if (this.ownerSkuCheckList.some(item => item.ownerSkuCode === ownerSkuCode)) {
+          this.ownerSkuErrorFn(
+            this.$lwLanguage.get('', '扫描/输入的货主物料已存在校验数据，不允许重复校验')
+          )
           return
         }
 
-        if (this.nowPickData.fromLpn) {
-          this.lpn.focus = true
-          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 || ''
         }
 
-        this.qty.focus = true
-      }
+        // 验证完成后
+        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)
+      })
     },
 
     // 托盘校验
@@ -828,20 +977,27 @@ export default {
     // 托盘确认
     lpnConfirm() {
       if (!this.lpnCheck()) return
-      switch (this.nowPickData.pickType) {
-        case '100':
-          this.submitPick()
-          break;
-        case '300':
-          this.qty.focus = true
-          break;
+
+      const {pickUom, needHandleSn} = this.nowPickData
+      if (pickUom === 'LPN') return this.submitPick()
+
+      if (pickUom !== 'LPN' && pickUom !== 'CASE') {
+        if (needHandleSn) {
+          this.sn.focus = true
+        } else {
+          this.$refs.qty?.getFocus()
+        }
       }
 
     },
 
     // 外托盘校验
     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(
@@ -867,42 +1023,138 @@ export default {
     },
     // 箱确认
     caseNumConfirm() {
-      if (this.caseNumCheck()) {
-        this.qty.focus = true
+      if (!this.caseNumCheck()) return
+
+      const {needHandleSn} = this.nowPickData
+      // 是否为零散拣选
+      if (this.nowPickIsEa) {
+        if (needHandleSn) {
+          this.sn.focus = true
+        } else {
+          this.$refs.qty?.getFocus()
+        }
+        return
       }
+
+      this.caseNumSubmit()
     },
     // 数量校验
     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
     },
-    // 提交拣选
-    submitPick() {
-      // 整托盘拣选校验
-      if (this.nowPickData.pickType === '100') {
-        this.lpnSubmit()
+
+    // 序列号输入确认
+    snConfirm(val, {data}) {
+      const {key, qty = 0} = data
+      if (!key) {
+        this.sn.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.gnaugjkr', '序列号不能为空')
+        )
+        return
+      }
+
+      if (this.snScanData.some(item => item.sn === key)) {
+        this.sn.focus = true
+        this.$lwToast.fail({
+          message: this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.ryvscryg', '当前序列号已存在列表中'),
+          forbidClick: false
+        })
         return
       }
-      // 零散拣选校验
-      if (this.nowPickData.pickType === '300') {
 
-        if (this.nowPickData.fromLpn && !this.nowPickData.fromCaseNum && !this.lpnCheck()) return
+      const {ownerId, skuId} = this.nowPickData
+      projectWmsOutboundPickCheckSn({
+        ownerId,
+        skuId,
+        sn: key,
+        qty
+      }).then(res => {
+        const sn = {
+          sn: res.sn,
+          qty: res.qty || 1
+        }
+        if (this.checkQtyBySn(sn)) {
+          this.snScanData.unshift(sn)
+        }
+
+        this.sn.focus = true
+      })
 
-        if (this.nowPickData.fromCaseNum && !this.caseNumCheck()) return
 
-        if (!this.qtyCheck()) return
+    },
+    // 序列号删除
+    delSn(item, index) {
+      this.$lwDialog.confirm({
+        type: 'warning',
+        title: this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.hbbogoqz', '提示'),
+        message: this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.tzphjoco', '确认删除序列号：{sn}', {sn: item.sn})
+      }).then(() => {
+        this.snScanData.splice(index, 1)
+      }).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
+      }
 
-        this.skuSubmit()
+      switch (pickUom) {
+        // 整托盘拣选校验
+        case 'LPN':
+          this.lpnSubmit()
+          return
+        case 'CASE':
+          this.caseNumSubmit()
+          return;
+        // 零散拣选校验
+        default:
+          this.skuSubmit()
       }
     },
     // 整托拣选提交
     lpnSubmit() {
-      if (!this.lpnCheck() || !this.extLpnCheck()) return
+      if (!this.extLpnCheck() || !this.lpnCheck()) return
 
       const {pickId, fromLpn, fromLocationId} = this.nowPickData
       projectWmsOutboundPDASoPick({
@@ -912,27 +1164,51 @@ export default {
         fromLocationId,
         actualLpn: this.lpn.value,
         extLpn: this.extLpn.value,
-      }).then(res => this.submitOver(res))
+      }).then(this.submitOver)
+    },
+    // 整箱拣选提交
+    caseNumSubmit() {
+
+      const {pickId, fromLpn, fromLocationId, fromCaseNum} = this.nowPickData
+      projectWmsOutboundPDASoCasePick({
+        soId: this.orderData.soId,
+        pickId,
+        fromLpn,
+        fromLocationId,
+        fromCaseNum,
+        actualCaseNum: this.caseNum.value,
+      }).then(this.submitOver)
     },
     // 零散拣选提交
     skuSubmit() {
-      if (this.nowPickData.fromLpn && !this.nowPickData.fromCaseNum && !this.lpnCheck()) return
 
-      if (this.nowPickData.fromCaseNum && !this.caseNumCheck()) return
+      const {fromLpn, fromCaseNum, fromLocationId, skuId, ownerId, needHandleSn} = this.nowPickData
 
-      if (!this.qtyCheck()) return
+      if (fromLpn && !fromCaseNum && !this.lpnCheck()) return
+
+      if (fromCaseNum && !this.caseNumCheck()) return
+
+      if (!needHandleSn && !this.qtyCheck()) return
+
+      let currentPickQty = 0
+      if (needHandleSn) {
+        currentPickQty = this.snScanData.reduce((a, b) => a + Number(b.qty), 0)
+      } else {
+        currentPickQty = this.$refs.qty?.getQty()
+      }
 
-      const {fromLpn, fromCaseNum, fromLocationId, skuId} = this.nowPickData
       projectWmsOutboundPDASoSkuPick({
         soId: this.orderData.soId,
         skuId,
         fromLpn,
         fromCaseNum,
         fromLocationId,
+        ownerId,
         actualLpn: this.lpn.value,
         actualCaseNum: this.caseNum.value,
-        currentPickQty: this.qty.value,
-      }).then(res => this.submitOver(res))
+        currentPickQty,
+        snList: this.snScanData
+      }).then(this.submitOver)
     },
 
     // 提交完成后执行的操作
@@ -940,76 +1216,60 @@ 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 (item.pickType === '300') {
-        const waitPick = this.orderData.currentPickList
-        for (let i = 0; i < waitPick.length; i++) {
-          const pick = waitPick[i]
-          if (
-            pick.pickType === '300' &&
-            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
         }
-      }
-      this.nowPickIndex = k
-      this.tabActive = "ing"
-      this.cutEnd()
-    },
 
-    // 撤销
-    backClick(item) {
-      this.backPopup.item = item
-      this.backPopup.loc.value = item.fromLocationCode
-      this.backPopup.show = true
-    },
-    // 撤销弹框 - 确认库位
-    async backPopupLocConfirm() {
-      const {loc, item} = this.backPopup
-      if (!loc.value) {
-        this.backPopup.loc.focus = true
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.slpujahh', '撤回放置库位不能为空')
-        )
-        return
-      }
-
-      const data = {
-        soId: this.orderData.soId,
-        fromLocationId: item.fromLocationId,
-        cancelToLocationCode: loc.value,
-      }
+        if (item.pickUom === 'CASE') {
+          if (pick.fromCaseNum === item.fromCaseNum) {
+            this.pickSku.index = i
+            break
+          }
+          continue
+        }
 
-      let res = {}
-      if (item.pickType === '300') {
-        res = await projectWmsOutboundPDASoCancelSkuPick({
-          ...data,
-          skuId: item.skuId,
-          cancelQty: item.totalQty
-        })
-      } else {
-        res = await projectWmsOutboundPDASoCancelLpnPick({
-          ...data,
-          pickId: item.pickId,
-          fromLpn: item.fromLpn,
-        })
+        if (pick.skuCode === item.skuCode) {
+          this.pickSku.index = i
+          break
+        }
       }
 
-
-      this.dataFormat(res)
-      this.$lwToast.success(
-        this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.hmiwzmix', '已撤销')
-      )
-      this.backPopup.show = false
-      this.backPopup.loc.value = ''
+      this.tabActive = "ing"
+      this.cutEnd()
     },
 
     // 取消拣选任务
@@ -1022,29 +1282,34 @@ 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()
         })
       })
-    }
+    },
+
   }
 }
 </script>
 
 <style scoped lang="less">
-.button-row {
-  width: 100%;
-  text-align: right;
+@import "../../../../../../assets/css/var.less";
+
+
+.sku-check-row {
+  background: rgb(41, 133, 225);
+  padding: 5px 10px;
 
-  > button {
-    width: 20%;
-    margin: 3px 0;
+  > div {
+    //color: #fff !important;
   }
 }
 
-.total-item {
-  width: 20%;
+.sn-data-head {
+  margin-top: 10px;
+  background: @baseColor;
 }
 </style>