@logwire/logwire-wms-pda-ui 3.4.0 → 3.5.0

package/src/views/wms/page/inbound/receive/receive-case/LwInboundReceiveCaseExecutePage.vue

@@ -7,11 +7,23 @@
   <div>
     <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.kbmbivvl', '整箱收货')"/>
     <div v-if="asn" class="lw-global-page-box">
-      <div>
-        <asn-info :data="asn" shrinkable radius/>
-      </div>
+      <asn-info
+        :data="asn"
+        shrinkable
+        radius
+      />
+
       <div class="lw-global-model-box" style="margin-top: 10px;">
-        <lw-input v-model="caseNum.value" :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.ezcaseei', '箱号')" :get-focus.sync="caseNum.focus" @confirm="addCase"/>
+        <lw-input
+          v-model="caseNum.value"
+          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.ezcaseei', '箱号')"
+          :get-focus.sync="caseNum.focus"
+          rule-key="case"
+          :create-rule="$lwScanRule.create('按箱收货-列表页-箱号','CASE')"
+          :owner-id="asn.ownerId"
+          :rule-serve-query="asn"
+          @confirm="addCase"
+        />
       </div>
       <div class="lw-global-model-box lw-global-flex-between case-nums">
         <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.zueoponq', '扫描结果')}}</div>
@@ -42,7 +54,7 @@
                 }}</span></div>
               <div>
                 {{ $lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.jkvbswog', '数量: ') }}<span>{{
-                  c.qty
+                  c.qtyLabel
                 }}</span></div>
               <div>
                 <lw-button mini @click="removeCase(c)">
@@ -67,9 +79,15 @@
               <asn-sku-info :data="sku">
                 <template #extend>
                   <div style="margin: 10px 0;">
-                    <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.glkfqpfz', '数量')}}<b style="color: red; font-size: 1.1em;">{{ ' ' + sku.qty }}</b></div>
                     <div>
-                      <lw-button color="orange" @click="showAbnormalPop(sku)">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.tkyllqtp', '收货异常')}}</lw-button>
+                      {{
+                        $lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.glkfqpfz', '数量')
+                      }}<b
+                      style="color: red; font-size: 1.1em;">{{ ' ' + sku.qtyLabel }}</b></div>
+                    <div>
+                      <lw-button color="orange" @click="showAbnormalPop(sku)">
+                        {{ $lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.tkyllqtp', '收货异常') }}
+                      </lw-button>
                     </div>
                   </div>
                 </template>
@@ -85,14 +103,25 @@
         </div>
       </template>
       <div class="lw-global-model-box">
-        <lw-input v-model="receiveLoc.value"
-                  :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.xjfjcsgo', '收货库位')"
-                  required :get-focus.sync="receiveLoc.focus"/>
+        <lw-input
+          v-model="receiveLoc.value"
+          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.xjfjcsgo', '收货库位')"
+          required
+          :get-focus.sync="receiveLoc.focus"
+          rule-key="loc"
+          :create-rule="$lwScanRule.create('按箱收货-列表页-收货库位','LOCATION')"
+          :owner-id="asn.ownerId"
+          :rule-serve-query="asn"
+        />
         <lw-input
           v-if="!asn.hideLpn"
           v-model="receiveLpn.value"
           :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.zhacwngt', '收货托盘')"
           :required="asn.requiredLpn"
+          rule-key="lpn"
+          :create-rule="$lwScanRule.create('按箱收货-列表页-收货托盘','LPN')"
+          :owner-id="asn.ownerId"
+          :rule-serve-query="asn"
         >
 
           <template #button>
@@ -116,8 +145,9 @@
     <!-- 异常弹框 -->
     <lw-popup
       :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.zgilmwhu', '收货异常')"
-      class="abnormal-popup-bg"
-      v-model="showAbnormal">
+      background="#f0f0f0"
+      v-model="showAbnormal"
+    >
 
       <lw-receive-abnormal-module
         v-if="currentSku"
@@ -130,6 +160,7 @@
         :asn-no="asn.asnNo"
         :sku-code="currentSku.sku.code"
         :qty="currentSku.qty"
+        :qty-label="currentSku.qtyLabel"
       />
 
       <template #button>
@@ -195,19 +226,26 @@ export default {
     }
     this.loadAsn(asnId, caseNum)
 
-    const {printData} = this.$lwPrint.test(
-      'PART_RECEIVE_LABEL',
-      this.$lwLanguage.get('', '收货托盘标签'),
-      false,
-      false
-    )
-    this.printLpnData = printData
+    this.printCheck()
   },
   methods: {
-    initCase (data) {
+    // 打印机校验
+    printCheck(needCheck) {
+      if (this.printLpnData.printId) return true
+
+      const {printData, success} = this.$lwPrint.test(
+        'PART_RECEIVE_LABEL',
+        this.$lwLanguage.get('', '收货托盘标签'),
+        needCheck
+      )
+      this.printLpnData = printData
+      return success
+    },
+
+    initCase(data) {
       const old = this.cases.find(i => i.caseNum === data.caseNum)
       if (old) {
-        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.has.scan', '箱号：{caseNum} 已经在当前已扫描列表中，请检查', {caseNum:data.caseNum}))
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.has.scan', '箱号：{caseNum} 已经在当前已扫描列表中，请检查', {caseNum: data.caseNum}))
       }
       if (data && data.skuList) {
         data.isShrink = true
@@ -305,11 +343,12 @@ export default {
         printTemplate: null,
         warehouseId: this.asn.warehouseId,
         lines: items,
+        taskId: this.$route.query.lwTaskId
       }
 
       const hasPrint = !!Object.keys(this.printLpnData).length
       // 判断当前输入托盘号是否是生成的
-      if (lpn === this.createLpn && hasPrint) {
+      if (lpn === this.createLpn && this.printCheck()) {
         data.printReceiveDeviceId = this.printLpnData.printId
         data.printReceiveTemplate = this.printLpnData.templateId
       }
@@ -359,6 +398,7 @@ export default {
             originalCaseNum: this.currentSku.caseNum,
           }
         ],
+        taskId: this.$route.query.lwTaskId
       }).then(() => {
         this.showAbnormal = false
         this.currentSku = null
@@ -380,11 +420,6 @@ export default {
 
 <style lang="less" scoped>
 
-@import "../../../../../../assets/css/var.less";
-
-.abnormal-popup-bg {
-  background: @pageColor;
-}
 
 .btn-shrink {
   margin-left: 10px;

package/src/views/wms/page/inbound/receive/receive-case/LwInboundReceiveCaseScanPage.vue

@@ -14,7 +14,17 @@
       </div>
       <div class="lw-global-page-box">
         <div class="lw-global-model-box">
-          <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.fsycjztc', '箱号')" required v-model="caseNum.value" :get-focus.sync="caseNum.focus" @confirm="toReceive"/>
+          <lw-input
+            :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.fsycjztc', '箱号')"
+            required
+            v-model="caseNum.value"
+            :get-focus.sync="caseNum.focus"
+            rule-key="case"
+            :create-rule="$lwScanRule.create('按箱收货-列表页-箱号','CASE')"
+            :owner-id="asn.ownerId"
+            :rule-serve-query="asn"
+            @confirm="toReceive"
+          />
         </div>
       </div>
     </div>
@@ -25,7 +35,10 @@
 </template>
 
 <script>
-import { getInboundAsnByAsnNo,getInboundFoundAsnWholeCaseNumDetail } from '../../../../api/inbound/receive'
+import {
+  getInboundFoundAsnWholeCaseNumDetail,
+  wmsMobileExtInGetAsnV2
+} from '../../../../api/inbound/receive'
 import AsnInfo from '../../components/AsnInfo.vue'
 
 export default {
@@ -50,7 +63,10 @@ export default {
   },
   methods: {
     getAsnByAsnNo (asnNo) {
-      getInboundAsnByAsnNo(asnNo).then(data => {
+      wmsMobileExtInGetAsnV2({
+        asnNo,
+        bizPoint: 'case'
+      }).then(data => {
         if (data) {
           this.asn = data
           return
@@ -67,7 +83,12 @@ export default {
           if(data && data.skuList){
             this.$router.push({
               path: '/inbound/receive/case/execute',
-              query: { asnId: this.asn.id, asnNo: this.asn.asnNo, caseNum: this.caseNum.value },
+              query: {
+                asnId: this.asn.id,
+                asnNo: this.asn.asnNo,
+                caseNum: this.caseNum.value,
+                lwTaskId: this.$route.query.lwTaskId
+              },
             })
           }else{
             this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_case.qaerzklp', '没有可用的商品信息'))

package/src/views/wms/page/inbound/receive/receive-lpn/LwInboundReceiveLpnBatchExecutePage.vue

@@ -10,15 +10,23 @@
       :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_lpn_batch.title', '整托批量收货')"
     />
     <div v-if="asn" class="lw-global-page-box">
-      <div>
-        <asn-info :data="asn" shrinkable radius/>
-      </div>
+      <asn-info
+        :data="asn"
+        shrinkable
+        radius
+      />
 
       <div class="lw-global-model-box lpn-title">
         <lw-input
           :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_lpn.gtjbahbq', '托盘号')"
-          required v-model="lpn.value" :get-focus.sync="lpn.focus"
-          @confirm="loadLpn"/>
+          required v-model="lpn.value"
+          :get-focus.sync="lpn.focus"
+          rule-key="lpn"
+          :create-rule="$lwScanRule.create('按托盘收货-整托批量收货-托盘号','LPN')"
+          :owner-id="asn.ownerId"
+          :rule-serve-query="asn"
+          @confirm="loadLpn"
+        />
       </div>
 
       <lw-tab-box style="margin-top: 10px">
@@ -160,9 +168,16 @@
         class="lw-global-model-box"
         style="margin-top: 10px;"
       >
-        <lw-input v-model="receiveLoc.value"
-                  :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_lpn.upggwlog', '收货库位')"
-                  required :get-focus.sync="receiveLoc.focus"/>
+        <lw-input
+          v-model="receiveLoc.value"
+          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_lpn.upggwlog', '收货库位')"
+          required
+          :get-focus.sync="receiveLoc.focus"
+          rule-key="loc"
+          :create-rule="$lwScanRule.create('按托盘收货-整托批量收货-收货库位','LOCATION')"
+          :owner-id="asn.ownerId"
+          :rule-serve-query="asn"
+        />
       </div>
 
     </div>
@@ -184,11 +199,10 @@
 <script>
 import {
   getInboundAsn,
-  getInboundAsnByAsnNo,
   getInboundAsnLpn,
   getInboundFoundAsnWholeLpnDetail,
   submitAsnAdvanceReceiveForWholeLpnBatch,
-  submitAsnFastReceiveForWholeLpnBatch,
+  submitAsnFastReceiveForWholeLpnBatch, wmsMobileExtInGetAsnV2,
 } from '../../../../api/inbound/receive'
 import AsnInfo from '../../components/AsnInfo.vue'
 
@@ -263,15 +277,18 @@ export default {
       }
     },
     loadAsn(asnNo) {
-      getInboundAsnByAsnNo(asnNo).then(res => {
+      wmsMobileExtInGetAsnV2({
+        asnNo,
+        bizPoint: 'lpnBatch'
+      }).then(res => {
         this.asn = res
         this.loadAsnLpn()
       })
     },
     loadAsnLpn() {
       getInboundAsnLpn(this.asn.id).then(res => {
-        this.receiveLpnList = res.receiveLpnList
-        this.lpnList = res.lpnList
+        this.receiveLpnList = res.receiveLpnList || []
+        this.lpnList = res.lpnList || []
 
         this.lpn.value = null
         this.lpn.focus = true
@@ -366,6 +383,7 @@ export default {
         printTemplate: null,
         warehouseId: this.asn.warehouseId,
         lpnList: lpns,
+        taskId: this.$route.query.lwTaskId
       }
       method(data).then(res => {
         this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_lpn.loozvytr', '操作成功'))

package/src/views/wms/page/inbound/receive/receive-lpn/LwInboundReceiveLpnExecutePage.vue

@@ -38,7 +38,7 @@
 
           <lw-title-value-cell
             :title="$lwLanguage.get('', '商品数量')"
-            :value="lpn.qty"
+            :value="lpn.qtyLabel"
             val-bold
             val-red
             :is-row="false"
@@ -55,7 +55,7 @@
                   {{
                     $lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_lpn.kfxdmeud', '数量')
                   }}<b
-                  style="color: red; font-size: 1.1em;">{{ ' ' + sku.qty }}</b></div>
+                  style="color: red; font-size: 1.1em;">{{ ' ' + sku.qtyLabel }}</b></div>
                 <div>
                   <lw-button color="orange" @click="showAbnormalPop(sku)">
                     {{
@@ -75,9 +75,16 @@
         </div>
       </template>
       <div class="lw-global-model-box">
-        <lw-input v-model="receiveLoc.value"
-                  :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_lpn.upggwlog', '收货库位')"
-                  required :get-focus.sync="receiveLoc.focus"/>
+        <lw-input
+          v-model="receiveLoc.value"
+          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_lpn.upggwlog', '收货库位')"
+          required
+          :get-focus.sync="receiveLoc.focus"
+          rule-key="loc"
+          :create-rule="$lwScanRule.create('按托盘收货-整托盘收货-收货库位','LOCATION')"
+          :owner-id="asn.ownerId"
+          :rule-serve-query="asn"
+        />
 
         <div class="lw-global-flex-start-start lw-global-row-end">
           <div class="lw-global-title" style="margin-right: 5px">
@@ -94,8 +101,9 @@
     <!-- 异常弹框 -->
     <lw-popup
       :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_lpn.wplairac', '收货异常')"
-      class="abnormal-popup-bg"
-      v-model="showAbnormal">
+      background="#f0f0f0"
+      v-model="showAbnormal"
+    >
 
       <lw-receive-abnormal-module
         v-if="currentLpnSku"
@@ -108,6 +116,7 @@
         :asn-no="asn.asnNo"
         :sku-code="currentLpnSku.sku.code"
         :qty="currentLpnSku.qty"
+        :qty-label="currentLpnSku.qtyLabel"
       />
 
       <template #button>
@@ -119,11 +128,10 @@
 
 <script>
 import {
-  getInboundAsn,
   getInboundFoundAsnWholeLpnDetail,
   submitAsnAbnormalReceive,
   submitAsnAdvanceReceiveForWholeLpn,
-  submitAsnFastReceiveForWholeLpn,
+  submitAsnFastReceiveForWholeLpn, wmsMobileExtInGetAsnV2,
 } from '../../../../api/inbound/receive'
 import AsnInfo from '../../components/AsnInfo.vue'
 import AsnSkuInfo from '../../components/AsnSkuInfo.vue'
@@ -167,7 +175,13 @@ export default {
   },
   methods: {
     loadAsnAndLpn (asnId, lpn) {
-      Promise.all([getInboundAsn(asnId), getInboundFoundAsnWholeLpnDetail(asnId, lpn)]).then(([asn, lpn]) => {
+      Promise.all([
+        wmsMobileExtInGetAsnV2({
+          asnId,
+          bizPoint: 'lpn'
+        }),
+        getInboundFoundAsnWholeLpnDetail(asnId, lpn)
+      ]).then(([asn, lpn]) => {
         if (!lpn.skuList) {
           return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_lpn.qhdrzejd', '没有可用的商品信息'))
         }
@@ -222,7 +236,8 @@ export default {
         printTemplate: null,
         warehouseId: this.asn.warehouseId,
         lines: items,
-        images: this.imgList.join('|')
+        images: this.imgList.join('|'),
+        taskId: this.$route.query.lwTaskId
       }
       const method = this.isAdvance ? submitAsnAdvanceReceiveForWholeLpn : submitAsnFastReceiveForWholeLpn
       method(data).then(res => {
@@ -252,6 +267,7 @@ export default {
             originalLpn: this.lpn.lpn,
           }
         ],
+        taskId: this.$route.query.lwTaskId
       }).then(() => {
         this.showAbnormal = false
         this.currentLpnSku = null
@@ -265,10 +281,6 @@ export default {
 
 
 <style lang="less" scoped>
-@import "../../../../../../assets/css/var.less";
 
-.abnormal-popup-bg {
-  background: @pageColor;
-}
 
 </style>

package/src/views/wms/page/inbound/receive/receive-lpn/LwInboundReceiveLpnScanPage.vue

@@ -21,6 +21,8 @@
             :get-focus.sync="lpn.focus"
             rule-key="lpn"
             :create-rule="$lwScanRule.create('收货-整托盘收货-托盘号','LPN')"
+            :owner-id="asn.ownerId"
+            :rule-serve-query="asn"
             @confirm="toReceive"
           />
         </div>
@@ -73,7 +75,12 @@ export default {
       if (this.lpn.value) {
         this.$router.push({
           path: '/inbound/receive/lpn/execute',
-          query: { asnId: this.asn.id, asnNo: this.asn.asnNo, lpn: this.lpn.value },
+          query: {
+            asnId: this.asn.id,
+            asnNo: this.asn.asnNo,
+            lpn: this.lpn.value,
+            lwTaskId: this.$route.query.lwTaskId
+          },
         })
       } else {
         this.lpn.focus = true