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

package/src/components/page/receive/putaway/components/overPutawayItem.vue

@@ -0,0 +1,119 @@
+<!--
+  已上架列表折叠项
+  @author: 张文
+  @date: 2022-07-18
+-->
+<template>
+  <div
+    class="lw-global-model-box lw-global-collapse-box lw-global-animation-out"
+    :style="{animationDelay: 50 * index + 'ms',padding:'5px 10px'}"
+  >
+    <van-collapse
+      v-model="collapse"
+      :border="false"
+    >
+      <van-collapse-item name="1">
+
+        <template #title>
+
+          <lw-title-value-cell
+            style="padding: 0 0 5px"
+            :title="$lwLanguage.get('wms_project.pda.components.page.receive.putaway.components.hpuxweda','上架标签/托盘号')"
+            :value="item.lpn"
+            val-bold
+          />
+
+          <div class="lw-global-row lw-global-flex-between">
+
+            <lw-title-value-cell
+              :title="$lwLanguage.get('wms_project.pda.components.page.receive.putaway.components.upkikhvl','原库位')"
+              :value="item.fromLocationCode"
+              val-bold
+              :is-row="false"
+            />
+
+            <lw-title-value-cell
+              :title="$lwLanguage.get('wms_project.pda.components.page.receive.putaway.components.ymfsbcri','数量')"
+              :value="item.qty"
+              val-bold
+              :is-row="false"
+            />
+
+            <lw-title-value-cell
+              :title="$lwLanguage.get('wms_project.pda.components.page.receive.putaway.components.ypiitxep','行数')"
+              :value="item.lineCount"
+              val-bold
+              :is-row="false"
+            />
+
+          </div>
+
+          <lw-title-value-cell
+            :title="$lwLanguage.get('wms_project.pda.components.page.receive.putaway.components.wlbdsnzh','实际库位')"
+            :value="item.toActLocationCode"
+            val-bold
+          />
+
+          <lw-title-value-cell
+            style="padding-top: 5px"
+            :title="$lwLanguage.get('wms_project.pda.components.page.receive.putaway.components.qmbkjada','上架时间')"
+            :value="$lwDate.format(item.time, 'yyyy-MM-dd hh:mm')"
+            val-bold
+            :is-row="false"
+          />
+
+        </template>
+
+        <case-info
+          v-if="item.caseList && item.caseList.length>0"
+          :case-list="item.caseList"
+          :show-pa-qty="false"
+        />
+        <sku-info
+          v-else
+          :sku-list="item.lines"
+          :show-abnormal="false"
+          :has-putaway="true"
+          :show-pa-qty="false"
+        />
+
+      </van-collapse-item>
+    </van-collapse>
+
+  </div>
+</template>
+
+<script>
+import skuInfo from './SkuInfo/index.vue'
+import CaseInfo from './CaseInfo/index.vue'
+
+export default {
+  name: "overPutawayItem",
+  components:{
+    skuInfo,CaseInfo
+  },
+  props:{
+    // 当前索引
+    index:{
+      type: Number,
+      default: 0
+    },
+
+    // 数据
+    item:{
+      type: Object,
+      default: ()=>{}
+    }
+  },
+  data() {
+    return {
+      collapse:[]
+    }
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/components/page/receive/putaway/index/index.js

@@ -1,11 +1,11 @@
-/*
-* 在库上架 - 起始页
-* @author: 张文
-* @date  2022-05-24
-* */
-
-import lwReceivePutawayPage from "./index.vue";
-
-lwReceivePutawayPage.install = Vue => Vue.component(lwReceivePutawayPage.name, lwReceivePutawayPage)
-
-export default lwReceivePutawayPage
+/*
+* 在库上架 - 起始页
+* @author: 张文
+* @date  2022-05-24
+* */
+
+import lwReceivePutawayPage from "./index.vue";
+
+lwReceivePutawayPage.install = Vue => Vue.component(lwReceivePutawayPage.name, lwReceivePutawayPage)
+
+export default lwReceivePutawayPage

package/src/components/page/receive/putaway/index/index.vue

@@ -10,60 +10,91 @@
 
     <div class="lw-global-page-box">
 
-      <!-- 输入框 -->
-      <div
-        v-if="!fromTask"
-        class="lw-global-model-box"
-      >
-        <lw-input
-          :title="$lwLanguage.get('wms_project.pda.receive.putaway.lpn','托盘号/上架标签')"
-          v-model="lpn.value"
-          :get-focus.sync="lpn.focus"
-          required
-          rule-key="lpn"
-          @confirm="lpnConfirm"
-        />
-
-        <lw-input
-          v-if="local.show"
-          :title="$lwLanguage.get('wms_project.pda.receive.putaway.local', '库位')"
-          v-model="local.value"
-          :get-focus.sync="local.focus"
-          rule-key="location"
-          @confirm="lpnConfirm"
-        />
-      </div>
+      <div class="lw-global-tab-box">
+
+        <van-tabs
+          type="card"
+          animated
+          v-model="tabActive"
+          @change="tanChange"
+        >
+
+          <!-- 执行上架 -->
+          <van-tab
+            name="ing"
+            :title="$lwLanguage.get('wms_project.pda.components.page.receive.putaway.index.quhrfbga','执行上架')"
+          >
+
+            <!-- 输入框 -->
+            <div
+              v-if="!fromTask"
+              class="lw-global-model-box"
+            >
+              <lw-input
+                :title="$lwLanguage.get('wms_project.pda.receive.putaway.lpn','托盘号/上架标签')"
+                v-model="lpn.value"
+                :get-focus.sync="lpn.focus"
+                required
+                rule-key="lpn"
+                @confirm="lpnConfirm"
+              />
+
+              <lw-input
+                v-if="local.show"
+                :title="$lwLanguage.get('wms_project.pda.receive.putaway.local', '库位')"
+                v-model="local.value"
+                :get-focus.sync="local.focus"
+                rule-key="location"
+                @confirm="lpnConfirm"
+              />
+            </div>
+
+            <!-- 扫描得到的数据 -->
+            <task-info
+              class="lw-global-animation-out"
+              v-for="(i,k) in taskList"
+              :key="i.taskId"
+              :style="{animationDelay: 50 * k + 'ms'}"
+              :item="i"
+              :show-del="showDel && !fromTask"
+              :show-print="showPrint"
+              :show-sku-abnormal="showSkuAbnormal"
+              :location-code="locationCode"
+              @del="itemDel(k)"
+            />
+
+          </van-tab>
+
+          <!-- 已上架列表 -->
+          <van-tab
+            name="list"
+            :title="$lwLanguage.get('wms_project.pda.components.page.receive.putaway.index.sivxtkkt','已上架列表')"
+          >
+            <over-putaway-item
+              v-for="(i,k) in overList.list"
+              :key="k"
+              :index="k"
+              :item="i"
+            />
+            <lw-pagination
+              v-model="overList.pageNum"
+              :page-size.sync="overList.pageSize"
+              :page-total="overList.pageTotal"
+              @change="getOverListData"
+            />
+
+            <lw-not-data v-if="!overList.list.length"/>
+          </van-tab>
+        </van-tabs>
 
-      <!-- 扫描得到的数据 -->
-      <task-info
-        class="lw-global-animation-out"
-        v-for="(i,k) in taskList"
-        :key="i.taskId"
-        :style="{animationDelay: 50 * k + 'ms'}"
-        :item="i"
-        :show-del="showDel && !fromTask"
-        :show-print="showPrint"
-        :show-sku-abnormal="showSkuAbnormal"
-        :location-code="locationCode"
-        @del="itemDel(k)"
-      />
+      </div>
 
     </div>
 
-    <lw-bottom-bar v-if="showBottomBar">
-
-      <lw-button
-        v-if="showLpnShelf"
-        plain
-        type="last"
-        @click="lpnShelf"
-      >{{ $lwLanguage.get('wms_project.pda.receive.putaway.allLpnUp','整托盘上架') }}</lw-button>
-
-      <lw-button @click="skuShelf">
-        {{ $lwLanguage.get('wms_project.pda.receive.putaway.skuUp','按商品上架') }}
-      </lw-button>
-
-    </lw-bottom-bar>
+    <lw-bottom-bar-btn-hidden
+      v-if="tabActive==='ing'"
+      :btn-list="bottomBtnList"
+    />
 
   </div>
 </template>
@@ -71,15 +102,17 @@
 <script>
 
 import TaskInfo from './../components/TaskInfo/index.vue'
+import overPutawayItem from './../components/overPutawayItem.vue'
 import {
   wmsMobileGetPutawayTaskByLpn,
-  wmsMobileGetPutawayTaskByTask
+  wmsMobileGetPutawayTaskByTask, wmsMobileQueryHasPutawayTask
 } from "../../../../../api/receive/putaway";
 
 export default {
   name: "lwReceivePutawayPage",
   components: {
-    TaskInfo
+    TaskInfo,
+    overPutawayItem
   },
   props:{
     // 是否显示删除按钮
@@ -94,7 +127,7 @@ export default {
       default: true
     },
 
-    // 是否显示零件异常上报按钮
+    // 是否显示商品异常上报按钮
     showSkuAbnormal:{
       type: Boolean,
       default: true
@@ -108,6 +141,9 @@ export default {
   },
   data() {
     return {
+      // tab激活项
+      tabActive: '',
+
       // 是否通过任务进入
       fromTask: false,
 
@@ -128,14 +164,62 @@ export default {
       taskList: [],
 
       // 是否显示整托盘上架按钮
-      showLpnShelf: true
+      showLpnShelf: true,
+
+      // 已上架列表
+      overList:{
+        pageNum: 1,
+        pageSize: 10,
+        pageTotal: 0,
+        list: []
+      },
+
+      // 底部按钮区全部按钮
+      allBtnList:{
+        lpn:{
+          text: this.$lwLanguage.get('wms_project.pda.receive.putaway.allLpnUp','整托盘上架'),
+          click: this.lpnShelf
+        },
+        sku:{
+          text: this.$lwLanguage.get('wms_project.pda.receive.putaway.skuUp','按商品上架'),
+          click: this.skuShelf
+        },
+        lpnBatch:{
+          text: this.$lwLanguage.get('wms_project.pda.components.page.receive.putaway.index.index.ohxyyiha','整托盘批量上架'),
+          click: this.lpnBatchShelf
+        },
+        case:{
+          text: this.$lwLanguage.get('wms_project.pda.components.page.receive.putaway.index.index.kjynliuc','整箱上架'),
+          click: this.caseShelf
+        }
+      },
+
     }
   },
   computed:{
-    // 是否显示底部按钮栏
-    showBottomBar(){
-      return !!this.taskList.length
-    },
+    // 底部按钮显示的按钮块
+    bottomBtnList() {
+
+      if (!this.taskList.length){
+        return []
+      }
+
+      // 找出所有托盘的并集
+      let btnList = []
+      this.taskList.forEach(item=>{
+        btnList = btnList.concat(item.putawayMethodList || [])
+      })
+
+      // 去重
+      let arr =  [...new Set(btnList)].map(item=>this.allBtnList[item])
+
+      // 商品上架 - 如果没有任何交集，按商品上架就是兜底方案
+      if (!arr.length){
+        arr.push(this.allBtnList.sku)
+      }
+
+      return arr
+    }
 
   },
   watch: {
@@ -166,8 +250,16 @@ export default {
         history.go(-1)
       })
     }
+    this.getOverListData()
   },
   methods: {
+    // tab切换
+    tanChange(){
+      if(this.tabActive === 'list' && !this.overList.list.length){
+        this.getOverListData()
+      }
+    },
+
     // 托盘号确认
     lpnConfirm() {
       if (!this.lpn.value) {
@@ -190,6 +282,65 @@ export default {
         lpn: this.lpn.value,
         locationCode: this.local.value
       }).then(res => {
+        // 是否存在多托盘
+        if (res.moreLocation) {
+          this.local.show = true
+          this.local.focus = true
+          return
+        }
+
+        if(res.warnNoTempLoc){
+          this.$lwDialog.confirm({
+            title: this.$lwLanguage.get('wms_project.pda.receive.putaway.total','提示'),
+            message: this.$lwLanguage.get(
+              'wms_project.pda.receive.putaway.error.inventory.loc.no.temp',
+              '库存在非暂存库位，是否生成上架任务？'
+            ),
+            confirmButtonText: this.$lwLanguage.get('wms_project.pda.receive.putaway.goCreate','确认生成'),
+            cancelButtonText: this.$lwLanguage.get('wms_project.pda.receive.putaway.cancel','取消')
+          }).then(()=>{this.locConfirm()}).catch(()=>{})
+          return
+        }
+
+        for (let i=0;i<res.list.length;i++){
+          for (let j=0;j<this.taskList.length;j++){
+            if (res.list[i].taskId === this.taskList[j].taskId){
+              this.taskList.splice(j, 1)
+              j--
+            }
+          }
+        }
+
+        this.taskList = res.list.concat(this.taskList)
+        this.clearInput()
+      }).catch(()=>{
+        this.clearInput()
+      })
+    },
+
+    // 库位确认
+    locConfirm() {
+      if (!this.lpn.value) {
+        this.lpnFocus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.receive.putaway.lpnNull', '托盘号不能为空')
+        )
+        return
+      }
+
+      if (this.local.show && !this.local) {
+        this.local.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.receive.putaway.scanLpn', '请扫描或输入仓库号定位当前托盘')
+        )
+        return
+      }
+
+      wmsMobileGetPutawayTaskByLpn({
+        lpn: this.lpn.value,
+        locationCode: this.local.value,
+        ignoreLocStorageType: true
+      }).then(res => {
 
         // 是否存在多托盘
         if (res.moreLocation) {
@@ -214,6 +365,8 @@ export default {
       })
     },
 
+
+
     // 清空输入框
     clearInput(){
       this.local.show = false
@@ -227,58 +380,67 @@ export default {
       this.taskList.splice(index, 1)
     },
 
-    // 整托盘上架
-    lpnShelf(){
-      // 校验是否能够整托盘上架
-      let lpnList = []
-      let notLpn = []
-      this.taskList.forEach(item=>{
-        if (item.wholeLpnPutaway){
-          lpnList.push(item.lpn)
-        }else {
-          notLpn.push(item.lpn)
-        }
+    // 获取已上架列表数据
+    getOverListData(){
+      this.overList.list = []
+      wmsMobileQueryHasPutawayTask({
+        pageSize: this.overList.pageSize,
+        pageNum: this.overList.pageNum - 1,
+        type: 'REC_PA',
+        onlySelf: true
+      }).then(res=>{
+        this.overList.pageTotal = res.total
+        this.overList.list = res.datas || []
       })
+    },
 
-      // 是否存在非整托盘上架的任务
-      if (notLpn.length){
-        this.$dialog.confirm({
-          title: this.$lwLanguage.get('wms_project.pda.receive.putaway.total','提示'),
-          message: this.$lwLanguage.get(
-            '',
-            '当前上架任务中存在非整托上架任务，请删除后重试。或使用按商品上架功能继续任务'
-          ),
-          confirmButtonText: this.$lwLanguage.get('wms_project.pda.receive.putaway.goDel','去删除'),
-          cancelButtonText: this.$lwLanguage.get('wms_project.pda.receive.putaway.skuUp','按商品上架')
-        }).then(()=>{}).catch(()=>{
-          this.skuShelf()
-        })
-        return
-      }
+    // 按商品上架
+    skuShelf(){
+      const taskIdList = this.taskList.map(item=>{
+        return item.taskId
+      })
+
+      this.$router.push({
+        path:'/receive/putaway/lwSkuAction',
+        query:{
+          lwTaskIdList: JSON.stringify(taskIdList),
+          lwBack: this.fromTask ? 2 : 1
+        }
+      })
+    },
 
+    // 整托盘上架
+    lpnShelf(){
       this.$router.push({
         path:'/receive/putaway/lwLpnAction',
         query:{
-          lwLpnList: JSON.stringify(lpnList),
+          lwLpnList: JSON.stringify(this.taskList.map(item=>item.lpn)),
           lwBack: this.fromTask ? 2 : 1
         }
       })
     },
 
-    // 按商品上架
-    skuShelf(){
-      const taskIdList = this.taskList.map(item=>{
-        return item.taskId
+    // 整托盘批量上架
+    lpnBatchShelf(){
+      this.$router.push({
+        path:'/receive/putaway/lwLpnBatchAction',
+        query:{
+          lwLpnList: JSON.stringify(this.taskList.map(item=>item.lpn)),
+          lwBack: this.fromTask ? 2 : 1
+        }
       })
+    },
 
+    // 整箱上架
+    caseShelf(){
       this.$router.push({
-        path:'/receive/putaway/lwSkuAction',
+        path:'/receive/putaway/lwCaseAction',
         query:{
-          lwTaskIdList: JSON.stringify(taskIdList),
+          lwLpnList: JSON.stringify(this.taskList.map(item=>item.lpn)),
           lwBack: this.fromTask ? 2 : 1
         }
       })
-    }
+    },
   }
 }
 </script>

package/src/components/page/receive/putaway/lpnAction/index.js

@@ -1,11 +1,11 @@
-/*
-* 入库上架 - 整托盘上架执行
-* @author: 张文
-* @date  2022-02-25
-* */
-
-import lwReceivePutawayLpnActionPage from "./index.vue";
-
-lwReceivePutawayLpnActionPage.install = Vue => Vue.component(lwReceivePutawayLpnActionPage.name, lwReceivePutawayLpnActionPage)
-
-export default lwReceivePutawayLpnActionPage
+/*
+* 入库上架 - 整托盘上架执行
+* @author: 张文
+* @date  2022-02-25
+* */
+
+import lwReceivePutawayLpnActionPage from "./index.vue";
+
+lwReceivePutawayLpnActionPage.install = Vue => Vue.component(lwReceivePutawayLpnActionPage.name, lwReceivePutawayLpnActionPage)
+
+export default lwReceivePutawayLpnActionPage