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

package/src/views/wms/page/inbound/receive/receive-sku/LwInboundReceiveSkuDirectPage.vue

@@ -15,28 +15,14 @@
           :show-data-look="false"
         />
 
-        <lw-data-look-bg type="not">
-          <lw-data-look-item
-            :title="$lwLanguage.get('wms_project.pda.views.wms.page.inbound.receive.receive-sku.LwInboundReceiveSkuDirectPage.udhvsicu','计划量')"
-            :value="asnSku.qty"
-          />
-          <lw-data-look-item
-            :title="$lwLanguage.get('wms_project.pda.views.wms.page.inbound.receive.receive-sku.LwInboundReceiveSkuDirectPage.suishzuk','已收量')"
-            :value="asnSku.receiveQty"
-          />
-          <lw-data-look-item
-            :title="$lwLanguage.get('wms_project.pda.views.wms.page.inbound.receive.receive-sku.LwInboundReceiveSkuDirectPage.yizqtcdc','待收量')"
-            :value="(Number(asnSku.qty || 0) - Number(asnSku.receiveQty || 0))"
-          />
-          <lw-data-look-item
-            :title="$lwLanguage.get('wms_project.pda.views.wms.page.inbound.receive.receive-sku.LwInboundReceiveSkuDirectPage.dovgmwzl','到货量')"
-            :value="asnSku.arrivalQty"
-          />
-          <lw-data-look-item
-            :title="$lwLanguage.get('wms_project.pda.views.wms.page.inbound.receive.receive-sku.LwInboundReceiveSkuDirectPage.xlekdods','异常量')"
-            :value="asnSku.qualityLossQty"
-          />
-        </lw-data-look-bg>
+        <lw-data-look-bg
+          type="not"
+          :data="asn.qtyList"
+          value-key="qtyLabel"
+          title-key="label"
+          :show-end-line="false"
+        />
+
         <asn-sku-info
           v-if="asnSku"
           :data="asnSku"
@@ -55,8 +41,15 @@
         <div class="lw-global-model-box" style="margin-top: 10px;">
           <lw-input
             :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.raqaebfl', '序列号条码')"
-            required v-model="sn.value" :get-focus.sync="sn.focus"
-            rule-key="sn" :rule-serve-query="barcodeQuery" @confirm="addSn"/>
+            required
+            v-model="sn.value"
+            :get-focus.sync="sn.focus"
+            rule-key="sn"
+            :create-rule="$lwScanRule.create('按商品收货-收货-序列号条码','SN')"
+            :owner-id="asn.ownerId"
+            :rule-serve-query="asn"
+            @confirm="addSn"
+          />
         </div>
         <div class="lw-global-model-box tag-list">
           <div class="tag-list-title">
@@ -103,11 +96,26 @@
             v-model="tag"
             :get-focus.sync="skuFocus"
             rule-key="skuReceive"
-            :rule-serve-query="barcodeQuery"
+            :create-rule="$lwScanRule.create('按商品收货-预收货-商品收货条码','SKU')"
+            :owner-id="asn.ownerId"
+            :rule-serve-query="asn"
             @confirm="addTag"
           />
         </div>
-        <div class="lw-global-model-box tag-list">
+        <!-- 数量收货 -->
+        <lw-get-qty-by-type
+          v-if="isQtyReceive"
+          ref="getQty"
+          class="lw-global-model-box"
+          :owner-id="asnSku.ownerId"
+          :pack-id="asnSku.pack.id"
+          :sku-id="asnSku.sku.id"
+        />
+        <!-- 看板收货列表 -->
+        <div
+          v-else
+          class="lw-global-model-box tag-list"
+        >
           <div class="tag-list-title">
             <div>
               {{
@@ -153,19 +161,30 @@
           </div>
         </div>
       </div>
-      <div v-if="lotQuery" class="lw-global-model-box" style="margin-top: 10px;">
-        <lw-lot-module ref="lotEl" :query="lotQuery"/>
+      <div v-if="lotList" class="lw-global-model-box" style="margin-top: 10px;">
+        <lw-lot-module ref="lotEl" :lot-list="lotList"/>
       </div>
       <div class="lw-global-model-box" style="margin-top: 10px;">
         <lw-input
           :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.mfygoqmw', '收货库位')"
-          required v-model="receiveLoc.value" :get-focus.sync="receiveLoc.focus"/>
+          required
+          v-model="receiveLoc.value"
+          :get-focus.sync="receiveLoc.focus"
+          rule-key="loc"
+          :create-rule="$lwScanRule.create('按商品收货-预收货-收货库位','')"
+          :owner-id="asn.ownerId"
+          :rule-serve-query="asn"
+        />
         <lw-input
           v-if="!asn.hideLpn"
           :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.kjwvyrqq', '收货托盘')"
           :required="asn.requiredLpn"
           v-model="receiveLpn.value"
           :get-focus.sync="receiveLpn.focus"
+          rule-key="lpn"
+          :create-rule="$lwScanRule.create('按商品收货-收货-收货托盘','LPN')"
+          :owner-id="asn.ownerId"
+          :rule-serve-query="asn"
         >
           <template #button>
 
@@ -214,7 +233,11 @@
       <div>
         <lw-input
           :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.tpanqila', '收货量')"
-          :disabled="asnSku && asnSku.sku.needSn" required v-model="submitQty"/>
+          :disabled="asnSku && (asnSku.sku.needSn || isQtyReceive)"
+          required
+          v-model="submitQty"
+          type="digit"
+        />
       </div>
       <template #button>
         <lw-button plain @click="showSubmit = false">
@@ -228,8 +251,9 @@
     <!-- 异常弹框 -->
     <lw-popup
       :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.tifrlevk', '收货异常')"
-      class="abnormal-popup-bg"
-      v-model="showAbnormal">
+      v-model="showAbnormal"
+      background="#f0f0f0"
+    >
 
       <lw-receive-abnormal-module
         v-if="showAbnormal"
@@ -240,6 +264,8 @@
         :asn-no="asn.asnNo"
         :sku-code="asnSku.sku.code"
         :qty="asn.pendingQty"
+        :qty-label="asn.pendingQtyLabel"
+        :group-key="$route.query.groupKey"
       />
 
       <template #button>
@@ -272,11 +298,11 @@
 
 <script>
 import {
-  getAsnSkuDetailBySkuCode,
   getAsnSkuSnDetail,
-  getInboundAsnByAsnNo, submitAsnAbnormalReceive,
+  getInboundAsnByAsnNo,
+  submitAsnAbnormalReceive,
   submitAsnFastReceiveForSku,
-  submitAsnFastReceiveForSkuSn,
+  submitAsnFastReceiveForSkuSn, wmsMobileExtInGetAsnSkuGroupV3,
   wmsMobileInboundNewReceiveLpn
 } from '../../../../api/inbound/receive'
 import AsnInfo from '../../components/AsnInfo.vue'
@@ -328,7 +354,7 @@ export default {
       // 收货照片
       imgList: [],
       showSubmit: false,
-      lotQuery: null,
+      lotList: null,
       submitQty: 0,
       lotData: null,
       showAbnormal: false,
@@ -349,11 +375,15 @@ export default {
     snsQty() {
       return this.sns.map(i => parseInt(i.qty)).reduce((a, b) => a + b, 0)
     },
-    barcodeQuery() {
-      return {
-        ownerId: this.asn.ownerId,
-        warehouseId: this.asn.warehouseId,
-      }
+    // 待复核量
+    waitQty() {
+      const wait = Number(this.asnSku.qty || 0) - Number(this.asnSku.receiveQty || 0)
+      if (wait < 0) return 0
+      return wait
+    },
+    // 是否是通过数量收货
+    isQtyReceive() {
+      return !this.asnSku?.sku.needSn && this.asnSku?.qtyInputType === 'ea'
     },
   },
   created() {
@@ -363,15 +393,24 @@ export default {
     }
     this.loadAsnAndSku(asnNo)
 
-    const {printData} = this.$lwPrint.test(
-      'PART_RECEIVE_LABEL',
-      this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.gdurijqqr', '收货托盘标签'),
-      false,
-      false
-    )
-    this.printLpnData = printData
+
+    this.checkPrint()
   },
   methods: {
+    // 打印机校验
+    checkPrint(needCheck) {
+
+      if (this.printData.printId) return true
+
+      const {printData, success} = this.$lwPrint.test(
+        'PART_RECEIVE_LABEL',
+        this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.gdurijqqr', '收货托盘标签'),
+        needCheck
+      )
+      this.printLpnData = printData
+      return success
+    },
+
     loadAsnAndSku(asnNo) {
       getInboundAsnByAsnNo(asnNo).then(data => {
         if (data) {
@@ -384,7 +423,19 @@ export default {
     },
     // 获取当前商品信息
     getNowSkuData(first = true) {
-      getAsnSkuDetailBySkuCode(this.asn.id, this.$route.query.skuCode).then(res => {
+      wmsMobileExtInGetAsnSkuGroupV3({
+        asnId: this.asn.id,
+        skuCode: this.$route.query.skuCode,
+        groupKey: this.$route.query.groupKey,
+      }).then(res => {
+        if (!res) {
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('', '获取单信息失败，请确认单据号、商品信息是否正确')
+          )
+          history.go(-1)
+          return
+        }
+
         this.asnSku = res
         if (!first) return
 
@@ -394,18 +445,13 @@ export default {
           this.skuFocus = true
         }
 
-        this.lotQuery = {
-          warehouseId: this.asn.warehouseId,
-          ownerId: this.asnSku.ownerId,
-          skuId: this.asnSku.sku.id,
-          type: 1,
-          lotType: 'inventory',
-          header: this.asn.map,
-          line: this.asnSku.map,
-        }
+        this.lotList = res.lotMap
+
         if (!this.receiveLoc.value) {
-          this.receiveLoc.value = res.receiveLocationCode
+          this.receiveLoc.value = this.asnSku.receiveLocationCode
         }
+
+        this.$refs.getQty?.init()
       })
     },
     addTag(sku, res) {
@@ -417,23 +463,31 @@ export default {
         return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.wlxehqom', '错误的商品'))
       }
       const qty = res.data && Number(res.data.qty || 0)
-      const tag = res.data && res.data.tag || '#'
-      const otag = this.tags.find(i => i.code === tag)
-      if (otag) {
-        if (otag.code !== '#') {
-          return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.qadqqgzv', '重复箱号'))
-        }
-        !qty ? this.tagFocus[tag] = true : ''
-        otag.qty = Number(otag.qty || 0) + qty
-        otag.confirmQty = Number(otag.confirmQty || 0) + qty
-      } else {
-        this.tagFocus[tag] = true
-        this.tags.unshift({
-          code: tag,
-          qty,
-          confirmQty: qty,
+
+      if (this.isQtyReceive) {
+        this.$nextTick(() => {
+          this.$refs.getQty.setQty(this.$refs.getQty.getQty() + qty)
         })
+      } else {
+        const tag = res.data && res.data.tag || '#'
+        const otag = this.tags.find(i => i.code === tag)
+        if (otag) {
+          if (otag.code !== '#') {
+            return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.qadqqgzv', '重复箱号'))
+          }
+          !qty ? this.tagFocus[tag] = true : ''
+          otag.qty = Number(otag.qty || 0) + qty
+          otag.confirmQty = Number(otag.confirmQty || 0) + qty
+        } else {
+          this.tagFocus[tag] = true
+          this.tags.unshift({
+            code: tag,
+            qty,
+            confirmQty: qty,
+          })
+        }
       }
+
       this.tag = ''
     },
     addSn(sn, res) {
@@ -476,7 +530,8 @@ export default {
       }
     },
     async submit() {
-      this.submitQty = this.asnSku.sku.needSn ? this.snsQty : this.tagsQty
+      const qty = this.isQtyReceive ? (this.$refs.getQty?.getQty() || 0) : this.tagsQty
+      this.submitQty = this.asnSku.sku.needSn ? this.snsQty : qty
       if (this.submitQty <= 0) {
         return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.utgdeatd', '收货数量必须大于0'))
       }
@@ -510,7 +565,9 @@ export default {
         lpn,
         qty,
         lotAttributes: this.lotData,
-        images: this.imgList.join('|')
+        images: this.imgList.join('|'),
+        taskId: this.$route.query.lwTaskId,
+        groupKey: this.$route.query.groupKey
       }
 
       // 判断当前输入托盘号是否是生成的
@@ -531,17 +588,20 @@ export default {
       this.afterSubmit(await api(data))
     },
     afterSubmit(res) {
-      this.getNowSkuData(false)
       this.$lwToast.success(
         this.$lwLanguage.get('wms_project.pda.wms.page.inbound.receive.receive-sku.LwInboundReceiveSkuDirectPage.fbmpvqah', '操作成功')
       )
       this.receiveLpn.value = ''
+      this.loadAsnAndSku(this.$route.query.asnNo)
 
-      this.asn = res.asn
       this.sn.value = ''
       this.tag = ''
       this.sns = []
-      this.tags = []
+      this.tags = [{
+        code: '#',
+        qty: 0,
+        confirmQty: '',
+      }]
       this.showSubmit = false
 
       // 打印托盘标签
@@ -550,6 +610,8 @@ export default {
           this.$lwPrint.bluetoothPrint(item.id)
         })
       }
+
+      this.$refs.getQty?.clearInput()
     },
     showAbnormalPop() {
       const lotData = this.$refs.lotEl.getData()
@@ -573,10 +635,11 @@ export default {
         abnSubType: data.abnSubType,
         order: data.order,
         lines: data.lines,
+        taskId: this.$route.query.lwTaskId
       }).then(() => {
         this.showAbnormal = false
         this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.rsfwmbhn', '异常上报成功'))
-        getInboundAsnByAsnNo(this.asn.asnNo).then(res => this.asn = res)
+        this.loadAsnAndSku(this.asn.asnNo)
       })
     },
 
@@ -596,8 +659,8 @@ export default {
           'INBOUND_SKU_PRINT_LABEL',
           this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive-sku.LwInboundReceiveSkuDirectPage.yknguuyl', '入库商品标签')
         )
-        if (!success) return
         this.printData = printData
+        if (!success) return
       }
 
       this.printPopupShow = true
@@ -624,11 +687,6 @@ export default {
 
 <style lang="less" scoped>
 
-@import "../../../../../../assets/css/var.less";
-
-.abnormal-popup-bg {
-  background: @pageColor;
-}
 
 .tag-list {
   margin-top: 10px;