@logwire/logwire-wms-pda-ui 1.1.18 → 1.1.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logwire/logwire-wms-pda-ui",
-  "version": "1.1.18",
+  "version": "1.1.19",
   "private": false,
   "author": "zhangwen",
   "description": "运匠科技wms-PDA基础组件库",

package/src/api/inbound/quality.js

@@ -88,6 +88,16 @@ export const submitSkuSnQuality = data => lwAxios.action({
   data
 })
 
+/**
+ * 完成商品品检
+ * @param taskId 品检任务id
+ * @returns {Promise<{ quality: Object, printList: Array<Object> }>} 品检结果
+ */
+export const finishSkuQuality = taskId => lwAxios.action({
+  url: 'wmsMobileInboundPassQuality',
+  data: { taskId }
+})
+
 /**
  * 提交品检异常
  * @param data 品检异常数据

package/src/components/page/inbound/receive/quality/LwInboundQualityExecutePage.vue

@@ -94,6 +94,10 @@
       <lw-button plain @click="resetLpn">切换托盘</lw-button>
       <lw-button @click="submitLpn">提交品检结果</lw-button>
     </lw-bottom-bar>
+    <lw-bottom-bar v-else-if="canFinish">
+      <lw-button plain @click="resetSku" v-if="$route.query.lwComeFrom !== 'task'">切换商品</lw-button>
+      <lw-button @click="finishSku">完成当前商品品检</lw-button>
+    </lw-bottom-bar>
     <van-dialog v-model="showSns" title="当前扫描的SN列表">
       <sns-list :sns="sns" @remove="removeSn"/>
     </van-dialog>
@@ -120,6 +124,7 @@
 
 <script>
 import {
+  finishSkuQuality,
   getInboundFoundQualityCard,
   getInboundGetQualityDetail, submitQualityAbnormal,
   submitSkuQuality, submitSkuSnQuality
@@ -161,6 +166,9 @@ export default {
         ownerId: this.task.asn.ownerId || null,
         warehouseId: this.task.warehouseId || null,
       }
+    },
+    canFinish () {
+      return !this.task.sku.needSn && this.task.qualityQty > 0 && this.task.sku.qualityType === '200'
     }
   },
   created () {
@@ -290,6 +298,17 @@ export default {
         this.sns.splice(idx, 1)
       }
     },
+    resetSku () {
+      this.$router.back()
+    },
+    finishSku () {
+      finishSkuQuality(this.task.id).then(res => {
+        if (res.quality) {
+          this.task = res.quality
+          this.$lwToast.success('品检完成')
+        }
+      })
+    },
     showAbnormalPop () {
       const lotData = this.$refs.lot.getData()
       if (lotData.success) {

package/src/components/page/outbound/delivery/components/soAndLpnItem/index.vue

@@ -20,7 +20,7 @@
 
     <!-- 单号 -->
     <div class="lw-global-flex-between lw-global-row-start">
-      <div>
+      <div v-if="type === 'so'">
         <span class="lw-global-title">
           {{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.orderNo','单号') }}
         </span>
@@ -29,6 +29,15 @@
         </span>
       </div>
 
+      <div v-if="type === 'lpn'">
+        <span class="lw-global-title">
+          {{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.lpn','托盘号') }}
+        </span>
+        <span class="lw-global-value-bold">
+          {{ item.palletNo }}
+        </span>
+      </div>
+
       <slot>
         <lw-button
             style="flex-shrink: 0"