@logwire/logwire-wms-pda-ui 1.1.17 → 1.2.0

package/src/components/page/inbound/receive/receive-random/LwInboundReceiveRandomSkuSnExecutePage.vue

@@ -0,0 +1,340 @@
+<!--
+  商品唯一码 无单收货
+  @author Jimmy
+-->
+<template>
+  <div>
+    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.mowpdtmf', '收货')"/>
+    <div v-if="receiveSku" class="lw-global-page-box">
+      <div class="lw-global-model-box">
+        <sku-receive-info :sku="receiveSku"/>
+      </div>
+      <div v-if="receiveSku">
+        <div class="lw-global-model-box" style="margin-top: 10px;">
+          <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.fpgtvhxq', '序列号条码')"
+                    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>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.zlxxrqzk', '当前扫描结果')}}</div>
+            <div>SN <span>{{ sns.length }}</span></div>
+            <div style="display: flex; justify-content: center;">
+              <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.dwdttkdo', '数量')}}<span>{{ ' ' + snsQty }}</span></div>
+              <div style="margin-left: 10px;">
+                <lw-button mini plain @click="showSns=true">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.ebwvtqxh', '全部')}}</lw-button>
+              </div>
+            </div>
+          </div>
+          <div class="tag-list-head">
+            <div>SN</div>
+            <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.ejascgbh', '数量')}}</div>
+            <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.jvigqpgf', '操作')}}</div>
+          </div>
+          <div class="tag-list-row" v-for="t in snsShow" :key="t.sn">
+            <div>{{ t.sn }}</div>
+            <div>{{ t.qty }}</div>
+            <div>
+              <lw-button mini @click="removeSn(t)">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.bwngrvjz', '剔除')}}</lw-button>
+            </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>
+      <div class="lw-global-model-box" style="margin-top: 10px;">
+        <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.ysrashvb', '收货库位')" required v-model="receiveLoc.value" :get-focus.sync="receiveLoc.focus"/>
+        <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.trxpixqq', '收货托盘')" required v-model="receiveLpn.value" :get-focus.sync="receiveLpn.focus"/>
+      </div>
+    </div>
+    <lw-bottom-bar>
+      <lw-button type="danger" @click="showAbnormalPop">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.pvrrhtjo', '收货异常')}}</lw-button>
+      <lw-button plain @click="$router.back()">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.zxsfuwgz', '重新扫描')}}</lw-button>
+      <lw-button @click="submit">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.ggcoyvgc', '确认收货')}}</lw-button>
+    </lw-bottom-bar>
+
+    <van-dialog v-model="showSns" :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.kgiquqaw', '当前扫描的SN列表')">
+      <div class="lw-global-page-box">
+        <div class="lw-global-model-box">
+          <sns-list :sns="sns" @remove="removeSn"/>
+        </div>
+      </div>
+    </van-dialog>
+    <lw-popup v-model="showSubmit" :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.cjfsamuo', '确认收货')" :show-off-btn="false">
+      <sku-receive-info :sku="receiveSku"/>
+      <div class="lw-global-sh"></div>
+      <div>
+        <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.lxrjtjpp', '收货量')" required v-model="submitQty" :readonly="true"/>
+      </div>
+      <template #button>
+        <lw-button plain @click="showSubmit = false">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.ueuqflsx', '取消')}}</lw-button>
+        <lw-button @click="doSubmit">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.cqsfqooe', '确认收货')}}</lw-button>
+      </template>
+    </lw-popup>
+    <!-- 异常弹框 -->
+    <lw-popup
+        :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.hmoekdrn', '收货异常')"
+        class="abnormal-popup-bg"
+        v-model="showAbnormal">
+
+      <lw-receive-abnormal-module
+        v-if="showAbnormal"
+        ref="abnormal"
+        :multiple="false"
+        :sku-disabled="true"
+        :show-bottom-bar="false"
+        :original-lpn="false"
+        :original-case-num="false"
+        :owner-id="receiveSku.ownerId"
+        :sku-code="receiveSku.code"
+      />
+
+      <template #button>
+        <lw-button @click="submitAbnormal">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.ienfcowc', '上报异常')}}</lw-button>
+      </template>
+    </lw-popup>
+  </div>
+</template>
+
+<script>
+import {
+  getInboundSkuReceive,
+  submitInboundReceiveForSkuSn,
+  submitAsnAbnormalReceive
+} from '../../../../../api/inbound/receive'
+import SkuReceiveInfo from '../../components/SkuReceiveInfo.vue'
+import SnsList from '../../components/SnsList.vue'
+import {scanUtils} from '../../util/InboundUtils'
+
+export default {
+  name: 'LwInboundReceiveRandomSkuSnExecutePage',
+  components: { SnsList, SkuReceiveInfo },
+  data () {
+    return {
+      receiveSku: null,
+      sn: {
+        value: '',
+        focus: false,
+      },
+      receiveLoc: {
+        value: '',
+        focus: false,
+      },
+      receiveLpn: {
+        value: '',
+        focus: false,
+      },
+      sns: [],
+      showSns: false,
+      showSubmit: false,
+      lotQuery: null,
+      submitQty: 0,
+      lotData: null,
+      showAbnormal: false,
+    }
+  },
+  computed: {
+    snsQty () {
+      return this.sns.map(i => parseInt(i.qty)).reduce((a, b) => a + b, 0)
+    },
+    snsShow() {
+      if (this.sns && this.sns.length > 3) {
+        return this.sns.slice(0, 3)
+      } else {
+        return this.sns ? this.sns : []
+      }
+    },
+    barcodeQuery () {
+      if (this.receiveSku) {
+        return {
+          ownerId: this.receiveSku.ownerId,
+        }
+      }
+      return {}
+    },
+  },
+  created () {
+    const {skuId} = this.$route.query
+    if (!skuId) {
+      return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.dxycpakk', '错误的商品ID'))
+    }
+    this.loadSkuReceive(skuId)
+  },
+  methods: {
+    initLot(){
+      this.lotQuery = {
+        ownerId: this.receiveSku.ownerId,
+        skuId: this.receiveSku.id,
+        type: 1,
+        lotType: 'inventory',
+        header: {},
+        line: {},
+      }
+    },
+    loadSkuReceive(skuId) {
+      getInboundSkuReceive(skuId).then(res => {
+        if (res) {
+          this.receiveSku = res
+          this.initLot()
+        } else {
+          return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.dxycpakk', '错误的商品ID'))
+        }
+      })
+    },
+    addSn (sn, res) {
+      const scanData = scanUtils.getScanSnData(sn, res)
+      if(!scanData.success){
+        return
+      }
+
+      const osn = this.sns.find(i => i.sn === scanData.sn)
+      if (osn) {
+        this.sn.focus = true
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.etqjwlfm', '重复的序列号'))
+      }
+      if (scanData.skuCode && scanData.skuCode !== this.receiveSku.code) {
+        this.sn.focus = true
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.sku.no.same', '商品编码：{sku} 与当前商品：{currentSku} 不符',{sku:scanData.skuCode,currentSku:this.receiveSku.code}))
+      }
+
+      this.sns.unshift({
+        sn: scanData.sn,
+        qty: scanData.qty || 1
+      })
+      this.sn.value = ''
+    },
+    removeSn (sn) {
+      const idx = this.sns.indexOf(sn)
+      if (idx > -1) {
+        this.sns.splice(idx, 1)
+      }
+    },
+    async submit () {
+      this.submitQty = this.snsQty
+      if (this.submitQty <= 0) {
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.junsznsk', '收货数量必须大于0'))
+      }
+      const lotData = await this.$refs.lotEl.getData()
+      if (!lotData.success) {
+        return
+      }
+      if (!this.receiveLoc.value) {
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.ecpvlksz', '收货库位不能为空'))
+      }
+      if (!this.receiveLpn.value) {
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.ivpcvnku', '收货托盘不能为空'))
+      }
+      this.lotData = lotData.data
+      this.showSubmit = true
+    },
+    doSubmit () {
+      const data = {
+        skuId: this.receiveSku.id,
+        locationCode: this.receiveLoc.value,
+        lpn: this.receiveLpn.value,
+        qty: this.submitQty,
+        lotAttributes: this.lotData,
+      }
+      if (data.qty <= 0) {
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.junsznsk', '收货数量必须大于0'))
+      }
+      data.snList = this.sns
+      submitInboundReceiveForSkuSn(data).then(()=>{
+        this.showSubmit = false
+        this.sns = []
+        this.sn.value = ''
+        this.receiveLoc.value = null
+        this.receiveLpn.value = null
+        this.sn.value = null
+        this.sn.focus = true
+      })
+    },
+    showAbnormalPop () {
+      const lotData = this.$refs.lotEl.getData()
+      if (lotData.success) {
+        this.showAbnormal = true
+      }
+    },
+    submitAbnormal () {
+      const {success, data} = this.$refs.abnormal.getAllAbnormalData()
+      if (!success) return
+
+      submitAsnAbnormalReceive({
+        order: data.order,
+        ownerId: this.receiveSku.ownerId,
+        lines: data.lines,
+        abnType: data.abnType,
+        abnSubType: data.abnSubType,
+      }).then(() => {
+        this.showAbnormal = false
+        this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.yslvvozl', '异常上报成功'))
+      })
+    }
+  },
+}
+</script>
+
+<style lang="less" scoped>
+
+@import "../../../../../assets/css/var.less";
+
+.abnormal-popup-bg {
+  background: @pageColor;
+}
+
+.tag-list {
+  margin-top: 10px;
+
+  &.dialog {
+    max-height: 50vh;
+    overflow-y: auto;
+  }
+
+  & > div {
+    display: flex;
+    align-items: center;
+
+    & > div:first-child {
+      flex-basis: 40%;
+    }
+
+    & > div:nth-child(2) {
+      flex-basis: 20%;
+      text-align: center;
+    }
+
+    & > div:last-child {
+      flex-basis: 40%;
+      text-align: center;
+    }
+  }
+
+  &-title {
+    background: #f45858;
+    color: white;
+    margin: -10px -10px 0;
+    padding: 8px;
+    border-radius: 8px 8px 0 0;
+
+    span {
+      color: yellow;
+      font-weight: bold;
+    }
+  }
+
+  &-head {
+    font-size: 0.9em;
+    color: gray;
+    padding: 5px 0;
+  }
+
+  &-row {
+    font-size: 0.9em;
+    height: 36px;
+    border-top: 1px solid lightgray;
+  }
+}
+</style>

package/src/components/page/inbound/receive/receive-random/index.js

@@ -0,0 +1,19 @@
+import LwInboundReceiveRandomSkuScanPage from './LwInboundReceiveRandomSkuScanPage.vue'
+import LwInboundReceiveRandomSkuExecutePage from './LwInboundReceiveRandomSkuExecutePage.vue'
+import LwInboundReceiveRandomSkuSnExecutePage from './LwInboundReceiveRandomSkuSnExecutePage.vue'
+
+const pages = [
+  LwInboundReceiveRandomSkuScanPage,
+  LwInboundReceiveRandomSkuExecutePage,
+  LwInboundReceiveRandomSkuSnExecutePage,
+]
+
+pages.forEach(page => page.install = Vue => Vue.component(page.name, page))
+
+export {
+  LwInboundReceiveRandomSkuScanPage,
+  LwInboundReceiveRandomSkuExecutePage,
+  LwInboundReceiveRandomSkuSnExecutePage,
+}
+
+export default pages

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

@@ -5,34 +5,33 @@
 -->
 <template>
   <div>
-    <lw-nav-bar title="预收货"/>
+    <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 class="lw-global-model-box">
+      <div>
         <asn-info :data="asn" :radius="false"/>
-        <asn-sku-info :data="asnSku"/>
+        <asn-sku-info :data="asnSku" type="bottom"/>
       </div>
       <div v-if="asnSku">
         <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.jvafkkwd', '商品收货条码')" 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.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>标签/箱号</div>
-            <div>数量</div>
-            <div>确认数量</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" 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>
@@ -41,45 +40,46 @@
         <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.kgtsbmse', '预收货库位')" required v-model="receiveLoc.value" :get-focus.sync="receiveLoc.focus"/>
+        <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.vmjriwdi', '预收货托盘')" 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.ptmjbyqv', '预收货异常')}}</lw-button>
+      <lw-button plain @click="$router.back()">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.eaquajkr', '重新扫描')}}</lw-button>
+      <lw-button @click="submit">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.goqvmney', '确认预收货')}}</lw-button>
     </lw-bottom-bar>
 
-    <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.cpnbhylh', '确认预收货')" :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.uovywpbr', '预收货量')" 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.chduapke', '取消')}}</lw-button>
+        <lw-button @click="doSubmit">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.msnqlizb', '确认预收货')}}</lw-button>
+      </template>
+    </lw-popup>
     <!-- 异常弹框 -->
     <lw-popup
-        title="收货异常"
+        :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.mpltjybz', '收货异常')"
+        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.ebpsoool', '上报异常')}}</lw-button>
       </template>
     </lw-popup>
   </div>
@@ -92,8 +92,9 @@ import {
   submitAsnAbnormalReceive,
   submitAsnAdvanceReceiveForSku,
 } from '../../../../../api/inbound/receive'
-import AsnInfo from '../../components/AsnInfo'
-import AsnSkuInfo from '../../components/AsnSkuInfo'
+import AsnInfo from '../../components/AsnInfo.vue'
+import AsnSkuInfo from '../../components/AsnSkuInfo.vue'
+import {scanUtils} from '../../util/InboundUtils'
 
 export default {
   name: 'LwInboundReceiveSkuAdvancePage',
@@ -116,6 +117,9 @@ export default {
         value: '',
         focus: false,
       },
+      tagFocus: {
+        '#': false,
+      },
       showSubmit: false,
       lotQuery: null,
       submitQty: 0,
@@ -137,7 +141,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.gdurijqq', '错误的到货通知单或商品'))
     }
     this.loadAsnAndSku(asnNo, skuCode)
   },
@@ -157,29 +161,37 @@ 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.guyyegea', '错误的到货通知单'))
         }
       })
     },
     addTag (sku, res) {
-      if (!res.data.skuCode) {
-        return this.$lwShowErrorMsg('错误的商品预收货条码')
+      const scanData = scanUtils.getScanSkuCodeData(sku, res)
+      if(!scanData.success){
+        return
       }
-      if (res.data.skuCode !== this.asnSku.sku.code) {
-        return this.$lwShowErrorMsg('错误的商品')
+
+      if (scanData.skuCode !== this.asnSku.sku.code) {
+        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}))
       }
-      const qty = parseInt(res.data.qty) || 0
-      const tag = res.data.tag || '#'
+
+      const qty = parseInt(scanData.qty) || 0
+      const tag = scanData.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.gwrovxal', '重复箱号'))
         }
+        this.tagFocus[tag] = true
         otag.qty = otag.qty + qty
         otag.confirmQty = otag.confirmQty + qty
       } else {
+        this.tagFocus[tag] = true
         this.tags.unshift({
           code: tag,
           qty,
@@ -189,19 +201,19 @@ export default {
       this.tag = ''
     },
     async submit () {
-      this.submitQty = this.asnSku.sku.needSn ? this.snsQty : this.tagsQty
+      this.submitQty = 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.mrvcqlef', '预收货数量必须大于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.imuomhqg', '预收货库位不能为空'))
       }
       if (!this.receiveLpn.value) {
-        return this.$lwShowErrorMsg('预收货托盘不能为空')
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.sgyohshb', '预收货托盘不能为空'))
       }
       this.lotData = lotData.data
       this.showSubmit = true
@@ -217,7 +229,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.mrvcqlef', '预收货数量必须大于0'))
       }
       data.boxList = this.tags.map(i => ({ box: i.code, qty: i.confirmQty }))
       submitAsnAdvanceReceiveForSku(data).then(this.afterSubmit)
@@ -235,37 +247,34 @@ 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()
-      if (!lotData.success) {
-        return
-      }
-
       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.nctiovjq', '异常上报成功'))
         getInboundAsnByAsnNo(this.asn.asnNo).then(res => this.asn = res)
       })
-    }
+    },
   },
 }
 </script>
 
 <style lang="less" scoped>
+
+@import "../../../../../assets/css/var.less";
+
+.abnormal-popup-bg {
+  background: @pageColor;
+}
+
 .tag-list {
   margin-top: 10px;
 
@@ -294,7 +303,7 @@ export default {
   }
 
   &-title {
-    background: #0f90dd;
+    background: #f45858;
     color: white;
     margin: -10px -10px 0;
     padding: 8px;
@@ -318,4 +327,4 @@ export default {
     border-top: 1px solid lightgray;
   }
 }
-</style>
+</style>