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

package/src/views/wms/page/inner/fragQuickMove/action/index.vue

@@ -24,7 +24,7 @@
         <!-- 下架托盘号 -->
         <lw-title-value-cell
           :title="$lwLanguage.get('wms_project.pda.components.page.inner.fragQuickMove.down.lpn', '下架托盘号')"
-          :value="inv.invList[inv.invIndex].fromLpn"
+          :value="nowTaskLine.fromLpn"
           :is-row="true"
           val-bold
           val-red
@@ -33,7 +33,7 @@
         <!-- 下架箱号 -->
         <lw-title-value-cell
           :title="$lwLanguage.get('wms_project.pda.components.page.inner.fragQuickMove.down.caseNum', '下架箱号')"
-          :value="inv.invList[inv.invIndex].fromCase"
+          :value="nowTaskLine.fromCase"
           :is-row="true"
           val-bold
           val-red
@@ -43,15 +43,16 @@
         <div class="lw-global-row">
           <div class="lw-global-flex-between">
             <div>
-              <div class="lw-global-value-bold">{{ inv.invList[inv.invIndex].skuCode }}</div>
-              <div>{{ inv.invList[inv.invIndex].skuName }}</div>
+              <div class="lw-global-value-bold">{{ nowTaskLine.skuCode }}</div>
+              <div>{{ nowTaskLine.skuName }}</div>
             </div>
             <lw-tag
-              v-if="inv.invList[inv.invIndex].sizeTypeLabel"
+              v-if="nowTaskLine.sizeTypeLabel"
               round
               plain
               style="flex-shrink: 0"
-            >{{ inv.invList[inv.invIndex].sizeTypeLabel }}</lw-tag>
+            >{{ nowTaskLine.sizeTypeLabel }}
+            </lw-tag>
           </div>
         </div>
 
@@ -61,7 +62,7 @@
             <!-- 总库存量 -->
             <lw-title-value-cell
               :title="$lwLanguage.get('wms_project.pda.components.page.inner.fragQuickMove.invQty', '总库存量')"
-              :value="inv.invList[inv.invIndex].qty"
+              :value="nowTaskLine.qtyLabel"
               :is-row="false"
               val-bold
               val-red
@@ -69,7 +70,7 @@
             <!-- 可用库存 -->
             <lw-title-value-cell
               :title="$lwLanguage.get('wms_project.pda.components.page.inner.fragQuickMove.availInvQty', '可用库存')"
-              :value="inv.invList[inv.invIndex].availInvQty"
+              :value="nowTaskLine.availInvQtyLabel"
               :is-row="false"
               val-bold
               val-red
@@ -80,14 +81,14 @@
         <!-- 货主 -->
         <lw-title-value-cell
           :title="$lwLanguage.get('wms_project.pda.components.page.inner.fragQuickMove.owner', '货主')"
-          :value="inv.invList[inv.invIndex].ownerCode + ' - ' + inv.invList[inv.invIndex].ownerName"
+          :value="nowTaskLine.ownerCode + ' - ' + nowTaskLine.ownerName"
           :is-row="true"
           val-bold
           val-red
         />
 
         <!-- 序列号输入 -->
-        <div v-if="inv.invList[inv.invIndex].collectSn">
+        <div v-if="nowTaskLine.collectSn">
           <lw-input
             :title="$lwLanguage.get('wms_project.pda.components.page.inner.fragQuickMove.sn','序列号')"
             v-model="sn.value"
@@ -95,12 +96,20 @@
             required
             rule-key="sn"
             :create-rule="$lwScanRule.create('随机快速移动-零散-SN','SN')"
+            :owner-id="nowTaskLine.ownerId"
+            :rule-serve-query="nowTaskLine"
             @confirm="snConfirm"
           />
           <lw-scan-data-list-module
             :title="$lwLanguage.get('wms_project.pda.components.page.inner.fragQuickMove.sn', '序列号')"
             :rowTitle="$lwLanguage.get('wms_project.pda.components.page.inner.fragQuickMove.sn', '序列号')"
-            v-model="sn.snList"/>
+            v-model="sn.snList"
+            start-bright
+            row-type="sn"
+            row-id="fragQuickMove"
+            total-type="sn"
+            total-type-id="fragQuickMove"
+          />
         </div>
 
         <!-- 商品条码输入 -->
@@ -113,17 +122,18 @@
             required
             rule-key="sku"
             :create-rule="$lwScanRule.create('随机快速移动-零散-商品条码','SKU')"
+            :owner-id="nowTaskLine.ownerId"
+            :rule-serve-query="nowTaskLine"
             @confirm="skuConfirm"
           />
 
 
           <!-- 移动数量 -->
-          <lw-input
+          <lw-get-qty-by-type
+            ref="qty"
             :title="$lwLanguage.get('wms_project.pda.components.page.inner.fragQuickMove.moveQty','移动数量')"
-            v-model="sku.qty.value"
-            :get-focus.sync="sku.qty.focus"
-            required
-            type="number"
+            :sku-id="nowTaskLine.skuId"
+            :owner-id="nowTaskLine.ownerId"
             @confirm="moveQtyConfirm"
           />
         </div>
@@ -138,7 +148,7 @@
 
       <!-- 批次属性 -->
       <div class="lw-global-model-box" v-if="inv.show">
-        <lw-lot-look-module :columns="inv.invList[inv.invIndex].lotData.items"/>
+        <lw-lot-look-module :columns="nowTaskLine.lotData.items"/>
       </div>
 
       <!-- 目标库位 底部栏 -->
@@ -228,42 +238,44 @@ export default {
         value: '',
         skuId: '',
         focus: false,
-        qty:{
-          value: '',
-          focus: false,
-        },
       },
 
       //底部输入框
-      bottomBar:{
+      bottomBar: {
         show: false,
         // 库位
-        toLoc:{
-          value:'',
-          focus:false
+        toLoc: {
+          value: '',
+          focus: false
         },
         // 托盘号
-        toLpn:{
-          value:"",
+        toLpn: {
+          value: "",
           focus: false
         },
         // 箱号
-        toCase:{
-          value:"",
+        toCase: {
+          value: "",
           focus: false
         },
       },
     }
   },
-  watch:{
-    'sn.snList':{
-      handler(list){
+  watch: {
+    'sn.snList': {
+      handler(list) {
         if (!list.length) {
           this.bottomBar.show = false
         }
       }
     }
   },
+  computed: {
+    // 当前任务行
+    nowTaskLine() {
+      return this.inv.invList[this.inv.invIndex]
+    },
+  },
   mounted() {
     this.getInvData()
   },
@@ -271,12 +283,12 @@ export default {
 
     // 查询库存
     getInvData() {
-
+      const {lwLocCode, lwLpn, lwCaseNo, lwSkuId} = this.$route.query
       wmsMobileFragQuickMoveQueryInv({
-        locCode: this.$route.query.lwLocCode,
-        lpn: this.$route.query.lwLpn,
-        caseNo: this.$route.query.lwCaseNo,
-        skuCode: this.$route.query.lwSkuCode
+        locCode: lwLocCode,
+        lpn: lwLpn,
+        caseNo: lwCaseNo,
+        skuId: lwSkuId
       }).then(res => {
         if(res){
           this.inv.fromLocId = res.fromLocId
@@ -286,7 +298,7 @@ export default {
           this.inv.invList = res.skuList
           this.inv.show = true
 
-          if (this.inv.invList[this.inv.invIndex].collectSn) {
+          if (this.nowTaskLine.collectSn) {
             this.sn.focus = true
           } else {
             this.sku.focus = true
@@ -309,8 +321,8 @@ export default {
       }
 
       wmsMobileFragQuickMoveQuerySn({
-        skuId: this.inv.invList[this.inv.invIndex].skuId,
-        ownerId: this.inv.invList[this.inv.invIndex].ownerId,
+        skuId: this.nowTaskLine.skuId,
+        ownerId: this.nowTaskLine.ownerId,
         sn: this.sn.value
       }).then(res => {
 
@@ -331,7 +343,7 @@ export default {
     snScanCheck(sn,qty){
       let snQty=0
       this.sn.snList.forEach(item => snQty += item.qty)
-      let aInvQty=(this.inv.invList[this.inv.invIndex].availInvQty || 0)
+      let aInvQty = (this.nowTaskLine.availInvQty || 0)
       if((snQty + qty) > aInvQty){
         this.$lwShowErrorMsg(
           this.$lwLanguage.get('wms_project.pda.components.page.inner.fragQuickMove.qty.than.availQty','扫描数量大于可用数量')
@@ -348,15 +360,15 @@ export default {
     // 商品校验
     skuCheck(){
       if (this.sku.value) {
-        if (this.sku.value !== this.inv.invList[this.inv.invIndex].skuCode) {
+        if (this.sku.value !== this.nowTaskLine.skuCode) {
           this.$lwShowErrorMsg(
-            this.$lwLanguage.get('wms_project.pda.components.page.inner.fragQuickMove.skuCode.not.match','商品条码与将要移动的商品条码不匹配')
+            this.$lwLanguage.get('wms_project.pda.components.page.inner.fragQuickMove.skuCode.not.match', '商品条码与将要移动的商品条码不匹配')
           )
           this.sku.value = ''
           this.sku.focus = true
           return false
         }
-        this.sku.qty.focus = true
+        this.$refs.qty?.getFocus()
         return true
       }
       this.$lwShowErrorMsg(
@@ -370,14 +382,15 @@ export default {
     moveQtyConfirm(){
       this.moveQtyCheck()
     },
-    moveQtyCheck(){
-      if (this.sku.qty.value) {
-        if (this.sku.qty.value > this.inv.invList[this.inv.invIndex].availInvQty) {
+    moveQtyCheck() {
+      const qty = this.$refs.qty?.getQty() || 0
+      if (qty) {
+        if (qty > this.nowTaskLine.availInvQty) {
           this.$lwShowErrorMsg(
-            this.$lwLanguage.get('wms_project.pda.components.page.inner.fragQuickMove.moveQty.more.than.invQty','移动数量大于可用库存数量')
+            this.$lwLanguage.get('wms_project.pda.components.page.inner.fragQuickMove.moveQty.more.than.invQty', '移动数量大于可用库存数量')
           )
-          this.sku.qty.value = ''
-          this.sku.qty.focus = true
+          this.$refs.qty?.clearInput()
+          this.$refs.qty?.getFocus()
           return false
         }
         this.bottomBar.show = true
@@ -385,9 +398,9 @@ export default {
         return true
       }
       this.$lwShowErrorMsg(
-        this.$lwLanguage.get('wms_project.pda.components.page.inner.fragQuickMove.moveQty.null','移动数量不能为空')
+        this.$lwLanguage.get('wms_project.pda.components.page.inner.fragQuickMove.moveQty.null', '移动数量不能为空')
       )
-      this.sku.qty.focus = true
+      this.$refs.qty?.getFocus()
       return false
     },
 
@@ -416,10 +429,10 @@ export default {
     // 执行移动
     move(){
       this.locCheck()
-      if (this.inv.invList[this.inv.invIndex].collectSn) {
+      if (this.nowTaskLine.collectSn) {
         if (!this.sn.snList.length) {
           this.$lwShowErrorMsg(
-            this.$lwLanguage.get('wms_project.pda.components.page.inner.fragQuickMove.sn.null','序列号不能为空')
+            this.$lwLanguage.get('wms_project.pda.components.page.inner.fragQuickMove.sn.null', '序列号不能为空')
           )
           return
         }
@@ -429,26 +442,26 @@ export default {
         title: this.$lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.warn','警告'),
         message: this.$lwLanguage.get('wms_project.pda.components.page.inner.caseQuickMove.move.confirm','确认执行移动？')
       }).then(() => {
-        let moveQty = this.sku.qty.value > 0 ? this.sku.qty.value : this.sn.snList.map(i => i.qty).reduce((a,b) => a + b)
-        if (moveQty == null ||moveQty <= 0) {
+        const moveQty = this.nowTaskLine.collectSn ? this.sn.snList.map(i => i.qty).reduce((a, b) => a + b) : this.$refs.qty?.getQty() || 0
+        if (moveQty == null || moveQty <= 0) {
           this.$lwShowErrorMsg(
-            this.$lwLanguage.get('wms_project.pda.components.page.inner.fragQuickMove.moveQty.less.than.zero','移动数量不能为0')
+            this.$lwLanguage.get('wms_project.pda.components.page.inner.fragQuickMove.moveQty.less.than.zero', '移动数量不能为0')
           )
           return
         }
 
         wmsMobileFragQuickMove({
           fromLocId: this.inv.fromLocId,
-          fromLpn: this.inv.invList[this.inv.invIndex].fromLpn,
-          fromCase: this.inv.invList[this.inv.invIndex].fromCase,
+          fromLpn: this.nowTaskLine.fromLpn,
+          fromCase: this.nowTaskLine.fromCase,
           toLocCode: this.bottomBar.toLoc.value,
           toLpn: this.bottomBar.toLpn.value,
           toCaseNum: this.bottomBar.toCase.value,
-          skuId: this.inv.invList[this.inv.invIndex].skuId,
-          ownerId: this.inv.invList[this.inv.invIndex].ownerId,
-          collectSn: this.inv.invList[this.inv.invIndex].collectSn,
+          skuId: this.nowTaskLine.skuId,
+          ownerId: this.nowTaskLine.ownerId,
+          collectSn: this.nowTaskLine.collectSn,
           snList: this.sn.snList,
-          moveQty: moveQty
+          moveQty
         }).then(() => {
           this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.components.page.inner.fragQuickMove.move.success','移动成功'))
           setTimeout(()=>{
@@ -475,12 +488,8 @@ export default {
       this.sn.value = ''
       this.sn.snList = []
       this.sku.value = ''
-      this.sku.qty = {
-        value: '',
-        focus: false
-      }
       this.bottomBar.show = false
-      if (this.inv.invList[this.inv.invIndex].collectSn) {
+      if (this.nowTaskLine.collectSn) {
         this.sn.focus = true
       } else {
         this.sku.focus = true
@@ -488,6 +497,11 @@ export default {
       this.bottomBar.toLoc.value = ''
       this.bottomBar.toLpn.value = ''
       this.bottomBar.toCase.value = ''
+
+      this.$nextTick(() => {
+        this.$refs.qty?.clearInput()
+        this.$refs.qty?.init()
+      })
     }
   }
 }

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

@@ -9,7 +9,7 @@
       :title="$lwLanguage.get('wms_project.pda.components.page.inner.fragQuickMove.title','随机快速移动-零散')"/>
 
     <div class="lw-global-page-box">
-      <div class="lw-global-model-box">
+      <div class="lw-global-model-box" style="padding-top: 3px">
         <lw-input
           :title="$lwLanguage.get('wms_project.pda.components.page.inner.fragQuickMove.loc','库位')"
           v-model="loc.value"
@@ -36,17 +36,23 @@
           @confirm="boxConfirm"
         />
 
-        <lw-input
+        <lw-search-select-popup-module
+          ref="skuSearch"
           :title="$lwLanguage.get('wms_project.pda.components.page.inner.fragQuickMove.skuCode','商品条码')"
           v-model="sku.value"
           :get-focus.sync="sku.focus"
           required
           rule-key="sku"
           :create-rule="$lwScanRule.create('随机快速移动-零散-商品条码','SKU')"
-          @confirm="skuConfirm"
+          :api="skuSearchApi"
+          :blur-search="false"
+          type="sku"
+          rule-value-key="skuCode"
+          @confirm="seoClick"
         />
 
         <lw-button
+          style="margin-top: 10px"
           block
           @click="seoClick"
         >{{ $lwLanguage.get('wms_project.pda.components.page.inner.fragQuickMove.query', '查询') }}
@@ -55,38 +61,11 @@
       </div>
     </div>
 
-    <!--    <lw-popup-->
-    <!--      v-if="skuPop.show"-->
-    <!--      v-model="skuPop.show"-->
-    <!--      :title="$lwLanguage.get('请选择商品','请选择商品')"-->
-    <!--    >-->
-    <!--      <div-->
-    <!--        v-for="(i,k) in skuPop.skuList"-->
-    <!--        :key="k"-->
-    <!--        class="lw-global-row"-->
-    <!--        @click="skuClick(k)"-->
-    <!--      >-->
-    <!--        <div class="lw-global-flex-between">-->
-    <!--          <div>-->
-    <!--            <div class="lw-global-value-bold">{{ i.skuCode }}</div>-->
-    <!--            <div>{{ i.skuName }}</div>-->
-    <!--          </div>-->
-    <!--          <div>-->
-    <!--            <div class="lw-global-value-bold">{{ i.ownerCode }}</div>-->
-    <!--            <div>{{ i.ownerName }}</div>-->
-    <!--          </div>-->
-    <!--        </div>-->
-    <!--      </div>-->
-    <!--    </lw-popup>-->
   </div>
 </template>
 
 <script>
 
-import {
-  wmsMobileFragQuickMoveQueryInv,
-} from "../../../../api/inner/move/quickMove"
-
 
 export default {
   name: "lwInnerFragQuickMove",
@@ -110,17 +89,8 @@ export default {
       // 商品
       sku: {
         value: '',
-        skuId: 0,
-        ownerId: 0,
-        focus: false
+        focus: false,
       },
-
-      // skuPop:{
-      //   show: false,
-      //   index: 0,
-      //   skuList:[{skuCode:'asku',skuName:this.$lwLanguage.get('wms_project.pda.inner.fragQuickMove.index.gpjeyicm', 'A商品'),skuId:'111',ownerCode:'Oa',ownerName:this.$lwLanguage.get('wms_project.pda.inner.fragQuickMove.index.ikpgyjci', 'A货主'),ownerId:'111'},
-      //     {skuCode:'asku',skuName:this.$lwLanguage.get('wms_project.pda.inner.fragQuickMove.index.gpjeyicm', 'A商品'),skuId:'222',ownerCode:'Ob',ownerName:this.$lwLanguage.get('wms_project.pda.inner.fragQuickMove.index.gygzzdnj', 'b货主'),ownerId:222}]
-      // }
     }
   },
   methods: {
@@ -145,7 +115,6 @@ export default {
 
     // 托盘号确认
     lpnConfirm() {
-      // this.lpnCheck()
       this.box.focus = true
     },
     // 托盘号校验
@@ -161,7 +130,6 @@ export default {
 
     // 箱号确认
     boxConfirm() {
-      // this.caseCheck()
       this.sku.focus = true
     },
     // 箱号校验
@@ -175,10 +143,6 @@ export default {
       return false
     },
 
-    // 商品确认
-    skuConfirm() {
-      this.skuCheck() && this.seoClick()
-    },
     // 商品校验
     skuCheck() {
       if (this.sku.value) return true
@@ -189,32 +153,26 @@ export default {
       return false
     },
 
-    // skuClick(k){
-    //   this.sku.skuId = this.skuPop.skuList[this.skuPop.index].skuId
-    //   this.skuPop.show = false
-    // },
-
+    // 商品搜索api
+    skuSearchApi(data) {
+      return this.$lwApi.common.searchInventorySku({
+        ...data,
+        locationCode: this.loc.value,
+        lpn: this.lpn.value,
+        caseNum: this.box.value,
+      })
+    },
     seoClick() {
 
       if (this.locCheck() && this.skuCheck()) {
-
-        wmsMobileFragQuickMoveQueryInv({
-          locCode: this.loc.value,
-          lpn: this.lpn.value,
-          caseNo: this.box.value,
-          skuCode: this.sku.value
-        }).then(() => {
-
-          this.$router.push({
-            path: '/inner/fragQuickMove/lwAction',
-            query: {
-              lwLocCode: this.loc.value,
-              lwLpn: this.lpn.value,
-              lwCaseNo: this.box.value,
-              lwSkuCode: this.sku.value
-            }
-          })
-
+        this.$router.push({
+          path: '/inner/fragQuickMove/lwAction',
+          query: {
+            lwLocCode: this.loc.value,
+            lwLpn: this.lpn.value,
+            lwCaseNo: this.box.value,
+            lwSkuId: this.sku.value
+          }
         })
       }
     }

package/src/views/wms/page/inner/index.js

@@ -93,11 +93,8 @@ import lwQualityActionPage from "./quality/action";
 // 排查单
 import lwInnerCheckOrderPage from "./check/action";
 
-
-
-
-
-
+// 排查单
+import lotTransfer from "./lotTransfer";
 
 
 export const inner = [
@@ -106,7 +103,7 @@ export const inner = [
   ...lwTaskMoveWholePage,
 
   lwInnerRandomMoveIndexPage,
-    lwMovePutAwayPage,
+  lwMovePutAwayPage,
 
   lwInnerLpnMovePage,
   lwInnerLpnMoveActionPage,
@@ -144,4 +141,6 @@ export const inner = [
   lwInnerFragQuickMoveAction,
   lwInnerCaseQuickMove,
 
+  ...lotTransfer,
+
 ]