@logwire/logwire-wms-pda-ui 3.4.0 → 3.5.0

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

@@ -17,6 +17,7 @@
         :get-focus.sync="seo.container.focus"
         required
         rule-key="upContainer"
+        :create-rule="$lwScanRule.create('随机移动-上架-中转容器','CONTAINER')"
         @confirm="upSeo"
       />
 
@@ -44,7 +45,7 @@
             {{ $lwLanguage.get('wms_project.pda.inbound.randomMoveUp.lpn','容器号') }}
           </span>
           <span class="lw-global-value-bold">
-            {{ upData[upIndex].lpn }}
+            {{ nowLpnData.lpn }}
           </span>
         </div>
         <lw-button mini @click="$emit('changeLpn')">{{$lwLanguage.get('wms_project.pda.inner.randomMove.components.Up.xguiwzot', '切换容器')}}</lw-button>
@@ -57,19 +58,20 @@
       >
         <div style="flex: 1">
           <div class="lw-global-value-bold">
-            {{ upData[upIndex].skuCode }}
+            {{ nowLpnData.skuCode }}
           </div>
           <div class="lw-global-title">
-            {{ upData[upIndex].skuName }}
+            {{ nowLpnData.skuName }}
           </div>
         </div>
 
         <lw-tag
-          v-if="upData[upIndex].skuSizeTypeLabel"
+          v-if="nowLpnData.skuSizeTypeLabel"
           round
           plain
           style="flex-shrink: 0"
-        >{{ upData[upIndex].skuSizeTypeLabel }}</lw-tag>
+        >{{ nowLpnData.skuSizeTypeLabel }}
+        </lw-tag>
       </div>
 
       <!-- 主库位 -->
@@ -83,7 +85,7 @@
           class="lw-global-value-bold"
           style="font-size: 16px;color: #D50000"
         >
-          {{ upData[upIndex].masterLocationCode || '-' }}
+          {{ nowLpnData.masterLocationCode || '-' }}
         </span>
       </div>
 
@@ -93,7 +95,7 @@
             {{ $lwLanguage.get('wms_project.pda.inbound.randomMoveUp.waitUp','待上架量') }}
           </span>
         <span class="lw-global-value-bold">
-            {{ upData[upIndex].putDownQty }}
+            {{ nowLpnData.putDownQtyLabel }}
           </span>
       </div>
 
@@ -103,14 +105,14 @@
             {{ $lwLanguage.get('wms_project.pda.inbound.randomMoveUp.owner','货主') }}
           </span>
         <span class="lw-global-value-bold">
-            {{ upData[upIndex].ownerCode }} - {{ upData[upIndex].ownerName }}
+            {{ nowLpnData.ownerCode }} - {{ nowLpnData.ownerName }}
           </span>
       </div>
 
       <!-- 输入框 -->
       <div>
 
-        <div v-if="upData[upIndex].needHandleSn">
+        <div v-if="nowLpnData.needHandleSn">
 
           <lw-input
             :title="$lwLanguage.get('wms_project.pda.components.page.inner.randomMove.components.Up.index.osgqywdy','扫描序列号')"
@@ -119,11 +121,18 @@
             :create-rule="$lwScanRule.create('随机移动-SN','SN')"
             rule-key="sn"
             required
+            :owner-id="nowLpnData.ownerId"
+            :rule-serve-query="nowLpnData"
             @confirm="taskSnConfirm"
           />
           <lw-scan-data-list-module
             :title="$lwLanguage.get('wms_project.pda.inner.randomMove.components.Up.fczbhauh', '已扫描序列号')"
             v-model="actionTask.snList"
+            start-bright
+            row-type="sn"
+            row-id="randomMoveUp"
+            total-type="sn"
+            total-type-id="randomMoveUp"
           />
 
         </div>
@@ -134,15 +143,19 @@
             :get-focus.sync="actionTask.sku.focus"
             required
             rule-key="upSku"
+            :create-rule="$lwScanRule.create('随机移动-上架-商品条码','SKU')"
+            :owner-id="nowLpnData.ownerId"
+            :rule-serve-query="nowLpnData"
             @confirm="skuConfirm"
           />
 
-          <lw-input
+
+          <lw-get-qty-by-type
+            ref="qty"
             :title="$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.qty','商品数量')"
-            type="digit"
-            v-model="actionTask.num.value"
-            :get-focus.sync="actionTask.num.focus"
-            required
+            :owner-id="nowLpnData.ownerId"
+            :sku-id="nowLpnData.skuId"
+            :auto-init="false"
             @confirm="actionNumConfirm"
           >
             <template #button>
@@ -151,10 +164,11 @@
                 mini
                 @click="lessUp"
               >
-                {{ $lwLanguage.get('wms_project.pda.inbound.randomMoveUp.little','缺货上架') }}
+                {{ $lwLanguage.get('wms_project.pda.inbound.randomMoveUp.little', '缺货上架') }}
               </lw-button>
             </template>
-          </lw-input>
+          </lw-get-qty-by-type>
+
         </div>
 
         <lw-input
@@ -163,6 +177,9 @@
           :get-focus.sync="actionTask.local.focus"
           required
           rule-key="upLocal"
+          :create-rule="$lwScanRule.create('随机移动-上架-目标库位','LOCATION')"
+          :owner-id="nowLpnData.ownerId"
+          :rule-serve-query="nowLpnData"
           @confirm="localConfirm"
         />
 
@@ -171,6 +188,9 @@
           v-model="actionTask.lpn.value"
           :get-focus.sync="actionTask.lpn.focus"
           rule-key="upLpn"
+          :create-rule="$lwScanRule.create('随机移动-上架-目标托盘','LPN')"
+          :owner-id="nowLpnData.ownerId"
+          :rule-serve-query="nowLpnData"
           @confirm="actionLpnConfirm"
         />
 
@@ -178,7 +198,10 @@
           :title="$lwLanguage.get('目标箱号','目标箱号')"
           v-model="actionTask.case.value"
           :get-focus.sync="actionTask.case.focus"
-          rule-key="upLpn"
+          rule-key="case"
+          :create-rule="$lwScanRule.create('随机移动-上架-目标箱号','CASE')"
+          :owner-id="nowLpnData.ownerId"
+          :rule-serve-query="nowLpnData"
           @confirm="actionCaseConfirm"
         />
 
@@ -202,19 +225,20 @@
       :title="$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.little','缺货上架')"
       v-model="lessUpPopup.show"
       height="auto"
+      @opened="$refs.lessUpPopupQty.init(0,true)"
     >
-
-      <lw-input
+      <lw-get-qty-by-type
+        ref="lessUpPopupQty"
         :title="$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.littleNum','缺货量')"
-        v-model="lessUpPopup.num.value"
-        :get-focus.sync="lessUpPopup.num.focus"
-        type="digit"
+        :owner-id="nowLpnData.ownerId"
+        :sku-id="nowLpnData.skuId"
+        :auto-init="false"
         @confirm="lessUpConfirm"
       />
 
       <template #button>
         <lw-button @click="lessUpConfirm">
-          {{ $lwLanguage.get('wms_project.pda.inbound.randomMoveUp.confirmLittle','确认缺货') }}
+          {{ $lwLanguage.get('wms_project.pda.inbound.randomMoveUp.confirmLittle', '确认缺货') }}
         </lw-button>
       </template>
 
@@ -250,14 +274,18 @@ export default {
       default: true
     }
   },
-  computed:{
-    showDownInput:{
-      get(){
+  computed: {
+    showDownInput: {
+      get() {
         return this.value
       },
-      set(v){
+      set(v) {
         this.$emit('input', v)
       }
+    },
+    // 当前上架托盘信息
+    nowLpnData() {
+      return this.upData.length ? this.upData[this.upIndex] : {}
     }
   },
   watch:{
@@ -299,10 +327,6 @@ export default {
           value:'',
           focus: false
         },
-        num:{
-          value:'',
-          focus: false
-        },
         local:{
           value:'',
           focus: false
@@ -320,16 +344,11 @@ export default {
           focus: false
         },
         snList:[],
-
       },
 
       // 缺货上架弹框
       lessUpPopup:{
-        show: false,
-        num: {
-          value:'',
-          focus: false
-        }
+        show: false
       }
 
     }
@@ -385,16 +404,16 @@ export default {
     // 商品条码确认
     skuConfirm(){
       if (this.skuCheck()){
-        this.actionTask.num.focus = true
+        this.$refs.qty?.getFocus()
       }
     },
     // 校验商品号
     skuCheck(){
 
-      if(this.upData[this.upIndex].needHandleSn){
-        if(this.actionTask.snList.length<=0){
+      if (this.nowLpnData.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')
+            this.$lwLanguage.get('wms_project.pda.components.page.inner.randomMove.components.Up.index.dmcacbex', 'sn列表不能为空，请扫描SN')
           )
           return false
         }
@@ -410,10 +429,10 @@ export default {
         return false
       }
 
-      if (skuCode !== this.upData[this.upIndex].skuCode){
+      if (skuCode !== this.nowLpnData.skuCode) {
         this.actionTask.sku.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.skuError','商品条码不一致')
+          this.$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.skuError', '商品条码不一致')
         )
         this.actionTask.sku.value = ''
         return false
@@ -432,24 +451,24 @@ export default {
     // 校验下架数量
     numCheck(){
 
-      if(this.upData[this.upIndex].needHandleSn){
+      if (this.nowLpnData.needHandleSn) {
         return true;
       }
 
-      const num = Number(this.actionTask.num.value || 0)
+      const num = this.$refs.qty?.getQty() || 0
       if (isNaN(num) || num === 0){
-        this.actionTask.num.focus = true
+        this.$refs.qty?.getFocus()
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.skuNumZero','上架数量不能为空且应当是大于0的整数')
+          this.$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.skuNumZero', '上架数量不能为空且应当是大于0的整数')
         )
 
         return false
       }
 
-      if (num > this.upData[this.upIndex].putDownQty){
-        this.actionTask.num.focus = true
+      if (num > this.nowLpnData.putDownQty) {
+        this.$refs.qty?.getFocus()
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.skuMore','上架数量不能大于待上架量')
+          this.$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.skuMore', '上架数量不能大于待上架量')
         )
 
         return false
@@ -484,17 +503,23 @@ export default {
     },
 
     // 清空输入框
-    clearInput(showMsg = true){
+    clearInput(showMsg = true) {
       showMsg && this.$lwToast.success(
-        this.$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.cutCell','已切换至行数：') + (this.upIndex + 1)
+        this.$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.cutCell', '已切换至行数：') + (this.upIndex + 1)
       )
       this.actionTask.sku.value = ''
       this.actionTask.sku.focus = true
-      this.actionTask.num.value = ''
       this.actionTask.local.value = ''
       this.actionTask.lpn.value = ''
       this.actionTask.case.value = ''
-      this.actionTask.snList=[]
+      this.actionTask.snList = []
+
+      this.$nextTick(() => {
+        if (!this.nowLpnData.needHandleSn) {
+          this.$refs.qty?.init()
+          this.$refs.qty?.clearInput()
+        }
+      })
     },
 
     // 校验输入框是否存在内容
@@ -503,7 +528,7 @@ export default {
         if (
           this.actionTask.sku.value ||
           this.actionTask.local.value ||
-          this.actionTask.num.value ||
+          this.$refs.qty?.getQty() || 0 ||
           this.actionTask.lpn.value ||
           this.actionTask.case.value
         ){
@@ -525,19 +550,18 @@ export default {
     actionUp(){
       if (!this.skuCheck() || !this.numCheck() || !this.localCheck()) return
 
-      const now = this.upData[this.upIndex]
       wmsRandomTaskMoveUp({
-        skuCode: now.skuCode,
-        ownerId: now.ownerId,
-        fromLocationCode: now.locationCode,
-        fromLpn: now.lpn,
-        inventoryLotId: now.inventoryLotId,
+        skuCode: this.nowLpnData.skuCode,
+        ownerId: this.nowLpnData.ownerId,
+        fromLocationCode: this.nowLpnData.locationCode,
+        fromLpn: this.nowLpnData.lpn,
+        inventoryLotId: this.nowLpnData.inventoryLotId,
         toLocationCode: this.actionTask.local.value,
         toLpn: this.actionTask.lpn.value,
         toCase: this.actionTask.case.value,
-        moveQty: this.actionTask.num.value,
+        moveQty: this.nowLpnData.needHandleSn ? 0 : this.$refs.qty?.getQty() || 0,
         relay: false, // 是否接力
-        snParamList:this.actionTask.snList
+        snParamList: this.actionTask.snList
       }).then(res=>{
         if (!res || !res.length){
           this.showDownInput = true
@@ -563,38 +587,35 @@ export default {
     },
 
     // 缺货上架
-    lessUp(){
+    lessUp() {
       this.lessUpPopup.show = true
-      this.lessUpPopup.num.value = ''
-      this.lessUpPopup.num.focus = true
     },
 
     // 确认缺货上架
-    lessUpConfirm(){
-      const num = Number(this.lessUpPopup.num.value || 0)
-      if (!num){
-        this.lessUpPopup.num.focus = true
+    lessUpConfirm() {
+      const abnQty = this.$refs.lessUpPopupQty?.getQty()
+      if (!abnQty) {
+        this.$refs.lessUpPopupQty?.getFocus()
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.littleNumError','缺货量不能为空，且应当是大于0的整数')
+          this.$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.littleNumError', '缺货量不能为空，且应当是大于0的整数')
         )
         return
       }
 
-      const now = this.upData[this.upIndex]
-      if (num > now.putDownQty){
-        this.lessUpPopup.num.focus = true
+      if (abnQty > this.nowLpnData.putDownQty) {
+        this.$refs.lessUpPopupQty?.getFocus()
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.littleNumMore','缺货量不能大于待上架量')
+          this.$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.littleNumMore', '缺货量不能大于待上架量')
         )
         return
       }
 
       wmsRandomTaskMoveUpLessQtyAbnormalSubmit({
-        ownerId: now.ownerId,
-        skuId: now.skuId,
-        abnQty: num,
-        abnLocationCode: this.upData[this.upIndex].locationCode,
-        abnLpn: this.upData[this.upIndex].lpn,
+        ownerId: this.nowLpnData.ownerId,
+        skuId: this.nowLpnData.skuId,
+        abnQty,
+        abnLocationCode: this.nowLpnData.locationCode,
+        abnLpn: this.nowLpnData.lpn,
       }).then(()=>{
         this.$lwToast.success(
           this.$lwLanguage.get('wms_project.pda.inbound.randomMoveUp.upSuccess','上报成功')
@@ -604,18 +625,17 @@ export default {
       })
     },
     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
+        skuCode: this.nowLpnData.skuCode,
+        ownerId: this.nowLpnData.ownerId,
+        fromLocationCode: this.nowLpnData.locationCode,
+        fromLpn: this.nowLpnData.lpn,
+        inventoryLotId: this.nowLpnData.inventoryLotId,
+        sn: snkey,
+        snQty: snQty
       };
       randomMoveTaskMoveUpSnCheck(snScanData).then(res=>{
         let snBackendQty=res.snInvQty
@@ -634,21 +654,19 @@ export default {
 
       let snCount=0
       for (let i = 0; i < this.actionTask.snList.length; i++) {
-        let snObj=this.actionTask.snList[i]
-        if(snObj.sn===sn){
+        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
+            this.$lwLanguage.get('wms_project.pda.components.page.inner.randomMove.components.Up.index.cxcdthbm', '重复扫描的SN') + sn
           )
           return false;
         }
-        snCount+=snObj.qty
+        snCount += snObj.qty
       }
-      let availInvQty=this.upData[this.upIndex].putDownQty
-      console.log(this.$lwLanguage.get('wms_project.pda.inner.randomMove.components.Up.vibkjmtx', '总扫描数量:'),(snCount+qty))
-      console.log(this.$lwLanguage.get('wms_project.pda.inner.randomMove.components.Up.dxogrkzq', '当前行可用数量:'),availInvQty)
-      if((snCount+qty) > availInvQty){
+
+      if ((snCount + qty) > this.nowLpnData.putDownQty) {
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.inner.randomMove.components.Up.index.lkutxxnl','扫描数量大于代上架数量')
+          this.$lwLanguage.get('wms_project.pda.components.page.inner.randomMove.components.Up.index.lkutxxnl', '扫描数量大于代上架数量')
         )
         return false;
       }

package/src/views/wms/page/inner/randomMove/index/index.vue

@@ -91,41 +91,53 @@
     </lw-bottom-bar>
 
     <!-- 整托上架弹框 -->
-    <lw-popup :title="$lwLanguage.get('wms_project.pda.inner.randomMove.index.sohpdojk', '整托盘上架')" v-if="upLpnData" v-model="upLpnPop.show">
+    <lw-popup
+      v-if="upLpnData"
+      :title="$lwLanguage.get('wms_project.pda.inner.randomMove.index.sohpdojk', '整托盘上架')"
+      v-model="upLpnPop.show"
+    >
       <div>
         <div class="lw-global-row">
-          <lw-title-value-cell :title="$lwLanguage.get('wms_project.pda.inner.randomMove.index.dnjdqvqm', '托盘号')" :value="upLpnData.lpn" val-bold :is-row="false"/>
+          <lw-title-value-cell :title="$lwLanguage.get('wms_project.pda.inner.randomMove.index.dnjdqvqm', '托盘号')"
+                               :value="upLpnData.lpn" val-bold :is-row="false"/>
         </div>
         <div class="lw-global-row lw-global-flex-between">
-          <lw-title-value-cell :title="$lwLanguage.get('wms_project.pda.inner.randomMove.index.trufalwx', '品种数')" :value="upLpnData.skuCount" val-bold val-red :is-row="false"/>
-          <lw-title-value-cell :title="$lwLanguage.get('wms_project.pda.inner.randomMove.index.vjnmxmjs', '待上架')" :value="upLpnData.toUpQty" val-bold val-red :is-row="false"/>
+          <lw-title-value-cell :title="$lwLanguage.get('wms_project.pda.inner.randomMove.index.trufalwx', '品种数')"
+                               :value="upLpnData.skuCount" val-bold val-red :is-row="false"/>
+          <lw-title-value-cell :title="$lwLanguage.get('wms_project.pda.inner.randomMove.index.vjnmxmjs', '待上架')"
+                               :value="upLpnData.toUpQtyLabel" 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">{{$lwLanguage.get('wms_project.pda.inner.randomMove.index.alulrlkl', '数量')}}</div>
-              </div>
-            </div>
-          </div>
+          <lw-sku-info-module
+            :sku-name="line.skuName"
+            :sku-code="line.skuCode"
+            :qty="line.pickQtyLabel"
+            is-row
+          />
         </div>
       </div>
-      <div class="lw-global-row">
-        <lw-input :title="$lwLanguage.get('wms_project.pda.inner.randomMove.index.rhiwjjil', '目标库位')" required v-model="upLpnPop.loc.value" :get-focus.sync="upLpnPop.loc.focus"
-                  @confirm="upLpnPop.lpn.focus = true"/>
-        <lw-input :title="$lwLanguage.get('wms_project.pda.inner.randomMove.index.geioneok', '目标托盘')" v-model="upLpnPop.lpn.value" :get-focus.sync="upLpnPop.lpn.focus"
-                  @confirm="doWholeLpnUp"/>
-      </div>
+      <lw-input
+        :title="$lwLanguage.get('wms_project.pda.inner.randomMove.index.rhiwjjil', '目标库位')"
+        required
+        v-model="upLpnPop.loc.value"
+        :get-focus.sync="upLpnPop.loc.focus"
+        rule-key="loc"
+        :create-rule="$lwScanRule.create('随机移动-整托盘上架弹框-目标库位','LOCATION')"
+        @confirm="upLpnPop.lpn.focus = true"
+      />
+      <lw-input
+        :title="$lwLanguage.get('wms_project.pda.inner.randomMove.index.geioneok', '目标托盘')"
+        v-model="upLpnPop.lpn.value"
+        :get-focus.sync="upLpnPop.lpn.focus"
+        rule-key="lpn"
+        :create-rule="$lwScanRule.create('随机移动-整托盘上架弹框-目标托盘','LPN')"
+        @confirm="doWholeLpnUp"
+      />
       <template #button>
-        <lw-button @click="doWholeLpnUp">{{$lwLanguage.get('整托盘上架', '整托盘上架')}}</lw-button>
+        <lw-button @click="doWholeLpnUp">{{ $lwLanguage.get('整托盘上架', '整托盘上架') }}</lw-button>
       </template>
     </lw-popup>
 
@@ -202,7 +214,7 @@ export default {
     // 上架取消
     upClear() {
       this.isUpInput = true
-      this.upLpn = null
+      // this.upLpn = null
       this.upLpnData = null
       this.upLpnPop.loc.value = ''
       this.upLpnPop.lpn.value = ''
@@ -216,23 +228,17 @@ export default {
       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
-      })
+    async upLpnLoad(lpn) {
+      const res = await wmsGetWholeLpnMoveTaskInfo(lpn || this.upLpn)
+
+      if (!res.whole) return false
+      this.upLpn = res.lpn
+      this.upLpnData = res
+      return true
     },
     // 整容器上架
-    wholeLpnUp() {
-      this.upLpnPop.show = true
+    async wholeLpnUp() {
+      this.upLpnPop.show = await this.upLpnLoad()
     },
     // 整容器上架
     doWholeLpnUp() {