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

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

@@ -6,35 +6,22 @@
 <template>
   <div>
     <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.ttjizgxy', '预收货')"/>
-    <div v-if="asn" class="lw-global-page-box">
+    <div v-if="asn && asnSku" class="lw-global-page-box">
       <div>
         <asn-info
           :data="asn"
           :radius="false"
           :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="asnSku.qtyList"
+          value-key="qtyLabel"
+          title-key="label"
+          :show-end-line="false"
+        />
+
         <asn-sku-info
           :data="asnSku"
           type="bottom"
@@ -42,50 +29,125 @@
           @printClick="printClick"
         />
 
-        <quality-card v-if="asnSku && asnSku.sku"
-                      type="asn" :obj-id="asn.id" :skuCode="asnSku.sku.code"
-                      :delay-load="false" :card-mode="true"/>
+        <quality-card
+          v-if="asnSku && asnSku.sku"
+          type="asn"
+          :obj-id="asn.id"
+          :skuCode="asnSku.sku.code"
+          :delay-load="false"
+          :card-mode="true"
+        />
 
       </div>
       <div v-if="asnSku">
         <div class="lw-global-model-box" style="margin-top: 10px;">
-          <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.jvafkkwd', '商品收货条码')" required v-model="tag"
-                    rule-key="skuReceive" :rule-serve-query="barcodeQuery" @confirm="addTag"/>
+          <lw-input
+            :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.jvafkkwd', '商品收货条码')"
+            required
+            v-model="tag"
+            rule-key="skuReceive"
+            :create-rule="$lwScanRule.create('按商品收货-预收货-商品收货条码','SKU')"
+            :rule-serve-query="asn"
+            :owner-id="asn.ownerId"
+            @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>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.peytdvcm', '当前扫描结果')}}</div>
-            <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.oiavvdid', '标签')}}<span>{{ ' ' + tags.length }}</span></div>
-            <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.tapobukc', '数量')}}<span>{{ ' ' + tagsQty }}</span></div>
+            <div>
+              {{
+                $lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.peytdvcm', '当前扫描结果')
+              }}
+            </div>
+            <div>
+              {{
+                $lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.oiavvdid', '标签')
+              }}<span>{{
+                ' ' + tags.length
+              }}</span></div>
+            <div>
+              {{
+                $lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.tapobukc', '数量')
+              }}<span>{{
+                ' ' + tagsQty
+              }}</span></div>
           </div>
           <div class="tag-list-head">
-            <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.blrdppuw', '标签/箱号')}}</div>
-            <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.xobpuees', '数量')}}</div>
-            <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.angvcbdb', '确认数量')}}</div>
+            <div>
+              {{ $lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.blrdppuw', '标签/箱号') }}
+            </div>
+            <div>{{ $lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.xobpuees', '数量') }}
+            </div>
+            <div>
+              {{ $lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.angvcbdb', '确认数量') }}
+            </div>
           </div>
           <div class="tag-list-row" v-for="t in tags" :key="t.code">
             <div>{{ t.code }}</div>
             <div>{{ t.qty }}</div>
             <div>
-              <lw-input required v-model="t.confirmQty" :get-focus.sync="tagFocus[t.code]" :placeholder="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.pgnkdque', '请确认数量')"/>
+              <lw-input
+                required
+                v-model="t.confirmQty"
+                :get-focus.sync="tagFocus[t.code]"
+                :placeholder="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.pgnkdque', '请确认数量')"
+                type="digit"
+              />
             </div>
           </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.kgtsbmse', '预收货库位')"
-          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('按商品收货-预收货-预收货托盘','LOCATION')"
+          :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.vmjriwdi', '预收货托盘')"
-          :required="asn.requiredLpn"
+          required
           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>
+
+            <lw-button
+              mini
+              @click="createLpnFn"
+            >
+              {{ $lwLanguage.get('', '生成') }}
+            </lw-button>
+
+          </template>
+
+        </lw-input>
         <div class="lw-global-flex-start-start lw-global-row-end">
           <div class="lw-global-title" style="margin-right: 5px">
             {{ $lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.vmjriwdci', '收货照片') }}
@@ -104,7 +166,13 @@
       <asn-sku-info :data="asnSku"/>
       <div class="lw-global-sh"></div>
       <div>
-        <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.uovywpbr', '预收货量')" required v-model="submitQty"/>
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.uovywpbr', '预收货量')"
+          required
+          :disabled="isQtyReceive"
+          v-model="submitQty"
+          type="digit"
+        />
       </div>
       <template #button>
         <lw-button plain @click="showSubmit = false">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.chduapke', '取消')}}</lw-button>
@@ -113,9 +181,10 @@
     </lw-popup>
     <!-- 异常弹框 -->
     <lw-popup
-        :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.mpltjybz', '收货异常')"
-        class="abnormal-popup-bg"
-        v-model="showAbnormal">
+      :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.mpltjybz', '收货异常')"
+      background="#f0f0f0"
+      v-model="showAbnormal"
+    >
 
       <lw-receive-abnormal-module
         v-if="showAbnormal"
@@ -126,6 +195,8 @@
         :asn-no="asn.asnNo"
         :sku-code="asnSku.sku.code"
         :qty="asn.pendingQty"
+        :qty-label="asn.pendingQtyLabel"
+        :group-key="$route.query.groupKey"
       />
 
       <template #button>
@@ -147,10 +218,10 @@
 
 <script>
 import {
-  getAsnSkuDetailBySkuCode,
   getInboundAsnByAsnNo,
   submitAsnAbnormalReceive,
-  submitAsnAdvanceReceiveForSku,
+  submitAsnAdvanceReceiveForSku, wmsMobileExtInGetAsnSkuGroupV3,
+  wmsMobileInboundNewReceiveLpn,
 } from '../../../../api/inbound/receive'
 import AsnInfo from '../../components/AsnInfo.vue'
 import AsnSkuInfo from '../../components/AsnSkuInfo.vue'
@@ -185,39 +256,61 @@ export default {
         '#': false,
       },
       showSubmit: false,
-      lotQuery: null,
+      lotList: null,
       submitQty: 0,
       lotData: null,
       showAbnormal: false,
 
       printPopupShow: false,
-      printData: {}
+      printData: {},
+
+      createLpn: '',
+      printLpnData: {}
     }
   },
   computed: {
-    tagsQty () {
+    tagsQty() {
       return this.tags.map(i => Number(i.confirmQty || 0)).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?.qtyInputType === 'ea'
     },
   },
   created () {
-    const { asnNo, skuCode } = this.$route.query
+    const {asnNo, skuCode} = this.$route.query
     if (!asnNo || !skuCode) {
       return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.gdurijqq', '错误的到货通知单或商品'))
     }
-    this.loadAsnAndSku(asnNo, skuCode)
+    this.loadAsnAndSku(asnNo)
+
+    this.checkPrint()
   },
   methods: {
-    loadAsnAndSku(asnNo) {
+    // 打印机校验
+    checkPrint(needCheck) {
+      if (this.printLpnData.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, first = true) {
       getInboundAsnByAsnNo(asnNo).then(data => {
         if (data) {
           this.asn = data
-          this.getNowSkuData()
+          this.getNowSkuData(first)
         } else {
           return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.guyyegea', '错误的到货通知单'))
         }
@@ -226,20 +319,24 @@ 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
 
-        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
         }
@@ -259,27 +356,34 @@ export default {
       }
 
       const qty = Number(scanData.qty || 0)
-      const tag = scanData.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.gwrovxal', '重复箱号'))
-        }
-        !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 = scanData.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.gwrovxal', '重复箱号'))
+          }
+          !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 = ''
     },
     async submit () {
-      this.submitQty = this.tagsQty
+      this.submitQty = this.isQtyReceive ? (this.$refs.getQty?.getQty() || 0) : this.tagsQty
       if (this.submitQty <= 0) {
         return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.mrvcqlef', '预收货数量必须大于0'))
       }
@@ -290,37 +394,66 @@ export default {
       if (!this.receiveLoc.value) {
         return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.imuomhqg', '预收货库位不能为空'))
       }
-      if ((this.asn.hideLpn && this.asn.requiredLpn) && !this.receiveLpn.value) {
+      if (!this.receiveLpn.value) {
         return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.sgyohshb', '预收货托盘不能为空'))
       }
       this.lotData = lotData.data
       this.showSubmit = true
     },
     doSubmit () {
+      const qty = this.submitQty
+      if (qty <= 0) {
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.mrvcqlef', '预收货数量必须大于0'))
+      }
+
+      const lpn = this.receiveLpn.value
+
       const data = {
         warehouseId: this.asn.warehouseId,
         asnId: this.asn.id,
         skuId: this.asnSku.sku.id,
         locationCode: this.receiveLoc.value,
-        lpn: this.receiveLpn.value,
-        qty: this.submitQty,
+        lpn,
+        qty,
+        boxList: this.tags.map(i => ({box: i.code, qty: i.confirmQty})),
         lotAttributes: this.lotData,
-        images: this.imgList.join('|')
+        images: this.imgList.join('|'),
+        taskId: this.$route.query.lwTaskId,
+        groupKey: this.$route.query.groupKey
       }
-      if (data.qty <= 0) {
-        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.mrvcqlef', '预收货数量必须大于0'))
+
+      // 判断当前输入托盘号是否是生成的
+      if (lpn === this.createLpn && this.checkPrint()) {
+        data.printDeviceId = this.printLpnData.printId
+        data.printTemplate = this.printLpnData.templateId
       }
-      data.boxList = this.tags.map(i => ({ box: i.code, qty: i.confirmQty }))
+
+
       submitAsnAdvanceReceiveForSku(data).then(this.afterSubmit)
     },
     afterSubmit (res) {
-      this.getNowSkuData(false)
       this.receiveLpn.value = ''
 
-      this.asn = res
+      this.loadAsnAndSku(this.asn.asnNo, false)
       this.tag = ''
-      this.tags = []
+      this.tags = [{
+        code: '#',
+        qty: 0,
+        confirmQty: 0,
+      }]
       this.showSubmit = false
+
+      // 打印托盘标签
+      if (res && this.checkPrint() && Array.isArray(res.printList)) {
+        res.printList.forEach(item => {
+          this.$lwPrint.bluetoothPrint(item.id)
+        })
+      }
+
+      this.$lwToast.success(
+        this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.mrvcqlefq', '操作成功')
+      )
+
     },
     showAbnormalPop () {
       const lotData = this.$refs.lotEl.getData()
@@ -342,20 +475,28 @@ export default {
       }).then(() => {
         this.showAbnormal = false
         this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.nctiovjq', '异常上报成功'))
-        getInboundAsnByAsnNo(this.asn.asnNo).then(res => this.asn = res)
+        this.loadAsnAndSku(this.asn.asnNo)
       })
     },
 
 
+    // 生成收货托盘
+    createLpnFn() {
+      wmsMobileInboundNewReceiveLpn().then(res => {
+        this.createLpn = res
+        this.receiveLpn.value = res
+      })
+    },
+
     // 补码按钮点击
-    printClick(){
-      if (!Object.keys(this.printData).length){
+    printClick() {
+      if (!Object.keys(this.printData).length) {
         const {success, printData} = this.$lwPrint.test(
           'INBOUND_SKU_PRINT_LABEL',
-          this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive-sku.LwInboundReceiveSkuAdvancePage.gwxxzyrs','入库商品标签')
+          this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive-sku.LwInboundReceiveSkuAdvancePage.gwxxzyrs', '入库商品标签')
         )
-        if(!success) return
         this.printData = printData
+        if (!success) return
       }
 
       this.printPopupShow = true
@@ -367,11 +508,6 @@ export default {
 
 <style lang="less" scoped>
 
-@import "../../../../../../assets/css/var.less";
-
-.abnormal-popup-bg {
-  background: @pageColor;
-}
 
 .tag-list {
   margin-top: 10px;