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

package/src/components/page/count/index.js

@@ -9,6 +9,8 @@ import LwCountLocActionPage from './loc/action'
 import LwCountInvIndexPage from './inv/index'
 import LwCountInvActionPage from './inv/action'
 
+import lwCountConsoleIndexPage from './console/index'
+
 export default [
   // 库位盘点页面
   LwCountLocIndexPage,
@@ -18,4 +20,6 @@ export default [
   LwCountInvIndexPage,
   // 库存盘点执行页面
   LwCountInvActionPage,
+  // 盘点控制台
+  lwCountConsoleIndexPage,
 ]

package/src/components/page/count/inv/action/index.vue

@@ -1,11 +1,11 @@
 <template>
   <div>
-    <lw-nav-bar title="库存盘点"/>
+    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.count.inv.action.bpooelkv', '库存盘点')"/>
 
     <div class="lw-global-page-box">
       <!-- 任务信息板 -->
       <div class="lw-global-model-box">
-        <count-board :data="taskData" :show-zones="false"/>
+        <count-board :data="taskData" :show-zones="false" type="inv"/>
       </div>
 
       <div v-if="line">
@@ -17,46 +17,55 @@
         </div>
 
         <div class="lw-global-model-box">
-          <div class="lw-global-flex-between" style="line-height: 1.5em;">
+          <div class="lw-global-flex-between" style="line-height: 1.5em; border-bottom: 1px solid #F0F0F0;">
             <div>
               <div>{{ line.skuCode }}</div>
               <div style="color: gray; font-size: 0.9em;">{{ line.skuName }}</div>
             </div>
             <div style="text-align: center;">
-              <template v-if="!taskData.bline">
+              <template v-if="!taskData.blind">
                 <div style="font-weight: bold; color: red;">{{ line.systemQty }}</div>
-                <div style="color: gray; font-size: 0.9em;">系统数</div>
+                <div style="color: gray; font-size: 0.9em;">{{$lwLanguage.get('wms_project.pda.components.page.count.inv.action.jagpcbcv', '系统数')}}</div>
               </template>
-              <lw-tag color="red" v-else>盲盘</lw-tag>
+              <lw-tag color="red" v-else>{{$lwLanguage.get('wms_project.pda.components.page.count.inv.action.puvmklex', '盲盘')}}</lw-tag>
             </div>
           </div>
-          <div class="lw-global-sh" style="margin-top: 10px;"></div>
-          <lw-input title="库位" v-model="inputData.locationCode.value"
-                    :get-focus.sync="inputData.locationCode.focus"
-                    @confirm="inputData.skuCode.focus = true"/>
-          <lw-input title="商品条码" v-model="inputData.skuCode.value"
-                    rule-key="sku" rule-value-key="skuCode"
+          <lw-title-value-cell v-if="['LPN', 'CASE'].includes(taskData.grading)" :title="$lwLanguage.get('wms_project.pda.components.page.count.loc.action.kedextkq', '托盘')" :value="line.lpn || '-'"/>
+          <lw-title-value-cell v-if="taskData.grading === 'CASE'" :title="$lwLanguage.get('wms_project.pda.components.page.count.loc.action.wkooappt', '箱号')" :value="line.caseNum || '-'"/>
+        </div>
+        <div class="lw-global-model-box">
+          <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.count.inv.action.vkxvrczd', '库位')" v-model="inputData.locationCode.value" required
+                    :get-focus.sync="inputData.locationCode.focus" @confirm="onLocationConfirm"/>
+          <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.count.loc.action.kedextkq', '托盘')" v-model="inputData.lpn.value"
+                    v-if="['LPN', 'CASE'].includes(taskData.grading)"
+                    :get-focus.sync="inputData.lpn.focus" @confirm="onLpnConfirm"/>
+          <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.count.loc.action.wkooappt', '箱号')" v-model="inputData.caseNum.value"
+                    v-if="taskData.grading === 'CASE'"
+                    :get-focus.sync="inputData.caseNum.focus" @confirm="onCaseNumConfirm"/>
+          <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.count.inv.action.vqaqfdbr', '商品条码')" v-model="inputData.skuCode.value" required
+                    rule-key="sku" @confirm="onSkuCodeConfirm"
                     :get-focus.sync="inputData.skuCode.focus"/>
           <div class="lw-global-props">
             <div>
-              <div>商品编码</div>
-              <div>{{ inputData.skuCode.value }}</div>
+              <div>{{$lwLanguage.get('wms_project.pda.components.page.count.inv.action.neivvwdw', '商品编码')}}</div>
+              <div>{{ skuCode }}</div>
             </div>
           </div>
           <div class="lw-global-sh"/>
-          <lw-input title="数量" type="number" v-model="inputData.qty.value" :get-focus.sync="inputData.qty.focus"/>
+          <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.count.inv.action.vvzdquvr', '数量')" type="number" v-model="inputData.qty.value" required
+                    :get-focus.sync="inputData.qty.focus"/>
         </div>
       </div>
     </div>
     <lw-bottom-bar>
-      <lw-button plain @click="$refs.randomPop.show()">随机盘点</lw-button>
-      <lw-button type="normal" @click="submitEmptyInv">无库存</lw-button>
-      <lw-button @click="submitCount">提交盘点</lw-button>
+      <lw-button plain @click="$refs.randomPop.show()">{{$lwLanguage.get('wms_project.pda.components.page.count.inv.action.qumhrjua', '随机盘点')}}</lw-button>
+      <lw-button type="normal" @click="submitEmptyInv">{{$lwLanguage.get('wms_project.pda.components.page.count.inv.action.lovcyuhd', '无库存')}}</lw-button>
+      <lw-button @click="submitCount">{{$lwLanguage.get('wms_project.pda.components.page.count.inv.action.fplnnpbb', '提交盘点')}}</lw-button>
     </lw-bottom-bar>
     <!-- 随机盘点 -->
-    <random-count ref="randomPop" :count-task-no="this.taskNo" @jump="getLine"/>
+    <random-count v-if="taskData" ref="randomPop" :count-task-no="this.taskNo" @jump="getLine" :grading="taskData.grading"/>
     <!-- 批次选择器 -->
-    <lw-popup title="填写批次数量" v-model="showLotGroups" :show-off-btn="false">
+    <lw-popup :title="$lwLanguage.get('wms_project.pda.components.page.count.inv.action.torlbkdh', '填写批次数量')" v-model="showLotGroups" :show-off-btn="false" @close="cancelLotGroup">
       <div v-if="lotGroups">
         <div v-for="g in lotGroups" :key="g.key">
           <div>
@@ -66,14 +75,14 @@
                 <div>{{item.value}}</div>
               </div>
             </div>
-            <lw-input title="数量" type="number" v-model="g.qty"/>
+            <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.count.inv.action.afmzmvch', '数量')" type="number" v-model="g.qty"/>
           </div>
           <div class="lw-global-sh"></div>
         </div>
       </div>
       <template #button>
-        <lw-button plain @click="cancelLotGroup">取消</lw-button>
-        <lw-button @click="submitCount">提交</lw-button>
+        <lw-button plain @click="cancelLotGroup">{{$lwLanguage.get('wms_project.pda.components.page.count.inv.action.rcunzcih', '取消')}}</lw-button>
+        <lw-button @click="submitCount">{{$lwLanguage.get('wms_project.pda.components.page.count.inv.action.usoixwpz', '提交')}}</lw-button>
       </template>
     </lw-popup>
   </div>
@@ -89,7 +98,7 @@ import {
   invCountLineSubmit
 } from '../../../../../api/inner/count'
 import CountBoard from '../../components/CountBoard.vue'
-import RandomCount from '../../components/RandomCount'
+import RandomCount from '../../components/RandomCount.vue'
 
 export default {
   name: 'lwCountInvActionPage',
@@ -100,18 +109,27 @@ export default {
       lineId: null,
       taskData: null,
       line: null,
+      skuCode: '',
       inputData: {
         locationCode: {
           value: '',
           focus: true,
         },
+        lpn: {
+          value: null,
+          focus: false,
+        },
+        caseNum: {
+          value: null,
+          focus: false,
+        },
         skuCode: {
           value: '',
           focus: false,
         },
         qty: {
           value: '',
-          focus: true,
+          focus: false,
         },
       },
       showLotGroups: false,
@@ -121,7 +139,7 @@ export default {
   created () {
     const { taskNo, lineId } = this.$route.query
     if (!taskNo) {
-      return this.$lwShowErrorMsg('错误的盘点任务号')
+      return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.count.inv.action.nznibnkq', '错误的盘点任务号'))
     }
     this.taskNo = taskNo
     this.lineId = lineId
@@ -131,7 +149,7 @@ export default {
     getTaskUnCountDetails () {
       getCountTaskDetails({ taskNo: this.taskNo, isCounted: false, page: 0, size: 1 }).then(res => {
         if (res.data.type !== 'INV') {
-          return this.$lwShowErrorMsg('该盘点任务不是库位盘点，无法操作')
+          return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.count.inv.action.xmhgxasv', '该盘点任务不是库位盘点，无法操作'))
         }
         if (res.countedLineCount != null) {
           res.data.countedLineCount = res.countedLineCount
@@ -153,7 +171,7 @@ export default {
     getLine (line = null) {
       if (line) {
         if (line.taskNo !== this.taskNo) {
-          return this.$lwShowErrorMsg('该盘点明细在任务 ' + line.taskNo + ' 中，无法跳转。')
+          return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.count.inv.action.swsyiesz', '该盘点明细在任务 {taskNo} 中已存在，无法跳转。', {taskNo: line.taskNo}))
         }
         if (this.line && this.line.id === line.id) {
           return
@@ -169,13 +187,51 @@ export default {
     getPrevLine () {
       getPreviousCountLine(this.taskNo, this.lineId).then(this.initLine)
     },
+    onLocationConfirm () {
+      if (['LPN','CASE'].includes(this.taskData.grading)) {
+        this.inputData.lpn.focus = true
+      } else {
+        this.inputData.skuCode.focus = true
+      }
+    },
+    onLpnConfirm () {
+      if (this.line.lpn !== this.inputData.lpn.value) {
+        return this.$lwShowErrorMsg('托盘号不正确')
+      }
+      if ('CASE' === this.taskData.grading) {
+        this.inputData.caseNum.focus = true
+      } else {
+        this.inputData.skuCode.focus = true
+      }
+    },
+    onCaseNumConfirm () {
+      if (this.line.caseNum !== this.inputData.caseNum.value) {
+        return this.$lwShowErrorMsg('箱号不正确')
+      }
+      this.inputData.skuCode.focus = true
+    },
+    onSkuCodeConfirm (sku, res) {
+      const skuCode = res.bizType === 'SKU' ? res.data.key : sku
+      if (skuCode) {
+        if (skuCode !== this.line.skuCode) {
+          this.$lwShowErrorMsg('商品编码不正确')
+          this.inputData.skuCode.value = ''
+          this.inputData.skuCode.focus = true
+          return
+        }
+        this.skuCode = skuCode
+        this.inputData.qty.focus = true
+      } else {
+        this.skuCode = ''
+      }
+    },
     submitEmptyInv () {
       if (!this.inputData.locationCode.value) {
-        return this.$lwShowErrorMsg('盘点库位不能为空')
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.count.inv.action.jpvypzfb', '盘点库位不能为空'))
       }
-      this.$dialog.confirm({
-        title: '确认空库位',
-        message: `当前库位 ${this.taskData.locationCode} 中商品 ${this.line.skuCode} 确认无库存？`
+      this.$lwDialog.confirm({
+        title: this.$lwLanguage.get('wms_project.pda.components.page.count.inv.action.cfuqrgip', '确认空库位'),
+        message: this.$lwLanguage.get('wms_project.pda.components.page.count.inv.action.cehchvqx', '当前库位 {locationCode} 中商品 {skuCode} 确认无库存？', {locationCode: this.line.locationCode, skuCode: this.line.skuCode})
       }).then(() => {
         this.inputData.skuCode.value = this.line.skuCode
         this.inputData.qty.value = 0
@@ -183,13 +239,24 @@ export default {
       })
     },
     submitCount () {
+      const qty = parseInt(this.inputData.qty.value)
       if (this.lotGroups) {
         const lotQty = this.lotGroups.map(i => parseInt(i.qty) || 0).reduce((a, b) => a + b, 0)
-        if (lotQty !== parseInt(this.inputData.qty.value)) {
-          return this.$lwShowErrorMsg('批次数量之和与盘点数量不符')
+        if (lotQty !== qty) {
+          return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.count.inv.action.fyausstw', '批次数量之和与盘点数量不符'))
         }
       }
 
+      if (this.line.systemQty !== qty) {
+        this.$lwDialog.confirm({
+          title: this.$lwLanguage.get('wms_project.pda.components.page.count.inv.action.qjlvdnaj', '提示'),
+          message: this.$lwLanguage.get('wms_project.pda.components.page.count.inv.action.siacfgjq', '当前盘点数量与系统数量不一致，确认提交吗？')
+        }).then(() => this.doSubmitCount())
+      } else {
+        this.doSubmitCount()
+      }
+    },
+    doSubmitCount () {
       invCountLineSubmit({
         countLineId: this.line.id,
         qty: this.inputData.qty.value,
@@ -204,11 +271,12 @@ export default {
         this.lotGroups = null
         this.showLotGroups = false
 
-        this.$toast('操作成功')
+        this.$toast(this.$lwLanguage.get('wms_project.pda.components.page.count.inv.action.fojagzah', '操作成功'))
         getCountTask(this.taskNo).then(res => {
+          this.taskData.diffLines = res.diffLines
           this.taskData.countedLineCount = res.countedLines
           if (res.unCountedLines === 0) {
-            this.$toast('当前盘点任务已经全部完成')
+            this.$toast(this.$lwLanguage.get('wms_project.pda.components.page.count.inv.action.zrjpyigl', '当前盘点任务已经全部完成'))
             setTimeout(() => {
               history.go(-2)
             }, 1500)
@@ -229,6 +297,14 @@ export default {
           value: '',
           focus: true,
         },
+        lpn: {
+          value: null,
+          focus: false,
+        },
+        caseNum: {
+          value: null,
+          focus: false,
+        },
         skuCode: {
           value: '',
           focus: false,
@@ -269,4 +345,4 @@ export default {
   margin: 5px 0;
   padding: 2px 0;
 }
-</style>
+</style>

package/src/components/page/count/inv/index/index.vue

@@ -1,32 +1,32 @@
 <template>
   <div>
-    <lw-nav-bar title="库存盘点"/>
+    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.count.inv.index.hhdqkzhq', '库存盘点')"/>
 
     <div v-if="unCountData" class="lw-global-page-box">
       <!-- 任务信息板 -->
       <div class="lw-global-model-box">
-        <count-board :data="unCountData"/>
+        <count-board :data="unCountData" type="inv"/>
       </div>
 
       <!-- TAB标签 -->
       <div class="lw-global-tab-box" style="margin-top: 10px;">
         <van-tabs type="card" animated v-model="tabActive" @change="tabChange">
-          <van-tab title="未盘点" name="unCount">
+          <van-tab :title="$lwLanguage.get('wms_project.pda.components.page.count.inv.index.fctlurjf', '未盘点')" name="unCount">
             <div class="lw-global-model-box">
-              <lw-input title="库位" v-model="unCountLocKey.value" @confirm="searchUnCountLocation"/>
+              <lw-input :get-focus.sync="focusData.locFocus" :title="$lwLanguage.get('wms_project.pda.components.page.count.inv.index.cbhbxztm', '库位')" v-model="unCountLocKey.value" @confirm="searchUnCountLocation"/>
             </div>
             <!-- 库位列表 -->
             <div class="lw-global-model-box" v-for="line in unCountData.countLines" :key="line.id" @click="toCountLine(line)">
               <div class="count-task-board">
                 <div class="count-task-board-top">
-                  <div>盘点库位</div>
+                  <div>{{$lwLanguage.get('wms_project.pda.components.page.count.inv.index.ntlesnyv', '盘点库位')}}</div>
                   <div class="count-task-board-top-l2">{{ line.locationCode }}</div>
                   <div class="count-task-board-top-l3">{{ $lwDict.getDictLabel('hight_low_type_choice', line.locationPosition) }}</div>
                 </div>
                 <div class="lw-global-sh"></div>
                 <div class="count-task-board-bottom">
-                  <div>系统商品数</div>
-                  <div class="count-task-board-bottom-l2">{{ line.systemQty || '-' }}</div>
+                  <div>{{$lwLanguage.get('wms_project.pda.components.page.count.inv.index.corracwb', '系统商品数')}}</div>
+                  <div class="count-task-board-bottom-l2">{{ unCountData.blind ? $lwLanguage.get('wms_project.pda.components.page.count.inv.action.puvmklex', '盲盘') : line.systemQty }}</div>
                 </div>
               </div>
             </div>
@@ -34,22 +34,22 @@
                       :page-size="unCountPagination.size"
                       :page-total="unCountPagination.total"/>
           </van-tab>
-          <van-tab title="已盘点" name="counted">
+          <van-tab :title="$lwLanguage.get('wms_project.pda.components.page.count.inv.index.qiinmtfk', '已盘点')" name="counted">
             <div class="lw-global-model-box">
-              <lw-input title="库位" v-model="countedLocKey.value" @confirm="searchCountedLocation"/>
+              <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.count.inv.index.tnlhdbag', '库位')" v-model="countedLocKey.value" @confirm="searchCountedLocation"/>
             </div>
             <!-- 库位列表 -->
             <div class="lw-global-model-box" v-for="line in countedData.countLines" :key="line.id">
               <div class="count-task-board">
                 <div class="count-task-board-top">
-                  <div>盘点库位</div>
+                  <div>{{$lwLanguage.get('wms_project.pda.components.page.count.inv.index.kbruduik', '盘点库位')}}</div>
                   <div class="count-task-board-top-l2">{{ line.locationCode }}</div>
                   <div class="count-task-board-top-l3">{{ $lwDict.getDictLabel('hight_low_type_choice', line.locationPosition) }}</div>
                 </div>
                 <div class="lw-global-sh"></div>
                 <div class="count-task-board-bottom">
-                  <div>系统商品数</div>
-                  <div class="count-task-board-bottom-l2">{{ line.systemQty || '-' }}</div>
+                  <div>{{$lwLanguage.get('wms_project.pda.components.page.count.inv.index.klhrsrtz', '系统商品数')}}</div>
+                  <div class="count-task-board-bottom-l2">{{ unCountData.blind ? $lwLanguage.get('wms_project.pda.components.page.count.inv.action.puvmklex', '盲盘') : line.systemQty }}</div>
                 </div>
               </div>
             </div>
@@ -67,11 +67,11 @@
     </div>
 
     <lw-bottom-bar v-if="countedData">
-      <lw-button plain @click="$refs.randomPop.show()">随机盘点</lw-button>
-      <lw-button @click="toCountLine">执行盘点</lw-button>
+      <lw-button plain @click="$refs.randomPop.show()">{{$lwLanguage.get('wms_project.pda.components.page.count.inv.index.bwknzykq', '随机盘点')}}</lw-button>
+      <lw-button @click="toCountLine">{{$lwLanguage.get('wms_project.pda.components.page.count.inv.index.llzwxrre', '执行盘点')}}</lw-button>
     </lw-bottom-bar>
 
-    <random-count ref="randomPop" :count-task-no="this.taskNo" @jump="toCountLine"/>
+    <random-count v-if="unCountData" ref="randomPop" :count-task-no="this.taskNo" @jump="toCountLine" :grading="unCountData.grading"/>
   </div>
 </template>
 
@@ -91,6 +91,9 @@ export default {
         value: '',
         current: null,
       },
+      focusData:{
+        locFocus: false,
+      },
       unCountPagination: {
         page: 0,
         size: 20,
@@ -116,6 +119,7 @@ export default {
       this.getTaskUnCountDetails()
     }
   },
+
   methods: {
     getTaskUnCountDetails () {
       getCountTaskDetails({
@@ -126,7 +130,7 @@ export default {
         size: this.unCountPagination.size
       }).then(res => {
         if (res.data.type !== 'INV') {
-          return this.$lwShowErrorMsg('该盘点任务不是库存盘点，无法操作')
+          return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.count.inv.index.ggxovgta', '该盘点任务不是库存盘点，无法操作'))
         }
         if (res.countedLineCount != null) {
           res.data.countedLineCount = res.countedLineCount
@@ -135,6 +139,12 @@ export default {
         this.unCountPagination.total = res.count
         this.unCountPagination.page = res.page
         this.unCountPagination.size = res.size
+        this.changeToLocFocus()
+      })
+    },
+    changeToLocFocus(){
+      this.$nextTick(()=>{
+        this.focusData.locFocus = true
       })
     },
     searchUnCountLocation() {
@@ -187,4 +197,4 @@ export default {
     }
   }
 }
-</script>
+</script>