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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logwire/logwire-wms-pda-ui",
-  "version": "1.1.16",
+  "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/api/outbound/bale/checkBale/action.js

@@ -112,3 +112,12 @@ export function projectWmsMixPackContainerSkuBlock(data){
     data
   })
 }
+
+
+// 异常确认
+export function projectWmsMixPackSubmitAbnormal(data){
+  return lwAxios.action({
+    url:'projectWmsMixPackSubmitAbnormal',
+    data
+  })
+}

package/src/components/module/InnerAbnormal/index.vue

@@ -119,6 +119,7 @@
       input-align="right"
       rule-prefix="innerAbn"
       rule-key="lpn"
+      :required="requireLpn"
       @confirm="abnormalFocus.remark=true"
     />
 
@@ -170,7 +171,13 @@ export default {
     abType: String,
 
     // 异常类型可选key
-    abnTypeKey: Array
+    abnTypeKey: Array,
+
+    // 是否必须填写LPN
+    requireLpn: {
+      type: Boolean,
+      default: false,
+    },
 
   },
   data() {
@@ -291,6 +298,17 @@ export default {
 
       return true
     },
+    // 异常LPN校验
+    abnLpnCheck(){
+      if (this.requireLpn && !this.abnormal.abnLpn){
+        this.abnormalFocus.lpn = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.module.inboundAbn.lpnNull','异常托盘号不能为空')
+        )
+        return false
+      }
+      return true
+    },
 
     // 必填校验
     requiredCheck(){
@@ -319,6 +337,8 @@ export default {
 
       if (!this.abnLocalCheck()) return
 
+      if (!this.abnLpnCheck()) return
+
       return true
     },
     // 获取填写的异常数据

package/src/components/module/Login/index.vue

@@ -86,8 +86,11 @@
 
 <script>
 
+import {loginAndInit} from "../../../mixins/loginAndInit";
+
 export default {
   name: "lwLoginModule",
+  mixins:[loginAndInit],
   props: {
     // 用户名图标
     usernameSrc: {
@@ -243,14 +246,7 @@ export default {
         // 储存token
         this.$lwApiUtils.setToken(res.token)
 
-        await Promise.all([
-          // 绑定UUID
-          this.$lwUUID.bound(),
-          // 获取字典数据
-          this.$lwDict.asyncGet(),
-          // 获取权限数据
-          this.$lwPermissions.asyncGet(),
-        ])
+        await this.getSystemInitData()
 
         // 如果存在跳转页面就自动跳转
         if (this.path) {

package/src/components/page/common/Warehouse/index.vue

@@ -65,8 +65,11 @@
 
 <script>
 
+import {loginAndInit} from "../../../../mixins/loginAndInit";
+
 export default {
   name: "lwWarehousePage",
+  mixins:[loginAndInit],
   props:{
 
     // 点击导航栏返回按钮
@@ -192,7 +195,7 @@ export default {
       await this.$lwApi.warehouse.selectConfirm(item.code)
 
       // 获取当前配置了的打印机
-      await this.$lwPrint.asyncGet()
+      await this.getSystemInitData()
 
       if (!this.routerConfirmBack && this.path){
         this.$router.push({

package/src/components/page/count/components/RandomCount.vue

@@ -2,7 +2,7 @@
   <lw-popup v-model="showPop" title="随机盘点" :show-off-btn="false">
     <div>
       <lw-input title="库位" v-model="data.loc.value" :get-focus.sync="data.loc.focus" @confirm="data.sku.focus = true"/>
-      <lw-input title="商品" v-model="data.sku.value" :get-focus.sync="data.sku.focus" @confirm="resolveSku"/>
+      <lw-input title="商品" v-model="data.sku.value" :get-focus.sync="data.sku.focus"/>
       <lw-input title="托盘" v-model="data.lpn.value"
                 v-if="grading === 'LPN'"
                 :get-focus.sync="data.lpn.focus"/>
@@ -77,17 +77,8 @@ export default {
       this.showPop = true
       this.data.loc.focus = true
     },
-    resolveSku () {
-      if (this.data.sku.value) {
-        // TODO: 商品条码解析
-        this.sku = this.data.sku.value
-      }
-    },
     submit (ownerId = null) {
-      if (!this.sku) {
-        this.sku = this.data.sku.value
-      }
-      if (!this.sku) {
+      if (!this.data.sku.value) {
         this.data.sku.focus = true
         return
       }
@@ -96,7 +87,7 @@ export default {
         return
       }
       invCountLineCustom({
-        skuCode: this.sku,
+        skuCode: this.data.sku.value,
         ownerId,
         taskNo: this.countTaskNo,
         locationCode: this.data.loc.value,

package/src/components/page/count/inv/action/index.vue

@@ -34,9 +34,9 @@
           <lw-input title="库位" v-model="inputData.locationCode.value"
                     :get-focus.sync="inputData.locationCode.focus"
                     @confirm="inputData.skuCode.focus = true"/>
-          <lw-input title="商品条码" v-model="inputData.skuCode.barcode"
-                    :get-focus.sync="inputData.skuCode.focus"
-                    @confirm="resolveSkuCode"/>
+          <lw-input title="商品条码" v-model="inputData.skuCode.value"
+                    rule-key="sku" rule-value-key="skuCode"
+                    :get-focus.sync="inputData.skuCode.focus"/>
           <div class="lw-global-props">
             <div>
               <div>商品编码</div>
@@ -106,7 +106,6 @@ export default {
           focus: true,
         },
         skuCode: {
-          barcode: '',
           value: '',
           focus: false,
         },
@@ -170,11 +169,6 @@ export default {
     getPrevLine () {
       getPreviousCountLine(this.taskNo, this.lineId).then(this.initLine)
     },
-    resolveSkuCode () {
-      // TODO: 商品条码解析
-      this.inputData.skuCode.value = this.inputData.skuCode.barcode
-      this.inputData.qty.focus = true
-    },
     submitEmptyInv () {
       if (!this.inputData.locationCode.value) {
         return this.$lwShowErrorMsg('盘点库位不能为空')
@@ -189,6 +183,13 @@ export default {
       })
     },
     submitCount () {
+      if (this.lotGroups) {
+        const lotQty = this.lotGroups.map(i => parseInt(i.qty) || 0).reduce((a, b) => a + b, 0)
+        if (lotQty !== parseInt(this.inputData.qty.value)) {
+          return this.$lwShowErrorMsg('批次数量之和与盘点数量不符')
+        }
+      }
+
       invCountLineSubmit({
         countLineId: this.line.id,
         qty: this.inputData.qty.value,
@@ -229,7 +230,6 @@ export default {
           focus: true,
         },
         skuCode: {
-          barcode: '',
           value: '',
           focus: false,
         },

package/src/components/page/count/loc/action/index.vue

@@ -59,7 +59,7 @@
                 <div v-else :key="record.key"
                      class="lw-global-model-box loc-cont-record">
                   <div v-if="record.diffQty !== 0" class="loc-cont-record-diff">有差异</div>
-                  <p><b>{{ record.ownerName }} / {{ record.ownerName }}</b></p>
+                  <p><b>{{ record.ownerCode }} / {{ record.ownerName }}</b></p>
                   <p>{{ record.skuCode }}</p>
                   <div class="lw-global-sh"></div>
                   <div class="lw-global-flex-between">

package/src/components/page/inbound/index.js

@@ -2,10 +2,16 @@ import LwInboundReceiveIndexPage from './receive/index'
 import LwInboundReceiveHomePage from './receive/home'
 import receiveSkuPages from './receive/receive-sku'
 import skuQualityPages from './receive/quality'
+// 新品配置
+import lwNewProjectIndexPage from "./newProject/index";
+// 新品配置
+import lwNewProjectActionPage from "./newProject/action";
 
 export default [
   LwInboundReceiveIndexPage,
   LwInboundReceiveHomePage,
   ...receiveSkuPages,
   ...skuQualityPages,
+  lwNewProjectIndexPage,
+  lwNewProjectActionPage,
 ]

package/src/components/page/{inner → inbound}/newProject/action/index.vue

@@ -23,6 +23,11 @@
         </div>
         <div class="lw-global-row">
 
+          <lw-title-value-cell
+              :value="skuNewProjectSkuInfo.skuName"
+              val-bold
+              :is-row="false"
+          />
 
           <lw-title-value-cell
               :title="$lwLanguage.get('','货主')"
@@ -142,28 +147,28 @@
 
                 <lw-input
                     v-model="skuNewProjectSkuInfo.length"
-                    title="裸件长"
+                    title="裸件长（mm）"
                     type="number"
 
                     :show-bottom-border="false"
                 />
                 <lw-input
                     v-model="skuNewProjectSkuInfo.width"
-                    title="裸件宽"
+                    title="裸件宽（mm）"
                     type="number"
                     :show-bottom-border="false"
                 />
 
                 <lw-input
                     v-model="skuNewProjectSkuInfo.height"
-                    title="裸件高"
+                    title="裸件高（mm）"
                     type="number"
                     :show-bottom-border="false"
                 />
 
                 <lw-input
                     v-model="skuNewProjectSkuInfo.weight"
-                    title="裸件重量"
+                    title="裸件重量（Kg）"
                     type="number"
                     :show-bottom-border="false"
                 />

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

@@ -12,7 +12,7 @@
         <van-tabs type="card" animated v-model="tabActive">
           <van-tab title="品检">
             <div class="lw-global-model-box">
-              <lw-input v-if="!currentLpn" title="托盘" v-model="lpn.value" :get-focus.sync="lpn.focus" @confirm="scanLpn"/>
+              <lw-input v-if="!currentLpn" title="托盘" v-model="lpn.value" :get-focus.sync="lpn.focus" @confirm="scanLpn()"/>
               <template v-if="currentLpn">
                 <div class="lw-global-props">
                   <div>
@@ -36,8 +36,9 @@
                 </div>
               </template>
             </div>
-            <div v-if="task.sku.needSn" class="lw-global-model-box" style="margin-top: 10px;">
-              <lw-input title="序列号条码" required v-model="sn" @confirm="addSn"/>
+            <div v-if="currentLpn && !task.sku.needSn" class="lw-global-model-box" style="margin-top: 10px;">
+              <lw-input title="序列号条码" required v-model="sn.value" :get-focus.sync="sn.focus"
+                        rule-key="sn" rule-value-key="sn" :rule-serve-query="barcodeQuery" @confirm="addSn"/>
               <div v-if="sns.length" class="tag-list">
                 <div class="tag-list-title">
                   <div>当前扫描结果</div>
@@ -93,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>
@@ -107,6 +112,7 @@
           :sku-name="task.sku.name"
           :qty="currentLpn.canQualityQty"
           :location="task.locationCode"
+          require-lpn
           type="品检"
           ab-type="品检异常"/>
       <template #button>
@@ -118,6 +124,7 @@
 
 <script>
 import {
+  finishSkuQuality,
   getInboundFoundQualityCard,
   getInboundGetQualityDetail, submitQualityAbnormal,
   submitSkuQuality, submitSkuSnQuality
@@ -140,7 +147,10 @@ export default {
         focus: true,
       },
       currentLpn: null,
-      sn: '',
+      sn: {
+        value: '',
+        focus: false,
+      },
       sns: [],
       showSns: false,
       lotQuery: null,
@@ -151,6 +161,15 @@ export default {
     snsQty () {
       return this.sns.map(i => parseInt(i.qty)).reduce((a, b) => a + b, 0)
     },
+    barcodeQuery () {
+      return {
+        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 () {
     let taskId = this.$route.query.taskId
@@ -241,33 +260,30 @@ export default {
         })
       }
     },
-    addSn () {
-      if (!this.sn) {
-        return
+    addSn (sn, res) {
+      if (!res.data.sn) {
+        this.sn.focus = true
+        return this.$lwShowErrorMsg('错误的商品条码序列号')
       }
-      const param = { componentId: 'WMS_INBOUND_RECEIVE_SKU_SN', barcode: this.sn, ownerId: this.task.asn.ownerId }
-      this.$lwApi.barcode.resolver(param).then(res => {
-        if (!res.data.sn) {
-          return this.$lwShowErrorMsg('错误的商品条码序列号')
-        }
-        const osn = this.sns.find(i => i.sn === res.data.sn)
-        if (osn) {
-          return this.$lwShowErrorMsg('重复的序列号')
-        }
-        if (res.data.sku && res.data.sku !== this.task.sku.code) {
-          return this.$lwShowErrorMsg('序列号商品编码不符')
+      const osn = this.sns.find(i => i.sn === sn)
+      if (osn) {
+        this.sn.focus = true
+        return this.$lwShowErrorMsg('重复的序列号')
+      }
+      if (res.data.skuCode && res.data.skuCode !== this.task.sku.code) {
+        this.sn.focus = true
+        return this.$lwShowErrorMsg('序列号商品编码不符')
+      }
+      getAsnSkuSnDetail(this.task.asn.id, this.task.sku.id, res.data.sn).then(data => {
+        if (data && data.sn) {
+          this.sns.unshift({
+            sn: data.sn,
+            qty: data.qty || 1
+          })
+          this.sn.value = ''
+        } else {
+          return this.$lwShowErrorMsg('错误的序列号')
         }
-        getAsnSkuSnDetail(this.task.asn.id, this.task.sku.id, res.data.sn).then(data => {
-          if (data && data.sn) {
-            this.sns.unshift({
-              sn: data.sn,
-              qty: data.qty || 1
-            })
-            this.sn = ''
-          } else {
-            return this.$lwShowErrorMsg('错误的序列号')
-          }
-        })
       })
     },
     resetLpn () {
@@ -282,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/inbound/receive/quality/LwInboundQualityTaskListPage.vue

@@ -34,13 +34,13 @@
         <div class="lw-global-model-box">
           <div>
             <lw-input title="商品条码" required v-model="skuBarCode.value" :get-focus.sync="skuBarCode.focus"
+                      rule-key="sku" rule-value-key="skuCode" :rule-serve-query="barcodeQuery"
                       @confirm="resolveSkuBarcode"/>
           </div>
         </div>
       </div>
       <lw-bottom-bar>
         <lw-button plain @click="showSkuScan = false">关闭</lw-button>
-        <lw-button @click="resolveSkuBarcode">确定</lw-button>
       </lw-bottom-bar>
     </van-dialog>
   </div>
@@ -73,6 +73,14 @@ export default {
         count: this.tasks.length,
         pendingQty: this.tasks.map(i => parseInt(i.canQualityQty)).reduce((a, b) => a + b, 0)
       }
+    },
+    barcodeQuery () {
+      const ownerIds = this.tasks.map(i => i.asn.ownerId)
+      const warehouseIds = this.tasks.map(i => i.asn.warehouseId)
+      return {
+        ownerId: ownerIds.length === 1 ? ownerIds[0] : null,
+        warehouseId: warehouseIds.length === 1 ? warehouseIds[0] : null,
+      }
     }
   },
   created () {
@@ -108,27 +116,16 @@ export default {
       this.skuBarCode.value = ''
       this.skuBarCode.focus = true
     },
-    resolveSkuBarcode () {
-      if (this.skuBarCode.value) {
-        const ownerIds = this.tasks.map(i => i.asn.ownerId)
-        const warehouseIds = this.tasks.map(i => i.asn.warehouseId)
-        this.$lwApi.barcode.resolver({
-          componentId: 'WMS_SKU',
-          barcode: this.skuBarCode.value,
-          ownerId: ownerIds.length === 1 ? ownerIds[0] : null,
-          warehouseId: warehouseIds.length === 1 ? warehouseIds[0] : null,
-        }).then(res => {
-          if (res.data.sku) {
-            const task = this.tasks.find(i => i.sku.code === res.data.sku)
-            if (task) {
-              this.toTask(task)
-            } else {
-              this.$lwShowErrorMsg(`商品 ${res.data.sku} 无匹配任务`)
-            }
-          } else {
-            this.$lwShowErrorMsg('错误的商品条码')
-          }
-        })
+    resolveSkuBarcode (skuCode, res) {
+      if (res.data.skuCode) {
+        const task = this.tasks.find(i => i.sku.code === res.data.skuCode)
+        if (task) {
+          this.toTask(task)
+        } else {
+          this.$lwShowErrorMsg(`商品 ${res.data.sku} 无匹配任务`)
+        }
+      } else {
+        this.$lwShowErrorMsg('错误的商品条码')
       }
     },
     toTask (task) {

package/src/components/page/inbound/receive/receive-sku/LwInboundReceiveSkuAdvancePage.vue

@@ -13,7 +13,9 @@
       </div>
       <div v-if="asnSku">
         <div class="lw-global-model-box" style="margin-top: 10px;">
-          <lw-input title="商品收货条码" required v-model="tag" @confirm="addTag"/>
+          <lw-input title="商品收货条码" required v-model="tag"
+                    rule-key="skuReceive" rule-value-key="skuCode" :rule-serve-query="barcodeQuery"
+                    @confirm="addTag"/>
         </div>
         <div class="lw-global-model-box tag-list">
           <div class="tag-list-title">
@@ -74,8 +76,8 @@
           :sku-code="asnSku.sku.code"
           :sku-name="asnSku.sku.name"
           :qty="asn.pendingQty"
-          type="品检"
-          ab-type="品检异常"/>
+          type="收货"
+          ab-type="预收货"/>
       <template #button>
         <lw-button @click="submitAbnormal">上报异常</lw-button>
       </template>
@@ -125,6 +127,12 @@ export default {
     tagsQty () {
       return this.tags.map(i => parseInt(i.confirmQty)).reduce((a, b) => a + b, 0)
     },
+    barcodeQuery () {
+      return {
+        ownerId: this.asn.ownerId,
+        warehouseId: this.asn.warehouseId,
+      }
+    },
   },
   created () {
     const { asnNo, skuCode } = this.$route.query
@@ -155,36 +163,30 @@ export default {
         }
       })
     },
-    addTag () {
-      if (!this.tag) {
-        return
+    addTag (sku, res) {
+      if (!res.data.skuCode) {
+        return this.$lwShowErrorMsg('错误的商品预收货条码')
       }
-      const param = { componentId: 'WMS_INBOUND_RECEIVE_SKU', barcode: this.tag, ownerId: this.asn.ownerId }
-      this.$lwApi.barcode.resolver(param).then(res => {
-        if (!res.data.sku) {
-          return this.$lwShowErrorMsg('错误的商品预收货条码')
-        }
-        if (res.data.sku !== this.asnSku.sku.code) {
-          return this.$lwShowErrorMsg('错误的商品')
-        }
-        const qty = parseInt(res.data.qty) || 0
-        const tag = res.data.tag || '#'
-        const otag = this.tags.find(i => i.code === tag)
-        if (otag) {
-          if (otag.code !== '#') {
-            return this.$lwShowErrorMsg('重复箱号')
-          }
-          otag.qty = otag.qty + qty
-          otag.confirmQty = otag.confirmQty + qty
-        } else {
-          this.tags.unshift({
-            code: tag,
-            qty,
-            confirmQty: qty,
-          })
+      if (res.data.skuCode !== this.asnSku.sku.code) {
+        return this.$lwShowErrorMsg('错误的商品')
+      }
+      const qty = parseInt(res.data.qty) || 0
+      const tag = res.data.tag || '#'
+      const otag = this.tags.find(i => i.code === tag)
+      if (otag) {
+        if (otag.code !== '#') {
+          return this.$lwShowErrorMsg('重复箱号')
         }
-        this.tag = ''
-      })
+        otag.qty = otag.qty + qty
+        otag.confirmQty = otag.confirmQty + qty
+      } else {
+        this.tags.unshift({
+          code: tag,
+          qty,
+          confirmQty: qty,
+        })
+      }
+      this.tag = ''
     },
     async submit () {
       this.submitQty = this.asnSku.sku.needSn ? this.snsQty : this.tagsQty

package/src/components/page/inbound/receive/receive-sku/LwInboundReceiveSkuDirectPage.vue

@@ -13,7 +13,8 @@
       </div>
       <div v-if="asnSku && asnSku.sku.needSn">
         <div class="lw-global-model-box" style="margin-top: 10px;">
-          <lw-input title="序列号条码" required v-model="sn" @confirm="addSn"/>
+          <lw-input title="序列号条码" required v-model="sn.value" :get-focus.sync="sn.focus"
+                    rule-key="sn" rule-value-key="sn" :rule-serve-query="barcodeQuery" @confirm="addSn"/>
         </div>
         <div class="lw-global-model-box tag-list">
           <div class="tag-list-title">
@@ -42,7 +43,9 @@
       </div>
       <div v-else>
         <div class="lw-global-model-box" style="margin-top: 10px;">
-          <lw-input title="商品收货条码" required v-model="tag" @confirm="addTag"/>
+          <lw-input title="商品收货条码" required v-model="tag"
+                    rule-key="skuReceive" rule-value-key="skuCode" :rule-serve-query="barcodeQuery"
+                    @confirm="addTag"/>
         </div>
         <div class="lw-global-model-box tag-list">
           <div class="tag-list-title">
@@ -110,8 +113,8 @@
           :sku-code="asnSku.sku.code"
           :sku-name="asnSku.sku.name"
           :qty="asn.pendingQty"
-          type="品检"
-          ab-type="品检异常"/>
+          type="收货"
+          ab-type="商品收货"/>
       <template #button>
         <lw-button @click="submitAbnormal">上报异常</lw-button>
       </template>
@@ -144,7 +147,10 @@ export default {
         qty: 0,
         confirmQty: 0,
       }],
-      sn: '',
+      sn: {
+        value: '',
+        focus: false,
+      },
       sns: [],
       showSns: false,
       receiveLoc: {
@@ -169,6 +175,12 @@ export default {
     snsQty () {
       return this.sns.map(i => parseInt(i.qty)).reduce((a, b) => a + b, 0)
     },
+    barcodeQuery () {
+      return {
+        ownerId: this.asn.ownerId,
+        warehouseId: this.asn.warehouseId,
+      }
+    },
   },
   created () {
     const { asnNo, skuCode } = this.$route.query
@@ -199,61 +211,55 @@ export default {
         }
       })
     },
-    addTag () {
-      if (!this.tag) {
-        return
+    addTag (sku, res) {
+      if (!res.data.skuCode) {
+        return this.$lwShowErrorMsg('错误的商品预收货条码')
       }
-      const param = { componentId: 'WMS_INBOUND_RECEIVE_SKU', barcode: this.tag, ownerId: this.asn.ownerId }
-      this.$lwApi.barcode.resolver(param).then(res => {
-        if (!res.data.sku) {
-          return this.$lwShowErrorMsg('错误的商品收货条码')
-        }
-        if (res.data.sku !== this.asnSku.sku.code) {
-          return this.$lwShowErrorMsg('错误的商品')
-        }
-        const qty = parseInt(res.data.qty) || 0
-        const tag = res.data.tag || '#'
-        const otag = this.tags.find(i => i.code === tag)
-        if (otag) {
-          if (otag.code !== '#') {
-            return this.$lwShowErrorMsg('重复箱号')
-          }
-          otag.qty = otag.qty + qty
-          otag.confirmQty = otag.confirmQty + qty
-        } else {
-          this.tags.unshift({
-            code: tag,
-            qty,
-            confirmQty: qty,
-          })
+      if (res.data.skuCode !== this.asnSku.sku.code) {
+        return this.$lwShowErrorMsg('错误的商品')
+      }
+      const qty = parseInt(res.data.qty) || 0
+      const tag = res.data.tag || '#'
+      const otag = this.tags.find(i => i.code === tag)
+      if (otag) {
+        if (otag.code !== '#') {
+          return this.$lwShowErrorMsg('重复箱号')
         }
-        this.tag = ''
-      })
+        otag.qty = otag.qty + qty
+        otag.confirmQty = otag.confirmQty + qty
+      } else {
+        this.tags.unshift({
+          code: tag,
+          qty,
+          confirmQty: qty,
+        })
+      }
+      this.tag = ''
     },
-    addSn () {
-      if (!this.sn) {
-        return
+    addSn (sn, res) {
+      if (!res.data.sn) {
+        this.sn.focus = true
+        return this.$lwShowErrorMsg('错误的商品条码序列号')
       }
-      const param = { componentId: 'WMS_INBOUND_RECEIVE_SKU_SN', barcode: this.sn, ownerId: this.asn.ownerId }
-      this.$lwApi.barcode.resolver(param).then(res => {
-        if (!res.data.sn) {
-          return this.$lwShowErrorMsg('错误的商品条码序列号')
-        }
-        const osn = this.sns.find(i => i.sn === res.data.sn)
-        if (osn) {
-          return this.$lwShowErrorMsg('重复的序列号')
+      const osn = this.sns.find(i => i.sn === res.data.sn)
+      if (osn) {
+        this.sn.focus = true
+        return this.$lwShowErrorMsg('重复的序列号')
+      }
+      if (res.data.skuCode && res.data.skuCode !== this.asnSku.sku.code) {
+        this.sn.focus = true
+        return this.$lwShowErrorMsg('序列号商品编码不符')
+      }
+      getAsnSkuSnDetail(this.asn.id, this.asnSku.sku.id, res.data.sn).then(data => {
+        if (data && data.sn) {
+          this.sns.unshift({
+            sn: data.sn,
+            qty: data.qty || 1
+          })
+          this.sn.value = ''
+        } else {
+          return this.$lwShowErrorMsg('错误的序列号')
         }
-        getAsnSkuSnDetail(this.asn.id, this.asnSku.sku.id, res.data.sn).then(data => {
-          if (data && data.sn) {
-            this.sns.unshift({
-              sn: data.sn,
-              qty: data.qty || 1
-            })
-            this.sn = ''
-          } else {
-            return this.$lwShowErrorMsg('错误的序列号')
-          }
-        })
       })
     },
     removeSn (sn) {
@@ -303,7 +309,7 @@ export default {
     },
     afterSubmit (res) {
       this.asn = res.asn
-      this.sn = ''
+      this.sn.value = ''
       this.tag = ''
       this.sns = []
       this.tags = []

package/src/components/page/inner/index.js

@@ -36,10 +36,7 @@ import lwMaterialApplyCreatePage from "./materialApply/generate";
 // 包材领用 - 执行领用单
 import lwMaterialApplyActionPage from "./materialApply/action";
 
-// 新品配置
-import lwNewProjectIndexPage from "./newProject/index";
-// 新品配置
-import lwNewProjectActionPage from "./newProject/action";
+
 
 
 
@@ -61,6 +58,5 @@ export const inner = [
 
   lwMaterialApplyCreatePage,
   lwMaterialApplyActionPage,
-  lwNewProjectIndexPage,
-  lwNewProjectActionPage,
+
 ]

package/src/components/page/inner/reportAbnormal/index/index.vue

@@ -177,6 +177,14 @@ export default {
       wmsGetSkuInfoByCode({
         skuCode: this.sku.value
       }).then(res=>{
+
+        if (res.length === 1){
+          setTimeout(()=>{
+            this.selectOwnerConfirm(res[0])
+          },10)
+          return
+        }
+
         this.selectOwner.list = res
         this.selectOwner.show = true
       })

package/src/components/page/outbound/bale/checkBale/action/index.vue

@@ -107,6 +107,7 @@
         :sku-list="checkData.containerData.packSkuList"
         :show-abn-btn="!fromAllCheck"
         :show-all-check="!fromAllCheck && allowAllCheck"
+        :abn-confirm="abnConfirm"
       />
 
     </div>
@@ -507,7 +508,7 @@ import {
   projectWmsMixPackContainerWholeBlock,
   projectWmsMixPackDeleteSku,
   projectWmsMixPackDeleteSkuWithSn,
-  projectWmsMixPackRePack,
+  projectWmsMixPackRePack, projectWmsMixPackSubmitAbnormal,
   projectWmsMixPackSubmitSku,
   projectWmsMixPackSubmitWithSn,
   projectWmsOutbondQueryPackMaterial
@@ -1293,6 +1294,14 @@ export default {
         )
         this.overBaleOpen()
       }
+    },
+
+    // 异常确认
+    abnConfirm(data){
+      return projectWmsMixPackSubmitAbnormal({
+        pickContainer: this.checkData.containerData.pickContainer,
+        ...data
+      })
     }
   }
 }

package/src/components/page/outbound/bale/components/containerInfo/index.vue

@@ -131,6 +131,7 @@
     <lw-popup
       :title="$lwLanguage.get('','异常上报')"
       v-model="abnPopup.show"
+      @closed="abnPopup.comShow = false"
     >
 
       <lw-inner-abnormal-module
@@ -145,7 +146,7 @@
       />
 
       <template #button>
-        <lw-button @click="abnConfirm">
+        <lw-button @click="abnConfirmBtn">
           {{ $lwLanguage.get('','上报') }}
         </lw-button>
       </template>
@@ -185,7 +186,10 @@ export default {
     },
 
     // 是否显示异常按钮
-    showAbnBtn: Boolean
+    showAbnBtn: Boolean,
+
+    // 异常提交
+    abnConfirm: Function
   },
   data() {
     return {
@@ -213,13 +217,17 @@ export default {
       this.abnPopup.show = true
     },
     // 异常确认
-    abnConfirm(){
+    abnConfirmBtn(){
       const {success, data} = this.$refs.abnormal.getAbnormalData()
 
       if (!success) return
 
-      this.$emit('abnConfirm', {...data,...this.abnPopup.data})
-    }
+      this.abnConfirm({...data,...this.abnPopup.data}).then(()=>{
+
+        this.abnPopup.show = false
+        this.$emit('abnSuccess')
+      })
+    },
   }
 }
 </script>

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"

package/src/components/page/receive/putaway/skuAction/index.vue

@@ -422,7 +422,7 @@ export default {
         // 商品
         sku:{
           value:'',
-          focus: false
+          focus: true
         },
         // 数量
         num:{
@@ -623,6 +623,7 @@ export default {
       this.$lwToast.success(
         this.$lwLanguage.get('wms_project.pda.receive.skuAction.jump','已跳转至任务行：') + (index + 1)
       )
+      this.input.sku.focus = true
       this.scrollTop()
     },
 

package/src/components/ui/Input/index.vue

@@ -383,6 +383,9 @@ export default {
     confirm(){
       let obj={},val = this.val
 
+      // 如果配置了解析规则，但是输入内容为空就不触发任何事件
+      if (this.ruleKey && !val) return
+
       if (this.ruleKey){
 
         const prefix = this.rulePrefix || this.$route.path
@@ -399,22 +402,27 @@ export default {
           return
         }
 
+        // 回填数据
         if (this.ruleValueKey){
-          val = obj.data[this.ruleValueKey] || '-'
+          val = obj.data[this.ruleValueKey]
         }
       }
 
-
+      // 是否需要清空输入框
       if (this.autoClearVal){
         this.clearClick()
       }else {
         this.val = val
       }
 
+      // 输入框是否需要失去焦点
       if (this.inputOverBlur){
         this.inputBlur()
       }
+
+      // 触发震动
       this.$lwAppPower.shortVibrate(500)
+
       this.$emit('confirm', val, obj)
     },
 

package/src/mixins/loginAndInit/index.js

@@ -0,0 +1,27 @@
+/*
+* 登录成功后和初始化页面有token时拉取的数据
+* @author: 张文
+* @date  2022-07-06
+* */
+
+export const loginAndInit = {
+  methods: {
+    getSystemInitData(){
+      let list = [
+        // 获取字典数据
+        this.$lwDict.asyncGet(),
+        // 获取权限数据
+        this.$lwPermissions.asyncGet()
+      ]
+
+      if (Object.keys(this.$lwWarehouse.get()).length){
+        // 获取当前配置了的打印机
+        list.push(this.$lwPrint.asyncGet())
+        // 获取条码解析规则
+        list.push(this.$lwBarcodeResolve.asyncInitRule())
+      }
+
+      return Promise.all(list)
+    }
+  }
+}

package/src/router/index.js

@@ -393,12 +393,12 @@ export default [
   {
     path: "/inbound/newProject/lwIndex",
     name: "LwNewProjectIndex",
-    component: () => import('./../views/inner/newProject/index')
+    component: () => import('../views/inbound/newProject/index')
   },
   {
     path: "/inbound/newProject/lwAction",
     name: "LwNewProjectAction",
-    component: () => import('./../views/inner/newProject/action')
+    component: () => import('../views/inbound/newProject/action')
   },
 
 

package/src/router/menu.js

@@ -72,7 +72,7 @@ const menuList = {
         title: '品检',
         tip: 0,
         hidden: false,
-        // permissions: ['/wms/pda/inbound/quality/task/list'],
+        permissions: ['/wms/pda/inbound/quality/task/list'],
         path: '/inbound/quality/task',
       },
 

package/src/views/common/init/index.vue

@@ -33,8 +33,11 @@
 
 <script>
 
+import {loginAndInit} from "../../../mixins/loginAndInit";
+
 export default {
   name: "init",
+  mixins:[loginAndInit],
   data() {
     return {
       // 显示加载框
@@ -72,16 +75,7 @@ export default {
         await this.$lwUUID.bound()
 
 
-        await Promise.all([
-          // 获取字典数据
-          this.$lwDict.asyncGet(),
-          // 获取权限数据
-          this.$lwPermissions.asyncGet(),
-          // 获取当前配置了的打印机
-          this.$lwPrint.asyncGet(),
-          // 获取条码解析规则
-          this.$lwBarcodeResolve.asyncInitRule()
-        ])
+        await this.getSystemInitData()
 
         if (self === top){
           history.go(-1)
@@ -101,7 +95,17 @@ export default {
           this.errorMsg = this.$lwLanguage.get('wms_project.pda.views.init.infoError', '基础数据加载失败')
           this.showLoading = false
         }, 1000)
+
         console.warn('初始化页面异常：', e)
+
+        const api = ['wmsGetAllChoices','wmsGetUserPermissions']
+        const url = e.config.url.split('/')
+
+        if (api.includes(url.pop())){
+          this.$router.replace({
+            path: '/lwLogin'
+          })
+        }
       }
     },