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

package/src/views/wms/page/outbound/delivery/addOrder/index.vue

@@ -26,6 +26,13 @@
           init-default-time
         />
 
+        <!-- 装车方式 -->
+        <lw-cell-popup-checkbox
+          :title="$lwLanguage.get('','装车方式')"
+          v-model="form.loadMethods"
+          dict-key="OutboundDeliveryLoadMethod"
+        />
+
         <lw-input
           :title="$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.addOrder.pmujrozl','外部发运单号')"
           v-model="form.extDeliveryNo"
@@ -217,6 +224,8 @@ export default {
         ownerId: '',
         // 计划发运时间
         planDeliveryTime: '',
+        // 装车方式
+        loadMethods: '',
         // 外部发运单号
         extDeliveryNo: '',
         // 承运商发运单号
@@ -260,6 +269,9 @@ export default {
       carrierDriverSelectPopupShow: false
     }
   },
+  mounted() {
+    this.form.loadMethods = this.$lwWarehouseConfig.get('systemConfig.OUTBOUND_SHIP_LOAD_METHOD')
+  },
   methods: {
     // 承运商编码确认
     carrierConfirm(item) {

package/src/views/wms/page/outbound/delivery/components/loadingTipContentPopupItem.vue

@@ -0,0 +1,143 @@
+<!--
+  装车提示详情弹框数据项
+  @author: 张文
+  @date: 2024-08-30
+-->
+<template>
+  <div class="lw-global-collapse-box lw-global-model-box-3px lw-global-model-box">
+    <van-collapse
+      v-model="activeCollapse"
+      :border="false"
+    >
+      <van-collapse-item name="1">
+
+        <template #title>
+          <div
+            v-if="isPack"
+            class="lw-global-flex-between"
+          >
+            <lw-title-value-cell
+              :title="isPackTitle.title"
+              :value="isPackTitle.value"
+              val-bold
+              :is-row="false"
+            />
+
+            <div class="lw-global-value-bold-red">{{ isPackTitle.qtyLabel }}</div>
+
+          </div>
+          <div
+            v-else
+            class="lw-global-flex-between"
+          >
+            <lw-title-value-cell
+              :title="notPackTitle"
+              :value="item.containerNo"
+              val-bold
+              :is-row="false"
+            />
+
+            <div class="lw-global-value-bold-red">{{ item.qtyLabel }}</div>
+
+          </div>
+        </template>
+
+        <template v-if="isPack && item.boxList">
+          <div
+            class="lw-global-group-base-color"
+            v-for="(i,k) in item.boxList"
+            :key="k"
+          >
+
+            <lw-title-value-cell
+              :title="$lwLanguage.get('', '捆包箱')"
+              :value="i.boxNo"
+              val-bold
+              is-row-start
+            />
+            <lw-sku-info-module
+              v-for="(j, l) in i.skuList"
+              :key="'sku'+l"
+              :sku-code="j.skuCode"
+              :sku-name="j.skuName"
+              :qty="j.qtyLabel"
+              :is-row="i.skuList.length > 1 && (l+1)<item.boxList.length"
+              :is-row-last="(l+1)===item.boxList.length"
+            />
+          </div>
+        </template>
+        <template v-else>
+
+          <lw-sku-info-module
+            v-for="(i, k) in item.skuList"
+            :key="k"
+            :sku-code="i.skuCode"
+            :sku-name="i.skuName"
+            :qty="i.qtyLabel"
+            :is-row-first="item.skuList.length > 1 && k===0"
+            :is-row="item.skuList.length > 1 && (k+1)<item.skuList.length"
+            :is-row-last="item.skuList.length > 1 && (k+1)===item.skuList.length"
+          />
+
+        </template>
+      </van-collapse-item>
+    </van-collapse>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "loadingTipContentPopupItem",
+  props: {
+    item: {
+      type: Object,
+      default: () => {
+      }
+    }
+  },
+  data() {
+    return {
+      activeCollapse: []
+    }
+  },
+  computed: {
+    // 是否是捆包箱
+    isPack() {
+      return this.$lwWarehouseConfig.get('systemConfig.OUTBOUND_SHIP_LOAD_NEED_EXECUTE_PACK') === 'true'
+    },
+
+    // 不是捆包箱的标题
+    notPackTitle() {
+      if (!this.item.containerNo) return this.$lwLanguage.get('', '商品')
+
+
+      if (this.item.type === 'PALLET_NO') return this.$lwLanguage.get('', '托号')
+
+      return this.$lwLanguage.get('', '拣选')
+    },
+
+    // 是捆包箱的标题
+    isPackTitle() {
+      if (this.item.lpn) {
+        return {
+          title: this.$lwLanguage.get('', '托号'),
+          value: this.item.lpn,
+          qtyLabel: this.$lwLanguage.get('', '{num}箱', {num: this.item.boxCount})
+        }
+      }
+
+      return {
+        title: this.$lwLanguage.get('', '捆包箱'),
+        value: this.item.boxNo,
+        qtyLabel: this.$lwLanguage.get('', '1箱')
+      }
+    },
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/wms/page/outbound/delivery/components/orderContentTitle/index.vue

@@ -45,12 +45,27 @@
       />
       <div
         style="text-align: right"
-        class="lw-global-row-end">
+        class="lw-global-row-end"
+      >
+        <!-- 查看已装 -->
+        <lw-button
+          mini
+          round
+          type="last"
+          plain
+          @click.stop="lookLoaded"
+        >
+          {{ $lwLanguage.get('', '查看已装') }}
+        </lw-button>
         <lw-button
           mini
           round
           @click.stop="changInfo"
-        >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContentTitle.scgzmnrb','修改信息') }}</lw-button>
+        >
+          {{
+            $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContentTitle.scgzmnrb', '修改信息')
+          }}
+        </lw-button>
       </div>
     </div>
 
@@ -72,7 +87,8 @@
             <div
               style="font-size: 1.25rem"
               class="lw-global-value-bold"
-            >{{ orderContent.deliveryNo }}
+            >
+              {{ orderContent.deliveryNo }}
             </div>
 
             <div class="lw-global-value">{{ $lwDate.format(orderContent.planDeliveryTime,'yyyy-MM-dd hh:mm') }}</div>
@@ -96,7 +112,9 @@
                 round
                 plain
                 :type="tagType"
-              >{{ orderContent.billStatusLabel }}</lw-tag>
+              >
+                {{ orderContent.billStatusLabel }}
+              </lw-tag>
 
             </div>
 
@@ -118,26 +136,57 @@
             <div class="lw-global-flex-between lw-global-row-end">
               <div>
                 <span class="lw-global-title">
-                {{ $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContentTitle.data', '装车数据') }}
-              </span>
+                  {{
+                    $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContentTitle.data', '装车数据')
+                  }}
+                </span>
                 <span class="lw-global-value">
-                <span
-                  style="color: #D50000;font-size: 1.25rem"
-                  class="lw-global-value-bold"
-                >{{ orderContent.soCount || 0 }}</span>
-                <span class="lw-global-value">{{$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContentTitle.oqptbtoc', ' 单 / ')}}</span>
-                <span
-                  style="color: #D50000;font-size: 1.25rem"
-                  class="lw-global-value-bold"
-                >{{ orderContent.boxCount || 0 }}</span>
-                <span class="lw-global-value">{{$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContentTitle.yfdoapqe', ' 箱')}}</span>
-              </span>
+                  <span
+                    style="color: #D50000;font-size: 1.25rem"
+                    class="lw-global-value-bold"
+                  >
+                    {{ orderContent.soCount || 0 }}
+                  </span>
+                  <span class="lw-global-value">
+                    {{
+                      $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContentTitle.oqptbtoc', ' 单 / ')
+                    }}
+                  </span>
+                  <span
+                    style="color: #D50000;font-size: 1.25rem"
+                    class="lw-global-value-bold"
+                  >
+                    {{ orderContent.boxCount || 0 }}
+                  </span>
+                  <span
+                    class="lw-global-value">
+                    {{
+                      $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContentTitle.yfdoapqe', ' 箱')
+                    }}
+                  </span>
+                </span>
+              </div>
+              <div style="flex-shrink: 0">
+                <!-- 查看已装 -->
+                <lw-button
+                  mini
+                  round
+                  type="last"
+                  plain
+                  @click.stop="lookLoaded"
+                >
+                  {{ $lwLanguage.get('', '查看已装') }}
+                </lw-button>
+                <lw-button
+                  mini
+                  round
+                  @click.stop="changInfo"
+                >
+                  {{
+                    $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContentTitle.scgzmnrb', '修改信息')
+                  }}
+                </lw-button>
               </div>
-              <lw-button
-                mini
-                round
-                @click.stop="changInfo"
-              >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContentTitle.scgzmnrb','修改信息') }}</lw-button>
             </div>
           </template>
         </template>
@@ -396,7 +445,9 @@
               <span class="lw-global-value-bold-red">{{ i.pickRate || 0 }}%</span>
               / {{ $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContentTitle.index.wjfdafrs','捆包率') }}
               <span class="lw-global-value-bold-red">{{ i.packRate || 0 }}%</span>
-              / {{ $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContentTitle.index.vblqlirw','装车率') }}
+              / {{
+                $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContentTitle.index.vblqlirw', '装车率')
+              }}
               <span class="lw-global-value-bold-red">{{ i.loadRate || 0 }}%</span>
             </div>
 
@@ -417,11 +468,12 @@ import {
 } from "../../../../../api/outbound/delivery/action";
 
 export default {
-  name: "index",
-  props:{
-    orderContent:{
+  name: "orderContentTitle",
+  props: {
+    orderContent: {
       type: Object,
-      default: () => {}
+      default: () => {
+      }
     },
     // 发运单id
     deliveryId: String
@@ -444,7 +496,7 @@ export default {
         default:
           return 'primary'
       }
-    }
+    },
   },
   data() {
     return {
@@ -463,10 +515,10 @@ export default {
       },
 
       // 出库单列表弹框
-      orderPopup:{
+      orderPopup: {
         show: false,
         list: []
-      }
+      },
     }
   },
   methods: {
@@ -526,14 +578,21 @@ export default {
     },
 
     // 查看出库单列表
-    showOrderListClick(){
+    showOrderListClick() {
       projectDeliveryRelatedOrder({
         deliveryId: this.deliveryId
-      }).then(res=>{
-        this.orderPopup.list = res
+      }).then(res => {
+        this.orderPopup.list = res || []
         this.orderPopup.show = true
       })
+    },
+
+    // 查看已装
+    lookLoaded() {
+      this.$emit('lookLoaded')
     }
+
+
   }
 }
 </script>

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

@@ -8,74 +8,75 @@
     <lw-nav-bar :title="$lwLanguage.get('', '月台集货准备')"/>
 
     <lw-page-body-module>
-      <lw-label-value-group
-        :list="deliveryInfo.headers"
-        show-model-style
-      />
-
-      <div class="lw-global-model-box-3px lw-global-model-box">
-        <lw-input
-          :title="$lwLanguage.get('', '集货托盘号')"
-          v-model="lpn.value"
-          :get-focus.sync="lpn.focus"
-          rule-key="lpn"
-          :create-rule="$lwScanRule.create('月台集货准备-运单集货准备-集货托盘号','LPN')"
-          :show-bottom-border="false"
-          required
-          auto-clear-val
-          @confirm="lpnConfirm"
-        />
-      </div>
-
-
-      <div
-        v-if="Object.keys(lpn.data).length"
-        class="lw-global-model-box lw-global-animation-rotate"
-      >
-
-        <div
-          class="lw-global-row-start lw-global-value-bold"
-          style="text-align: center;"
-          :style="{color: '#07c160'}"
-        >
-          {{ $lwLanguage.get('', '扫描成功，请送到月台进行集货') }}
-        </div>
-
-        <lw-title-value-cell
-          :title="$lwLanguage.get('', '托盘号')"
-          :value="lpn.data.lpn"
-          val-bold
-        />
-
-        <div class="lw-global-row lw-global-flex-between">
-
-          <lw-title-value-cell
-            :title="$lwLanguage.get('', '品种数')"
-            :value="lpn.data.skuTypeCount"
-            val-bold
-            val-red
-            :is-row="false"
-          />
-          <lw-title-value-cell
-            :title="$lwLanguage.get('', '商品数')"
-            :value="lpn.data.qtyLabel"
-            val-bold
-            val-red
-            :is-row="false"
-          />
-        </div>
-
-        <lw-sku-info-module
-          v-for="(i,k) in lpn.data.skuList"
-          :key="k"
-          :sku-code="i.skuCode"
-          :sku-name="i.skuName"
-          :qty="i.qtyLabel"
-          is-row
-          :is-row-last="(k+1)===lpn.data.skuList.length"
-        />
-
-      </div>
+      <lw-label-value-group :list="deliveryInfo.headers" show-model-style/>
+
+      <lw-tab-box style="margin-top: 10px">
+        <van-tabs type="card" v-model="tabActive" animated>
+
+          <van-tab name="scan" :title="('', '集货扫描')">
+            <div class="lw-global-model-box-3px lw-global-model-box">
+              <lw-input
+                :title="$lwLanguage.get('', '集货托盘号')"
+                v-model="lpn.value"
+                :get-focus.sync="lpn.focus"
+                rule-key="lpn"
+                :create-rule="$lwScanRule.create('月台集货准备-运单集货准备-集货托盘号','LPN')"
+                :show-bottom-border="false"
+                required
+                auto-clear-val
+                @confirm="lpnConfirm"
+              />
+            </div>
+
+            <div v-if="Object.keys(lpn.data).length" class="lw-global-model-box lw-global-animation-rotate">
+
+              <div class="lw-global-row-start lw-global-value-bold" style="text-align: center;" :style="{color: '#07c160'}">
+                {{ $lwLanguage.get('', '扫描成功，请送到月台进行集货') }}
+              </div>
+              <lw-title-value-cell :title="$lwLanguage.get('', '托盘号')" :value="lpn.data.lpn" val-bold/>
+
+              <div class="lw-global-row lw-global-flex-between">
+                <lw-title-value-cell
+                  :title="$lwLanguage.get('', '品种数')"
+                  :value="lpn.data.skuTypeCount"
+                  val-bold
+                  val-red
+                  :is-row="false"
+                />
+                <lw-title-value-cell
+                  :title="$lwLanguage.get('', '商品数')"
+                  :value="lpn.data.qtyLabel"
+                  val-bold
+                  val-red
+                  :is-row="false"
+                />
+              </div>
+
+              <lw-sku-info-module
+                v-for="(i,k) in lpn.data.skuList"
+                :key="k"
+                :sku-code="i.skuCode"
+                :sku-name="i.skuName"
+                :qty="i.qtyLabel"
+                is-row
+                :is-row-last="(k+1)===lpn.data.skuList.length"
+              />
+
+            </div>
+          </van-tab>
+
+          <van-tab name="pending" :title="$lwLanguage.get('', '待集货')">
+            <lpn-collapse-item v-for="(i,k) in deliveryInfo.pendingCollectContainerVos" :key="k" :style="{animationDelay:k*50+'ms'}"
+                               :item="i" :show-back-pick-btn="false" @reprint="reprint(i)"/>
+            <lw-not-data v-if="!deliveryInfo.pendingCollectContainerVos || deliveryInfo.pendingCollectContainerVos?.length === 0"/>
+          </van-tab>
+          <van-tab name="finished" :title="$lwLanguage.get('', '已集货')">
+            <lpn-collapse-item v-for="(i,k) in deliveryInfo.finishedCollectContainerVos" :key="k" :style="{animationDelay:k*50+'ms'}"
+                               :item="i" :show-back-pick-btn="false" @reprint="reprint(i)"/>
+            <lw-not-data v-if="!deliveryInfo.finishedCollectContainerVos || deliveryInfo.finishedCollectContainerVos?.length === 0"/>
+          </van-tab>
+        </van-tabs>
+      </lw-tab-box>
 
     </lw-page-body-module>
 
@@ -85,43 +86,80 @@
 </template>
 
 <script>
-
-
 import {
   projectWmsOutboundQueryDockCollectPrepareDetail,
   projectWmsOutboundQueryDockCollectPrepareSubmit
-} from "../../../api/outbound/dockConvergeReady";
-import pickBlockPopup from "../components/pickBlockPopup.vue";
+} from '../../../api/outbound/dockConvergeReady'
+import pickBlockPopup from '../components/pickBlockPopup.vue'
+import lpnCollapseItem from '../orderPickDelivery/components/lpnCollapseItem.vue'
+import { projectWmsOutboundPickPrint } from '../../../api/outbound/orderPickDelivery'
 
 export default {
-  name: "lwOutboundDockPreparationConvergeDeliveryAction",
+  name: 'lwOutboundDockPreparationConvergeDeliveryAction',
   components: {
+    lpnCollapseItem,
     pickBlockPopup,
   },
-  data() {
+  data () {
     return {
       deliveryInfo: {},
 
+      tabActive: 'scan',
+
       lpn: {
         value: '',
         focus: true,
         data: {}
-      }
+      },
+
+      // 托盘标签的打印机数据
+      printLpnData: {},
+      // 商品标签的打印机数据
+      printSkuData: {},
     }
   },
-  mounted() {
+  mounted () {
     this.init()
+    this.checkLpnPrint()
+    this.checkSkuPrint()
   },
   methods: {
+    // 容器打印机校验
+    checkLpnPrint(needCheck) {
+
+      if (this.printLpnData.printId) return true
+
+      const {printData, success} = this.$lwPrint.test({
+        templateCode: 'OUTBOUND_PICK_CONTAINER_LABEL',
+        msg: this.$lwLanguage.get('', '托盘标签'),
+        msgType: needCheck ? 'HARD' : ''
+      })
+      this.printLpnData = printData
+      return success
+    },
+    // 商品打印机校验
+    checkSkuPrint(needCheck) {
+
+      if (this.printSkuData.printId) return true
+
+      const {printData, success} = this.$lwPrint.test({
+        templateCode: 'SKU_LOT_LABEL',
+        msg: this.$lwLanguage.get('', '商品标签'),
+        msgType: needCheck ? 'HARD' : ''
+      })
+      this.printSkuData = printData
+      return success
+    },
+
     // 获取数据
-    init() {
+    init () {
       projectWmsOutboundQueryDockCollectPrepareDetail(this.$route.query).then(res => {
         this.deliveryInfo = res || {}
       })
     },
 
     // 托盘确认
-    async lpnConfirm(val, {data}) {
+    async lpnConfirm (val, { data }) {
 
       const lpn = data.lpn || data.key
       if (!lpn) {
@@ -144,7 +182,27 @@ export default {
         this.init()
       })
 
-    }
+    },
+
+    // 托盘 - 补打
+    reprint (item) {
+      if (this.checkLpnPrint(true)) {
+        projectWmsOutboundPickPrint({
+          deliveryId: this.deliveryInfo.deliveryId,
+          soId: this.deliveryInfo.soId,
+          containerNo: item.pickContainerNo,
+          type: 'container_or_sku',
+          printDeviceId: this.printLpnData.printId,
+          printTemplate: this.printLpnData.templateId,
+          skuPrintDeviceId: this.printSkuData.printId,
+          skuPrintTemplate: this.printSkuData.templateId,
+        }).then(res => {
+          res.ids?.forEach(item => {
+            this.$lwPrint.bluetoothPrint(item)
+          })
+        })
+      }
+    },
   }
 }
 </script>

package/src/views/wms/page/outbound/handover/components/pageBox.vue

@@ -385,7 +385,7 @@ export default {
         }
       },
 
-      // 自提弹框 TODO 接口没有返回自提状态
+      // 自提弹框
       aloneGoPopup:{
         all: false,
         part: false,