@logwire/logwire-wms-pda-ui 1.1.19 → 3.1.0

package/src/components/page/inbound/receive/receive-sku/LwInboundReceiveSkuDirectPage.vue

@@ -5,64 +5,72 @@
 -->
 <template>
   <div>
-    <lw-nav-bar title="收货"/>
+    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.vthvurhw', '收货')"/>
     <div v-if="asn" class="lw-global-page-box">
-      <div class="lw-global-model-box">
+      <div>
         <asn-info :data="asn" :radius="false"/>
-        <asn-sku-info :data="asnSku"/>
+        <asn-sku-info
+          :data="asnSku"
+          type="bottom"
+          show-print
+          @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"/>
       </div>
       <div v-if="asnSku && asnSku.sku.needSn">
         <div class="lw-global-model-box" style="margin-top: 10px;">
-          <lw-input title="序列号条码" required v-model="sn.value" :get-focus.sync="sn.focus"
-                    rule-key="sn" rule-value-key="sn" :rule-serve-query="barcodeQuery" @confirm="addSn"/>
+          <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"/>
         </div>
         <div class="lw-global-model-box tag-list">
           <div class="tag-list-title">
-            <div>当前扫描结果</div>
+            <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.rqlniedq', '当前扫描结果')}}</div>
             <div>SN <span>{{ sns.length }}</span></div>
             <div style="display: flex; justify-content: center;">
-              <div>数量 <span>{{ snsQty }}</span></div>
+              <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.nzrqhgpp', '数量')}}<span>{{ ' ' + snsQty }}</span></div>
               <div style="margin-left: 10px;">
-                <lw-button mini @click="showSns=true">全部</lw-button>
+                <lw-button mini @click="showSns=true">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.fpvapcbu', '全部')}}</lw-button>
               </div>
             </div>
           </div>
           <div class="tag-list-head">
             <div>SN</div>
-            <div>数量</div>
-            <div>操作</div>
+            <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.ynvvcidw', '数量')}}</div>
+            <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.kyafpgqz', '操作')}}</div>
           </div>
           <div class="tag-list-row" v-for="t in sns" :key="t.sn">
             <div>{{ t.sn }}</div>
             <div>{{ t.qty }}</div>
             <div>
-              <lw-button mini @click="removeSn(t)">剔除</lw-button>
+              <lw-button mini @click="removeSn(t)">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.upanrgfq', '剔除')}}</lw-button>
             </div>
           </div>
         </div>
       </div>
       <div v-else>
         <div class="lw-global-model-box" style="margin-top: 10px;">
-          <lw-input title="商品收货条码" required v-model="tag"
-                    rule-key="skuReceive" rule-value-key="skuCode" :rule-serve-query="barcodeQuery"
-                    @confirm="addTag"/>
+          <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.nqqatsxg', '商品收货条码')" required v-model="tag"
+                    rule-key="skuReceive" :rule-serve-query="barcodeQuery" @confirm="addTag"/>
         </div>
         <div class="lw-global-model-box tag-list">
           <div class="tag-list-title">
-            <div>当前扫描结果</div>
-            <div>标签 <span>{{ tags.length }}</span></div>
-            <div>数量 <span>{{ tagsQty }}</span></div>
+            <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.rtgvicxr', '当前扫描结果')}}</div>
+            <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.dvgxukiw', '标签 ')}}<span>{{ tags.length }}</span></div>
+            <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.jhdwriwc', '数量 ')}}<span>{{ tagsQty }}</span></div>
           </div>
           <div class="tag-list-head">
-            <div>标签/箱号</div>
-            <div>数量</div>
-            <div>确认数量</div>
+            <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.iityeemn', '标签/箱号')}}</div>
+            <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.mfhljspg', '数量')}}</div>
+            <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.ghqqzkeg', '确认数量')}}</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" placeholder="请扫描/输入序列号"/>
+              <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', '请确认数量')"/>
             </div>
           </div>
         </div>
@@ -71,54 +79,66 @@
         <lw-lot-module ref="lotEl" :query="lotQuery"/>
       </div>
       <div class="lw-global-model-box" style="margin-top: 10px;">
-        <lw-input title="收货库位" required v-model="receiveLoc.value" :get-focus.sync="receiveLoc.focus"/>
-        <lw-input title="收货托盘" required v-model="receiveLpn.value" :get-focus.sync="receiveLpn.focus"/>
+        <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"/>
+        <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.kjwvyrqq', '收货托盘')" required v-model="receiveLpn.value" :get-focus.sync="receiveLpn.focus"/>
       </div>
     </div>
     <lw-bottom-bar>
-      <lw-button type="danger" @click="showAbnormalPop">收货异常</lw-button>
-      <lw-button plain @click="$router.back()">重新扫描</lw-button>
-      <lw-button @click="submit">确认收货</lw-button>
+      <lw-button type="danger" @click="showAbnormalPop">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.bnoowiod', '收货异常')}}</lw-button>
+      <lw-button plain @click="$router.back()">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.cqqdewnc', '重新扫描')}}</lw-button>
+      <lw-button @click="submit">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.jholvdiu', '确认收货')}}</lw-button>
     </lw-bottom-bar>
 
-    <van-dialog v-model="showSns" title="当前扫描的SN列表">
+    <van-dialog v-model="showSns" :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.locnnmlk', '当前扫描的SN列表')">
       <div class="lw-global-page-box">
         <div class="lw-global-model-box">
           <sns-list :sns="sns" @remove="removeSn"/>
         </div>
       </div>
     </van-dialog>
-    <van-dialog v-model="showSubmit" :show-confirm-button="false" title="确认收货">
-      <div class="lw-global-page-box">
-        <div class="lw-global-model-box">
-          <asn-sku-info :data="asnSku"/>
-          <div class="lw-global-sh"></div>
-          <div>
-            <lw-input title="收货量" required v-model="submitQty"/>
-          </div>
-          <div style="margin-top: 10px; display: flex; justify-content: center;">
-            <lw-button plain @click="showSubmit = false">取消</lw-button>
-            <lw-button @click="doSubmit">确认收货</lw-button>
-          </div>
-        </div>
+    <lw-popup v-model="showSubmit" :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.qqxkfpov', '确认收货')" :show-off-btn="false">
+      <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.tpanqila', '收货量')" :disabled="asnSku && asnSku.sku.needSn" required v-model="submitQty"/>
       </div>
-    </van-dialog>
+      <template #button>
+        <lw-button plain @click="showSubmit = false">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.jlmkllmv', '取消')}}</lw-button>
+        <lw-button @click="doSubmit">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.vtamdwrt', '确认收货')}}</lw-button>
+      </template>
+    </lw-popup>
     <!-- 异常弹框 -->
     <lw-popup
-        title="收货异常"
+        :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.tifrlevk', '收货异常')"
+        class="abnormal-popup-bg"
         v-model="showAbnormal">
-      <lw-inner-abnormal-module
-          v-if="showAbnormal"
-          ref="abnormal"
-          :sku-code="asnSku.sku.code"
-          :sku-name="asnSku.sku.name"
-          :qty="asn.pendingQty"
-          type="收货"
-          ab-type="商品收货"/>
+
+      <lw-receive-abnormal-module
+        v-if="showAbnormal"
+        ref="abnormal"
+        :multiple="false"
+        :sku-disabled="true"
+        :show-bottom-bar="false"
+        :asn-no="asn.asnNo"
+        :sku-code="asnSku.sku.code"
+        :qty="asn.pendingQty"
+      />
+
       <template #button>
-        <lw-button @click="submitAbnormal">上报异常</lw-button>
+        <lw-button @click="submitAbnormal">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.leohtzpw', '上报异常')}}</lw-button>
       </template>
     </lw-popup>
+
+
+    <!-- 补码弹框 -->
+    <print-label-popup
+      v-if="asn && asnSku"
+      v-model="printPopupShow"
+      :asn-id="asn.id"
+      :sku-id="asnSku.sku.id"
+      :print-data="printData"
+    />
+
   </div>
 </template>
 
@@ -130,13 +150,16 @@ import {
   submitAsnFastReceiveForSku,
   submitAsnFastReceiveForSkuSn
 } from '../../../../../api/inbound/receive'
-import AsnInfo from '../../components/AsnInfo'
-import AsnSkuInfo from '../../components/AsnSkuInfo'
-import SnsList from '../../components/SnsList'
+import AsnInfo from '../../components/AsnInfo.vue'
+import AsnSkuInfo from '../../components/AsnSkuInfo.vue'
+import SnsList from '../../components/SnsList.vue'
+import QualityCard from '../../components/QualityCard.vue'
+import {scanUtils} from '../../util/InboundUtils'
+import printLabelPopup from "../../components/printLabelPopup.vue";
 
 export default {
   name: 'LwInboundReceiveSkuDirectPage',
-  components: { SnsList, AsnSkuInfo, AsnInfo },
+  components: { SnsList, AsnSkuInfo, AsnInfo,QualityCard, printLabelPopup },
   data () {
     return {
       asn: null,
@@ -147,6 +170,9 @@ export default {
         qty: 0,
         confirmQty: 0,
       }],
+      tagFocus: {
+        '#': false,
+      },
       sn: {
         value: '',
         focus: false,
@@ -166,6 +192,9 @@ export default {
       submitQty: 0,
       lotData: null,
       showAbnormal: false,
+
+      printPopupShow:false,
+      printData:{}
     }
   },
   computed: {
@@ -185,7 +214,7 @@ export default {
   created () {
     const { asnNo, skuCode } = this.$route.query
     if (!asnNo || !skuCode) {
-      return this.$lwShowErrorMsg('错误的到货通知单或商品')
+      return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.uecsvjpd', '错误的到货通知单或商品'))
     }
     this.loadAsnAndSku(asnNo, skuCode)
   },
@@ -205,29 +234,35 @@ export default {
               header: this.asn.map,
               line: this.asnSku.map,
             }
+            if(!this.receiveLoc.value){
+              this.receiveLoc.value = res.receiveLocationCode
+            }
           })
         } else {
-          return this.$lwShowErrorMsg('错误的到货通知单')
+          return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.nhqwabhf', '错误的到货通知单'))
         }
       })
     },
     addTag (sku, res) {
-      if (!res.data.skuCode) {
-        return this.$lwShowErrorMsg('错误的商品预收货条码')
+      const skuCode = res.bizType === 'SKU' ? res.data.key : sku
+      if (!skuCode) {
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.edvsrebn', '错误的商品预收货条码'))
       }
-      if (res.data.skuCode !== this.asnSku.sku.code) {
-        return this.$lwShowErrorMsg('错误的商品')
+      if (skuCode !== this.asnSku.sku.code) {
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.wlxehqom', '错误的商品'))
       }
-      const qty = parseInt(res.data.qty) || 0
-      const tag = res.data.tag || '#'
+      const qty = res.data && parseInt(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('重复箱号')
+          return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.qadqqgzv', '重复箱号'))
         }
-        otag.qty = otag.qty + qty
-        otag.confirmQty = otag.confirmQty + qty
+        this.tagFocus[tag] = true
+        otag.qty = (parseInt(otag.qty ) || 0) + qty
+        otag.confirmQty = (parseInt(otag.confirmQty ) || 0) + qty
       } else {
+        this.tagFocus[tag] = true
         this.tags.unshift({
           code: tag,
           qty,
@@ -237,20 +272,24 @@ export default {
       this.tag = ''
     },
     addSn (sn, res) {
-      if (!res.data.sn) {
+      const scanData = scanUtils.getScanSnData(sn, res)
+      if(!scanData.success){
         this.sn.focus = true
-        return this.$lwShowErrorMsg('错误的商品条码序列号')
+        return
       }
-      const osn = this.sns.find(i => i.sn === res.data.sn)
+
+      const osn = this.sns.find(i => i.sn === scanData.sn)
       if (osn) {
         this.sn.focus = true
-        return this.$lwShowErrorMsg('重复的序列号')
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.lxcdmkkd', '重复的序列号'))
       }
-      if (res.data.skuCode && res.data.skuCode !== this.asnSku.sku.code) {
+
+      if (scanData.skuCode && scanData.skuCode !== this.asnSku.sku.code) {
         this.sn.focus = true
-        return this.$lwShowErrorMsg('序列号商品编码不符')
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.sku.no.same', '商品编码：{sku} 与当前商品：{currentSku} 不符',{sku:scanData.skuCode,currentSku:this.asnSku.sku.code}))
       }
-      getAsnSkuSnDetail(this.asn.id, this.asnSku.sku.id, res.data.sn).then(data => {
+      const qty = scanData.qty || 1
+      getAsnSkuSnDetail(this.asn.id, this.asnSku.sku.id, scanData.sn, qty).then(data => {
         if (data && data.sn) {
           this.sns.unshift({
             sn: data.sn,
@@ -258,7 +297,7 @@ export default {
           })
           this.sn.value = ''
         } else {
-          return this.$lwShowErrorMsg('错误的序列号')
+          return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.zschuybj', '错误的序列号'))
         }
       })
     },
@@ -271,17 +310,17 @@ export default {
     async submit () {
       this.submitQty = this.asnSku.sku.needSn ? this.snsQty : this.tagsQty
       if (this.submitQty <= 0) {
-        return this.$lwShowErrorMsg('收货数量必须大于0')
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.utgdeatd', '收货数量必须大于0'))
       }
       const lotData = await this.$refs.lotEl.getData()
       if (!lotData.success) {
         return
       }
       if (!this.receiveLoc.value) {
-        return this.$lwShowErrorMsg('收货库位不能为空')
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.bhtjbfci', '收货库位不能为空'))
       }
       if (!this.receiveLpn.value) {
-        return this.$lwShowErrorMsg('收货托盘不能为空')
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.sdjhrqte', '收货托盘不能为空'))
       }
       this.lotData = lotData.data
       this.showSubmit = true
@@ -297,7 +336,7 @@ export default {
         lotAttributes: this.lotData,
       }
       if (data.qty <= 0) {
-        return this.$lwShowErrorMsg('收货数量必须大于0')
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.utgdeatd', '收货数量必须大于0'))
       }
       if (this.asnSku.sku.needSn) {
         data.snList = this.sns
@@ -308,6 +347,8 @@ export default {
       }
     },
     afterSubmit (res) {
+      this.receiveLpn.value = ''
+
       this.asn = res.asn
       this.sn.value = ''
       this.tag = ''
@@ -322,7 +363,7 @@ export default {
       }
     },
     submitAbnormal () {
-      const {success, data} = this.$refs.abnormal.getAbnormalData()
+      const {success, data} = this.$refs.abnormal.getAllAbnormalData()
       if (!success) return
 
       const lotData = this.$refs.lotEl.getData()
@@ -331,28 +372,46 @@ export default {
       }
 
       submitAsnAbnormalReceive({
-        order: {},
-        ownerId: this.asn.ownerId,
-        warehouseId: this.asn.warehouseId,
         asnId: this.asn.id,
-        lines: [{
-          skuId: this.asnSku.sku.id,
-          lotAttributes: lotData.data,
-          ...data,
-        }],
+        ownerId: this.asn.ownerId,
         abnType: data.abnType,
         abnSubType: data.abnSubType,
+        order: data.order,
+        lines: data.lines,
       }).then(() => {
         this.showAbnormal = false
-        this.$lwToast.success('异常上报成功')
+        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)
       })
+    },
+
+
+    // 补码按钮点击
+    printClick(){
+      if (!Object.keys(this.printData).length){
+        const {success, printData} = this.$lwPrint.test(
+          'INBOUND_SKU_PRINT_LABEL',
+          this.$lwLanguage.get('','入库商品标签')
+        )
+        if(!success) return
+        this.printData = printData
+      }
+
+      this.printPopupShow = true
+
     }
   },
 }
 </script>
 
 <style lang="less" scoped>
+
+@import "../../../../../assets/css/var.less";
+
+.abnormal-popup-bg {
+  background: @pageColor;
+}
+
 .tag-list {
   margin-top: 10px;
 
@@ -381,7 +440,7 @@ export default {
   }
 
   &-title {
-    background: #0f90dd;
+    background: #f45858;
     color: white;
     margin: -10px -10px 0;
     padding: 8px;
@@ -405,4 +464,4 @@ export default {
     border-top: 1px solid lightgray;
   }
 }
-</style>
+</style>

package/src/components/page/inbound/receive/receive-sku/LwInboundReceiveSkuScanPage.vue

@@ -5,21 +5,22 @@
 -->
 <template>
   <div>
-    <lw-nav-bar title="按商品收货"/>
+    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.dkcbaaoi', '按商品收货')"/>
     <div v-if="asn">
       <div class="lw-global-page-box">
-        <div class="lw-global-model-box">
+        <div>
           <asn-info :data="asn"/>
         </div>
       </div>
       <div class="lw-global-page-box">
         <div class="lw-global-model-box">
-          <lw-input title="商品收货条码" required v-model="receiveCode.barcode" :get-focus.sync="receiveCode.focus"
-                    placeholder="商品编码、条码、看板、唯一码等"
+          <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.rhrnrwas', '商品收货条码')" required v-model="receiveCode.barcode" :get-focus.sync="receiveCode.focus"
+                    rule-key="skuReceive" :rule-serve-query="barcodeQuery"
+                    :placeholder="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.kkeynasp', '商品编码、条码、看板、唯一码等')"
                     @confirm="resolveReceiveBarcode"/>
-          <lw-input v-if="needSku" title="收货条码" required v-model="skuCode.barcode" :get-focus.sync="skuCode.focus"
-                    placeholder="商品编码、条码"
-                    @confirm="resolveSkuBarcode"/>
+          <lw-input v-if="needSku" :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.tgssdzcn', '收货条码')" required v-model="skuCode.barcode" :get-focus.sync="skuCode.focus"
+                    rule-key="sku" :rule-serve-query="barcodeQuery" @confirm="resolveSkuBarcode"
+                    :placeholder="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.sjayzqlp', '商品编码、条码')"/>
         </div>
       </div>
     </div>
@@ -35,13 +36,16 @@ import {
   getAsnSkuDetailBySn,
   getInboundAsnByAsnNo
 } from '../../../../../api/inbound/receive'
-import AsnInfo from '../../components/AsnInfo'
+import AsnInfo from '../../components/AsnInfo.vue'
+import {scanUtils} from '../../util/InboundUtils'
 
 export default {
   name: 'LwInboundReceiveSkuScanPage',
   components: { AsnInfo },
   data () {
     return {
+      // 返回步数
+      backStep: -1,
       asn: null,
       receiveCode: {
         componentId: 'WMS_INBOUND_RECEIVE_SKU',
@@ -58,12 +62,24 @@ export default {
       needSku: false,
       asnSku: null,
       sn: '',
+      showQualityCard: false,
+    }
+  },
+  computed: {
+    barcodeQuery () {
+      if (this.asn) {
+        return {
+          ownerId: this.asn.ownerId,
+          warehouseId: this.asn.warehouseId,
+        }
+      }
+      return {}
     }
   },
   created () {
     const asnNo = this.$route.query.asnNo
     if (!asnNo) {
-      return this.$lwShowErrorMsg('未指定到货通知单号')
+      return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.wpqgyhuy', '未指定到货通知单号'))
     }
     this.getAsnByAsnNo(asnNo)
   },
@@ -76,58 +92,54 @@ export default {
           this.skuCode.ownerId = data.ownerId
           return
         }
-        this.$lwShowErrorMsg('错误的到货通知单号')
+        this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.gfzftmin', '错误的到货通知单号'))
       })
     },
-    resolveReceiveBarcode () {
+    resolveReceiveBarcode (value, res) {
       this.needSku = false
       this.sn = ''
-      this.$lwApi.barcode.resolver(this.receiveCode).then(res => {
-        if (!res.data || !res.type) {
-          return this.$lwShowErrorMsg('错误的商品收货条码')
-        }
-        if (res.data.sku) {
-          getAsnSkuDetailBySkuCode(this.asn.id, res.data.sku).then(data => {
-            if (data && data.sku && data.sku.id) {
-              this.asnSku = data
-              this.toReceive()
-            } else {
-              return this.$lwShowErrorMsg('错误的商品收货条码')
-            }
-          })
-          return
-        }
-        if (res.type === 'SN' && res.data.sn) {
-          this.sn = res.data.sn
-          getAsnSkuDetailBySn(this.asn.id, res.data.sn).then(data => {
-            if (data && data.sku && data.sku.id) {
-              this.asnSku = data
-              this.toReceive()
-            } else {
-              this.needSku = true
-              this.skuCode.focus = true
-            }
-          })
-        }
-        this.$lwShowErrorMsg('错误的商品收货条码')
-      })
+
+      const skuCode = res.bizType === 'SKU' ? res.data.key : value;
+      if (skuCode) {
+        getAsnSkuDetailBySkuCode(this.asn.id, skuCode).then(data => {
+          if (data && data.sku && data.sku.id) {
+            this.asnSku = data
+            this.toReceive()
+          } else {
+            return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.qdhcqqtw', '错误的商品收货条码'))
+          }
+        })
+        return
+      }
+      if (res.bizType === 'SN' && res.data.sn) {
+        this.sn = res.data.sn
+        getAsnSkuDetailBySn(this.asn.id, res.data.sn).then(data => {
+          if (data && data.sku && data.sku.id) {
+            this.asnSku = data
+            this.toReceive()
+          } else {
+            this.needSku = true
+            this.skuCode.focus = true
+          }
+        })
+      }
     },
-    resolveSkuBarcode () {
-      this.$lwApi.barcode.resolver(this.skuCode).then(res => {
-        if (res.data && res.data.sku) {
-          getAsnSkuDetailBySkuCode(this.asn.id, res.data.sku).then(data => {
-            if (data && data.sku && data.sku.id) {
-              this.asnSku = data
-              this.toReceive()
-            } else {
-              this.$lwShowErrorMsg('错误的商品条码')
-            }
-          })
+    resolveSkuBarcode (sku, res) {
+      const scanData = scanUtils.getScanSkuCodeData(sku, res)
+      if(!scanData.success){
+        return
+      }
+
+      getAsnSkuDetailBySkuCode(this.asn.id, scanData.skuCode).then(data => {
+        if (data && data.sku && data.sku.id) {
+          this.asnSku = data
           this.toReceive()
-          return
+        } else {
+          this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.ubnjrpvb', '错误的商品条码'))
         }
-        this.$lwShowErrorMsg('错误的商品条码')
       })
+      this.toReceive()
+      return
     },
     toReceive () {
       if (this.asnSku) {
@@ -147,4 +159,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>