@logwire/logwire-wms-pda-ui 3.5.3 → 3.5.5-wat.1

package/src/views/wms/page/outbound/pick/mixin/aloneAndNotAlone.js

@@ -42,6 +42,9 @@ export const aloneAndNotAlone = {
         // 后端返回的全部数据
         data: {},
       },
+
+      // 记录使用过的拣选容器数据
+      usePickContainer: []
     }
   },
   computed: {
@@ -260,17 +263,43 @@ export const aloneAndNotAlone = {
         lpn: split.lpn,
         needDirectMove: this.$lwWarehouseConfig.get('systemConfig.OUTBOUND_SPLIT_DOWN_NEED_DIRECT_MOVE') === 'true',
         ...data,
-      }).then(()=>{
+      }).then(() => {
         this.$lwToast.success(
-            this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.aloneAndNotAlone.success','操作成功')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.aloneAndNotAlone.success', '操作成功')
         )
         this.splitPopup.show = false
       })
     },
+
+    // 页面返回
+    mixinAloneBackPage() {
+      const back = JSON.parse(this.$route.query.backPageInfo || '{}')
+      if (Object.keys(back).length) {
+        this.$router.replace({
+          path: back.path,
+          query: {
+            ...back.query,
+            container: this.usePickContainer.join(',')
+          }
+        })
+      } else {
+        history.go(-1)
+      }
+
+    },
     // 拆板下架弹出框关闭
     mixinAloneSplitOff() {
       // 判断当前拣选任务是否完成
-      if (this.splitPopup.data.pickOrderFinish) {
+      const {pickOrderFinish, pickTaskData} = this.splitPopup.data
+      if (pickOrderFinish || !pickTaskData.pendingPickLineList.length) {
+
+        // 判断是否有返回页面，目前（2024-9-13，屈臣氏 #1785）用于返回跳转
+        if (this.$route.query.backPageInfo) {
+          this.mixinAloneBackPage()
+          return
+        }
+
+
         this.$refs.dataLookAndChange.openPickSuccessPopup(this.splitPopup.data)
         return
       }
@@ -281,6 +310,15 @@ export const aloneAndNotAlone = {
     async mixinAlonePickSuccessCheck(res, pickContainer) {
       pickContainer ? this.container.value = pickContainer : ''
 
+      // 判断是否有返回页面，目前（2024-9-13，屈臣氏 #1785）用于返回跳转
+      if (this.$route.query.backPageInfo) {
+        // 如果存在就记录当前拣选的托盘号，方便业务需要
+        if (!this.usePickContainer.some(item => item === this.container.value)) {
+          this.usePickContainer.push(this.container.value)
+        }
+      }
+
+
       // 判断是否需要打印箱票
       try {
         await this.$refs.dataLookAndChange.print(res)
@@ -297,7 +335,6 @@ export const aloneAndNotAlone = {
       // 是否需要拆板下架
       if (res.needSplitDown) {
         this.splitPopup.show = true
-        this.splitPopup.container.focus = true
         return
       }
 
@@ -320,7 +357,7 @@ export const aloneAndNotAlone = {
     mixinAloneCheckPickQtyByQty(nowPickQty) {
       return this.mixinAloneCheckPickQty(
         Number(nowPickQty || 0),
-        this.$refs.qty.getQty()
+        this.$refs.qty?.getQty() || 0
       )
     },
     // 拣选数量校验是否超过待拣量 - 序列号

package/src/views/wms/page/outbound/pick/notAlone/index.vue

@@ -15,6 +15,7 @@
     :lack-confirm-fn="mixinAloneLackConfirm"
     :abn-confirm-fn="mixinAloneAbnConfirm"
     :get-data="getData"
+    :nav-back-fn="mixinAloneBackPage"
     @pickConfirm="pickConfirm"
   >
 
@@ -392,34 +393,13 @@ export default {
       printOldLabel: {
         open: false,
       },
-
-      // TODO 开发数据
-      needSnList: [
-        {sn: 123, qty: 1}
-      ]
     }
   },
   mounted() {
-    this.getData().then(() => {
-      // 检验是否自带扫描托盘号拣选
-      const pickLpn = this.$route.query.pickLpn
-      if (this.hasLpn && pickLpn) {
-        const pending = this.pickData.pendingPickLineList || []
-        for (let i = 0; i < pending.length; i++) {
-          const item = pending[i]
-          if (item.fromLpn === pickLpn) {
-            this.taskIndex = i
-            this.lpn.value = pickLpn
-            this.mixinAloneLpnConfirm(
-              pickLpn,
-              {data: {key: pickLpn, lpn: pickLpn}}
-            )
-            break
-          }
-        }
-      }
-    })
     this.checkLpnPrint()
+    this.getData()
+    const backPageInfo = JSON.parse(this.$route.query.backPageInfo || '{}')
+    this.usePickContainer = backPageInfo.query?.container?.split(',') || []
   },
   methods: {
 
@@ -454,35 +434,78 @@ export default {
       })
     },
     // 拣选容器按钮点击
-    containerBtnClick() {
+    async containerBtnClick() {
       if (this.container.confirm) {
         this.container.popup.show = true
         this.container.popup.focus = true
         return
       }
 
-      this.containerConfirm()
+      await this.containerConfirm()
+
+      // 检验是否自带扫描托盘号拣选
+      const {pickLpn, pickSkuCode} = this.$route.query
+      if (this.hasLpn && pickLpn) {
+        const pending = this.pickData.pendingPickLineList || []
+        let index = -1
+        for (let i = 0; i < pending.length; i++) {
+          const item = pending[i]
+          if (item.fromLpn === pickLpn) {
+
+            index = i
+            // 找到托盘号后找商品号
+            if (this.mixinNeedInputSku && pickSkuCode && item.skuCode !== pickSkuCode) continue
+
+            this.lpn.value = pickLpn
+            this.mixinAloneLpnConfirm(
+              pickLpn,
+              {data: {key: pickLpn, lpn: pickLpn}}
+            )
+
+            if (pickSkuCode) {
+              this.sku.value = pickSkuCode
+              this.skuConfirm(
+                pickSkuCode,
+                {data: {key: pickSkuCode, skuCode: pickSkuCode}}
+              )
+            }
+
+            this.taskIndex = index
+
+            return
+          }
+        }
+
+        if (index > 0) {
+          this.lpn.value = pickLpn
+          this.mixinAloneLpnConfirm(
+            pickLpn,
+            {data: {key: pickLpn, lpn: pickLpn}}
+          )
+          this.taskIndex = index
+        }
+      }
     },
     // 绑定拣选容器号确认
-    containerConfirm() {
+    async containerConfirm() {
 
       if (!this.containerCheck()) return
 
       const container = this.container.confirm ? this.container.popup.value : this.container.value
-      projectWmsOutboundPickCheckContainer({
+      await projectWmsOutboundPickCheckContainer({
         ...this.apiCommonParam,
         pickNo: this.pickData.pickNo,
         pickContainer: container
-      }).then(() => {
-        this.$lwToast.success(
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.atjhrrvp', '容器绑定成功')
-        )
-        this.container.popup.show = false
-        this.container.value = container
-        this.container.confirm = true
-
-        this.mixinAllInitGetFocus()
       })
+
+      this.$lwToast.success(
+        this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.atjhrrvp', '容器绑定成功')
+      )
+      this.container.popup.show = false
+      this.container.value = container
+      this.container.confirm = true
+
+      this.mixinAllInitGetFocus()
     },
     // 校验拣选容器号
     containerCheck() {
@@ -505,7 +528,11 @@ export default {
     // 获取数据
     getData() {
       return new Promise((resolve) => {
-        projectQueryStandardPickData(this.apiCommonParam).then(res => {
+        const {pickLpn, backPageInfo} = this.$route.query
+        projectQueryStandardPickData({
+          ...this.apiCommonParam,
+          lpn: backPageInfo ? pickLpn : ''
+        }).then(res => {
           this.mixinAloneFormatData(res)
 
           resolve()
@@ -756,7 +783,8 @@ export default {
         printDeviceId: printId,
         printTemplate: templateId,
         needPrintOldLpnLabel: this.printOldLabel.open,
-        ...data
+        ...data,
+        lpn: this.$route.query.pickLpn
       })
 
       // 打印原始标签

package/src/views/wms/page/outbound/pick/notAlone/selectPickTask.vue

@@ -0,0 +1,112 @@
+<!--
+  选择拣选任务
+  @author: 张文
+  @date: 2024-09-13
+-->
+<template>
+  <div>
+    <lw-nav-bar
+      :title="$lwLanguage.get('', '选择拣选任务')"
+      :click-left="pickTaskOver"
+    />
+
+    <lw-page-body-module>
+
+      <div class="lw-global-model-box">
+        <lw-title-value-cell
+          :title="$lwLanguage.get('', '拣选托盘')"
+          :value="$route.query.lpn"
+          val-bold
+          :is-row="false"
+        />
+      </div>
+
+      <div
+        class="lw-global-model-box lw-global-click-style"
+        v-for="(i,k) in pickList"
+        :key="k"
+        :style="{animationDelay:k*50+'ms'}"
+        @click="pickTaskClick(i)"
+      >
+        <div class="lw-global-row-start lw-global-flex-between">
+          <div class="lw-global-value-bold">{{ i.pickNo }}</div>
+          <lw-tag>{{ i.sort }}</lw-tag>
+        </div>
+        <lw-label-value-group
+          class="lw-global-row-end"
+          :list="i.content"
+          :show-row-style="false"
+        />
+      </div>
+
+    </lw-page-body-module>
+  </div>
+</template>
+
+<script>
+
+
+import {projectDeliveryListLpnPickTask} from "../../../../api/outbound/pick/notAlone";
+
+export default {
+  name: "selectPickTask",
+  data() {
+    return {
+      pickList: []
+    }
+  },
+  mounted() {
+    this.getPickList()
+  },
+  methods: {
+    getPickList() {
+      projectDeliveryListLpnPickTask({
+        lpn: this.$route.query.lpn,
+        deliveryId: this.$route.query.deliveryId
+      }).then((res = []) => {
+        if (res.length === 0) {
+          this.pickTaskOver()
+          return
+        }
+
+        this.pickList = res
+      })
+    },
+
+    // 拣选任务点击
+    pickTaskClick(item) {
+
+      this.$router.replace({
+        path: '/outbound/pick/lwNotAloneAction',
+        query: {
+          pickId: item.pickId,
+          lwPickId: item.pickId,
+          deliveryId: this.$route.query.deliveryId,
+          pickLpn: this.$route.query.lpn,
+          backPageInfo: JSON.stringify({
+            path: '/outbound/pick/selectPickTask',
+            query: this.$route.query
+          })
+        }
+      })
+    },
+
+    // 拣选任务完成
+    pickTaskOver() {
+      const {backPageInfo, container} = this.$route.query
+      const back = JSON.parse(backPageInfo)
+      this.$router.replace({
+        path: back.path,
+        query: {
+          ...back.query,
+          container,
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/wms/page/outbound/pick/sow/index.vue

@@ -283,6 +283,7 @@
 
       <lw-button
         type="last"
+        auth-code="/wms/pda/outbound/pick.btn.pickLack"
         plain
         @click="pickLack"
       >

package/src/views/wms/page/outbound/pickConsole/orderAction/index.vue

@@ -467,6 +467,7 @@
     <lw-bottom-bar v-if="pickSku.list.length && tabActive==='ing'">
       <lw-button
         type="last"
+        auth-code="/wms/pda/outbound/pick.btn.pickLack"
         @click="lackAbnBtn('lack')"
       >
         {{
@@ -476,6 +477,7 @@
 
       <lw-button
         type="normal"
+        auth-code="/wms/pda/outbound/pick.btn.pickAbnormal"
         plain
         @click="lackAbnBtn('abn')"
       >

package/src/views/wms/page/outbound/pickConsoleV2/action.vue

@@ -6,9 +6,7 @@
 <template>
   <div>
 
-    <lw-nav-bar
-      :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsoleV2.action.gwlvwsws', '出库订单拣选')"
-    >
+    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsoleV2.action.gwlvwsws', '出库订单拣选')">
       <template #right>
         <van-icon
           name="replay"
@@ -22,13 +20,21 @@
       <div class="lw-global-model-top-radius">
         <div class="lw-global-row-start lw-global-flex-between">
           <div class="lw-global-value-bold">{{ orderData.soNo }}</div>
-          <lw-tag
-            round
-            plain
-            :type="tagType(orderData.billStatus)"
-          >
-            {{ orderData.billStatusLabel }}
-          </lw-tag>
+          <div>
+            <lw-tag
+              round
+              plain
+              :type="tagType(orderData.billStatus)">
+              {{ orderData.billStatusLabel }}
+            </lw-tag>
+            <lw-button
+              type="last"
+              plain
+              small
+              @click="toOrderTaskDetails">
+              {{ $lwLanguage.get('', '任务详情') }}
+            </lw-button>
+          </div>
         </div>
         <lw-label-value-group
           class="lw-global-row-end"
@@ -42,10 +48,7 @@
         title-key="fieldCode"
         value-key="qtyLabel"
       />
-      <div
-        v-if="dataLookBottomBtnRow"
-        class="lw-global-model-bottom-radius btn-box"
-      >
+      <div v-if="dataLookBottomBtnRow" class="lw-global-model-bottom-radius btn-box">
         <lw-button
           v-if="orderData.canReleasePickTask"
           type="last"
@@ -718,6 +721,7 @@
 
       <lw-button
         type="last"
+        auth-code="/wms/pda/outbound/pick.btn.pickLack"
         @click="lackAbnBtn('lack')"
       >
         {{
@@ -727,6 +731,7 @@
 
       <lw-button
         type="normal"
+        auth-code="/wms/pda/outbound/pick.btn.pickAbnormal"
         plain
         @click="lackAbnBtn('abn')"
       >
@@ -1277,20 +1282,33 @@ export default {
         }).then(res => {
 
           if (!res.currentAllocate) {
-            this.$lwToast.fail(
-              this.$lwLanguage.get('', '发放失败')
-            )
+            let errorMsg = res.currentAllocateMsg ? res.currentAllocateMsg : this.$lwLanguage.get('', '发放失败');
+            this.$lwDialog.alert({
+              title: this.$lwLanguage.get('wms_project.pda.inner.deadSmall.toast','提示'),
+              message: errorMsg
+            })
+            if(res.currentAllocatePrepick){
+              this.init()
+            }
             return
           }
 
-          this.$lwToast.success(
-            this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsoleV2.action.ylzwqccu', '发放成功')
-          )
+          let msg = res.currentAllocateMsg ? res.currentAllocateMsg :this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsoleV2.action.ylzwqccu', '发放成功');
 
+          this.$lwToast.success(msg)
           this.init()
         })
       })
     },
+    // 跳转到任务详情
+    toOrderTaskDetails() {
+      this.$router.push({
+        path: '/outbound/orderTask/details',
+        query: {
+          soId: this.orderData.soId,
+        }
+      })
+    },
     // 指定库存拣选
     appointInvPick() {
       this.$router.push({

package/src/views/wms/page/outbound/pickConsoleV2/index.vue

@@ -10,28 +10,67 @@
 
     <lw-page-body-module>
 
-      <div class="lw-global-model-box lw-global-model-box-3px">
+      <div
+        style="padding-top: 3px"
+        class="lw-global-model-box"
+      >
         <lw-input
           ref="so"
           :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsoleV2.index.ihavrluo', '单号')"
           :placeholder="$lwLanguage.get('', '请扫描或输入订单号/外部单号查询')"
-          v-model="keyword"
+          v-model="search.keyword"
           rule-key="order"
           :create-rule="$lwScanRule.create('按单拣选控制台v2-起始页-单号搜索','SO')"
-          :show-bottom-border="false"
-          @confirm="searchConfirm()"
-          @clear="searchConfirm()"
-        >
-          <template #button>
-            <lw-button
-              mini
-              round
-              @click="searchConfirm()"
-            >
-              {{ $lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsoleV2.index.xrftvnyk', '查询') }}
-            </lw-button>
-          </template>
-        </lw-input>
+          input-align="right"
+        />
+
+        <lw-cell-popup-radio
+          :title="$lwLanguage.get('', '订单类型')"
+          v-model="search.orderType"
+          dict-key="OutboundPlanOrderType"
+        />
+        <lw-cell-popup-date
+          :title="$lwLanguage.get('','订单开始时间')"
+          v-model="search.orderTimeStart"
+          type="datetime"
+        />
+        <lw-cell-popup-date
+          :title="$lwLanguage.get('','订单结束时间')"
+          v-model="search.orderTimeEnd"
+          type="datetime"
+        />
+        <lw-cell-popup-date
+          :title="$lwLanguage.get('','计划开始处理时间')"
+          v-model="search.planHandleTimeStart"
+          type="datetime"
+        />
+        <lw-cell-popup-date
+          :title="$lwLanguage.get('','计划结束处理时间')"
+          v-model="search.planHandleTimeEnd"
+          type="datetime"
+        />
+
+        <div class="lw-global-flex-between lw-global-row-end">
+          <lw-button
+            type="last"
+            small
+            plain
+            block
+            @click="reset"
+          >
+            {{ $lwLanguage.get('', '重置') }}
+          </lw-button>
+
+          <lw-button
+            style="margin-left: 10px"
+            small
+            block
+            @click="searchConfirm()"
+          >
+            {{ $lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsoleV2.index.xrftvnyk', '查询') }}
+          </lw-button>
+
+        </div>
       </div>
 
       <lw-tab-box style="margin-top: 10px">
@@ -163,8 +202,14 @@ export default {
   },
   data() {
     return {
-      keyword: '',
-      keywordConfirm: '',
+      search: {
+        keyword: '',
+        orderType: '',
+        orderTimeStart: '',
+        orderTimeEnd: '',
+        planHandleTimeStart: '',
+        planHandleTimeEnd: '',
+      },
       tabActive: '',
       all: {
         pageNum: 1,
@@ -194,9 +239,8 @@ export default {
   },
   mounted() {
 
-    const keyword = this.$route.query.keyword
-    this.keywordConfirm = keyword
-    this.keyword = keyword
+    const search = JSON.parse(this.$route.query.search || '{}')
+    Object.keys(search).length ? this.search = search : ''
 
     this.searchConfirm(true)
   },
@@ -212,7 +256,7 @@ export default {
       }
 
       const res = await projectWmsOutboundPDASoPickQueryPageV2({
-        keyword: this.keywordConfirm,
+        ...this.search,
         pageNum: this[key].pageNum,
         pageSize: this[key].pageSize,
         queryType: queryType[key]
@@ -221,8 +265,8 @@ export default {
       this[key].pageTotal = res.total || 0
     },
 
+    // 搜索
     searchConfirm(first) {
-      this.keywordConfirm = this.keyword
       this.all.pageNum = 1
       this.ing.pageNum = 1
       this.abnormal.pageNum = 1
@@ -251,13 +295,20 @@ export default {
       })
 
     },
+    // 重置
+    reset() {
+      for (const k in this.search) {
+        this.search[k] = ''
+      }
+      this.searchConfirm()
+    },
 
     soClick(item) {
 
       this.$router.replace({
         path: '/outbound/pickConsoleV2/lwIndex',
         query: {
-          keyword: this.keywordConfirm,
+          search: JSON.stringify(this.search),
           tabActive: this.tabActive,
           _t: Date.now()
         }

package/src/views/wms/page/receive/byLpnLabel/index.vue

@@ -439,7 +439,6 @@ import {
   wmsMobileInboundSubmitAsnLabelReceive
 } from "../../../api/receive/byLpnLabel";
 import {wmsMobileQueryContainerSkuList} from "../../../api/receive/byContainer";
-import stringRandom from "string-random";
 
 export default {
   name: "lwReceiveByLpnLabelIndex",
@@ -515,7 +514,8 @@ export default {
         list: this.receive.list.map(item => {
           return {
             lpn: item.lpn,
-            skuId: item.sku.id
+            skuId: item.sku.id,
+            lotAttributes: item.lotAttributes
           }
         }),
         asnId: this.$route.query.asnId
@@ -746,7 +746,7 @@ export default {
     // 容器收货 - 增加容器
     addContainerReceive() {
       this.containerReceive.list.unshift({
-        id: stringRandom(10, {numbers: true}) + Date.now(),
+        id: this.$lwStringRandom(10, {numbers: true, letters: true}) + Date.now(),
         skuId: '',
         qty: '',
         qtyFocus: true