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

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

@@ -13,7 +13,7 @@
 
       <!-- 看板 -->
       <div>
-        <div style="padding: 10px;border-radius: 10px 10px 0 0;background: #fff">
+        <div class="lw-global-model-top-radius">
           <span class="lw-global-title">
             {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.taskNo','任务号') }}
           </span>
@@ -24,13 +24,13 @@
           <!-- 品种数 -->
           <div>
             <div>{{ taskData.skuCount || 0 }}</div>
-            <div class="lw-data-look-bg-title">{{ $lwLanguage.get('wms_project.pda.inbound.taskMove.skuCount','品种数') }}</div>
+            <div>{{ $lwLanguage.get('wms_project.pda.inbound.taskMove.skuCount','品种数') }}</div>
           </div>
 
           <!-- 计划量 -->
           <div>
             <div>{{ taskData.planQty || 0 }}</div>
-            <div class="lw-data-look-bg-title">
+            <div>
               {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.planQty','计划量') }}
             </div>
           </div>
@@ -38,7 +38,7 @@
           <!-- 已上架 -->
           <div>
             <div>{{ taskData.putUpQty || 0 }}</div>
-            <div class="lw-data-look-bg-title">
+            <div>
               {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.putUpQty','已上架') }}
             </div>
           </div>
@@ -46,7 +46,7 @@
           <!-- 待上架 -->
           <div>
             <div>{{ taskData.toPutUpQty || 0 }}</div>
-            <div class="lw-data-look-bg-title">
+            <div>
               {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.toPutUpQty','待上架') }}
             </div>
           </div>
@@ -54,7 +54,7 @@
           <!-- 异常量 -->
           <div>
             <div>{{ taskData.abnQty || 0 }}</div>
-            <div class="lw-data-look-bg-title">
+            <div>
               {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.abnQty','异常量') }}
             </div>
           </div>
@@ -72,7 +72,10 @@
         >
 
           <!-- 下架 -->
-          <van-tab name="down" title="下架">
+          <van-tab
+            name="down"
+            :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.down','下架')"
+          >
 
             <div
               v-if="taskData.putDownMoveTaskLines.length"
@@ -171,25 +174,45 @@
                   @confirm="downDataDownLpnConfirm"
               />
 
-              <!-- 商品条码 -->
-              <lw-input
-                :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.skuCode','商品条码')"
-                v-model="downData.input.sku.value"
-                :get-focus.sync="downData.input.sku.focus"
-                required
-                rule-key="sku"
-                @confirm="downDataSkuCodeConfirm"
-              />
+              <div v-if="taskData.putDownMoveTaskLines[downData.index].needHandleSn">
+
+                <lw-input
+                  :title="$lwLanguage.get('','扫描序列号')"
+                  v-model="downData.input.sn.value"
+                  :get-focus.sync="downData.input.sn.focus"
+                  :rule-production-data="$lwScanRule.production('标准移动-SN','SN')"
+                  rule-key="sn"
+                  required
+                  @confirm="moveDownTaskSnConfirm"
+                />
+                <lw-scan-data-list-module
+                  title="已扫描序列号"
+                  v-model="downData.input.snList"
+                />
+
+              </div>
+              <div v-else>
+                <!-- 商品条码 -->
+                <lw-input
+                  :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.skuCode','商品条码')"
+                  v-model="downData.input.sku.value"
+                  :get-focus.sync="downData.input.sku.focus"
+                  required
+                  rule-key="sku"
+                  @confirm="downDataSkuCodeConfirm"
+                />
+
+                <!-- 数量 -->
+                <lw-input
+                  :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.qty','数量')"
+                  v-model="downData.input.num.value"
+                  :get-focus.sync="downData.input.num.focus"
+                  type="digit"
+                  required
+                  @confirm="downDataNumConfirm"
+                />
+              </div>
 
-              <!-- 数量 -->
-              <lw-input
-                :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.qty','数量')"
-                v-model="downData.input.num.value"
-                :get-focus.sync="downData.input.num.focus"
-                type="digit"
-                required
-                @confirm="downDataNumConfirm"
-              />
 
               <!-- 托盘号 -->
               <lw-input
@@ -229,7 +252,9 @@
 
 
           <!-- 上架 -->
-          <van-tab name="up" title="上架">
+          <van-tab
+            name="up"
+            :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.up','上架')">
 
             <div
               v-if="taskData.putUpMoveTaskLines.length"
@@ -295,28 +320,50 @@
                 </div>
               </div>
 
-              <lw-lot-look-module :columns="taskData.putUpMoveTaskLines[upData.index].groupKeyItemList"
-                                  title-key="label" value-key="value"/>
-
-              <!-- 商品条码 -->
-              <lw-input
-                :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.skuCode','商品条码')"
-                v-model="upData.input.sku.value"
-                :get-focus.sync="upData.input.sku.focus"
-                required
-                rule-key="sku"
-                @confirm="upDataSkuCodeConfirm"
+              <lw-lot-look-module
+                :columns="taskData.putUpMoveTaskLines[upData.index].groupKeyItemList"
+                title-key="label" value-key="value"
               />
 
-              <!-- 数量 -->
-              <lw-input
-                :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.qty','数量')"
-                v-model="upData.input.num.value"
-                :get-focus.sync="upData.input.num.focus"
-                type="digit"
-                required
-                @confirm="upDataNumConfirm"
-              />
+              <div v-if="taskData.putUpMoveTaskLines[upData.index].needHandleSn">
+
+                <lw-input
+                  :title="$lwLanguage.get('','扫描序列号')"
+                  v-model="upData.input.sn.value"
+                  :get-focus.sync="upData.input.sn.focus"
+                  :rule-production-data="$lwScanRule.production('标准移动-SN','SN')"
+                  rule-key="sn"
+                  required
+                  @confirm="moveUpTaskSnConfirm"
+                />
+                <lw-scan-data-list-module
+                  title="已扫描序列号"
+                  v-model="upData.input.snList"
+                />
+
+              </div>
+
+              <div v-else>
+                <!-- 商品条码 -->
+                <lw-input
+                  :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.skuCode','商品条码')"
+                  v-model="upData.input.sku.value"
+                  :get-focus.sync="upData.input.sku.focus"
+                  required
+                  rule-key="sku"
+                  @confirm="upDataSkuCodeConfirm"
+                />
+
+                <!-- 数量 -->
+                <lw-input
+                  :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.qty','数量')"
+                  v-model="upData.input.num.value"
+                  :get-focus.sync="upData.input.num.focus"
+                  type="digit"
+                  required
+                  @confirm="upDataNumConfirm"
+                />
+              </div>
 
               <!-- 接力上架 -->
               <lw-cell
@@ -642,6 +689,11 @@ export default {
             value:'',
             focus: false
           },
+          // sn
+          sn:{
+            value:'',
+            focus: false
+          },
           // 数量
           num:{
             value:'',
@@ -652,6 +704,8 @@ export default {
             value:'',
             focus: false
           },
+          // sn扫描列表
+          snList:[]
         }
       },
 
@@ -683,6 +737,14 @@ export default {
             value:'',
             focus: false
           },
+          // sn
+          sn:{
+            value:'',
+            focus: false
+          },
+          // sn扫描列表
+          snList:[]
+
         }
       },
       // 上架 - 扫描商品定位
@@ -708,15 +770,11 @@ export default {
       wmsGetMoveTaskInfo({
         taskId: this.$route.query.lwTaskId
       }).then(res=>{
-        this.taskData = res
 
-        if ((this.downData.index + 1) > this.taskData.putDownMoveTaskLines.length){
-          this.downData.index > 0 ? this.downData.index-- : this.downData.index = 0
-        }
+        this.downData.index = this.$lwUtils.cutCardIndexCount(this.downData.index, res.putDownMoveTaskLines.length)
+        this.upData.index = this.$lwUtils.cutCardIndexCount(this.upData.index, res.putUpMoveTaskLines.length)
 
-        if ((this.upData.index + 1) > this.taskData.putUpMoveTaskLines.length){
-          this.upData.index > 0 ? this.upData.index-- : this.upData.index = 0
-        }
+        this.taskData = res
 
         // 滚动到页面顶部
         document.querySelector('#lw-task-move-top').scrollIntoView({
@@ -897,7 +955,7 @@ export default {
 
       const item = this.abnormalPopup.item
       wmsMoveTaskAbnormalSubmit({
-        taskId: this.$route.query.taskId,
+        taskId: this.$route.query.lwTaskId,
         taskLineKey: item.lineKey,
         fromLocationId: item.fromLocationId,
         fromLpn: item.fromLpn,
@@ -945,12 +1003,14 @@ export default {
       input.sku.value = ''
       input.num.value = ''
       input.lpn.value = ''
+      input.snList=[]
+      input.sn=''
     },
 
     // 是否有下架托盘
     hasDownLpn(){
       let item = this.taskData.putDownMoveTaskLines[this.downData.index]
-      console.log(item.fromLpn && item.fromLpn !== '')
+
       return item.fromLpn && item.fromLpn !== ''
     },
 
@@ -1028,6 +1088,18 @@ export default {
     },
     // 商品号输入校验
     downDataSkuCodeCheck(){
+
+
+      if(this.taskData.putDownMoveTaskLines[this.downData.index].needHandleSn){
+        if(this.downData.input.snList.length<=0){
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('','请扫描SN')
+          )
+          return false
+        }
+        return true
+      }
+
       const sku = this.downData.input.sku
       // 非空校验
       if (!sku.value){
@@ -1059,6 +1131,17 @@ export default {
     },
     // 数量校验
     downDataNumCheck(){
+
+      if(this.taskData.putDownMoveTaskLines[this.downData.index].needHandleSn){
+        if(this.downData.input.snList.length<=0){
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('','请扫描SN')
+          )
+          return false
+        }
+        return true
+      }
+
       const num = Number(this.downData.input.num.value || 0)
       if (!num){
         this.downData.input.num.focus = true
@@ -1134,7 +1217,8 @@ export default {
         toLocationCode: this.downData.input.local.value,
         toLpn: this.downData.input.lpn.value,
         moveQty: this.downData.input.num.value,
-        moveMethod: '1' // 1-下架，2-上架
+        moveMethod: '1',  // 1-下架，2-上架
+        snParamList:this.downData.input.snList,
       }, this.downClearInput)
     },
 
@@ -1149,6 +1233,8 @@ export default {
       this.upData.input.wait = false
       this.upData.input.local.value = ''
       this.upData.input.lpn.value = ''
+      this.upData.input.snList=[]
+      this.upData.input.sn=''
     },
 
     // 商品号确认
@@ -1159,6 +1245,17 @@ export default {
     },
     // 商品号输入校验
     upDataSkuCodeCheck(){
+
+      if(this.taskData.putUpMoveTaskLines[this.upData.index].needHandleSn){
+        if(this.upData.input.snList.length<=0){
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('','请扫描SN')
+          )
+          return false
+        }
+        return true;
+      }
+
       const sku = this.upData.input.sku
       // 非空校验
       if (!sku.value){
@@ -1190,6 +1287,11 @@ export default {
     },
     // 数量校验
     upDataNumCheck(){
+
+      if(this.taskData.putUpMoveTaskLines[this.upData.index].needHandleSn){
+        return true;
+      }
+
       const num = Number(this.upData.input.num.value || 0)
       if (!num){
         this.upData.input.num.focus = true
@@ -1272,7 +1374,7 @@ export default {
       // 检验库位是否正确
       const upLocal = this.taskData.putUpMoveTaskLines[this.upData.index].toLocationCode
       if(!this.upData.input.wait && upLocal && this.upData.input.local.value !== upLocal) {
-        this.$dialog.confirm({
+        this.$lwDialog.confirm({
           title: this.$lwLanguage.get('wms_project.pda.inbound.taskMove.total', '提示'),
           message: this.$lwLanguage.get('wms_project.pda.inbound.taskMove.toLocalError', '目标库位与上架库位不一致，确认继续？')
         }).then(() => {
@@ -1286,7 +1388,8 @@ export default {
             toLpn: this.upData.input.lpn.value,
             moveQty: this.upData.input.num.value,
             relay: this.upData.input.wait,
-            moveMethod: '2' // 1-下架，2-上架
+            moveMethod: '2', // 1-下架，2-上架
+            snParamList:this.upData.input.snList
           }, this.upClearInput)
         }).catch(() => {})
 
@@ -1302,7 +1405,8 @@ export default {
         toLpn: this.upData.input.lpn.value,
         moveQty: this.upData.input.num.value,
         relay: this.upData.input.wait,
-        moveMethod: '2' // 1-下架，2-上架
+        moveMethod: '2' ,// 1-下架，2-上架
+        snParamList:this.upData.input.snList
       }, this.upClearInput)
     },
 
@@ -1359,7 +1463,24 @@ export default {
       )
       this.upSkuSeoPopup.sku.focus = true
       this.upSkuSeoPopup.sku.value = ''
-    }
+    },
+    moveDownTaskSnConfirm(value, {data}){
+      let snkey = data.key;
+      let snQty = data.qty;
+      this.downData.input.snList.unshift({
+        sn:snkey,
+        qty: snQty
+      })
+    },
+
+    moveUpTaskSnConfirm(value, {data}){
+      let snkey = data.key;
+      let snQty = data.qty;
+      this.upData.input.snList.unshift({
+        sn:snkey,
+        qty: snQty
+      })
+    },
   }
 }
 </script>

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

@@ -0,0 +1,17 @@
+/*
+* 库存入口
+* @author: 鲍珺
+* @date  2022-07-07
+* */
+
+import lwQueryInventoryIndex from './queryInventory/index/index'
+import lwQueryInventoryPage from './queryInventory/page/index'
+import lwInventoryItem from './inventoryItem/index.vue'
+import lwInventoryLotPage from './inventoryLotPage/index.vue'
+
+export const inventory = [
+  lwQueryInventoryIndex,
+  lwQueryInventoryPage,
+  lwInventoryItem,
+  lwInventoryLotPage
+]

package/src/components/page/inventory/inventoryItem/index.vue

@@ -0,0 +1,127 @@
+<template>
+  <div
+    :class="[
+      'lw-global-model-box',
+      item.lwPdaStart ?
+        'lw-global-animation-breath' :
+        'lw-global-animation-out'
+    ]"
+    :style="{
+      animationDelay:item.lwPdaStart ? '' : 50 * index + 'ms',
+      background: item.lwPdaStart ? 'rgb(244 218 219)' : ''
+    }"
+    @click="detail"
+  >
+
+    <!-- 库位 -->
+    <div class="lw-global-flex-between lw-global-row-start" v-if="type === 'location'">
+      <div>
+        <span class="lw-global-title">
+          {{ $lwLanguage.get('wms_project.pda.inventory.query.location', '库位') }}
+        </span>
+        <span class="lw-global-value-bold">
+          {{ item.locationCode }}
+        </span>
+      </div>
+
+      <div style="flex-shrink: 0">
+        <span class="lw-global-value-bold">
+          {{ item.locationTypeLabel }}
+        </span>
+      </div>
+    </div>
+
+    <!-- 商品 -->
+    <div class="lw-global-flex-between lw-global-row-start" v-if="type === 'sku'">
+      <div>
+        <span class="lw-global-title">
+          {{ $lwLanguage.get('wms_project.pda.inventory.query.sku', '商品') }}
+        </span>
+        <span class="lw-global-value-bold">
+          {{ item.skuCode }}
+        </span>
+      </div>
+
+      <div style="flex-shrink: 0">
+        <span class="lw-global-value-bold">
+          {{ item.locationTypeLabel }}
+        </span>
+      </div>
+    </div>
+
+    <!-- 库存统计 -->
+    <div class="lw-global-row">
+      <span class="lw-global-title">
+        {{ $lwLanguage.get('wms_project.pda.inventory.query.invReport', '库存统计') }}
+      </span>
+      <span>
+        <span class="lw-global-value">
+          {{ $lwLanguage.get('wms_project.pda.inventory.query.invReport.qty', '库存量') }}
+        </span>
+        <span
+          class="lw-global-value-bold"
+          style="color: #D50000"
+        >
+          {{ item.qty }}
+        </span>
+        <span class="lw-global-value">
+           / {{ $lwLanguage.get('wms_project.pda.inventory.query.invReport.lockQty', '锁定量') }}
+        </span>
+        <span
+          class="lw-global-value-bold"
+          style="color: #D50000"
+        >
+          {{ item.lockQty }}
+        </span>
+        <span class="lw-global-value">
+           / {{ $lwLanguage.get('wms_project.pda.inventory.query.invReport.availQty', '可用量') }}
+        </span>
+        <span
+          class="lw-global-value-bold"
+          style="color: #D50000"
+        >
+          {{ item.availQty }}
+        </span>
+      </span>
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "index",
+  props:{
+    type: {
+      type: String,
+      default: ''
+    },
+
+    // 数据
+    item:{
+      type: Object,
+      default: ()=>{}
+    },
+
+    // 数据索引
+    index:{
+      type: Number,
+      default: 0
+    }
+  },
+  data() {
+    return {}
+  },
+  methods: {
+    // 查看详细
+    detail(){
+      this.$emit('detail', this.item, this.index)
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>