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

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,25 +770,93 @@ export default {
         lpn,
         deliveryId: this.$route.query.deliveryId
       }).then(res => {
+        if (res.break) {
+          this.$lwDialog.confirm({
+            title: this.$lwLanguage.get('', '提示'),
+            message: res.message,
+          }).then(() => {
+            api({
+              lpn,
+              deliveryId: this.$route.query.deliveryId,
+              force: true,
+            }).then(d => this.deliveryLpnConfirmApiBack(lpn, d))
+          }).catch(() => {})
+        } else {
+          this.deliveryLpnConfirmApiBack(lpn, res)
+        }
+      })
+    },
 
-        if (this.lpnScanType === 'need') {
-          const lpnData = res?.result[0] || {}
-          this.lpn.data = {
+    deliveryLpnConfirmApiBack(lpn, res) {
+      if (Array.isArray(res.extra?.messages)) {
+        this.$lwDialog.alert({
+          title: this.$lwLanguage.get('', '提示'),
+          message: res.extra.messages.join('\n'),
+        })
+      }
+      if (this.lpnScanType === 'need') {
+        const lpnData = res?.result[0] || {}
+        this.lpn.data = {
+          status: res.status,
+          statusLabel: res.statusLabel,
+          lpnList: [{
             pickContainerNo: lpnData.pickContainerNo || '',
             skuList: lpnData.skuList || [],
-            status: res.status,
-            statusLabel: res.statusLabel
-          }
-        } else {
-          this.lpn.data = res[0] || {}
+          }]
+        }
+      } 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.deliveryLpnList.datas = []
-        this.skuList.datas = []
 
-        this.init()
-      })
-    },
+        this.lpn.data = {lpnList: res.loadList || []}
+      } else {
+        this.lpn.data = {lpnList: res || []}
+      }
 
+      this.deliveryLpnList.datas = []
+      this.skuList.datas = []
+      this.init()
+    },
 
     // 已装载托盘 - 搜索
     deliveryLpnListLpnSearch() {

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

@@ -61,13 +61,22 @@
             v-if="orderInfo.canReleasePickTask"
             small
             type="last"
-            @click="grantClick"
+            @click="showReleasePickTask"
           >
             {{
               $lwLanguage.get('wms_project.pda.wms.page.outbound.orderPickDelivery.taskList.rygjpcgp', '发放拣选任务')
             }}
           </lw-button>
 
+          <lw-button
+            small
+            type="normal"
+            plain
+            @click="toOrderTaskDetails"
+          >
+            {{ $lwLanguage.get('', '任务详情') }}
+          </lw-button>
+
           <lw-button
             small
             type="normal"
@@ -340,6 +349,24 @@
 
     </lw-page-body-module>
 
+    <lw-popup
+      :title="$lwLanguage.get('', '发放拣选任务')"
+      v-model="pickRelease.show">
+      <div class="lw-global-model-box">
+        <div style="padding: 10px 0 20px;">{{ $lwLanguage.get('wms_project.pda.wms.page.outbound.orderPickDelivery.taskList.pzvtksek', '确认发放拣选任务？') }}</div>
+        <lw-cell-popup-radio
+          v-model="pickRelease.value.id"
+          :title="$lwLanguage.get('', '拣选单规则')"
+          :columns="pickRelease.rulePickOrders"
+          value-key="id"
+          label-key="label"
+        />
+      </div>
+      <template #button>
+        <lw-button @click="doReleasePickTask">{{ $lwLanguage.get('','确定') }}</lw-button>
+      </template>
+    </lw-popup>
+
     <!-- 拦截弹框 -->
     <pick-block-popup
       ref="pickBackPopup"
@@ -432,8 +459,8 @@ import {
   projectWmsOutboundPDADeliveryListNotAllocate,
   projectWmsOutboundPDADeliveryReportStock,
   wmsProjectDeliveryForceCheck,
-  projectWmsOutboundPickPrint
-} from "../../../api/outbound/orderPickDelivery";
+  projectWmsOutboundPickPrint, listRulePickOrders
+} from '../../../api/outbound/orderPickDelivery'
 import {taskMixin} from "../../../../common/mixin/taskMixin";
 import pickBlockPopup from "./../components/pickBlockPopup.vue";
 import pickDeliveryPopup from "./../components/pickDeliveryPopup.vue";
@@ -508,6 +535,18 @@ export default {
         msgLV: [],
       },
 
+      // 发放拣选任务弹框
+      pickRelease: {
+        show: false,
+        rulePickOrders: [],
+        value: {
+          id: null,
+          code: '',
+          name: '',
+          label: '',
+        },
+      },
+
       // 托盘标签的打印机数据
       printLpnData: {},
       // 商品标签的打印机数据
@@ -559,6 +598,11 @@ export default {
       this.lpnList.datas = []
       this.lpnList.pageNum = 1
 
+      listRulePickOrders().then(res => {
+        res.forEach(item => item.label = item.code + '-' + item.name)
+        this.pickRelease.rulePickOrders = res
+      })
+
       await this.getDeliveryData()
 
       if (this.showTaskTab) {
@@ -720,27 +764,31 @@ export default {
         }
       })
     },
-    // 发放拣选任务点击
-    grantClick() {
-      this.$lwDialog.confirm({
-        title: this.$lwLanguage.get('wms_project.pda.wms.page.outbound.orderPickDelivery.taskList.ekzgwsby', '提示'),
-        message: this.$lwLanguage.get('wms_project.pda.wms.page.outbound.orderPickDelivery.taskList.pzvtksek', '确认发放拣选任务？'),
-      }).then(() => {
-        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', '发放失败')
-            )
-          }
-        })
-      }).catch(() => {
+    // 弹出发放拣选任务
+    showReleasePickTask() {
+      this.pickRelease.value = { id: null, label: '' }
+      this.pickRelease.show = true;
+    },
+    // 发放拣选任务
+    doReleasePickTask() {
+      wmsProjectDeliveryPickReleaseTask({
+        deliveryId: this.$route.query.deliveryId,
+        pickOrderRuleId: this.pickRelease.value.id,
+      }).then(res => {
+        this.pickRelease.show = false
+        this.$lwToast.toast(res.msg)
+        if(res.releaseTaskCount){
+          this.init()
+        }
+      })
+    },
+    // 跳转到任务详情
+    toOrderTaskDetails() {
+      this.$router.push({
+        path: '/outbound/orderTask/details',
+        query: {
+          deliveryId: this.orderInfo.deliveryId
+        }
       })
     },
     // 容器出库点击

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
+})