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

package/src/views/wms/{page/outbound/pickConsole/components → components/consoleAndPick}/waitOverTitle.vue

@@ -8,7 +8,7 @@
 
     <div class="lw-global-flex-between">
 
-      <div v-if="pickType==='300'">
+      <div v-if="isEa">
         <div class="lw-global-value-bold">{{ skuCode }}</div>
         <div class="lw-global-title">{{ skuName }}</div>
       </div>
@@ -33,14 +33,14 @@
     <div class="lw-global-flex-between">
 
       <lw-title-value-cell
-        :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.components.waitOverTitle.puhvorbf','拣选库位')"
+        :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.waitOverTitle.olanyznb','拣选库位')"
         :value="loc"
         val-bold
         :is-row="false"
       />
 
       <lw-title-value-cell
-        :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.components.waitOverTitle.xeilshxl','数量')"
+        :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.waitOverTitle.jjdfzkdt','数量')"
         :value="qty"
         val-bold
         val-red
@@ -55,7 +55,7 @@
     >
 
       <lw-title-value-cell
-        :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.components.waitOverTitle.sfoneehf','拣货人')"
+        :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.waitOverTitle.iiiduyxb','拣货人')"
         :value="name"
         val-bold
         :is-row="false"
@@ -76,7 +76,7 @@
         mini
         @click.stop="$emit('back')"
       >
-        {{ $lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.components.waitOverTitle.apuomrjb','撤销') }}
+        {{ $lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.waitOverTitle.ktlmiihx','撤销') }}
       </lw-button>
     </div>
   </div>
@@ -97,18 +97,22 @@ export default {
     lpnOrCase: [String, Number],
     type: String,
     showBack: Boolean,
+    isEa: {
+      type: Boolean,
+      default: false
+    },
   },
   computed: {
     tagMsg() {
       switch (this.pickType) {
-        case '100':
-          return this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.components.waitOverTitle.arxgsmhc','整托')
-        case '200':
-          return this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.components.waitOverTitle.xvxqdyiv','整箱')
+        case 'LPN':
+          return this.$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.waitOverTitle.joyfrwtt', '整托')
+        case 'CASE':
+          return this.$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.waitOverTitle.ukupgypl', '整箱')
         default:
-          return this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.components.waitOverTitle.qvwdnmad','零散')
+          return this.$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.waitOverTitle.nyewoyxr', '零散')
       }
-    }
+    },
   },
   data() {
     return {}

package/src/views/wms/menu.js

@@ -43,6 +43,7 @@ import outboundImg from './../../assets/img/menu/outbound.png'
 import pickImg from './../../assets/img/menu/pick.png'
 import pickMergeImg from './../../assets/img/menu/pickMerge.png'
 import sowImg from './../../assets/img/menu/sow.png'
+import sort from './../../assets/img/menu/sort.png'
 import baleImg from './../../assets/img/menu/bale.png'
 import aloneBaleImg from './../../assets/img/menu/aloneBale.png'
 import baleChangeImg from './../../assets/img/menu/baleChange.png'
@@ -56,9 +57,12 @@ import boxTransferImg from './../../assets/img/menu/boxTransfer.png'
 import outboundBlockImg from './../../assets/img/menu/outboundBlock.png'
 import confirmStockOutImg from './../../assets/img/menu/confirmStockOut.png'
 import outboundReprintImg from './../../assets/img/menu/outboundReprint.png'
+import pickConsole from './../../assets/img/menu/pickConsole.png'
+import assignLpnPick from './../../assets/img/menu/assignLpnPick.png'
 import sortingImg from './../../assets/img/menu/sorting.png'
 import unload from './../../assets/img/menu/unload.png'
 import receiveConsole from './../../assets/img/menu/receive-console.png'
+import moreOrder from './../../assets/img/menu/moreOrder.png'
 import packCollect from "./../../assets/img/menu/packCollect.png";
 import sowCollect from "./../../assets/img/menu/sowCollect.png";
 import container from "./../../assets/img/menu/container/container.png";
@@ -262,7 +266,7 @@ export default {
         path: '/inbound/unload/lwIndex',
       },
 
-      // 收货控制台 TODO 国际化，权限
+      // 收货控制台
       console: {
         src: receiveConsole,
         title: '收货控制台',
@@ -273,6 +277,17 @@ export default {
         path: '/receive/console/lwIndex',
       },
 
+      // 多单收货
+      moreOrder: {
+        src: moreOrder,
+        title: '多单收货',
+        titleKey: 'wms_project.pda.menu.moreOrder',
+        tip: 0,
+        hidden: false,
+        permissions: ['/wms/pda/receive/moreOrder/lwIndex'],
+        path: '/receive/moreOrder/lwIndex',
+      },
+
     }
   },
 
@@ -555,6 +570,17 @@ export default {
         path: '/outbound/sow/lwIndex',
       },
 
+      // 播种分拣
+      sort: {
+        src: sort,
+        title: '拣选分货',
+        titleKey: 'wms_project.pda.menu.sort',
+        tip: 0,
+        hidden: false,
+        permissions: ['/wms/pda/outbound/sort/lwIndex'],
+        path: '/outbound/sort/lwIndex',
+      },
+
       // 捆包集货
       packCollect: {
         src: packCollect,
@@ -711,7 +737,7 @@ export default {
 
       // 按单拣选控制台
       pickConsole: {
-        src: outboundReprintImg,
+        src: pickConsole,
         title: '按单拣选控制台',
         titleKey: 'wms_project.pda.menu.pickConsole',
         tip: 0,
@@ -720,6 +746,17 @@ export default {
         path: '/outbound/pickConsole/lwIndex',
       },
 
+      // 指定整托拣选
+      assignLpnPick: {
+        src: assignLpnPick,
+        title: '指定整托拣选',
+        titleKey: 'wms_project.pda.menu.assignLpnPick',
+        tip: 0,
+        hidden: false,
+        permissions: ['/wms/pda/outbound/assignLpnPick/lwIndex'],
+        path: '/outbound/assignLpnPick/lwIndex',
+      },
+
     },
   },
 

package/src/views/wms/module/Lot/index.vue

@@ -159,6 +159,8 @@ export default {
         const key = i.use || 'lw-text'
         this.list.push(this.map[key](i.attributes))
       }
+
+      this.$nextTick(() => this.$emit('loaded'))
     },
 
     // 获取数据

package/src/views/wms/module/ReceiveAbnormal/index.vue

@@ -654,8 +654,6 @@ export default {
         skuCode: this.skuInfo.skuCode
       }
 
-      console.log(this.asnData)
-      console.log(this.abnormalType)
 
       if (this.asnData.ownerId){
         query.asnId = this.asnData.id
@@ -663,7 +661,6 @@ export default {
         query.ownerId = this.abnormalType.ownerId
       }
 
-      console.log(query)
 
       const res = await wmsMobileFoundAsnLineSku(query)
 

package/src/views/wms/module/ScanDataList/index.vue

@@ -107,6 +107,7 @@
       v-model="popup.show"
       :title="$lwLanguage.get('wms_project.pda.components.module.ScanDataList.fywkkruh','查看更多')"
       height="70%"
+      :show-keyboard-placeholder="false"
       @closed="popupOff"
     >
 

package/src/views/wms/page/inbound/components/AsnInfo.vue

@@ -113,8 +113,9 @@ export default {
           data.allocWarehouse = data.allocWarehouseCode + ' - ' + data.allocWarehouseName
         }
       }
-      data.pendingQty = data.qty - data.receiveQty
-      if(data.pendingQty<0){
+      const {qualityLossQty, qty, arrivalQty} = data
+      data.pendingQty = Number(qty || 0) + Number(qualityLossQty || 0) - Number(arrivalQty || 0)
+      if (data.pendingQty < 0) {
         data.pendingQty = 0
       }
       return data

package/src/views/wms/page/inbound/receive/receive-case/LwInboundReceiveCaseExecutePage.vue

@@ -34,12 +34,31 @@
             </div>
             <div class="lw-global-sh" style="margin: 10px 0"></div>
             <div class="lw-global-flex-between">
-              <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.cytznwxn', '品种数: ')}}<span>{{ c.skuCount }}</span></div>
-              <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.jkvbswog', '数量: ')}}<span>{{ c.qty }}</span></div>
               <div>
-                <lw-button mini @click="removeCase(c)">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.gkjijylo', '移除')}}</lw-button>
+                {{
+                  $lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.cytznwxn', '品种数: ')
+                }}<span>{{
+                  c.skuCount
+                }}</span></div>
+              <div>
+                {{ $lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.jkvbswog', '数量: ') }}<span>{{
+                  c.qty
+                }}</span></div>
+              <div>
+                <lw-button mini @click="removeCase(c)">
+                  {{ $lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.gkjijylo', '移除') }}
+                </lw-button>
               </div>
             </div>
+            <div class="lw-global-sh" style="margin: 10px 0"></div>
+            <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_case.zhacwngtd', '收货照片')
+                }}
+              </div>
+              <lw-img-upload v-model="c._imgList"/>
+            </div>
           </div>
 
           <div v-show="!c.isShrink">
@@ -66,8 +85,28 @@
         </div>
       </template>
       <div class="lw-global-model-box">
-        <lw-input v-model="receiveLoc.value" :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.xjfjcsgo', '收货库位')" required :get-focus.sync="receiveLoc.focus"/>
-        <lw-input v-model="receiveLpn.value" :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.zhacwngt', '收货托盘')" required :get-focus.sync="receiveLpn.focus"/>
+        <lw-input v-model="receiveLoc.value"
+                  :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.xjfjcsgo', '收货库位')"
+                  required :get-focus.sync="receiveLoc.focus"/>
+        <lw-input
+          v-if="!asn.hideLpn"
+          v-model="receiveLpn.value"
+          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.zhacwngt', '收货托盘')"
+          :required="asn.requiredLpn"
+        >
+
+          <template #button>
+
+            <lw-button
+              mini
+              @click="createLpnFn"
+            >
+              {{ $lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.zhacwngtw', '生成') }}
+            </lw-button>
+
+          </template>
+
+        </lw-input>
       </div>
     </div>
     <lw-bottom-bar>
@@ -102,8 +141,11 @@
 
 <script>
 import {
-  getInboundAsn, getInboundFoundAsnWholeCaseNumDetail,
-  submitAsnAbnormalReceive, submitAsnFastReceiveForWholeCaseNum,
+  getInboundAsn,
+  getInboundFoundAsnWholeCaseNumDetail,
+  submitAsnAbnormalReceive,
+  submitAsnFastReceiveForWholeCaseNum,
+  wmsMobileInboundNewReceiveLpn,
 } from '../../../../api/inbound/receive'
 import AsnInfo from '../../components/AsnInfo.vue'
 import AsnSkuInfo from '../../components/AsnSkuInfo.vue'
@@ -130,6 +172,9 @@ export default {
       },
       currentSku: null,
       showAbnormal: false,
+
+      createLpn: '',
+      printLpnData: {}
     }
   },
   computed: {
@@ -141,7 +186,7 @@ export default {
     },
   },
   created () {
-    const { asnId, caseNum } = this.$route.query
+    const {asnId, caseNum} = this.$route.query
     if (!asnId) {
       return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.ttthaies', '错误的到货通知单号'))
     }
@@ -149,6 +194,14 @@ export default {
       return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.sgkzzkbm', '错误的箱号'))
     }
     this.loadAsn(asnId, caseNum)
+
+    const {printData} = this.$lwPrint.test(
+      'PART_RECEIVE_LABEL',
+      this.$lwLanguage.get('', '收货托盘标签'),
+      false,
+      false
+    )
+    this.printLpnData = printData
   },
   methods: {
     initCase (data) {
@@ -170,6 +223,7 @@ export default {
             line: sku.map,
           }
         }
+        data._imgList = []
         this.cases.push(data)
         this.caseNum.value = ''
 
@@ -209,17 +263,23 @@ export default {
         this.caseNum.focus = true
         return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.beevnrig', '请扫描箱号'))
       }
-      if (!this.receiveLoc.value) {
+
+      const locationCode = this.receiveLoc.value
+      if (!locationCode) {
         this.receiveLoc.focus = true
         return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.xymgmnid', '收货库位不能为空'))
       }
-      if (!this.receiveLpn.value) {
+
+      const lpn = this.receiveLpn.value
+      if (this.asn.hideLpn && this.asn.requiredLpn && !lpn) {
         this.receiveLpn.focus = true
         return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.qdxoqyqo', '收货托盘不能为空'))
       }
+
+
       const items = []
       for (let c of this.cases) {
-        if(!c.fastReceive){
+        if (!c.fastReceive) {
           return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.not.fast', '箱号：{caseNum} 不能整箱快收', {caseNum: c.caseNum}))
         }
 
@@ -231,24 +291,40 @@ export default {
           items.push({
             caseNum: c.caseNum,
             skuId: i.sku.id,
-            lotAttributes: lotData.data
+            lotAttributes: lotData.data,
+            images: c._imgList.join('|')
           })
         }
       }
+
       const data = {
         asnId: this.asn.id,
-        locationCode: this.receiveLoc.value,
-        lpn: this.receiveLpn.value,
+        locationCode,
+        lpn,
         printDeviceId: null,
         printTemplate: null,
         warehouseId: this.asn.warehouseId,
         lines: items,
       }
-      submitAsnFastReceiveForWholeCaseNum(data).then(() => {
-        this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.ivymtjgb', '操作成功'))
-        setTimeout(() => {
-          this.$router.back()
-        }, 1000)
+
+      const hasPrint = !!Object.keys(this.printLpnData).length
+      // 判断当前输入托盘号是否是生成的
+      if (lpn === this.createLpn && hasPrint) {
+        data.printReceiveDeviceId = this.printLpnData.printId
+        data.printReceiveTemplate = this.printLpnData.templateId
+      }
+
+      submitAsnFastReceiveForWholeCaseNum(data).then(res => {
+        this.$lwToast.success({
+          message: this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.ivymtjgb', '操作成功'),
+          onClose: () => this.$router.back()
+        })
+        // 打印托盘标签
+        if (res && hasPrint && Array.isArray(res.printList)) {
+          res.printList.forEach(item => {
+            this.$lwPrint.bluetoothPrint(item.id)
+          })
+        }
       }).catch(()=>this.clearCase())
     },
     removeCase (c) {
@@ -289,7 +365,15 @@ export default {
         this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.dxihbntd', '异常上报成功'))
         this.loadAsn(this.asn.id)
       })
-    }
+    },
+
+    // 生成收货托盘
+    createLpnFn() {
+      wmsMobileInboundNewReceiveLpn().then(res => {
+        this.createLpn = res
+        this.receiveLpn.value = res
+      })
+    },
   },
 }
 </script>

package/src/views/wms/page/inbound/receive/receive-lpn/LwInboundReceiveLpnScanPage.vue

@@ -14,7 +14,15 @@
       </div>
       <div class="lw-global-page-box">
         <div class="lw-global-model-box">
-          <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_lpn.gtjbahbq', '托盘号')" required v-model="lpn.value" :get-focus.sync="lpn.focus" @confirm="toReceive"/>
+          <lw-input
+            :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_lpn.gtjbahbq', '托盘号')"
+            required
+            v-model="lpn.value"
+            :get-focus.sync="lpn.focus"
+            rule-key="lpn"
+            :create-rule="$lwScanRule.create('收货-整托盘收货-托盘号','LPN')"
+            @confirm="toReceive"
+          />
         </div>
       </div>
     </div>

package/src/views/wms/page/inbound/receive/receive-random/LwInboundReceiveRandomSkuExecutePage.vue

@@ -54,9 +54,13 @@
         <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.eroicgsb', '收货库位')" required v-model="receiveLoc.value" :get-focus.sync="receiveLoc.focus"/>
-        <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.inovnpea', '收货托盘')" required v-model="receiveLpn.value" :get-focus.sync="receiveLpn.focus"/>
+      <div class="lw-global-model-box lw-global-model-box-3px">
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.eroicgsb', '收货库位')"
+          required v-model="receiveLoc.value" :get-focus.sync="receiveLoc.focus" @confirm="receiveLpn.focus=true"/>
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.inovnpea', '收货托盘')"
+          required v-model="receiveLpn.value" :get-focus.sync="receiveLpn.focus" :show-bottom-border="false"/>
       </div>
 
     </div>

package/src/views/wms/page/inbound/receive/receive-random/LwInboundReceiveRandomSkuSnExecutePage.vue

@@ -40,7 +40,9 @@
             <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>
+              <lw-button mini @click="removeSn(t)">
+                {{ $lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_random.bwngrvjz', '剔除') }}
+              </lw-button>
             </div>
           </div>
         </div>
@@ -49,9 +51,13 @@
       <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 class="lw-global-model-box lw-global-model-box-3px">
+        <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" @confirm="receiveLpn.focus=true"/>
+        <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" :show-bottom-border="false"/>
       </div>
     </div>
     <lw-bottom-bar>

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

@@ -82,10 +82,23 @@
         <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"
-        />
+        >
+
+          <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', '收货照片') }}
@@ -150,7 +163,7 @@ import {
   getAsnSkuDetailBySkuCode,
   getInboundAsnByAsnNo,
   submitAsnAbnormalReceive,
-  submitAsnAdvanceReceiveForSku,
+  submitAsnAdvanceReceiveForSku, wmsMobileInboundNewReceiveLpn,
 } from '../../../../api/inbound/receive'
 import AsnInfo from '../../components/AsnInfo.vue'
 import AsnSkuInfo from '../../components/AsnSkuInfo.vue'
@@ -191,7 +204,10 @@ export default {
       showAbnormal: false,
 
       printPopupShow: false,
-      printData: {}
+      printData: {},
+
+      createLpn: '',
+      printLpnData: {}
     }
   },
   computed: {
@@ -206,11 +222,19 @@ export default {
     },
   },
   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)
+
+    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
   },
   methods: {
     loadAsnAndSku(asnNo) {
@@ -290,27 +314,39 @@ 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('|')
       }
-      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 && Object.keys(this.printLpnData).length) {
+        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) {
@@ -321,6 +357,14 @@ export default {
       this.tag = ''
       this.tags = []
       this.showSubmit = false
+
+      // 打印托盘标签
+      if (res && Object.keys(this.printLpnData).length && Array.isArray(res.printList)) {
+        res.printList.forEach(item => {
+          this.$lwPrint.bluetoothPrint(item.id)
+        })
+      }
+
     },
     showAbnormalPop () {
       const lotData = this.$refs.lotEl.getData()
@@ -347,14 +391,22 @@ export default {
     },
 
 
+    // 生成收货托盘
+    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
+        if (!success) return
         this.printData = printData
       }