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

package/src/views/wms/page/receive/moreOrder/selectType/index.vue

@@ -0,0 +1,94 @@
+<!--
+  多单收货 - 选择收货方式
+  @author: 张文
+  @date: 2023-05-31
+-->
+<template>
+  <div>
+
+    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.selectType.index.crpcfekm', '多单收货')"/>
+
+    <lw-page-body-module>
+
+      <asn-list-content/>
+      <lw-data-look-bg
+        type="bottom"
+        :data="asnCount.qtyList"
+        value-key="qtyLabel"
+        title-key="label"
+        :show-end-line="false"
+      />
+
+    </lw-page-body-module>
+
+    <lw-bottom-bar-btn-hidden :btn-list="btnList"/>
+
+  </div>
+</template>
+
+<script>
+
+import asnListContent from "./../components/asnListContent.vue"
+import {wmsMobileMultiInGetSkuState} from "../../../../api/receive/moreOrder";
+
+export default {
+  name: "lwReceiveMoreOrderSelectType",
+  components: {
+    asnListContent
+  },
+  data() {
+    return {
+
+      btnList: [],
+      asnMethod: {
+        sku: {
+          text: this.$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.selectType.index.ijnstjmv', '按商品收货'),
+          click: () => this.bottomClick('/receive/moreOrder/lwSku')
+        },
+        case: {
+          text: this.$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.selectType.index.habepwpw', '整箱批量收货'),
+          click: () => this.bottomClick('/receive/moreOrder/lwBox')
+        },
+        lpn: {
+          text: this.$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.selectType.index.tyxjnmrt', '整托盘收货'),
+          click: () => this.bottomClick('/receive/moreOrder/lwLpn')
+        },
+      },
+
+      asnCount: {}
+    }
+  },
+  mounted() {
+    this.getAsnData()
+  },
+  methods: {
+    // 获取单的数据
+    getAsnData() {
+      this.btnList = []
+      wmsMobileMultiInGetSkuState({
+        asnIds: this.$route.query.lwAsnIds.split(',')
+      }).then(res => {
+        this.asnCount = res
+        this.asnCount.receiveMethodList.forEach(item => {
+          const obj = this.asnMethod[item]
+          obj && this.btnList.push(obj)
+        })
+      })
+    },
+
+    // 底部按钮点击
+    bottomClick(path) {
+      this.$router.push({
+        path,
+        query: {
+          ...this.$route.query
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/wms/page/receive/moreOrder/sku/index.js

@@ -0,0 +1,12 @@
+/*
+* 多单收货 - 按商品收货
+* @author: 张文
+* @date  2023-06-14
+* */
+
+
+import lwReceiveMoreOrderSku from "./index.vue";
+
+lwReceiveMoreOrderSku.install = Vue => Vue.component(lwReceiveMoreOrderSku.name, lwReceiveMoreOrderSku)
+
+export default lwReceiveMoreOrderSku

package/src/views/wms/page/receive/moreOrder/sku/index.vue

@@ -0,0 +1,291 @@
+<!--
+  多单收货 - 按商品收货
+  @author: 张文
+  @date: 2023-06-14
+-->
+<template>
+  <div>
+
+    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.sku.index.ogsznuls', '多单按商品收货')"/>
+
+    <lw-page-body-module>
+
+      <asn-list-content/>
+      <lw-data-look-bg
+        type="bottom"
+        :data="skuCount.qtyList"
+        value-key="qtyLabel"
+        title-key="label"
+        :show-end-line="false"
+      />
+
+      <!-- 商品条码输入框 -->
+      <div
+        style="margin-top: 10px"
+        class="lw-global-model-box lw-global-model-box-3px"
+      >
+
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.sku.index.qsgxtmle', '商品收货条码')"
+          v-model="sku.value"
+          :get-focus.sync="sku.focus"
+          rule-key="sku"
+          :create-rule="$lwScanRule.create('多单收货-按商品收货-商品号','SKU')"
+          :show-bottom-border="false"
+          required
+          @confirm="skuConfirm"
+        />
+
+      </div>
+
+      <!-- 商品列表 -->
+      <div
+        class="lw-global-model-box lw-global-click-style"
+        v-for="(i,k) in skuList"
+        :key="k"
+        @click="skuClick(i.sku.code)"
+      >
+
+        <div class="lw-global-row-start">
+
+          <div class="lw-global-value-bold">{{ i.sku.code }}</div>
+          <div class="lw-global-title">{{ i.sku.name }}</div>
+
+        </div>
+        <div
+          style="flex-wrap: wrap"
+          class="lw-global-row-end lw-global-flex-start"
+        >
+          <template v-for="(item,key) in i.qtyList">
+            <lw-title-value-cell
+              :key="key"
+              :title="item.label"
+              :value="item.qtyLabel"
+              :is-row="false"
+              val-red
+              val-bold
+            />
+            <div
+              v-if="(key+1) !== i.qtyList.length"
+              :key="'i'+key"
+              class="separator"
+            >
+              /
+            </div>
+          </template>
+
+        </div>
+
+      </div>
+
+
+      <lw-pagination
+        v-model="pageNum"
+        :page-size.sync="pageSize"
+        :page-total="pageTotal"
+        @change="pageChange"
+      />
+
+
+    </lw-page-body-module>
+
+
+    <lw-popup
+      :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.sku.index.cvtfaxnh', '请选择')"
+      v-model="selectPopup.show"
+      :show-keyboard-placeholder="false"
+      background="#f0f0f0"
+      :show-off-btn="false"
+      height="90%"
+      @closed="selectPopupOff"
+      @opened="selectPopupOpened"
+    >
+      <van-radio-group v-model="selectPopup.result">
+
+        <div
+          v-for="(i,k) in selectPopup.list"
+          :key="k"
+          class="lw-global-model-box radio-box"
+        >
+          <van-radio :name="k">
+
+            <lw-label-value-group
+              :list="i.sku.contentList"
+              show-row-style
+            />
+
+          </van-radio>
+        </div>
+      </van-radio-group>
+
+      <template #button>
+        <lw-button
+          type="last"
+          plain
+          @click="selectPopup.show=false"
+        >
+          {{ $lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.sku.index.lcqfkahl', '关闭') }}
+        </lw-button>
+        <lw-button @click="selectPopupConfirm">
+          {{ $lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.sku.index.dnsvvfko', '确认') }}
+        </lw-button>
+      </template>
+    </lw-popup>
+
+  </div>
+</template>
+
+<script>
+
+import asnListContent from "./../components/asnListContent.vue"
+import {
+  wmsMobileMultiInGetSkuState,
+  wmsMobileMultiInQuerySku,
+  wmsMobileMultiInQuerySkuPageListV2, wmsMobileMultiInQuerySkuV2
+} from "../../../../api/receive/moreOrder";
+
+export default {
+  name: "lwReceiveMoreOrderSku",
+  components: {
+    asnListContent,
+  },
+  data() {
+    return {
+      asnIds: [],
+      skuCount: {},
+      sku: {
+        value: '',
+        focus: true
+      },
+
+      // 选择弹框
+      selectPopup: {
+        show: false,
+        result: '',
+        list: []
+      },
+
+      // 商品列表
+      skuList: [],
+      pageNum: 1,
+      pageSize: 10,
+      pageTotal: 0,
+    }
+  },
+  mounted() {
+    this.init()
+  },
+  methods: {
+    init() {
+      this.asnIds = this.$route.query.lwAsnIds.split(',')
+      wmsMobileMultiInGetSkuState({
+        asnIds: this.asnIds
+      }).then(res => this.skuCount = res)
+      this.pageChange()
+    },
+
+    // 页码改变
+    pageChange() {
+      wmsMobileMultiInQuerySkuPageListV2({
+        asnIds: this.asnIds,
+        pageNum: this.pageNum,
+        pageSize: this.pageSize,
+      }).then(res => {
+        this.skuList = res.datas || []
+        this.pageTotal = res.total || 0
+      })
+    },
+
+    // 商品号确认
+    skuConfirm() {
+
+      const skuCode = this.sku.value
+      if (!skuCode) {
+        this.sku.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.sku.index.holwqdzv', '商品号不能为空')
+        )
+        return
+      }
+
+      wmsMobileMultiInQuerySkuV2({
+        asnIds: this.$route.query.lwAsnIds.split(','),
+        skuCode
+      }).then(res => {
+
+        const list = res.list || []
+
+        if (!list.length) {
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.sku.index.ghonjysg', '获取商品数据失败')
+          )
+          return
+        }
+
+        if (list.length > 1) {
+          this.selectPopup.show = true
+          this.selectPopup.list = list
+          return
+        }
+
+        const {asn, sku} = list[0]
+        this.jumpPage(asn.asnNo, sku.sku.code, sku.sku.canFastReceive)
+      })
+
+    },
+    // 商品号点击
+    skuClick(code) {
+      this.sku.value = code
+      this.$nextTick(this.skuConfirm)
+    },
+
+    // 选择到货单弹框 - 确认选择
+    selectPopupConfirm() {
+      const {result, list} = this.selectPopup
+
+      this.selectPopup.show = false
+
+      const {asn, sku} = list[result]
+      this.jumpPage(asn.asnNo, sku.sku.code, sku.sku.canFastReceive)
+    },
+    // 选择到货弹框 - 关闭
+    selectPopupOff() {
+      this.selectPopup.result = ''
+    },
+    // 选择到货弹框 - 打开完成
+    selectPopupOpened() {
+      this.selectPopup.result = 0
+    },
+
+    // 页面跳转
+    jumpPage(asnNo, skuCode, canFastReceive) {
+      const path = canFastReceive ? '/inbound/receive/sku/direct' : '/inbound/receive/sku/advance'
+      this.$router.push({
+        path,
+        query: {
+          asnNo,
+          skuCode
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.separator {
+  margin: 0 5px;
+}
+
+.radio-box {
+  /deep/ .van-radio__label {
+    flex: 1;
+  }
+}
+
+.checkbox {
+  /deep/ .van-radio__icon {
+    flex: 0;
+  }
+}
+</style>

package/src/views/wms/page/receive/putaway/caseAction/index.vue

@@ -9,7 +9,7 @@
     <div class="lw-global-page-box">
 
       <!-- tab -->
-      <lw-tab-box>
+      <lw-tab-box v-if="lpnList.length">
         <van-tabs
           type="card"
           animated
@@ -32,14 +32,12 @@
         <div class="lw-global-model-box">
 
           <!-- 托盘号 -->
-          <div class="lw-global-row-start">
-          <span class="lw-global-title">
-            {{ $lwLanguage.get('wms_project.pda.receive.putaway.lpnCode', '托盘号') }}
-          </span>
-            <span class="lw-global-value-bold">
-            {{ lpnTaskData.lpn }}
-          </span>
-          </div>
+          <lw-title-value-cell
+            :title="$lwLanguage.get('wms_project.pda.receive.putaway.lpnCode', '托盘号')"
+            :value="$lwCheckVal(lpnTaskData.lpn)"
+            val-bold
+            is-row-start
+          />
 
           <!-- 原库位、目标库位 -->
           <lw-title-value-cell
@@ -75,16 +73,16 @@
           />
 
           <!-- 总数量、行数 -->
-          <div class="lw-global-row lw-global-flex-between">
+          <div class="lw-global-row-end lw-global-flex-between">
 
             <div>
             <span class="lw-global-title">
-                {{ $lwLanguage.get('wms_project.pda.receive.putaway.allqty.and.paqty','总数量/待上架') }}
+                {{ $lwLanguage.get('wms_project.pda.receive.putaway.allqty.and.paqty', '总数量/待上架') }}
               </span>
               <span class="lw-global-value-bold">
-                <span>{{ lpnTaskData.qty }}</span>
+                <span>{{ lpnTaskData.qtyLabel }}</span>
                 /
-                <span style="color: #D50000">{{ lpnTaskData.canPaQty }}</span>
+                <span style="color: #D50000">{{ lpnTaskData.canPaQtyLabel }}</span>
               </span>
             </div>
 
@@ -101,12 +99,15 @@
 
         </div>
 
-        <div class="lw-global-model-box lpn-title">
+        <div class="lw-global-model-box lw-global-model-box-3px">
           <lw-input
             :title="$lwLanguage.get('wms_project.pda.receive.putaway.caseNum', '箱号')"
             required v-model="caseNum.value" :get-focus.sync="caseNum.focus"
             rule-key="case"
-            @confirm="scanCase"/>
+            :create-rule="$lwScanRule.create('入库上架-整箱-箱号','CASE')"
+            :show-bottom-border="false"
+            @confirm="scanCase"
+          />
         </div>
 
         <div class="lw-global-tab-box" style="margin-top: 10px">
@@ -199,6 +200,7 @@
             :get-focus.sync="local.focus"
             required
             rule-key="location"
+            :create-rule="$lwScanRule.create('入库上架-整箱-目标库位','LOCATION')"
             @confirm="confirmLocal"
           />
 
@@ -207,6 +209,7 @@
             :title="$lwLanguage.get('wms_project.pda.receive.putaway.toLpn','目标托盘')"
             v-model="lpn.value"
             rule-key="lpn"
+            :create-rule="$lwScanRule.create('入库上架-整箱-目标托盘','LPN')"
             :get-focus.sync="lpn.focus"
             :show-bottom-border="false"
             @confirm="confirmLpn"
@@ -222,6 +225,7 @@
             :get-focus.sync="local.focus"
             required
             rule-key="location"
+            :create-rule="$lwScanRule.create('入库上架-整箱-通道库位','LOCATION')"
             @confirm="confirmLocal"
           />
 
@@ -229,7 +233,8 @@
             class="lw-global-animation-left"
             :title="$lwLanguage.get('wms_project.pda.receive.putaway.tempLpn','暂存容器')"
             v-model="lpn.value"
-            rule-key="lpn"
+            rule-key="waitLpn"
+            :create-rule="$lwScanRule.create('入库上架-整箱-暂存容器','LPN')"
             :get-focus.sync="lpn.focus"
             :show-bottom-border="false"
             @confirm="confirmLpn"
@@ -266,7 +271,9 @@
 import CaseInfo from './../components/CaseInfo/index.vue'
 
 import {
-  wmsMobileGetPutawayTaskByWholeLpn, wmsMobileSecondAllocatePutawayByWholeCase,
+  wmsMobileGetPutawayTaskByTask,
+  wmsMobileGetPutawayTaskByWholeLpn,
+  wmsMobileSecondAllocatePutawayByWholeCase,
   wmsMobileSubmitPutawayByWholeCase
 } from "../../../../api/receive/putaway";
 
@@ -282,6 +289,8 @@ export default {
       backStep: -1,
       // 托盘列表
       lpnList: [],
+      // 任务id，解决任务进来没有lpn的问题
+      taskId: '',
 
       // tab当前激活项
       tabActive: 0,
@@ -311,21 +320,24 @@ export default {
     }
   },
   mounted() {
-    const {lwLpnList, lwBack} = this.$route.query
+    const {lwLpnList, lwBack, lwTaskId} = this.$route.query
     const lpnList = JSON.parse(lwLpnList || '[]')
+
+    this.taskId = lwTaskId
     this.backStep = Number('-' + lwBack)
 
-    if (!lpnList.length) {
+    if (!lpnList.length && !this.taskId) {
       this.$lwShowErrorMsg(
         this.$lwLanguage.get('wms_project.pda.receive.putaway.lpnCodeNull', '托盘数据为空')
       )
-      history.go(this.backStep)
+      // history.go(this.backStep)
 
       return
     }
 
     this.lpnList = lpnList
-    this.tabChange()
+
+    this.lpnList.length ? this.tabChange() : this.getTaskByTaskId()
 
   },
   methods: {
@@ -360,34 +372,50 @@ export default {
         })
       } else {
         this.tabActive + 1 > this.lpnList.length ? this.tabActive = 0 : ''
+        this.getTaskByLpn()
 
-        wmsMobileGetPutawayTaskByWholeLpn({
-          lpn: this.lpnList[this.tabActive]
-        }).then(res => {
-          if(res && res.caseList){
-            res.caseList.forEach(c=>c._scanned = false)
-          }
-          this.tabCaseActive = 0
-          this.lpnTaskData = res
-        }).catch((err) => {
-          this.$lwDialog.confirm({
-            title: this.$lwLanguage.get('wms_project.pda.receive.putaway.dataError', '数据异常'),
-            message:
-              this.$lwLanguage.get('wms_project.pda.receive.putaway.errorInfo', '错误信息：') +
-              err.data.message +
-              '\n' +
-              this.$lwLanguage.get('wms_project.pda.receive.putaway.errorMsg', '点击确定继续执行剩余任务，点击返回回退至上一页')
-            ,
-            cancelButtonText: this.$lwLanguage.get('wms_project.pda.receive.putaway.back', '返回'),
-          }).then(() => {
-            this.lpnList.splice(this.tabActive, 1)
-            this.tabChange()
-          }).catch(() => {
-            history.go(this.backStep)
-          })
-        })
       }
     },
+    // 通过托盘号获取任务
+    getTaskByLpn() {
+      wmsMobileGetPutawayTaskByWholeLpn({
+        lpn: this.lpnList[this.tabActive]
+      }).then(res => {
+        if (res && res.caseList) {
+          res.caseList.forEach(c => c._scanned = false)
+        }
+        this.tabCaseActive = 0
+        this.lpnTaskData = res
+      }).catch((err) => {
+        this.$lwDialog.confirm({
+          title: this.$lwLanguage.get('wms_project.pda.receive.putaway.dataError', '数据异常'),
+          message:
+            this.$lwLanguage.get('wms_project.pda.receive.putaway.errorInfo', '错误信息：') +
+            err.data.message +
+            '\n' +
+            this.$lwLanguage.get('wms_project.pda.receive.putaway.errorMsg', '点击确定继续执行剩余任务，点击返回回退至上一页')
+          ,
+          cancelButtonText: this.$lwLanguage.get('wms_project.pda.receive.putaway.back', '返回'),
+        }).then(() => {
+          this.lpnList.splice(this.tabActive, 1)
+          this.tabChange()
+        }).catch(() => {
+          history.go(this.backStep)
+        })
+      })
+    },
+    // 通过任务号获取信息
+    getTaskByTaskId() {
+      wmsMobileGetPutawayTaskByTask({taskId: this.taskId}).then(res => {
+        if (res && res.caseList) {
+          res.caseList.forEach(c => c._scanned = false)
+        }
+        this.tabCaseActive = 0
+        this.lpnTaskData = res
+      }).catch(() => {
+        history.go(this.backStep)
+      })
+    },
 
     scanCase() {
       const caseNum = this.caseNum.value

package/src/views/wms/page/receive/putaway/components/CaseInfo/index.vue

@@ -45,7 +45,7 @@
 
               <div class="lw-global-flex-start">
                 <div class="lw-global-title lw-global-value-bold" style="color: red;">
-                  {{ showPaQty?i.canPaQty:i.qty }}
+                  {{ showPaQty ? i.canPaQtyLabel : i.qtyLabel }}
                 </div>
 
                 <div style="margin: 0px 12px 0px 32px;" v-if="showDel">
@@ -76,7 +76,7 @@
             />
             <lw-title-value-cell
               :title="$lwLanguage.get('wms_project.pda.receive.putaway.qty', '数量')"
-              :value="showPaQty?i.canPaQty:i.qty"
+              :value="showPaQty?i.canPaQtyLabel:i.qtyLabel"
               :is-row="false"
               val-bold
               val-red

package/src/views/wms/page/receive/putaway/components/SkuInfo/index.vue

@@ -125,7 +125,7 @@
 
         <lw-title-value-cell
           :title="$lwLanguage.get('wms_project.pda.receive.putaway.qty', '数量')"
-          :value="showPaQty?i.canPaQty:i.qty"
+          :value="showPaQty?i.canPaQtyLabel:i.qtyLabel"
           :is-row="false"
           val-bold
           val-red
@@ -183,7 +183,10 @@
         ref="abnormal"
         :sku-code="abnPopup.sku.skuCode"
         :sku-name="abnPopup.sku.skuName"
+        :sku-id="abnPopup.sku.skuId"
+        :owner-id="abnPopup.sku.ownerId"
         :qty="abnPopup.sku.qty"
+        :qty-label="abnPopup.sku.qtyLabel"
         :location="locationCode"
         :type="$lwLanguage.get('wms_project.pda.receive.putaway.inbound','在库')"
         :ab-type="$lwLanguage.get('wms_project.pda.receive.putaway.putaway','入库上架')"
@@ -273,7 +276,10 @@ export default {
       this.abnPopup.sku = {
         skuCode: item.sku.code,
         skuName: item.sku.name,
-        qty:item.qty,
+        skuId: item.sku.id,
+        ownerId: item.sku.ownerId,
+        qty: item.qty,
+        qtyLabel: item.qtyLabel,
         groupKey: item.groupKey
       }
       this.abnPopup.show = true
@@ -289,6 +295,7 @@ export default {
         taskId: this.taskId,
         skuCode: this.abnPopup.sku.skuCode,
         groupKey: this.abnPopup.sku.groupKey,
+        skuId: this.abnPopup.sku.skuId,
         ...data
       }).then(()=>{
         this.abnPopup.show = false