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

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

@@ -50,6 +50,15 @@
           class="lw-global-row-end"
         >
 
+          <lw-button
+            small
+            type="normal"
+            plain
+            @click="toOrderTaskDetails"
+          >
+            {{ $lwLanguage.get('', '任务详情') }}
+          </lw-button>
+
           <lw-button
             small
             type="normal"
@@ -155,7 +164,7 @@
               <div
                 v-if="lpnScanType==='need'"
                 class="lw-global-row-start lw-global-value-bold"
-                style="text-align: center;"
+                style="text-align: center;margin-bottom: 5px"
                 :style="{color: lpn.data.status==='success' ?'#07c160' :'#D50000'}"
               >
                 {{ lpn.data.statusLabel }}
@@ -163,7 +172,7 @@
               <div
                 v-else
                 class="lw-global-row-start lw-global-value-bold"
-                style="text-align: center;color: #07c160"
+                style="text-align: center;color: #07c160;margin-bottom: 5px"
               >
                 {{
                   lpnScanType === 'delivery' ?
@@ -172,35 +181,41 @@
                 }}
               </div>
 
-              <lw-title-value-cell
-                :title="$lwLanguage.get('', '托盘号')"
-                :value="lpn.data.pickContainerNo"
-                val-bold
-              />
-
               <div
-                v-for="(i,k) in lpn.data.skuList"
+                class="lw-global-group-base-color"
+                v-for="(i,k) in lpn.data.lpnList"
                 :key="k"
-                :class="$lwUtils.getCellClass({
-                  index: k,
-                  length: lpn.data.skuList.length,
-                  only:'lw-global-row-end',
-                  start:'lw-global-row'
-                })"
               >
-                <lw-sku-info-module
-                  :sku-code="i.skuCode"
-                  :sku-name="i.skuName"
-                  :qty="i.qtyLabel"
-                  :qty-text="$lwLanguage.get('', '拣选量')"
-                />
                 <lw-title-value-cell
-                  v-for="(lot,lotK) in i.lotDisplayList"
-                  :key="'lot'+lotK"
-                  :title="lot.title"
-                  :value="lot.value"
-                  :is-row="false"
+                  :title="$lwLanguage.get('', '托盘号')"
+                  :value="i.pickContainerNo"
+                  val-bold
                 />
+
+                <div
+                  v-for="(sku,skuKey) in i.skuList"
+                  :key="'sku'+skuKey"
+                  :class="$lwUtils.getCellClass({
+                  index: skuKey,
+                  length: i.skuList.length,
+                  only:'lw-global-row-end',
+                  start:'lw-global-row'
+                })"
+                >
+                  <lw-sku-info-module
+                    :sku-code="sku.skuCode"
+                    :sku-name="sku.skuName"
+                    :qty="sku.qtyLabel"
+                    :qty-text="$lwLanguage.get('', '拣选量')"
+                  />
+                  <lw-title-value-cell
+                    v-for="(lot,lotK) in sku.lotDisplayList"
+                    :key="'lot'+lotK"
+                    :title="lot.title"
+                    :value="lot.value"
+                    :is-row="false"
+                  />
+                </div>
               </div>
             </div>
 
@@ -382,9 +397,10 @@ import {
   wmsProjectDeliveryPickQueryLoadedLpnPage,
   wmsProjectDeliveryPickQuerySkuPage,
   wmsProjectDeliveryHasNoPickCheck,
+  wmsProjectDeliveryLoadShipCheck,
   projectDeliveryForceLoad,
   projectWmsOutboundPDADeliveryReportStock,
-  wmsProjectDeliveryForceCheck
+  wmsProjectDeliveryForceCheck, projectDeliveryAddLpns
 } from "../../../api/outbound/orderDeliveryShip";
 
 import pickBlockPopup from "./../components/pickBlockPopup.vue";
@@ -441,31 +457,54 @@ export default {
     this.init()
   },
   methods: {
-    init() {
+    async init() {
+
+      // 检查是否有拣选容器号
+      const container = this.$route.query.container
+      if (container) {
+        const deliveryData = await projectDeliveryAddLpns({
+          deliveryId: this.$route.query.deliveryId,
+          lpnList: container.split(',')
+        })
+        const routeQuery = this.$route.query
+        delete routeQuery.container
+        this.$router.replace({
+          path: '/outbound/orderDeliveryShip/lwAction',
+          query: {
+            ...routeQuery,
+            _t: Date.now()
+          }
+        })
+        this.lpn.data = {
+          lpnList: deliveryData || []
+        }
+      }
+
       this.deliveryLpnList.datas = []
       this.deliveryLpnList.pageNum = 1
       this.skuList.datas = []
       this.skuList.pageNum = 1
-      wmsProjectDeliveryPickQueryDetail({
+      const res = await wmsProjectDeliveryPickQueryDetail({
         deliveryId: this.$route.query.deliveryId,
         action: 'load'
-      }).then(res => {
-        this.orderInfo = res || {}
+      })
 
-        // 检查链接状态
-        this.orderInfo.blockStatus === '300' ? this.allBlock() : this.$refs.pickBackPopup.getBlockData()
+      this.orderInfo = res || {}
 
+      // 检查链接状态
+      this.orderInfo.blockStatus === '300' ? this.allBlock() : await this.$refs.pickBackPopup.getBlockData()
 
-        this.$nextTick(() => {
-          if (this.orderInfo.canCancelLoad) {
-            this.tabActive = 'delivery'
-            this.lpn.focus = true
-            return
-          }
-          this.tabActive = 'deliveryLpnList'
-          this.deliveryLpnListLpnSearch()
 
-        })
+      // tab选中
+      this.$nextTick(() => {
+        if (this.orderInfo.canCancelLoad) {
+          this.tabActive = 'delivery'
+          this.lpn.focus = true
+          return
+        }
+        this.tabActive = 'deliveryLpnList'
+        this.deliveryLpnListLpnSearch()
+
       })
     },
 
@@ -487,6 +526,16 @@ export default {
       this.lpn.data = {}
     },
 
+    // 跳转到任务详情
+    toOrderTaskDetails() {
+      this.$router.push({
+        path: '/outbound/orderTask/details',
+        query: {
+          deliveryId: this.orderInfo.deliveryId
+        }
+      })
+    },
+
     // 容器出库点击
     containerOutClick() {
       this.$router.push({
@@ -552,6 +601,16 @@ export default {
         })
       })
     },
+
+    checkDeliveryLoadShip() {
+      return new Promise((resolve) => {
+        wmsProjectDeliveryLoadShipCheck({
+          deliveryId: this.$route.query.deliveryId
+        }).then(res => {
+          resolve(res)
+        })
+      })
+    },
     // 发运点击
     async deliveryClick() {
       try {
@@ -577,21 +636,47 @@ export default {
           "join": null
         }])
 
-        const pick = await this.checkPickOver()
-        pick && this.deliveryPopup.msgLV.push([{
-          "type": "LV",
-          "label": "",
-          "value": pick,
-          "valueType": null,
-          "formatMethod": null,
-          "labelStyle": null,
-          "valueStyle": null,
-          "valBold": true,
-          "valRed": true,
-          "tagList": null,
-          "child": null,
-          "join": null
-        }])
+        // const pick = await this.checkPickOver()
+        let res = await this.checkDeliveryLoadShip();
+        if(res){
+          if(res.hasPickedNoLoad){
+            if(res.hasPickedNoLoadForceBlock){
+              this.$lwShowErrorMsg(res.hasPickedNoLoadMsg)
+              return
+            }else {
+              this.deliveryPopup.msgLV.push([{
+                "type": "LV",
+                "label": "",
+                "value": res.hasPickedNoLoadMsg,
+                "valueType": null,
+                "formatMethod": null,
+                "labelStyle": null,
+                "valueStyle": null,
+                "valBold": true,
+                "valRed": true,
+                "tagList": null,
+                "child": null,
+                "join": null
+              }])
+            }
+          }
+          if(res.hasNoPick){
+            this.deliveryPopup.msgLV.push([{
+              "type": "LV",
+              "label": "",
+              "value": res.hasNoPickMsg,
+              "valueType": null,
+              "formatMethod": null,
+              "labelStyle": null,
+              "valueStyle": null,
+              "valBold": true,
+              "valRed": true,
+              "tagList": null,
+              "child": null,
+              "join": null
+            }])
+          }
+        }
 
         this.deliveryPopup.show = true
         this.deliveryPopup.confirmText =
@@ -685,21 +770,67 @@ export default {
         lpn,
         deliveryId: this.$route.query.deliveryId
       }).then(res => {
-
         if (this.lpnScanType === 'need') {
           const lpnData = res?.result[0] || {}
           this.lpn.data = {
-            pickContainerNo: lpnData.pickContainerNo || '',
-            skuList: lpnData.skuList || [],
             status: res.status,
-            statusLabel: res.statusLabel
+            statusLabel: res.statusLabel,
+            lpnList: [{
+              pickContainerNo: lpnData.pickContainerNo || '',
+              skuList: lpnData.skuList || [],
+            }]
+          }
+        } else if (this.lpnScanType === 'delivery') {
+          if (res.pickList?.length) {
+
+            this.$lwDialog.confirm({
+              type: 'warning',
+              title: this.$lwLanguage.get('', '拣货提示'),
+              message: this.$lwLanguage.get('', '当前运单扫描的托盘未拣货，是否拣货？'),
+              confirmButtonText: this.$lwLanguage.get('', '去拣货')
+            }).then(() => {
+
+              const backPageInfo = JSON.stringify({
+                path: '/outbound/orderDeliveryShip/lwAction',
+                query: this.$route.query
+              })
+
+              if (res.pickList.length > 1) {
+                this.$router.replace({
+                  path: '/outbound/pick/selectPickTask',
+                  query: {
+                    lpn,
+                    deliveryId: this.$route.query.deliveryId,
+                    backPageInfo
+                  }
+                })
+                return
+              }
+
+              const item = res.pickList[0]
+              this.$router.replace({
+                path: '/outbound/pick/lwNotAloneAction',
+                query: {
+                  pickId: item.pickId,
+                  lwPickId: item.pickId,
+                  deliveryId: this.$route.query.deliveryId,
+                  pickLpn: lpn,
+                  backPageInfo
+                }
+              })
+
+            }).catch(() => {
+            })
+            return
           }
+
+          this.lpn.data = {lpnList: res.loadList || []}
         } else {
-          this.lpn.data = res[0] || {}
+          this.lpn.data = {lpnList: res || []}
         }
+
         this.deliveryLpnList.datas = []
         this.skuList.datas = []
-
         this.init()
       })
     },

package/src/views/wms/page/outbound/orderPickDelivery/taskList.vue

@@ -68,6 +68,15 @@
             }}
           </lw-button>
 
+          <lw-button
+            small
+            type="normal"
+            plain
+            @click="toOrderTaskDetails"
+          >
+            {{ $lwLanguage.get('', '任务详情') }}
+          </lw-button>
+
           <lw-button
             small
             type="normal"
@@ -729,20 +738,25 @@ export default {
         wmsProjectDeliveryPickReleaseTask({
           deliveryId: this.$route.query.deliveryId
         }).then(res => {
-          if (res && res.length) {
-            this.$lwToast.success(
-              this.$lwLanguage.get('wms_project.pda.wms.page.outbound.orderPickDelivery.taskList.uebgatgt', '已发放')
-            )
-            this.init()
-          } else {
-            this.$lwToast.fail(
-              this.$lwLanguage.get('wms_project.pda.wms.page.outbound.orderPickDelivery.taskList.vfqsjyhj', '发放失败')
-            )
+          if(res){
+            this.$lwToast.toast(res.msg)
+            if(res.releaseTaskCount){
+              this.init()
+            }
           }
         })
       }).catch(() => {
       })
     },
+    // 跳转到任务详情
+    toOrderTaskDetails() {
+      this.$router.push({
+        path: '/outbound/orderTask/details',
+        query: {
+          deliveryId: this.orderInfo.deliveryId
+        }
+      })
+    },
     // 容器出库点击
     containerOutClick() {
       this.$router.push({

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

@@ -39,6 +39,15 @@
           class="lw-global-row-end"
         >
 
+          <lw-button
+            small
+            type="normal"
+            plain
+            @click="toOrderTaskDetails"
+          >
+            {{ $lwLanguage.get('', '任务详情') }}
+          </lw-button>
+
           <lw-button
             small
             type="normal"
@@ -421,6 +430,16 @@ export default {
       })
     },
 
+    // 跳转到任务详情
+    toOrderTaskDetails() {
+      this.$router.push({
+        path: '/outbound/orderTask/details',
+        query: {
+          deliveryId: this.orderInfo.deliveryId
+        }
+      })
+    },
+
     // 容器出库点击
     containerOutClick() {
       this.$router.push({

package/src/views/wms/page/outbound/orderTaskDetails/index.js

@@ -0,0 +1,15 @@
+/*
+* 出库业务单任务详情
+* @author: 董和春
+* @date: 2024-11-08
+* */
+import lwOrderTaskDetails from './orderTaskDetails.vue'
+
+const components = [
+  lwOrderTaskDetails
+]
+
+export default components.map(item => {
+  item.install = Vue => Vue.component(item.name, item)
+  return item
+})

package/src/views/wms/page/outbound/orderTaskDetails/orderTaskDetails.vue

@@ -0,0 +1,121 @@
+<template>
+  <div>
+    <lw-nav-bar :title="$lwLanguage.get('','执行任务详情')"/>
+    <lw-page-body-module v-if="data">
+      <div class="lw-global-model-top-radius">
+        <lw-title-value-cell :title="$lwLanguage.get('', '单号')" :value="data.orderNo" is-row-start val-bold />
+        <lw-label-value-group class="lw-global-row-end" :list="data.headers" :show-row-style="false"/>
+      </div>
+      <lw-data-look-bg :data="data.labeledQtyList" type="bottom"
+                       title-key="fieldCode" value-key="qtyLabel"  :show-end-line="false" />
+      <!-- TAB -->
+      <lw-tab-box style="margin-top: 10px">
+        <van-tabs type="card" animated v-model="tabActive">
+          <van-tab name="load" :title="$lwLanguage.get('', '待装列表')">
+            <template v-if="data.waitLoads?.length">
+              <div class="lw-global-model-box" v-for="item in data.waitLoads" :key="item.containerNo">
+                <div class="lw-global-row-start lw-global-flex-between">
+                  <div class="lw-global-value-bold">{{ item.containerNo ?? '-' }}</div>
+                  <div>
+                    <lw-tag v-if="item.loadOrder" round>{{ item.loadOrder }}</lw-tag>
+                    <lw-tag plain :type="tagType(item.status)">{{ item.statusLabel }}</lw-tag>
+                  </div>
+                </div>
+                <lw-label-value-group class="lw-global-row-end" :list="item.headers" :show-row-style="false"/>
+              </div>
+            </template>
+            <lw-not-data v-else />
+          </van-tab>
+          <van-tab name="prepick" :title="$lwLanguage.get('', '备货列表')">
+            <template v-if="data.prePicks?.length">
+              <div class="lw-global-model-box" v-for="item in data.prePicks" :key="item.containerNo">
+                <div class="lw-global-row-start lw-global-flex-between">
+                  <div class="lw-global-value-bold">{{ item.containerNo ?? '-' }}</div>
+                  <lw-tag round plain :type="tagType(item.status)">{{ item.statusLabel }}</lw-tag>
+                </div>
+                <lw-label-value-group class="lw-global-row-end" :list="item.headers" :show-row-style="false"/>
+              </div>
+            </template>
+            <lw-not-data v-else />
+          </van-tab>
+          <van-tab name="pick" :title="$lwLanguage.get('', '待拣列表')">
+            <template v-if="data.waitPicks?.length">
+              <div class="lw-global-model-box" v-for="item in data.waitPicks" :key="item.containerNo">
+                <div class="lw-global-row-start lw-global-flex-between">
+                  <div class="lw-global-value-bold">{{ item.containerNo ?? '-' }}</div>
+                  <lw-tag round plain :type="tagType(item.status)">{{ item.statusLabel }}</lw-tag>
+                </div>
+                <lw-label-value-group class="lw-global-row-end" :list="item.headers" :show-row-style="false"/>
+              </div>
+            </template>
+            <lw-not-data v-else />
+          </van-tab>
+          <van-tab name="allocate" :title="$lwLanguage.get('', '待分配列表')">
+            <template v-if="data.waitAllocates?.length">
+              <div class="lw-global-model-box" v-for="item in data.waitAllocates" :key="item.skuId">
+                <div class="lw-global-row-start">
+                  <div class="lw-global-value-bold">{{ item.skuCode }}</div>
+                </div>
+                <lw-label-value-group class="lw-global-row-end" :list="item.headers" :show-row-style="false"/>
+              </div>
+            </template>
+            <lw-not-data v-else />
+          </van-tab>
+        </van-tabs>
+      </lw-tab-box>
+    </lw-page-body-module>
+  </div>
+</template>
+
+<script>
+import { projectWmsOutboundTaskDetails } from '../../../api/outbound/orderTaskDetails'
+
+export default {
+  name: 'lwOrderTaskDetails',
+  data () {
+    const soId = this.$route.query.soId
+    const deliveryId = this.$route.query.deliveryId
+    return {
+      soId,
+      deliveryId,
+      data: null,
+      tabActive: 'load',
+    }
+  },
+  computed: {
+    isSo () {
+      return !!this.soId
+    },
+    isDelivery () {
+      return !!this.deliveryId
+    }
+  },
+  created () {
+    if (!this.soId && !this.deliveryId) {
+      this.$lwShowErrorMsg(this.$lwLanguage.get('', '未指定单号'))
+      return
+    }
+    this.loadData()
+  },
+  methods: {
+    loadData () {
+      projectWmsOutboundTaskDetails({ soId: this.soId, deliveryId: this.deliveryId }).then(res => {
+        res.orderNo = res.soNo ?? res.deliveryNo
+        this.data = res
+      })
+    },
+
+    tagType(status) {
+      switch (status) {
+        case 'loaded':
+          return 'success'
+        case 'picking':
+        case 'prepicking':
+          return 'warning'
+        default:
+          return 'primary'
+      }
+    },
+  },
+}
+</script>

package/src/views/wms/page/outbound/pick/components/dataLookAndChange/index.vue

@@ -6,7 +6,10 @@
 <template>
   <div>
 
-    <lw-nav-bar :title="showTitle"/>
+    <lw-nav-bar
+      :title="showTitle"
+      :click-left="navBackFn"
+    />
 
     <!-- 页主体 -->
     <div class="lw-global-page-box">
@@ -71,6 +74,7 @@
 
       <lw-button
         type="last"
+        auth-code="/wms/pda/outbound/pick.btn.pickLack"
         @click="lackAbnBtn('lack')"
       >
         {{
@@ -80,6 +84,7 @@
 
       <lw-button
         type="normal"
+        auth-code="/wms/pda/outbound/pick.btn.pickAbnormal"
         plain
         @click="lackAbnBtn('abn')"
       >
@@ -374,15 +379,21 @@ export default {
     pickContainer: String,
 
     // 获取数据
-    getData:{
+    getData: {
       type: Function,
       required: true
     },
 
     // 是否显示底部操作按钮
-    showBottomBar:{
+    showBottomBar: {
       type: Boolean,
       default: true
+    },
+
+    // 返回按钮执行的方法
+    navBackFn: {
+      type: Function,
+      default: () => history.go(-1)
     }
   },
   computed: {

package/src/views/wms/page/outbound/pick/components/skuLocationInfo/index.vue

@@ -103,6 +103,9 @@
       <lw-data-look-item
         :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.skuLocationInfo.ghoxuwxz','待拣量')"
         :value="item.waitPickQtyLabel"
+        subject-color
+        val-size="1.28rem"
+        title-color="#D50000"
       />
 
     </lw-data-look-bg>