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

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

@@ -9,7 +9,7 @@
     <lw-nav-bar
       :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.kbenunwi','边拣边分')"/>
 
-    <div class="lw-global-page-box">
+    <lw-page-body-module>
 
       <!-- 任务看板 -->
       <task-info :item="pickData">
@@ -22,7 +22,7 @@
             :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.dptuorvg','拣选小车')"
             v-model="sowCar.car.value"
             :get-focus.sync="sowCar.car.focus"
-            :create-rule="$lwScanRule.create('拣选小车', 'LPN')"
+            :create-rule="$lwScanRule.create('播种拣选-拣选小车', 'LPN')"
             rule-key="sowCar"
             :show-bottom-border="false"
             :disabled="!sowCar.needBind"
@@ -106,12 +106,15 @@
 
               <!-- 库位 -->
               <lw-input
+                v-if="mixinNeedInputLoc"
                 :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.rriutzfg','拣选库位')"
                 v-model="locationCode.value"
                 :get-focus.sync="locationCode.focus"
                 required
-                :create-rule="$lwScanRule.create('拣选 - 边拣边分 - 拣选库位', 'LOCATION')"
+                :create-rule="$lwScanRule.create('边拣边分-拣选库位', 'LOCATION')"
                 rule-key="location"
+                :owner-id="nowPickData.ownerId"
+                :rule-serve-query="nowPickData"
                 @confirm="locationCodeConfirm"
               />
 
@@ -122,8 +125,10 @@
                 v-model="lpn.value"
                 :get-focus.sync="lpn.focus"
                 required
-                :create-rule="$lwScanRule.create('拣选 - 边拣边分 - 托盘号', 'LPN')"
+                :create-rule="$lwScanRule.create('边拣边分-托盘号', 'LPN')"
                 rule-key="lpn"
+                :owner-id="nowPickData.ownerId"
+                :rule-serve-query="nowPickData"
                 @confirm="lpnConfirm"
               />
 
@@ -136,6 +141,8 @@
                 required
                 rule-key="case"
                 :create-rule="$lwScanRule.create('边拣边分-箱号','CASE')"
+                :owner-id="nowPickData.ownerId"
+                :rule-serve-query="nowPickData"
                 @confirm="boxConfirm"
               />
 
@@ -145,32 +152,66 @@
                 v-model="sku.value"
                 :get-focus.sync="sku.focus"
                 required
-                :create-rule="$lwScanRule.create('拣选 - 边拣边分 - 商品号', 'SKU')"
+                :create-rule="$lwScanRule.create('边拣边分-商品号', 'SKU')"
                 rule-key="sku"
+                :owner-id="nowPickData.ownerId"
+                :rule-serve-query="nowPickData"
                 @confirm="skuConfirm"
               />
               <lw-title-value-cell
                 :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.wsbghnsh','当前扫描')"
                 :value="nowSkuCode"
               />
-              <lw-input
-                :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.busfurmf','数量')"
-                v-model="qty.value"
-                :get-focus.sync="qty.focus"
-                required
-                type="digit"
+
+
+              <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
-                    v-if="!qty.disabled"
                     mini
                     round
-                    @click="pickConfirm"
-                  >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.pbzrsvah', '确认') }}
+                    @click="qtyConfirm"
+                  >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.ursidwbt', '确认') }}
                   </lw-button>
                 </template>
-              </lw-input>
+              </lw-get-qty-by-type>
+
+              <!--              <div
+                              style="padding: 0"
+                              class="lw-global-flex-between lw-global-row"
+                            >
+                              <lw-input
+                                v-if="nowPickData.uom==='CS'"
+                                style="flex: 1"
+                                :title="$lwLanguage.get('','箱数')"
+                                v-model="caseNo.value"
+                                :get-focus.sync="caseNo.focus"
+                                type="digit"
+                                :show-bottom-border="false"
+                                @confirm="qty.focus=true"
+                              />
+                              <lw-input
+                                style="flex: 1"
+                                :title="nowPickData.uom==='CS'?
+                                  $lwLanguage.get('','盒数'):
+                                  $lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.busfurmf','数量')
+                                "
+                                v-model="qty.value"
+                                :get-focus.sync="qty.focus"
+                                :required="nowPickData.uom!=='CS'"
+                                type="digit"
+                                :show-bottom-border="false"
+                                @confirm="qtyConfirm"
+                              />
+
+                            </div>-->
 
 
               <lw-cut-card
@@ -200,72 +241,18 @@
 
           <van-tab
             name="line"
-            :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.rrpdyewp','拣选明细行')"
+            :title="$lwLanguage.get('','待拣列表')"
           >
 
-            <div
-              class="lw-global-model-box lw-global-animation-out"
-              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"
               :style="{animationDelay: 50 * k + 'ms'}"
-            >
-
-              <lw-sku-info-module
-                :sku-name="i.skuCode"
-                :sku-code="i.skuCode"
-                is-row
-              >
-
-                <!-- 尺寸 -->
-                <lw-tag
-                  v-if="i.skuSizeLabel"
-                  plain
-                  round
-                >{{ i.skuSizeLabel }}
-                </lw-tag>
-
-                <!-- 拣选状态 -->
-                <lw-tag
-                  plain
-                  round
-                  :type="pickStatus(i).type"
-                >{{ pickStatus(i).msg }}
-                </lw-tag>
-
-              </lw-sku-info-module>
-
-              <div class="lw-global-flex-between lw-global-row">
-
-                <lw-title-value-cell
-                  :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.rriutzfg','拣选库位')"
-                  :value="i.fromLocationCode"
-                  val-bold
-                  :is-row="false"
-                />
-
-                <lw-title-value-cell
-                  :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.fzrxibbu','已拣选/计划')"
-                  :value="(i.pickQty || 0) + '/' + (i.totalQty || 0)"
-                  val-bold
-                  val-red
-                  :is-row="false"
-                />
-
-              </div>
-
-              <div
-                v-if="i.groupFieldList && i.groupFieldList.length"
-                style="padding: 5px;border-radius: 5px;border: solid 1px #f0f0f0"
-              >
-                <lw-lot-look-module
-                  :columns="i.groupFieldList"
-                  title-key="title"
-                  value-key="value"
-                  :show-row="false"
-                />
-              </div>
+              :item="i"
+              @skuClick="mixinAllWaitPickSkuClick"
+            />
 
-            </div>
 
           </van-tab>
 
@@ -280,7 +267,7 @@
 
       </lw-tab-box>
 
-    </div>
+    </lw-page-body-module>
 
 
     <lw-bottom-bar v-if="!sowCar.needBind && needContainer">
@@ -353,7 +340,7 @@
         :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.wqvqagej','周转箱号')"
         v-model="bindContainerPopup.container.value"
         :get-focus.sync="bindContainerPopup.container.focus"
-        :create-rule="$lwScanRule.create('周转箱号', 'CONTAINER')"
+        :create-rule="$lwScanRule.create('边拣边分-周转箱号', 'CONTAINER')"
         rule-key="containerBox"
         input-over-blur
         @confirm="sowLocationBindContainerConfirm"
@@ -407,7 +394,7 @@
       <lw-sku-info-module
         :sku-name="nowPickData.skuName"
         :sku-code="nowPickData.skuCode"
-        :qty="qty.value"
+        :qty="mixinAllGetQty()"
         :qty-text="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.bcvasnej','当前拣选量')"
         is-row-first
       />
@@ -481,8 +468,11 @@
         ref="abnormal"
         :sku-code="nowPickData.skuCode"
         :sku-name="nowPickData.skuName"
+        :sku-id="nowPickData.skuId"
+        :owner-id="nowPickData.ownerId"
         :location="nowPickData.fromLocationCode"
-        :qty="waitPickQty"
+        :qty="nowPickData.waitPickQty"
+        :qty-label="nowPickData.waitPickQtyLabel"
         :type="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.nmwudjru','在库')"
         :ab-type="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.nzhpvyuv','拣选')"
       />
@@ -536,18 +526,19 @@
       <lw-title-value-cell
         class="lw-global-row"
         :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.vxauexbo','待拣量')"
-        :value="waitPickQty"
+        :value="nowPickData.waitPickQtyLabel"
         val-bold
         val-red
         :is-row="false"
       />
 
-
-      <lw-input
+      <lw-get-qty-by-type
+        v-if="lackPopup.show"
         :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.btfrzivy','缺货量')"
-        v-model="lackPopup.lackQty"
-        :get-focus.sync="lackPopup.lackQtyFocus"
-        type="digit"
+        ref="lackPopupQty"
+        :owner-id="nowPickData.ownerId"
+        :sku-id="nowPickData.skuId"
+        init-focus
         @confirm="lackConfirm"
       />
 
@@ -569,7 +560,7 @@
         :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.xkmdfmdo','已满容器')"
         v-model="fullContainerPopup.full.value"
         :get-focus.sync="fullContainerPopup.full.focus"
-        :create-rule="$lwScanRule.create('拣选 - 边拣边分 - 拣满换容器 - 已满容器', 'CONTAINER')"
+        :create-rule="$lwScanRule.create('边拣边分-拣满换容器-已满容器', 'CONTAINER')"
         rule-key="fullContainer"
         @confirm="fullContainerConfirm"
       />
@@ -612,7 +603,7 @@
           :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.uqcdsbxl','新容器')"
           v-model="fullContainerPopup.new.value"
           :get-focus.sync="fullContainerPopup.new.focus"
-          :create-rule="$lwScanRule.create('拣选 - 边拣边分 - 拣满换容器 - 新容器', 'CONTAINER')"
+          :create-rule="$lwScanRule.create('边拣边分-拣满换容器-新容器', 'CONTAINER')"
           rule-key="newContainer"
           @confirm="changeContainerConfirm"
         />
@@ -644,6 +635,7 @@
 <script>
 import taskInfo from "../components/taskInfo.vue";
 import sowList from "../components/sowList.vue";
+import waitPickCollapseItem from "../components/waitPickCollapseItem.vue";
 import skuLocationInfo from './../components/skuLocationInfo/index.vue'
 import {
   projectQueryPickSowData, projectWmsGetSkuBySn,
@@ -658,20 +650,18 @@ import {
   projectWmsPickSowUnbind
 } from "../../../../api/outbound/pick/sow";
 import {all} from "../mixin/all";
-import {aloneAndNotAlone} from "../mixin/aloneAndNotAlone";
 
 export default {
   name: "lwOutboundPickSowPage",
   components: {
     taskInfo,
     sowList,
-    skuLocationInfo
+    skuLocationInfo,
+    waitPickCollapseItem,
   },
-  mixins: [all, aloneAndNotAlone],
+  mixins: [all],
   data() {
     return {
-      // 任务数据
-      pickData: {},
 
       // 拣选小车
       sowCar: {
@@ -699,21 +689,7 @@ export default {
         }
       },
 
-      // 正在拣选的任务索引
-      taskIndex: 0,
-      // 拣选库位
-      locationCode: {
-        value: '',
-        focus: true
-      },
-      lpn: {
-        value: '',
-        focus: false
-      },
-      box: {
-        value: '',
-        focus: false
-      },
+
       sku: {
         value: '',
         focus: false
@@ -724,6 +700,10 @@ export default {
         value: '',
         focus: false
       },
+      caseNo: {
+        value: '',
+        focus: false
+      },
 
       // 计算播种位弹框
       sowLocPopup: {
@@ -781,11 +761,6 @@ export default {
       return num
     },
 
-    // 待拣选量
-    waitPickQty() {
-      return Number(this.nowPickData.totalQty || 0) - Number(this.nowPickData.pickQty || 0)
-    },
-
     // 绑定弹框 - 当前绑定的播种位
     bindPopupNowBindSowLoc() {
       const list = this.bindContainerPopup.sowList
@@ -837,8 +812,8 @@ export default {
           })
         }
 
-        this.pickData = this.formatData(res)
-        this.checkTaskIndex(this.pickData.pendingPickLineList.length)
+        this.pickData = res
+        this.mixinAllCheckTaskIndex(this.pickData.pendingPickLineList.length)
       })
     },
     // 全部拣选完成
@@ -1012,7 +987,8 @@ export default {
     },
     // 检查拣选库位
     locationCodeCheck() {
-      return this.inputCheck({
+      if (!this.mixinNeedInputLoc) return true
+      return this.mixinAllInputCheck({
         key: 'locationCode',
         checkVal: this.nowPickData.fromLocationCode,
       })
@@ -1020,32 +996,12 @@ export default {
 
     // 托盘号确认
     lpnConfirm() {
-      if (this.lpnCheck()) this.sku.focus = true
-    },
-    // 托盘号校验
-    lpnCheck() {
-
-      if (!this.hasLpn) return true
-
-      return this.inputCheck({
-        key: 'lpn',
-        needCheck: false
-      })
+      if (this.mixinAllLpnCheck()) this.sku.focus = true
     },
 
     // 箱号确认
     boxConfirm() {
-      if (this.boxCheck()) this.sku.focus = true
-    },
-    // 箱号校验
-    boxCheck() {
-
-      if (!this.nowPickData.fromCase) return true
-
-      return this.inputCheck({
-        key: 'box',
-        needCheck: false
-      })
+      if (this.mixinAllBoxCheck()) this.sku.focus = true
     },
 
     // 商品确认
@@ -1075,26 +1031,25 @@ export default {
 
       this.nowSkuCode = this.sku.value
 
-      let newQty = Number(this.nowPickData.uomQty)
-      // 如果条码解析成功，并且能解析出数量就加法运算
-      if (data.qty) {
-        newQty = data.qty
-      }
+      if (this.nowPickData.uom !== 'CS') {
+        let newQty = Number(this.nowPickData.uomQty)
+        // 如果条码解析成功，并且能解析出数量就加法运算
+        if (data.qty) {
+          newQty = data.qty
+        }
+
+        this.qty.value = Number(this.qty.value || 0) + newQty
 
-      this.qty.value = Number(this.qty.value || 0) + newQty
+        this.sku.focus = true
+        this.sku.value = ''
+      } else {
+        this.caseNo.focus = true
+      }
 
-      /*const waitQty = Number(this.nowPickData.totalQty || 0) - Number(this.nowPickData.pickQty || 0)
-      if (this.qty.value === waitQty) {
-        this.pickConfirm()
-        return;
-      }*/
-      
-      this.sku.focus = true
-      this.sku.value = ''
     },
     // 商品检查
     skuCheck() {
-      return this.inputCheck({
+      return this.mixinAllInputCheck({
         key: 'sku',
         needCheck: false
       })
@@ -1102,53 +1057,12 @@ export default {
 
     // 数量确认
     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.sow.index.mvkcfove', '拣选数量不能为空，且应当是大于0的整数')
-        )
-        this.qty.value = ''
-        return false
-      }
-
-      const item = this.nowPickData
-      const uomQty = Number(item.uomQty || 0)
-
-      if (uomQty === 0) {
-        console.warn('拣选最小单位数据异常，值为：', uomQty)
-        return true
-      }
-
-      if (qty % item.uomQty !== 0) {
-        this.qty.focus = true
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.cyjdoamc', '拣选数量应当为{0}的倍数', [item.uomLabel.top])
-        )
-        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.sow.index.ommmlsnz', '拣选数量不能大于待拣量')
-        )
-        this.qty.value = ''
-        return false
-      }
-
-      return true
+      if (this.mixinAllCheckQty()) this.pickConfirm()
     },
 
     // 任务行切换前
     cutStart() {
-      return this.checkInputVal(
+      return this.mixinAllCheckInputVal(
         ['locationCode', 'lpn', 'box', 'sku', 'qty'],
       )
 
@@ -1156,13 +1070,17 @@ export default {
     // 任务行切换后
     cutEnd() {
 
-      const {focus} = this.clearInputVal(
-        this.getCheckInputKeyArr(this.nowPickData.fromCase),
+      this.showUomQty = false
+      const {focus} = this.mixinAllClearInputVal(
+        this.mixinAllGetCheckInputKeyArr(this.nowPickData.fromCase),
         ['sku', 'qty']
       )
+      this.caseNo.value = ''
       this.nowSkuCode = ''
 
       this.tabActive === 'ing' ? this[focus].focus = true : ''
+
+      this.$nextTick(() => this.showUomQty = true)
     },
 
     // 确认拣选
@@ -1177,15 +1095,15 @@ export default {
       }
       if (!(
         this.locationCodeCheck() &&
-        this.lpnCheck() &&
-        this.boxCheck() &&
+        this.mixinAllLpnCheck() &&
+        this.mixinAllBoxCheck() &&
         checkSku() &&
-        this.qtyCheck()
+        this.mixinAllCheckQty()
       )) return
 
       projectWmsPickSowComputePosition({
         ...this.actionQuery,
-        currentPickQty: this.qty.value,
+        currentPickQty: this.mixinAllGetQty(),
       }).then(res => {
         this.sowLocPopup.list = res
         this.sowLocPopup.show = true
@@ -1200,7 +1118,7 @@ export default {
         return
       }
 
-      if (this.pickChangeTotal > Number(this.qty.value || 0)) {
+      if (this.pickChangeTotal > this.mixinAllGetQty()) {
         this.$lwShowErrorMsg(
           this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.cjiegwjf', '调整后的拣选量不能大于当前拣选量')
         )
@@ -1278,28 +1196,26 @@ export default {
     // 拣选缺货
     pickLack() {
       this.lackPopup.show = true
-      this.lackPopup.lackQtyFocus = true
     },
     // 确认拣选缺货
     lackConfirm() {
-      const qty = Number(this.lackPopup.lackQty || 0)
+      const qty = this.$refs.lackPopupQty.getQty()
       if (!qty) {
-        this.lackPopup.lackQtyFocus = true
+        this.$refs.lackPopupQty.getFocus()
         this.$lwShowErrorMsg(
           this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.eowiwjep', '缺货量不能为空，且应当是大于0的整数')
         )
-        this.lackPopup.lackQty = ''
         return
       }
 
 
       // 判断是否大于待拣量
-      if (this.waitPickQty < qty) {
-        this.lackPopup.lackQtyFocus = true
+      if (this.nowPickData.waitPickQty < qty) {
+        this.$refs.lackPopupQty.getFocus()
         this.$lwShowErrorMsg(
           this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.oqzvdfeq', '缺货量不能大于待拣量')
         )
-        this.lackPopup.lackQty = ''
+        this.$refs.lackPopupQty.clearInput()
         return
       }