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

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

@@ -28,12 +28,10 @@
         @confirm="lpnConfirm"
       />
 
-      <lw-input
-        :title="$lwLanguage.get('wms_project.pda.inbound.randomMove.skuCode','商品条码')"
+      <lw-sn-search-sku
         v-model="seo.sku.value"
         :get-focus.sync="seo.sku.focus"
-        required
-        rule-key="downSku"
+        :input-prop="seo.sku.prop"
         @confirm="skuConfirm"
       />
 
@@ -61,13 +59,21 @@
         </span>
         </div>
 
-        <div class="lw-global-row">
-        <span class="lw-global-title">
-          {{ $lwLanguage.get('wms_project.pda.inbound.randomMoveDown.downLpn', '下架托盘号') }}
-        </span>
+        <div class="lw-global-row" v-if="downData[downIndex].lpn">
+          <span class="lw-global-title">
+            {{ $lwLanguage.get('wms_project.pda.inbound.randomMoveDown.downLpn', '下架托盘号') }}
+          </span>
+            <span class="lw-global-value-bold">
+            {{ downData[downIndex].lpn }}
+          </span>
+        </div>
+        <div class="lw-global-row" v-if="downData[downIndex].caseNum">
+          <span class="lw-global-title">
+            {{ $lwLanguage.get('wms_project.pda.inbound.randomMoveDown.downCaseNum', '下架箱号') }}
+          </span>
           <span class="lw-global-value-bold">
-          {{ downData[downIndex].lpn }}
-        </span>
+            {{ downData[downIndex].caseNum }}
+          </span>
         </div>
 
         <div
@@ -84,6 +90,7 @@
           </div>
 
           <lw-tag
+            v-if="downData[downIndex].skuSizeTypeLabel"
             round
             plain
             style="flex-shrink: 0"
@@ -123,23 +130,43 @@
         </div>
 
         <!-- 输入框 -->
-        <div>
+        <div >
+          <div v-if="downData[downIndex].needHandleSn">
+
+            <lw-input
+              :title="$lwLanguage.get('wms_project.pda.components.page.inner.randomMove.components.Down.index.mjmwxpwl','扫描序列号')"
+              v-model="actionTask.sn.value"
+              :get-focus.sync="actionTask.sn.focus"
+              :create-rule="$lwScanRule.create('随机移动-SN','SN')"
+              rule-key="sn"
+              required
+              @confirm="taskSnConfirm"
+            />
+            <lw-scan-data-list-module
+              title="已扫描序列号"
+              ref="snScanList"
+              v-model="actionTask.snList"
+            />
 
-          <lw-input
-            :title="$lwLanguage.get('wms_project.pda.inbound.randomMoveDown.skuCode','商品条码')"
-            v-model="actionTask.sku.value"
-            rule-key="downSku"
-            @confirm="actionTask.num.focus = true"
-          />
 
-          <lw-input
-            :title="$lwLanguage.get('wms_project.pda.inbound.randomMoveDown.downNum','下架数量')"
-            type="digit"
-            v-model="actionTask.num.value"
-            :get-focus.sync="actionTask.num.focus"
-            required
-            @confirm="actionNumConfirm"
-          />
+          </div>
+          <div v-else>
+              <lw-input
+                :title="$lwLanguage.get('wms_project.pda.inbound.randomMoveDown.skuCode','商品条码')"
+                v-model="actionTask.sku.value"
+                rule-key="downSku"
+                @confirm="actionTask.num.focus = true"
+              />
+
+              <lw-input
+                :title="$lwLanguage.get('wms_project.pda.inbound.randomMoveDown.downNum','下架数量')"
+                type="digit"
+                v-model="actionTask.num.value"
+                :get-focus.sync="actionTask.num.focus"
+                required
+                @confirm="actionNumConfirm"
+              />
+          </div>
 
           <lw-input
             :title="$lwLanguage.get('wms_project.pda.inbound.randomMoveDown.lpn','中转容器号')"
@@ -179,6 +206,11 @@ import {
   wmsRandomMoveGetSkuInfo,
   wmsRandomTaskMoveDown
 } from "../../../../../../api/receive/randomMove";
+import {
+  innerTaskSnCheck
+} from "../../../../../../api/inner/snCheck/snCheck";
+
+
 
 export default {
   name: "index",
@@ -239,7 +271,13 @@ export default {
         // 商品条码输入框
         sku:{
           value:'',
-          focus:false
+          focus:false,
+          prop:{
+            title: this.$lwLanguage.get('wms_project.pda.inbound.randomMove.skuCode','商品条码'),
+            required: true,
+            ruleKey:'downSku'
+          }
+
         },
       },
 
@@ -253,6 +291,10 @@ export default {
         sku:{
           value:''
         },
+        sn:{
+          value:'',
+          focus:false
+        },
         num:{
           value:'',
           focus: false
@@ -261,6 +303,8 @@ export default {
           value:'',
           focus: false
         },
+        snList:[],
+
       }
 
     }
@@ -328,7 +372,7 @@ export default {
           }
 
           this.$lwToast.success(
-            this.$lwLanguage.get('wms_project.pda.inbound.randomMoveDown.downAll','当前零件已全部下架')
+            this.$lwLanguage.get('wms_project.pda.inbound.randomMoveDown.downAll','当前商品已全部下架')
           )
           this.showDownInput = true
           this.$emit('over')
@@ -336,15 +380,11 @@ export default {
 
         }
 
+        this.downIndex = this.$lwUtils.cutCardIndexCount(this.downIndex, res.length)
         this.downData = res
 
-        const index = this.downIndex +1
-        if (index > this.downData.length){
-          this.downIndex--
-        }
-
         !showError && this.$lwToast.success(
-          this.$lwLanguage.get('wms_project.pda.inbound.randomMoveDown.jump','操作成功，已切换至任务行') + ':' + index
+          this.$lwLanguage.get('wms_project.pda.inbound.randomMoveDown.jump','操作成功，已切换至任务行') + ':' + (this.downIndex+1)
         )
 
         this.showDownInput = false
@@ -370,6 +410,11 @@ export default {
     },
     // 校验下架数量
     downNumCheck(){
+
+      if(this.downData[this.downIndex].needHandleSn){
+        return true;
+      }
+
       const num = Number(this.actionTask.num.value || 0)
       if (isNaN(num) || num === 0){
         this.actionTask.num.focus = true
@@ -420,6 +465,9 @@ export default {
       this.actionTask.num.value = ''
       this.actionTask.num.focus = true
       this.actionTask.lpn.value = ''
+      this.actionTask.sn.value=''
+      this.actionTask.snList=[]
+
     },
 
     // 校验输入框是否存在内容
@@ -430,7 +478,7 @@ export default {
           this.actionTask.num.value ||
           this.actionTask.lpn.value
         ){
-          this.$dialog.confirm({
+          this.$lwDialog.confirm({
             title: this.$lwLanguage.get('wms_project.pda.inbound.randomMoveDown.warning','警告'),
             message: this.$lwLanguage.get('wms_project.pda.inbound.randomMoveDown.inputClear','跳转后输入框将会被清空')
           }).then(()=>{
@@ -453,12 +501,58 @@ export default {
         ownerId: now.ownerId,
         fromLocationCode: now.locationCode,
         fromLpn: now.lpn,
+        fromCaseNum: now.caseNum,
         toLpn: this.actionTask.lpn.value,
         inventoryLotId: now.inventoryLotId,
-        moveQty: this.actionTask.num.value
+        moveQty: this.actionTask.num.value,
+        snParamList:this.actionTask.snList
       }).then(()=>{
         this.downSeo(false)
       })
+    },
+
+
+    taskSnConfirm(value,{data}){
+      let snkey = data.key;
+      let snQty = data.qty;
+      this.actionTask.sn.value=''
+      innerTaskSnCheck({sn:snkey,qty:snQty}).then(res=>{
+        console.log("snCheckResult:" + res);
+
+        let snQty= res.snInvQty
+        if(!this.snScanCheck(snkey,snQty)){
+          return;
+        }
+        this.actionTask.snList.unshift({
+          sn:snkey,
+          qty: res.snInvQty
+        })
+      })
+
+    },
+
+    snScanCheck(sn,qty){
+      let snCount=0
+      for (let i = 0; i < this.actionTask.snList.length; i++) {
+        let snObj=this.actionTask.snList[i]
+        if(snObj.sn===sn){
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('wms_project.pda.components.page.inner.randomMove.components.Down.index.rexdddui','重复扫描的SN')+sn
+          )
+          return false;
+        }
+        snCount+=snObj.qty
+      }
+      let availInvQty=this.downData[this.downIndex].availInvQty
+      console.log("总扫描数量:",(snCount+qty))
+      console.log("当前行可用数量:",availInvQty)
+      if((snCount+qty) > availInvQty){
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.components.page.inner.randomMove.components.Down.index.owoeykkf','扫描数量大于可用库存量')
+        )
+        return false;
+      }
+      return true;
     }
 
   }

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

@@ -38,16 +38,19 @@
     >
 
       <!-- 容器号 -->
-      <div class="lw-global-row">
-        <span class="lw-global-title">
-          {{ $lwLanguage.get('wms_project.pda.inbound.randomMoveUp.lpn','容器号') }}
-        </span>
-        <span class="lw-global-value-bold">
-          {{ upData[upIndex].lpn }}
-        </span>
+      <div class="lw-global-row lw-global-flex-between">
+        <div>
+          <span class="lw-global-title">
+            {{ $lwLanguage.get('wms_project.pda.inbound.randomMoveUp.lpn','容器号') }}
+          </span>
+          <span class="lw-global-value-bold">
+            {{ upData[upIndex].lpn }}
+          </span>
+        </div>
+        <lw-button mini @click="$emit('changeLpn')">切换容器</lw-button>
       </div>
 
-      <!-- 零件信息 -->
+      <!-- 商品信息 -->
       <div
         class="lw-global-flex-between lw-global-row"
         style="align-items: flex-start"
@@ -62,6 +65,7 @@
         </div>
 
         <lw-tag
+          v-if="upData[upIndex].skuSizeTypeLabel"
           round
           plain
           style="flex-shrink: 0"
@@ -106,33 +110,52 @@
       <!-- 输入框 -->
       <div>
 
-        <lw-input
-          :title="$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.skuCode','商品条码')"
-          v-model="actionTask.sku.value"
-          :get-focus.sync="actionTask.sku.focus"
-          required
-          rule-key="upSku"
-          @confirm="skuConfirm"
-        />
+        <div v-if="upData[upIndex].needHandleSn">
+
+          <lw-input
+            :title="$lwLanguage.get('wms_project.pda.components.page.inner.randomMove.components.Up.index.osgqywdy','扫描序列号')"
+            v-model="actionTask.sn.value"
+            :get-focus.sync="actionTask.sn.focus"
+            :create-rule="$lwScanRule.create('随机移动-SN','SN')"
+            rule-key="sn"
+            required
+            @confirm="taskSnConfirm"
+          />
+          <lw-scan-data-list-module
+            title="已扫描序列号"
+            v-model="actionTask.snList"
+          />
 
-        <lw-input
-          :title="$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.qty','商品数量')"
-          type="digit"
-          v-model="actionTask.num.value"
-          :get-focus.sync="actionTask.num.focus"
-          required
-          @confirm="actionNumConfirm"
-        >
-          <template #button>
-            <lw-button
-              round
-              mini
-              @click="lessUp"
-            >
-              {{ $lwLanguage.get('wms_project.pda.inbound.randomMoveUp.little','缺货上架') }}
-            </lw-button>
-          </template>
-        </lw-input>
+        </div>
+        <div v-else>
+          <lw-input
+            :title="$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.skuCode','商品条码')"
+            v-model="actionTask.sku.value"
+            :get-focus.sync="actionTask.sku.focus"
+            required
+            rule-key="upSku"
+            @confirm="skuConfirm"
+          />
+
+          <lw-input
+            :title="$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.qty','商品数量')"
+            type="digit"
+            v-model="actionTask.num.value"
+            :get-focus.sync="actionTask.num.focus"
+            required
+            @confirm="actionNumConfirm"
+          >
+            <template #button>
+              <lw-button
+                round
+                mini
+                @click="lessUp"
+              >
+                {{ $lwLanguage.get('wms_project.pda.inbound.randomMoveUp.little','缺货上架') }}
+              </lw-button>
+            </template>
+          </lw-input>
+        </div>
 
         <lw-input
           :title="$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.toLocal','目标库位')"
@@ -151,6 +174,14 @@
           @confirm="actionLpnConfirm"
         />
 
+        <lw-input
+          :title="$lwLanguage.get('目标箱号','目标箱号')"
+          v-model="actionTask.case.value"
+          :get-focus.sync="actionTask.case.focus"
+          rule-key="upLpn"
+          @confirm="actionCaseConfirm"
+        />
+
 
       </div>
 
@@ -200,6 +231,11 @@ import {
 } from "../../../../../../api/receive/randomMove";
 import {wmsRandomTaskMoveUpLessQtyAbnormalSubmit} from "../../../../../../api/inner/move/taskMove";
 
+import {
+  randomMoveTaskMoveUpSnCheck
+} from "../../../../../../api/inner/snCheck/snCheck";
+
+
 export default {
   name: "index",
   props:{
@@ -275,6 +311,16 @@ export default {
           value:'',
           focus: false
         },
+        case:{
+          value:'',
+          focus: false
+        },
+        sn:{
+          value:'',
+          focus: false
+        },
+        snList:[],
+
       },
 
       // 缺货上架弹框
@@ -306,20 +352,26 @@ export default {
     upSeo(){
       if (!this.containerCheck()) return
 
-      wmsGetRandomTaskByLpn({
-        lpn: this.seo.container.value
-      }).then(res=>{
+      const lpn = this.seo.container.value
+
+      wmsGetRandomTaskByLpn({ lpn }).then(res=>{
 
         if (!res || !res.length){
-          this.$lwShowErrorMsg(
-            this.$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.notData','没有查询到任何数据')
+          this.showDownInput = true
+          this.seo.container.focus = true
+          this.$lwToast.fail(
+            this.$lwLanguage.get('wms_project.pda.components.page.inner.randomMove.components.Up.index.dmcacbexa','当前容器没有可执行的任务')
           )
+          this.seo.container.value = ''
           return
         }
 
+        this.$emit('load', lpn, res)
+
+        this.upIndex = this.$lwUtils.cutCardIndexCount(this.upIndex, res.length)
         this.upData = res
         this.showDownInput = false
-      })
+      }).catch(() => this.$emit('load', lpn, null))
     },
 
     // 清空搜索输入框
@@ -336,15 +388,39 @@ export default {
         this.actionTask.num.focus = true
       }
     },
-    // 校验零件号
+    // 校验商品号
     skuCheck(){
-      if (this.actionTask.sku.value) return true
 
-      this.actionTask.sku.focus = true
-      this.$lwShowErrorMsg(
-        this.$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.skuNull','商品条码不能为空')
-      )
-      return false
+      if(this.upData[this.upIndex].needHandleSn){
+        if(this.actionTask.snList.length<=0){
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('wms_project.pda.components.page.inner.randomMove.components.Up.index.dmcacbex','sn列表不能为空，请扫描SN')
+          )
+          return false
+        }
+        return true;
+      }
+
+      const skuCode = this.actionTask.sku.value
+      if (!skuCode) {
+        this.actionTask.sku.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.skuNull','商品条码不能为空')
+        )
+        return false
+      }
+
+      if (skuCode !== this.upData[this.upIndex].skuCode){
+        this.actionTask.sku.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.skuError','商品条码不一致')
+        )
+        this.actionTask.sku.value = ''
+        return false
+      }
+
+      return true
+
     },
 
     // 执行任务下架数量确定
@@ -355,6 +431,11 @@ export default {
     },
     // 校验下架数量
     numCheck(){
+
+      if(this.upData[this.upIndex].needHandleSn){
+        return true;
+      }
+
       const num = Number(this.actionTask.num.value || 0)
       if (isNaN(num) || num === 0){
         this.actionTask.num.focus = true
@@ -395,9 +476,11 @@ export default {
 
     // 执行任务中转容器号确定
     actionLpnConfirm(){
+      this.actionTask.case.focus = true
+    },
 
+    actionCaseConfirm(){
       this.actionUp()
-
     },
 
     // 清空输入框
@@ -410,6 +493,8 @@ export default {
       this.actionTask.num.value = ''
       this.actionTask.local.value = ''
       this.actionTask.lpn.value = ''
+      this.actionTask.case.value = ''
+      this.actionTask.snList=[]
     },
 
     // 校验输入框是否存在内容
@@ -419,9 +504,10 @@ export default {
           this.actionTask.sku.value ||
           this.actionTask.local.value ||
           this.actionTask.num.value ||
-          this.actionTask.lpn.value
+          this.actionTask.lpn.value ||
+          this.actionTask.case.value
         ){
-          this.$dialog.confirm({
+          this.$lwDialog.confirm({
             title: this.$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.warning','警告'),
             message: this.$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.inputClear','跳转后输入框将会被清空')
           }).then(()=>{
@@ -448,8 +534,10 @@ export default {
         inventoryLotId: now.inventoryLotId,
         toLocationCode: this.actionTask.local.value,
         toLpn: this.actionTask.lpn.value,
+        toCase: this.actionTask.case.value,
         moveQty: this.actionTask.num.value,
         relay: false, // 是否接力
+        snParamList:this.actionTask.snList
       }).then(res=>{
         if (!res || !res.length){
           this.showDownInput = true
@@ -511,9 +599,61 @@ export default {
         this.$lwToast.success(
           this.$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.upSuccess','上报成功')
         )
+        this.lessUpPopup.show = false
         this.upSeo()
       })
-    }
+    },
+    taskSnConfirm(value,{data}){
+      const now = this.upData[this.upIndex]
+      let snkey = data.key;
+      let snQty = data.qty;
+      this.actionTask.sn.value=''
+      let snScanData = {
+        skuCode: now.skuCode,
+        ownerId: now.ownerId,
+        fromLocationCode: now.locationCode,
+        fromLpn: now.lpn,
+        inventoryLotId: now.inventoryLotId,
+        sn:snkey,
+        snQty:snQty
+      };
+      randomMoveTaskMoveUpSnCheck(snScanData).then(res=>{
+        let snBackendQty=res.snInvQty
+        if(!this.snScanCheck(snkey,snBackendQty)){
+          return;
+        }
+        this.actionTask.snList.unshift({
+          sn:snkey,
+          qty: res.snInvQty
+        })
+      })
+
+
+    },
+    snScanCheck(sn,qty){
+
+      let snCount=0
+      for (let i = 0; i < this.actionTask.snList.length; i++) {
+        let snObj=this.actionTask.snList[i]
+        if(snObj.sn===sn){
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('wms_project.pda.components.page.inner.randomMove.components.Up.index.cxcdthbm','重复扫描的SN')+sn
+          )
+          return false;
+        }
+        snCount+=snObj.qty
+      }
+      let availInvQty=this.upData[this.upIndex].putDownQty
+      console.log("总扫描数量:",(snCount+qty))
+      console.log("当前行可用数量:",availInvQty)
+      if((snCount+qty) > availInvQty){
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.components.page.inner.randomMove.components.Up.index.lkutxxnl','扫描数量大于代上架数量')
+        )
+        return false;
+      }
+      return true;
+    },
   }
 }
 </script>