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

package/src/components/page/inner/randomMove/index/index.vue

@@ -41,6 +41,8 @@
               ref="up"
               :input-focus="tabActive==='up'"
               v-model="isUpInput"
+              @load="upLpnLoad"
+              @changeLpn="upClear"
             />
 
           </van-tab>
@@ -70,12 +72,8 @@
 
     <!-- 上架的底部操作栏 -->
     <lw-bottom-bar v-if="tabActive === 'up' && !isUpInput">
-      <lw-button
-        plain
-        type="last"
-        @click="upClear"
-      >
-        {{ $lwLanguage.get('wms_project.pda.inbound.randomMove.cance','取消') }}
+      <lw-button v-if="upLpnData" plain type="last" @click="wholeLpnUp">
+        {{ $lwLanguage.get('wms_project.pda.inbound.randomMove.wholeCase','整容器上架') }}
       </lw-button>
       <lw-button
         plain
@@ -89,10 +87,48 @@
       </lw-button>
     </lw-bottom-bar>
 
+    <!-- 整托上架弹框 -->
+    <lw-popup title="整托盘上架" v-if="upLpnData" v-model="upLpnPop.show">
+      <div>
+        <div class="lw-global-row">
+          <lw-title-value-cell title="托盘号" :value="upLpnData.lpn" val-bold :is-row="false" />
+        </div>
+        <div class="lw-global-row lw-global-flex-between">
+          <lw-title-value-cell title="品种数" :value="upLpnData.skuCount" val-bold val-red :is-row="false" />
+          <lw-title-value-cell title="待上架" :value="upLpnData.toUpQty" val-bold val-red :is-row="false" />
+        </div>
+      </div>
+      <div class="box-model">
+        <div class="box-item-sku" v-for="line in upLpnData.lines" :key="line.id">
+          <!-- 任务行信息 -->
+          <div class="lw-global-row">
+            <div class="lw-global-flex-between">
+              <div>
+                <div class="lw-global-value-bold">{{line.skuCode}}</div>
+                <div class="lw-global-title">{{line.skuName}}</div>
+              </div>
+              <div style="text-align: center;">
+                <div class="lw-global-value-bold" style="color: red;">{{line.pickQty}}</div>
+                <div class="lw-global-title">数量</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="lw-global-row">
+        <lw-input title="目标库位" required v-model="upLpnPop.loc.value" :get-focus.sync="upLpnPop.loc.focus" @confirm="upLpnPop.lpn.focus = true"/>
+        <lw-input title="目标托盘" v-model="upLpnPop.lpn.value" :get-focus.sync="upLpnPop.lpn.focus" @confirm="doWholeLpnUp" />
+      </div>
+      <template #button>
+        <lw-button @click="doWholeLpnUp">整托盘上架</lw-button>
+      </template>
+    </lw-popup>
+
   </div>
 </template>
 
 <script>
+import { wmsGetWholeLpnMoveTaskInfo, wmsWholeLpnUp } from '../../../../../api/inner/move/taskMove'
 import Down from './../components/Down/index.vue'
 import Up from './../components/Up/index.vue'
 
@@ -113,13 +149,23 @@ export default {
       // 上架tab是输入框状态
       isUpInput: true,
 
+      upLpn: null,
+      // 当前整托上架的托盘数据
+      upLpnData: null,
+      upLpnPop: {
+        show: false,
+        loc: {
+          value: '',
+          focus: false,
+        },
+        lpn: {
+          value: '',
+          focus: false,
+        },
+      },
     }
   },
   methods: {
-    // 下架取消
-    downClear(){
-      this.isDownInput = true
-    },
     // 执行下架
     downAction(){
       this.$refs.down.actionDown()
@@ -132,6 +178,10 @@ export default {
     // 上架取消
     upClear(){
       this.isUpInput = true
+      this.upLpn = null
+      this.upLpnData = null
+      this.upLpnPop.loc.value = ''
+      this.upLpnPop.lpn.value = ''
     },
     // 执行上架
     upAction(){
@@ -141,6 +191,57 @@ export default {
     lessUp(){
       this.$refs.up.lessUp()
     },
+    // 整容器上架信息
+    upLpnLoad (lpn, data) {
+      if (!data) {
+        this.upLpn = null
+        this.upLpnData = null
+        return
+      }
+      wmsGetWholeLpnMoveTaskInfo(lpn).then(res => {
+        if (!res.whole) {
+          return
+        }
+        this.upLpn = lpn
+        this.upLpnData = res
+      })
+    },
+    // 整容器上架
+    wholeLpnUp(){
+      this.upLpnPop.show = true
+    },
+    // 整容器上架
+    doWholeLpnUp(){
+      if (!this.upLpnData) {
+        return
+      }
+      const toLocCode = this.upLpnPop.loc.value
+      if (!toLocCode) {
+        this.upLpnPop.loc.value = ''
+        this.upLpnPop.loc.focus = true
+        return this.$lwShowErrorMsg('目标库位不能为空')
+      }
+      const toLpn = this.upLpnPop.lpn.value
+
+      const method = () => {
+        wmsWholeLpnUp(this.upLpnData.lpn, toLocCode, toLpn).then(() => {
+          this.upLpnPop.show = false
+          this.$lwToast.success(
+            this.$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.success','操作成功')
+          )
+          this.upClear()
+        })
+      }
+
+      if (this.upLpnData.toLocCode && this.upLpnData.toLocCode !== toLocCode) {
+        this.$dialog.confirm({
+          title: '提示',
+          message: `任务的目标库位是 ${this.upLpnData.toLocCode}，确定要上架的库位 ${toLocCode} 吗？`
+        }).then(method).catch(() => {})
+      } else {
+        method()
+      }
+    },
 
 
   }
@@ -148,5 +249,17 @@ export default {
 </script>
 
 <style scoped lang="less">
+.box-model {
+  margin-top: 5px;
 
+  .box-item {
+    padding: 10px;
+    border-radius: 5px;
+    margin-bottom: 6px;
+
+    &-sku {
+      margin: 8px 0;
+    }
+  }
+}
 </style>

package/src/components/page/inner/reportAbnormal/index/index.vue

@@ -1,251 +1,251 @@
-<!--
-  在库异常上报 - 起始页
-  @author: 张文
-  @date: 2022-05-20
--->
-<template>
-  <div>
-    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.reportAbn.index.title','在库异常上报')"/>
-
-    <div class="lw-global-page-box">
-      <div
-        class="lw-global-model-box"
-        style="transition: all .3s;overflow: hidden"
-        :style="{ height: showMore ? '237px' : '39px' }"
-      >
-
-        <!-- 商品号 -->
-        <lw-input
-          :title="$lwLanguage.get('wms_project.pda.reportAbn.index.sku','商品号')"
-          v-model="sku.value"
-          :get-focus.sync="sku.focus"
-          required
-          rule-key="sku"
-          @confirm="skuConfirm"
-        >
-          <template #button>
-            <lw-button
-              round
-              mini
-              @click="skuConfirm"
-            >
-              {{ $lwLanguage.get('wms_project.pda.reportAbn.index.seo','查询') }}
-            </lw-button>
-          </template>
-        </lw-input>
-
-        <!-- 商品信息 -->
-        <lw-cell
-          :title="$lwLanguage.get('wms_project.pda.reportAbn.index.name','商品名称')"
-          :value="selectOwner.item.skuName"
-          :is-link="false"
-        />
-
-        <!-- 货主 -->
-        <lw-cell
-          :title="$lwLanguage.get('wms_project.pda.reportAbn.index.owner','货主')"
-          :value="selectOwner.item.ownerCode + ' - ' + selectOwner.item.ownerName"
-          :is-link="false"
-        />
-
-        <!-- 库位 -->
-        <lw-input
-          :title="$lwLanguage.get('wms_project.pda.reportAbn.index.local','库位')"
-          v-model="local.value"
-          :get-focus.sync="local.focus"
-          input-align="right"
-          required
-          rule-key="location"
-          @confirm="localConfirm"
-        />
-
-        <!-- 托盘号 -->
-        <lw-input
-          :title="$lwLanguage.get('wms_project.pda.reportAbn.index.lpn','托盘号')"
-          v-model="lpn.value"
-          :get-focus.sync="lpn.focus"
-          input-align="right"
-          rule-key="lpn"
-          @confirm="lpnConfirm"
-        />
-
-        <!-- 查询库位 -->
-        <lw-button
-          style="margin-top: 10px"
-          block
-          @click="seo"
-        >
-          {{ $lwLanguage.get('wms_project.pda.reportAbn.index.seoLocal','查询库存') }}
-        </lw-button>
-
-      </div>
-    </div>
-
-    <!-- 选择货主 -->
-    <lw-popup
-      :title="$lwLanguage.get('wms_project.pda.reportAbn.index.selectOwner','选择货主')"
-      v-model="selectOwner.show"
-    >
-      <div
-        class="lw-global-click-style lw-global-flex-between lw-global-row"
-        v-for="(i,k) in selectOwner.list"
-        :key="k"
-        @click="selectOwnerConfirm(i)"
-      >
-        <div style="flex: 1;">
-          <div>
-            <span class="lw-global-title">
-              {{ $lwLanguage.get('wms_project.pda.reportAbn.index.owner','货主') }}
-            </span>
-            <span class="lw-global-value-bold">
-              {{ i.ownerCode }} - {{ i.ownerName }}
-            </span>
-          </div>
-          <div
-            style="margin-top: 5px"
-            class="lw-global-value-bold"
-          >{{ i.skuCode }}</div>
-          <div class="lw-global-title">{{ i.skuName }}</div>
-        </div>
-
-        <van-icon name="arrow" />
-
-      </div>
-    </lw-popup>
-
-  </div>
-</template>
-
-<script>
-import {
-  wmsGetSkuInfoByCode
-} from "../../../../../api/inner/reportAbnormal";
-
-export default {
-  name: "lwInnerReportAbnormalPage",
-  data() {
-    return {
-      // 商品号
-      sku:{
-        value:'',
-        focus: true,
-        item:{}
-      },
-      // 库位
-      local:{
-        value:'',
-        focus: false
-      },
-      // 托盘号
-      lpn:{
-        value:'',
-        focus: false
-      },
-
-      // 显示更多信息
-      showMore: false,
-
-      // 选择货主
-      selectOwner: {
-        show: false,
-        list:[],
-        item:''
-      }
-    }
-  },
-  watch:{
-    'sku.value':{
-      handler(n){
-        if (!n){
-          this.selectOwner.list = []
-          this.selectOwner.item = {}
-          this.local.value = ''
-          this.lpn.value = ''
-          this.showMore = false
-        }
-      }
-    }
-  },
-  methods: {
-    // 商品号确认
-    skuConfirm(){
-      if (!this.sku.value){
-        this.$lwLanguage.get('wms_project.pda.reportAbn.index.skuNull','商品号不能为空')
-        return
-      }
-
-      wmsGetSkuInfoByCode({
-        skuCode: this.sku.value
-      }).then(res=>{
-
-        if (res.length === 1){
-          setTimeout(()=>{
-            this.selectOwnerConfirm(res[0])
-          },10)
-          return
-        }
-
-        this.selectOwner.list = res
-        this.selectOwner.show = true
-      })
-    },
-
-    // 选择商品确认
-    selectOwnerConfirm(item){
-      this.selectOwner.item = item
-      this.selectOwner.show = false
-      this.showMore = true
-      this.local.focus = true
-    },
-
-    // 库位确认
-    localConfirm(){
-      if (this.localCheck()) this.lpn.focus = true
-    },
-    // 库位必填校验
-    localCheck(){
-      if(this.local.value) return true
-
-      this.$lwShowErrorMsg(
-        this.$lwLanguage.get('wms_project.pda.reportAbn.index.localNull','库位不能为空')
-      )
-      return false
-    },
-
-    // 托盘号确认
-    lpnConfirm(){
-      this.seo()
-    },
-
-
-    // 查询库存
-    seo(){
-      if (this.sku.value !== this.selectOwner.item.skuCode){
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.reportAbn.index.skuError','输入的商品号与选择的商品信息不一致！请点击商品号输入框后的查询按钮，重新获取当前输入的商品信息')
-        )
-        return
-
-      }
-
-      if (!this.localCheck()) return
-
-      const item = this.selectOwner.item
-      this.$router.push({
-        path:'/inner/reportAbnormal/lwAction',
-        query:{
-          lwSkuId: item.skuId,
-          lwOwnerId: item.ownerId,
-          lwLocationCode: this.local.value,
-          lwLpn: this.lpn.value
-        }
-      })
-
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-
-</style>
+<!--
+  在库异常上报 - 起始页
+  @author: 张文
+  @date: 2022-05-20
+-->
+<template>
+  <div>
+    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.reportAbn.index.title','在库异常上报')"/>
+
+    <div class="lw-global-page-box">
+      <div
+        class="lw-global-model-box"
+        style="transition: all .3s;overflow: hidden"
+        :style="{ height: showMore ? '237px' : '39px' }"
+      >
+
+        <!-- 商品号 -->
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.reportAbn.index.sku','商品号')"
+          v-model="sku.value"
+          :get-focus.sync="sku.focus"
+          required
+          rule-key="sku"
+          @confirm="skuConfirm"
+        >
+          <template #button>
+            <lw-button
+              round
+              mini
+              @click="skuConfirm"
+            >
+              {{ $lwLanguage.get('wms_project.pda.reportAbn.index.seo','查询') }}
+            </lw-button>
+          </template>
+        </lw-input>
+
+        <!-- 商品信息 -->
+        <lw-cell
+          :title="$lwLanguage.get('wms_project.pda.reportAbn.index.name','商品名称')"
+          :value="selectOwner.item.skuName"
+          :is-link="false"
+        />
+
+        <!-- 货主 -->
+        <lw-cell
+          :title="$lwLanguage.get('wms_project.pda.reportAbn.index.owner','货主')"
+          :value="selectOwner.item.ownerCode + ' - ' + selectOwner.item.ownerName"
+          :is-link="false"
+        />
+
+        <!-- 库位 -->
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.reportAbn.index.local','库位')"
+          v-model="local.value"
+          :get-focus.sync="local.focus"
+          input-align="right"
+          required
+          rule-key="location"
+          @confirm="localConfirm"
+        />
+
+        <!-- 托盘号 -->
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.reportAbn.index.lpn','托盘号')"
+          v-model="lpn.value"
+          :get-focus.sync="lpn.focus"
+          input-align="right"
+          rule-key="lpn"
+          @confirm="lpnConfirm"
+        />
+
+        <!-- 查询库位 -->
+        <lw-button
+          style="margin-top: 10px"
+          block
+          @click="seo"
+        >
+          {{ $lwLanguage.get('wms_project.pda.reportAbn.index.seoLocal','查询库存') }}
+        </lw-button>
+
+      </div>
+    </div>
+
+    <!-- 选择货主 -->
+    <lw-popup
+      :title="$lwLanguage.get('wms_project.pda.reportAbn.index.selectOwner','选择货主')"
+      v-model="selectOwner.show"
+    >
+      <div
+        class="lw-global-click-style lw-global-flex-between lw-global-row"
+        v-for="(i,k) in selectOwner.list"
+        :key="k"
+        @click="selectOwnerConfirm(i)"
+      >
+        <div style="flex: 1;">
+          <div>
+            <span class="lw-global-title">
+              {{ $lwLanguage.get('wms_project.pda.reportAbn.index.owner','货主') }}
+            </span>
+            <span class="lw-global-value-bold">
+              {{ i.ownerCode }} - {{ i.ownerName }}
+            </span>
+          </div>
+          <div
+            style="margin-top: 5px"
+            class="lw-global-value-bold"
+          >{{ i.skuCode }}</div>
+          <div class="lw-global-title">{{ i.skuName }}</div>
+        </div>
+
+        <van-icon name="arrow" />
+
+      </div>
+    </lw-popup>
+
+  </div>
+</template>
+
+<script>
+import {
+  wmsGetSkuInfoByCode
+} from "../../../../../api/inner/reportAbnormal";
+
+export default {
+  name: "lwInnerReportAbnormalPage",
+  data() {
+    return {
+      // 商品号
+      sku:{
+        value:'',
+        focus: true,
+        item:{}
+      },
+      // 库位
+      local:{
+        value:'',
+        focus: false
+      },
+      // 托盘号
+      lpn:{
+        value:'',
+        focus: false
+      },
+
+      // 显示更多信息
+      showMore: false,
+
+      // 选择货主
+      selectOwner: {
+        show: false,
+        list:[],
+        item:''
+      }
+    }
+  },
+  watch:{
+    'sku.value':{
+      handler(n){
+        if (!n){
+          this.selectOwner.list = []
+          this.selectOwner.item = {}
+          this.local.value = ''
+          this.lpn.value = ''
+          this.showMore = false
+        }
+      }
+    }
+  },
+  methods: {
+    // 商品号确认
+    skuConfirm(){
+      if (!this.sku.value){
+        this.$lwLanguage.get('wms_project.pda.reportAbn.index.skuNull','商品号不能为空')
+        return
+      }
+
+      wmsGetSkuInfoByCode({
+        skuCode: this.sku.value
+      }).then(res=>{
+
+        if (res.length === 1){
+          setTimeout(()=>{
+            this.selectOwnerConfirm(res[0])
+          },10)
+          return
+        }
+
+        this.selectOwner.list = res
+        this.selectOwner.show = true
+      })
+    },
+
+    // 选择商品确认
+    selectOwnerConfirm(item){
+      this.selectOwner.item = item
+      this.selectOwner.show = false
+      this.showMore = true
+      this.local.focus = true
+    },
+
+    // 库位确认
+    localConfirm(){
+      if (this.localCheck()) this.lpn.focus = true
+    },
+    // 库位必填校验
+    localCheck(){
+      if(this.local.value) return true
+
+      this.$lwShowErrorMsg(
+        this.$lwLanguage.get('wms_project.pda.reportAbn.index.localNull','库位不能为空')
+      )
+      return false
+    },
+
+    // 托盘号确认
+    lpnConfirm(){
+      this.seo()
+    },
+
+
+    // 查询库存
+    seo(){
+      if (this.sku.value !== this.selectOwner.item.skuCode){
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.reportAbn.index.skuError','输入的商品号与选择的商品信息不一致！请点击商品号输入框后的查询按钮，重新获取当前输入的商品信息')
+        )
+        return
+
+      }
+
+      if (!this.localCheck()) return
+
+      const item = this.selectOwner.item
+      this.$router.push({
+        path:'/inner/reportAbnormal/lwAction',
+        query:{
+          lwSkuId: item.skuId,
+          lwOwnerId: item.ownerId,
+          lwLocationCode: this.local.value,
+          lwLpn: this.lpn.value
+        }
+      })
+
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>