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

package/src/components/page/inbound/components/containerPrintPopup.vue

@@ -0,0 +1,105 @@
+<!--
+  容器商品打印弹框
+  @author: 张文
+  @date: 2023-01-16
+-->
+<template>
+  <lw-popup
+    :title="$lwLanguage.get('','打印容器商品标签')"
+    v-model="show"
+    @closed="qty.value=''"
+    @opened="qty.focus=true"
+  >
+
+    <lw-input
+      :title="$lwLanguage.get('','打印容器条码数量')"
+      v-model="qty.value"
+      :get-focus.sync="qty.focus"
+      @confirm="confirmPrint"
+    />
+
+    <template #button>
+      <lw-button @click="confirmPrint">
+        {{ $lwLanguage.get('','打印') }}
+      </lw-button>
+    </template>
+
+  </lw-popup>
+</template>
+
+<script>
+
+import {wmsMobileInboundAsnContainerSkuExecutePrint} from "../../../../api/inbound/containerPrant";
+
+export default {
+  name: "containerPrintPopup",
+  props: {
+    value: {
+      type: Boolean,
+      default: false
+    },
+    printData: {
+      type: Object,
+      default: () => {
+      }
+    },
+
+    asnId: String,
+    skuId: String,
+  },
+  computed: {
+    show: {
+      get() {
+        return this.value
+      },
+      set(v) {
+        this.$emit('input', v)
+      }
+    },
+  },
+  data() {
+    return {
+      qty:{
+        value: '',
+        focus: false
+      }
+    }
+  },
+  methods: {
+
+    // 打印
+    async confirmPrint(){
+
+      const qty = Number(this.qty.value || 0)
+
+      if (!qty){
+        this.qty.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('','打印数量不能为空，且应当是大于0的整数')
+        )
+        return
+      }
+
+      const res = await wmsMobileInboundAsnContainerSkuExecutePrint({
+        asnId: this.asnId,
+        skuId: this.skuId,
+        qty,
+        printDeviceId: this.printData.printId,
+        printTemplateId: this.printData.templateId,
+      })
+
+      try{
+        await this.$lwPrint.bluetoothPrint({taskId:res.printTaskDTO.id})
+        this.show = false
+      }catch (err){
+        console.error('商品容器打印失败:' + err)
+      }
+
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/components/page/inbound/receive/quality/LwInboundQualityExecutePage.vue

@@ -3,14 +3,18 @@
     <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.esghuudd', '收货品检')"/>
     <div class="lw-global-page-box">
       <div class="lw-global-model-box">
-        <quality-task-info :data="task"/>
+        <quality-task-info
+          :data="task"
+          :show-print-container-btn="task && task.sku.containerSku"
+          @printContainer="printContainer"
+        />
       </div>
 
       <quality-card v-if="task"
                     type="quality" :obj-id="task.taskId" :skuCode="task.sku.code"
                     :delay-load="false" :card-mode="true"/>
 
-      <div v-if="task" class="lw-global-tab-box" style="margin-top: 10px;">
+      <lw-tab-box v-if="task" style="margin-top: 10px;">
         <van-tabs type="card" animated v-model="tabActive">
           <van-tab :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.nlclgbzy', '品检')">
 
@@ -33,7 +37,11 @@
                   <div>
                     <div>{{currentLpn.canQualityQty}}</div>
                     <div>
-                      <lw-input :name="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.oqfkqbqb', '抽检量')" type="number" v-model="currentLpn.samplingQty"/>
+                      <lw-input
+                        :name="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.oqfkqbqb', '抽检量')"
+                        type="number"
+                        v-model="currentLpn.samplingQty"
+                      />
                     </div>
                     <div>{{currentLpn.qualityLossQty}}</div>
                   </div>
@@ -93,7 +101,7 @@
             </div>
           </van-tab>
         </van-tabs>
-      </div>
+      </lw-tab-box>
     </div>
     <lw-bottom-bar v-if="currentLpn">
       <lw-button type="warning" @click="showAbnormalPop">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.omqljbkf', '品检异常')}}</lw-button>
@@ -126,6 +134,32 @@
         <lw-button @click="submitAbnormal">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.kzuugcny', '上报异常')}}</lw-button>
       </template>
     </lw-popup>
+
+
+    <!-- 打印容器数量弹框 -->
+    <lw-popup
+      :title="$lwLanguage.get('','打印容器条码')"
+      v-model="printContainerPopup.show"
+      @closed="printContainerPopup.num.value=''"
+    >
+
+      <lw-input
+        :title="$lwLanguage.get('','数量')"
+        v-model="printContainerPopup.num.value"
+        :get-focus.sync="printContainerPopup.num.focus"
+        type="digit"
+        @confirm="confirmPrintContainer"
+      />
+
+      <template #button>
+
+        <lw-button @click="confirmPrintContainer">
+          {{ $lwLanguage.get('','确定') }}
+        </lw-button>
+
+      </template>
+
+    </lw-popup>
   </div>
 </template>
 
@@ -133,7 +167,7 @@
 import {
   finishSkuQuality,
   getInboundGetQualityDetail, submitQualityAbnormal,
-  submitSkuQuality, submitSkuSnQuality
+  submitSkuQuality, submitSkuSnQuality, wmsMobileInboundContainerSkuExecutePrint
 } from '../../../../../api/inbound/quality'
 import QualityTaskInfo from '../../components/QualityTaskInfo.vue'
 import QualityCard from '../../components/QualityCard.vue'
@@ -161,6 +195,16 @@ export default {
       lotQuery: null,
       showAbnormal: false,
       autoWholeSn: false,
+
+      // 打印容器弹框
+      printContainerPopup:{
+        show: false,
+        num:{
+          value: '',
+          focus: false
+        },
+        printInit:{}
+      }
     }
   },
   computed: {
@@ -240,19 +284,15 @@ export default {
       if (!this.currentLpn) {
         return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.iuyvdwlp', '请扫描LPN'))
       }
-      const checkQty = parseInt(this.currentLpn.samplingQty)
+      const checkQty = Number(this.currentLpn.samplingQty || 0)
 
-      console.log("---------")
-      console.log(this.currentLpn.samplingQty)
-      console.log(checkQty)
-      console.log(this.currentLpn.canQualityQty)
 
       if (isNaN(checkQty) || checkQty <= 0 || checkQty > this.currentLpn.canQualityQty) {
         return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.arxfirlt', '抽检量必须大于0且小于待检量'))
       }
       if (this.task.sku.needSn && !this.autoWholeSn) {
-        const snQty = this.sns.map(i => parseInt(i.qty)).reduce((a, b) => a + b, 0)
-        if (snQty !== parseInt(this.currentLpn.canQualityQty)) {
+        const snQty = this.sns.map(i => Number(i.qty)).reduce((a, b) => a + b, 0)
+        if (snQty !== Number(this.currentLpn.canQualityQty)) {
           return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.qmeccorr', '商品序列号数量与待检量不符，请确认'))
         }
       }
@@ -364,10 +404,49 @@ export default {
       }).then(res => {
         this.showAbnormal = false
         this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.oxdbxfzn', '异常上报成功'))
+        this.$refs.abnormal.printLabel()
         this.task = res
         this.lpn.value = this.currentLpn.lpn
         this.scanLpn(true)
       })
+    },
+
+    // 打印容器号按钮被点击
+    printContainer(){
+
+      if(!Object.keys(this.printContainerPopup.printInit).length){
+        const {success, printData} = this.$lwPrint.test(
+          'INBOUND_CONTAINER_SKU_PRINT_LABEL',
+          this.$lwLanguage.get('','入库容器商品标签')
+        )
+        if(!success) return
+        this.printContainerPopup.printInit = printData
+      }
+      console.log(this.printContainerPopup.printInit,999)
+      this.printContainerPopup.show = true
+      this.printContainerPopup.num.focus = true
+    },
+    // 打印容器确认
+    confirmPrintContainer(){
+      const popup = this.printContainerPopup
+      const qty = Number(popup.num.value || 0)
+
+      if (!qty){
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('','打印数量不能为空，且应当是大于0的正整数')
+        )
+        return
+      }
+
+      wmsMobileInboundContainerSkuExecutePrint({
+        skuId:this.task.sku.id,
+        qty,
+        printTemplateId: popup.printInit.templateId,
+        printDeviceId: popup.printInit.printId,
+      }).then(res=>{
+        this.$lwPrint.bluetoothPrint(res.printTaskDTO.id)
+        this.printContainerPopup.show = false
+      })
     }
   },
 }

package/src/components/page/inbound/receive/receive-alloc/LwInboundReceiveAllocTabListPage.vue

@@ -7,7 +7,7 @@
         <div>
           <asn-info :data="asn"/>
         </div>
-        <div class="lw-global-tab-box" style="margin-top: 10px">
+        <lw-tab-box style="margin-top: 10px">
           <van-tabs animated v-model="tabActive" @change="tabChange" type="card">
             <van-tab
               :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_alloc.giqjqjbb', '待收货')"
@@ -43,7 +43,7 @@
               <lw-not-data v-else/>
             </van-tab>
           </van-tabs>
-        </div>
+        </lw-tab-box>
       </div>
     </div>
     <div v-else>

package/src/components/page/inbound/receive/receive-lpn/LwInboundReceiveLpnBatchExecutePage.vue

@@ -20,7 +20,7 @@
                   @confirm="loadLpn"/>
       </div>
 
-      <div class="lw-global-tab-box" style="margin-top: 10px">
+      <lw-tab-box style="margin-top: 10px">
         <van-tabs animated v-model="tabActive" type="card">
           <van-tab :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_lpn_batch.tab.scan', '已扫描')">
             <div v-if="scanLpnList && scanLpnList.length" class="lw-global-model-box">
@@ -140,7 +140,7 @@
           </van-tab>
 
         </van-tabs>
-      </div>
+      </lw-tab-box>
 
 
       <div

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

@@ -10,10 +10,13 @@
       <div>
         <asn-info :data="asn" :radius="false"/>
         <asn-sku-info
+          v-if="asnSku"
           :data="asnSku"
           type="bottom"
-          show-print
+          :show-print="!asnSku.sku.containerSku"
+          :show-container-print="asnSku.sku.containerSku"
           @printClick="printClick"
+          @containerPrint="containerPrint"
         />
 
         <quality-card v-if="asnSku && asnSku.sku"
@@ -138,6 +141,14 @@
       :sku-id="asnSku.sku.id"
       :print-data="printData"
     />
+    <!-- 补码弹框 -->
+    <container-print-popup
+      v-if="asn && asnSku"
+      v-model="containerPrintShow"
+      :asn-id="asn.id"
+      :sku-id="asnSku.sku.id"
+      :print-data="containerPrintData"
+    />
 
   </div>
 </template>
@@ -155,11 +166,19 @@ 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";
+import printLabelPopup from "../../components/printLabelPopup.vue"
+import containerPrintPopup from "../../components/containerPrintPopup.vue"
 
 export default {
   name: 'LwInboundReceiveSkuDirectPage',
-  components: { SnsList, AsnSkuInfo, AsnInfo,QualityCard, printLabelPopup },
+  components: {
+    SnsList,
+    AsnSkuInfo,
+    AsnInfo,
+    QualityCard,
+    printLabelPopup,
+    containerPrintPopup,
+  },
   data () {
     return {
       asn: null,
@@ -194,7 +213,9 @@ export default {
       showAbnormal: false,
 
       printPopupShow:false,
-      printData:{}
+      printData:{},
+      containerPrintShow:false,
+      containerPrintData:{}
     }
   },
   computed: {
@@ -399,7 +420,22 @@ export default {
 
       this.printPopupShow = true
 
-    }
+    },
+
+    // 补码按钮点击
+    containerPrint(){
+      if (!Object.keys(this.containerPrintData).length){
+        const {success, printData} = this.$lwPrint.test(
+          'INBOUND_CONTAINER_SKU_PRINT_LABEL',
+          this.$lwLanguage.get('','入库容器商品标签')
+        )
+        if(!success) return
+        this.containerPrintData = printData
+      }
+
+      this.containerPrintShow = true
+
+    },
   },
 }
 </script>