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

package/src/components/page/outbound/pickMerge/components/finishPopup/index.vue

@@ -5,12 +5,12 @@
 -->
 <template>
   <lw-popup
-    :title="$lwLanguage.get('','直接集合完成(当前容器)')"
+    :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pickMerge.components.finishPopup.eeozdxrm','直接集合完成(当前容器)')"
     v-model="show"
   >
 
     <lw-title-value-cell
-      :title="$lwLanguage.get('','拣选容器号')"
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pickMerge.components.finishPopup.bzptsuzu','拣选容器号')"
       :value="pickContainer"
       val-red
       val-bold
@@ -30,7 +30,7 @@
 
     <template #button>
       <lw-button @click="finishConfirm">
-        {{ $lwLanguage.get('','直接集合完成') }}
+        {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pickMerge.components.finishPopup.pqzovdcs','直接集合完成') }}
       </lw-button>
     </template>
 
@@ -74,7 +74,7 @@ export default {
         summaryLot: this.summaryLot
       }).then(()=>{
         this.$lwToast.success(
-          this.$lwLanguage.get('','成功')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pickMerge.components.finishPopup.eygzjgkn','成功')
         )
         history.go(-1)
       })

package/src/components/page/outbound/pickMerge/components/skuInfo/index.vue

@@ -1,5 +1,5 @@
 <!--
-  零件信息
+  商品信息
   @author: 张文
   @date: 2022-06-21
 -->
@@ -28,14 +28,14 @@
         round
         mini
         @click="abn"
-      >{{ $lwLanguage.get('','异常') }}</lw-button>
+      >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pickMerge.components.skuInfo.cehmgeei','异常') }}</lw-button>
 
       <lw-tag
         v-if="isScan && item.waitQty === 0"
         type="success"
         round
         plain
-      >{{ $lwLanguage.get('','已完成') }}</lw-tag>
+      >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pickMerge.components.skuInfo.rbclrdxl','已完成') }}</lw-tag>
 
     </div>
 
@@ -56,7 +56,7 @@
     <div class="lw-global-flex-between">
 
       <lw-title-value-cell
-        :title="$lwLanguage.get('','计划量')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pickMerge.components.skuInfo.cnfbpskh','计划量')"
         :value="item.totalQty"
         val-red
         val-bold
@@ -64,7 +64,7 @@
       />
 
       <lw-title-value-cell
-        :title="$lwLanguage.get('','已集合量')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pickMerge.components.skuInfo.ploohdma','已集合量')"
         :value="item.summaryQty"
         val-red
         val-bold
@@ -72,7 +72,7 @@
       />
 
       <lw-title-value-cell
-        :title="$lwLanguage.get('','异常量')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pickMerge.components.skuInfo.mbbznnfd','异常量')"
         :value="item.abnormalQty"
         val-red
         val-bold

package/src/components/page/outbound/pickMerge/content/index.vue

@@ -6,7 +6,7 @@
 <template>
   <div>
 
-    <lw-nav-bar :title="$lwLanguage.get('','分区拣选集合')"/>
+    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pickMerge.content.xqrplbxu','分区拣选集合')"/>
 
     <div class="lw-global-page-box">
 
@@ -20,11 +20,11 @@
         type="last"
         plain
         @click="finishPopupShow=true"
-      >{{ $lwLanguage.get('','直接集合完成(当前容器)') }}</lw-button>
+      >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pickMerge.content.povfsnmw','直接集合完成(当前容器)') }}</lw-button>
 
       <lw-button
         @click="addContainer"
-      >{{ $lwLanguage.get('','绑定容器号') }}</lw-button>
+      >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pickMerge.content.tiqglfsu','绑定容器号') }}</lw-button>
 
     </lw-bottom-bar>
 
@@ -37,20 +37,20 @@
 
     <!-- 绑定容器弹出框 -->
     <lw-popup
-      :title="$lwLanguage.get('','绑定容器号')"
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pickMerge.content.tiqglfsu','绑定容器号')"
       v-model="containerPopup.show"
       @closed="containerPopup.value=''"
     >
 
       <lw-title-value-cell
-        :title="$lwLanguage.get('','集合位')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pickMerge.content.ixzdjfqu','集合位')"
         :value="mergeData.summaryPositionCode"
         val-bold
         val-red
       />
 
       <lw-input
-        :title="$lwLanguage.get('','绑定容器号')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pickMerge.content.tiqglfsu','绑定容器号')"
         v-model="containerPopup.value"
         :get-focus.sync="containerPopup.focus"
         required
@@ -61,7 +61,7 @@
       <template #button>
 
         <lw-button @click="containerConfirm">
-          {{ $lwLanguage.get('','确认绑定') }}
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pickMerge.content.ngurkqxw','确认绑定') }}
         </lw-button>
 
       </template>
@@ -76,7 +76,7 @@ import containerInfo from './../components/containerInfo/index.vue'
 import finishPopup from './../components/finishPopup/index.vue'
 import {
   projectWmsSummaryBindContainer,
-  projectWmsSummaryQueryContainerData
+  projectWmsSummaryQueryContainerData, projectWmsSummaryStartTask
 } from "../../../../../api/outbound/pickMerge";
 
 export default {
@@ -106,10 +106,15 @@ export default {
   },
   methods: {
     // 获取数据
-    getData(){
-      projectWmsSummaryQueryContainerData({
-        pickContainer: this.$route.query.lwPickContainer
-      }).then(res=>{
+    async getData(){
+      try {
+        const res = await projectWmsSummaryQueryContainerData({
+          pickContainer: this.$route.query.lwPickContainer
+        })
+
+        await projectWmsSummaryStartTask({
+          summaryLot: res.summaryLot
+        })
 
         // 如果已经绑定容器号就直接跳转
         if (res.summaryPositionContainer){
@@ -118,7 +123,11 @@ export default {
         }
 
         this.mergeData = res
-      }).catch(()=>history.go(-1))
+      }catch {
+        history.go(-1)
+      }
+
+
     },
 
 
@@ -133,7 +142,7 @@ export default {
         this.containerPopup.focus = true
 
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','容器号不能为空')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pickMerge.content.ufgltjsh','容器号不能为空')
         )
 
         return
@@ -146,7 +155,7 @@ export default {
         summaryLot: this.mergeData.summaryLot,
       }).then(()=>{
         this.$lwToast.success(
-          this.$lwLanguage.get('','容器绑定成功')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pickMerge.content.iqlbehfg','容器绑定成功')
         )
         this.goPage()
       })

package/src/components/page/outbound/pickMerge/index/index.vue

@@ -6,14 +6,14 @@
 <template>
   <div>
 
-    <lw-nav-bar :title="$lwLanguage.get('','分区拣选集合')"/>
+    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pickMerge.index.naalgrxq','分区拣选集合')"/>
 
     <div class="lw-global-page-box">
 
       <div class="lw-global-model-box">
 
         <lw-input
-          :title="$lwLanguage.get('','拣选容器号')"
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pickMerge.index.gekjqmlz','拣选容器号')"
           v-model="container"
           :get-focus.sync="containerFocus"
           rule-key="container"
@@ -25,7 +25,7 @@
           block
           @click="containerConfirm"
         >
-          {{ $lwLanguage.get('','查询') }}
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pickMerge.index.sxggoodh','查询') }}
         </lw-button>
 
       </div>
@@ -54,7 +54,7 @@ export default {
         this.containerFocus = true
 
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','容器号不能为空')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pickMerge.index.bllcialp','容器号不能为空')
         )
 
         return

package/src/components/page/outbound/reprint-box/LwOutboundReprintBoxListPage.vue

@@ -0,0 +1,203 @@
+<template>
+  <div>
+    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.pvsffdcy', '出货票补打')"/>
+
+    <div class="lw-global-page-box">
+      <div
+        class="lw-global-model-box"
+        style="margin-bottom: 10px;padding-top: 5px"
+      >
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.bzfgwgga', '客户编码')"
+          v-model="param.customerCode.value"
+          :get-focus.sync="param.customerCode.focus"
+          @confirm="param.soNo.focus = true"
+        />
+
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.ysxswhiu', '出库单号')"
+          v-model="param.soNo.value"
+          :get-focus.sync="param.soNo.focus"
+          @confirm="param.boxNo.focus = true"
+        />
+
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.kxymijkx', '箱号')"
+          v-model="param.boxNo.value"
+          :get-focus.sync="param.boxNo.focus"
+          @confirm="param.sn.focus = true"
+        />
+
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.bgifgkzp', '商品序列号')"
+          v-model="param.sn.value"
+          :get-focus.sync="param.sn.focus"
+          rule-key="sn"
+          rule-value-key="sn"
+          @confirm="queryData"
+        />
+        <lw-button
+          style="margin-top: 10px"
+          block
+          @click="queryData"
+        >
+          {{$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.coyucmhf', '查询')}}
+        </lw-button>
+      </div>
+
+      <lw-not-data v-if="showEmpty"/>
+      <div v-else>
+        <div
+          v-for="box in boxes"
+          :key="box.boxNo"
+          class="lw-global-model-box"
+          style="padding-bottom: 5px"
+        >
+          <div>
+            <div class="lw-global-flex-start-start lw-global-row-start">
+              <div class="lw-global-title">
+                {{$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.pjtloamy', '客户')}}
+              </div>
+              <div class="lw-global-value">
+                <div class="lw-global-value-bold">{{ box.customerCode }}</div>
+                <div class="lw-global-title">{{ box.customerName }}</div>
+              </div>
+            </div>
+
+
+            <lw-title-value-cell
+              :title="$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.qdetdtmw', '捆包箱号')"
+              :value="box.boxNo"
+            />
+
+            <div class="lw-global-flex-between lw-global-row">
+
+              <lw-title-value-cell
+                :title="$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.xavynmlc', '捆包时间')"
+                :value="$lwDate.format(box.boxTime, 'yyyy-MM-dd hh:mm')"
+                :is-row="false"
+              />
+              <lw-button
+                mini
+                round
+                @click="executePrint(box)"
+              >
+                {{$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.rmxmarpu', '补打出货票')}}
+              </lw-button>
+            </div>
+
+          </div>
+
+          <collapse-item :item="box"/>
+
+        </div>
+        <lw-pages v-model="query.pageNum" :page-size="query.pageSize" :page-total="query.total" @change="loadPage"/>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import collapseItem from "./collapseItem.vue";
+import {
+  outboundQueryCanHandleBox,
+  projectWmsGetPrintBoxData
+} from '../../../../api/outbound/reprint-box'
+
+export default {
+  name: 'LwOutboundReprintBoxListPage',
+  components:{
+    collapseItem
+  },
+  data () {
+    return {
+      param: {
+        customerCode: {
+          value: null,
+          focus: false,
+        },
+        soNo: {
+          value: null,
+          focus: false,
+        },
+        boxNo: {
+          value: null,
+          focus: false,
+        },
+        sn: {
+          value: null,
+          focus: false,
+        }
+      },
+      boxes: [],
+      showEmpty: false,
+      query: {
+        pageNum: 1,
+        pageSize: 10,
+        total: 0,
+        customerCode: null,
+        soNo: null,
+        boxNo: null,
+        sn: null,
+      },
+      printData:{}
+    }
+  },
+  methods: {
+    queryData () {
+      this.showEmpty = false
+
+      this.query.customerCode = this.param.customerCode.value
+      this.query.soNo = this.param.soNo.value
+      this.query.boxNo = this.param.boxNo.value
+      this.query.sn = this.param.sn.value
+      this.loadPage(1)
+    },
+    loadPage (page) {
+      const param = { ...this.query, pageNum: page || 1 }
+      outboundQueryCanHandleBox(param).then(res => {
+        this.query.pageNum = res.pageNum
+        this.query.pageSize = res.pageSize
+        this.query.total = res.total
+        res.datas.forEach(i => i.fold = false)
+        this.boxes = res.datas
+        if (!this.boxes || !this.boxes.length) {
+          this.showEmpty = true
+        }
+      })
+    },
+
+    // 检查打印机
+    checkPrint(){
+      if (this.printData.printId) return true
+
+      // 判断当前是否配置了打印机
+      const {success,printData} = this.$lwPrint.test(
+        'OUTBOUND_BOX_LABEL',
+        this.$lwLanguage.get('','出库箱票标签')
+      )
+      if (!success)return false
+      this.printData = printData
+      return true
+    },
+    async executePrint (box) {
+      if (!this.checkPrint()) return
+      try {
+        const res = await projectWmsGetPrintBoxData({
+          boxId: box.boxId,
+          printDeviceId: this.printData.printId
+        })
+
+        await this.$lwPrint.bluetoothPrint({taskId:res.id})
+      }catch (e){
+        console.log(e)
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>

package/src/components/page/outbound/reprint-box/collapseItem.vue

@@ -0,0 +1,71 @@
+<!--
+  折叠项
+  @author: 张文
+  @date: 2022-11-30
+-->
+<template>
+  <div class="lw-global-collapse-box">
+    <van-collapse
+      v-model="activeCollapse"
+      :border="false"
+    >
+      <van-collapse-item name="1">
+
+        <template #title>
+          <div class="lw-global-flex-between">
+
+            <div class="lw-global-title">
+              {{ $lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.iwomuosq', '捆包箱商品列表') }}
+            </div>
+
+            <div class="lw-global-title">
+              {{$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.spsgqdjo', '行数 ')}}
+              <span class="lw-global-value-bold">{{ item.skuList.length }}</span>
+            </div>
+
+            <div class="lw-global-title">
+              {{$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.nxxcraqt', '数量 ')}}
+              <span class="lw-global-value-bold-red">{{ item.skuQty }}</span>
+            </div>
+
+
+          </div>
+        </template>
+
+        <lw-sku-info-module
+          v-for="(i,k) in item.skuList"
+          :key="i.skuId"
+          :sku-name="i.skuName"
+          :sku-code="i.skuCode"
+          :qty="i.qty"
+          :is-row="k!==0 && (k+1) < item.skuList.length"
+          :is-row-first="k===0"
+          :is-row-last="(k+1) === item.skuList.length"
+        />
+      </van-collapse-item>
+    </van-collapse>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "collapseItem",
+  props:{
+    item:{
+      type: Object,
+      default:()=>{}
+    }
+  },
+  data() {
+    return {
+      activeCollapse:[]
+    }
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/components/page/outbound/reprint-box/index.js

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