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

package/src/components/page/inbound/receive/printLabel/index.vue

@@ -0,0 +1,209 @@
+<!--
+  打印标签页
+  @author: 张文
+  @date: 2022-11-24
+-->
+<template>
+  <div>
+
+    <lw-nav-bar :title="$lwLanguage.get('','打印标签')"/>
+
+    <div class="lw-global-page-box">
+
+      <asn-info :data="asn"/>
+
+      <div
+        id="skuInfo"
+        style="margin-top: 10px"
+        class="lw-global-model-box"
+      >
+        <lw-input
+          :title="$lwLanguage.get('','商品信息')"
+          v-model="sku.value"
+          :get-focus.sync="sku.focus"
+          :placeholder="$lwLanguage.get('','可搜索名称或编码')"
+          :show-bottom-border="false"
+          rule-key="sku"
+          :create-rule="$lwScanRule.create('打印标签 - 商品号','SKU')"
+          @confirm="skuConfirm"
+        >
+          <template #button>
+
+            <lw-button
+              mini
+              round
+              @click="skuConfirm"
+            >
+              {{$lwLanguage.get('','搜索')}}
+            </lw-button>
+
+          </template>
+        </lw-input>
+      </div>
+
+      <template v-if="skuList.length">
+        <div
+          class="lw-global-model-box"
+          v-for="(i,k) in skuList"
+          :key="k"
+        >
+
+          <lw-sku-info-module
+            :sku-name="i.skuName"
+            :sku-code="i.skuCode"
+            is-row-first
+          >
+            <lw-button
+              mini
+              round
+              @click="printClick(i)"
+            >
+              {{$lwLanguage.get('','打印标签')}}
+            </lw-button>
+          </lw-sku-info-module>
+
+          <div class="lw-global-flex-between lw-global-row-end num-box">
+
+            <lw-title-value-cell
+              :title="$lwLanguage.get('','计划量')"
+              :value="i.qty || 0"
+              val-bold
+              :is-row="false"
+            />
+
+            <lw-title-value-cell
+              :title="$lwLanguage.get('','已收量')"
+              :value="i.receiveQty || 0"
+              val-bold
+              val-color="#409EFF"
+              :is-row="false"
+            />
+
+            <lw-title-value-cell
+              :title="$lwLanguage.get('','待收量')"
+              :value="i.waitReceiveQty || 0"
+              val-bold
+              val-red
+              :is-row="false"
+            />
+
+          </div>
+
+        </div>
+        <lw-pagination
+          v-model="page.num"
+          :page-total="page.total"
+          :page-size.sync="page.size"
+          scroll-element="#skuInfo"
+          @change="skuConfirm"
+        />
+      </template>
+
+      <lw-not-data v-if="showNotData && !skuList.length"/>
+
+    </div>
+
+    <print-label-popup
+      v-model="printPopup.show"
+      :asn-id="printPopup.asnId"
+      :sku-id="printPopup.skuId"
+      :print-data="printData"
+    />
+
+  </div>
+</template>
+
+<script>
+import printLabelPopup from "../../components/printLabelPopup.vue";
+import AsnInfo from '../../components/AsnInfo.vue'
+import { getInboundAsnByAsnNo } from "../../../../../api/inbound/receive";
+import {wmsMobileInboundGetAsnSkuLinePage} from "../../../../../api/inbound/printLabel";
+
+export default {
+  name: "lwInboundReceivePrintLabelPage",
+  components:{
+    printLabelPopup,
+    AsnInfo,
+  },
+  data() {
+    return {
+      asn:{},
+
+      sku:{
+        value:'',
+        focus:true
+      },
+      page:{
+        num: 1,
+        size: 10,
+        total:0
+      },
+      showNotData: false,
+
+      skuList:[],
+
+      printPopup:{
+        show: false,
+        asnId:'',
+        skuId:'',
+      },
+
+      printData:{}
+    }
+  },
+  mounted() {
+    const {success, printData} = this.$lwPrint.test(
+      'INBOUND_SKU_PRINT_LABEL',
+      this.$lwLanguage.get('','入库商品标签')
+    )
+    if(!success){
+      history.go(-1)
+      return
+    }
+    this.printData = printData
+
+    getInboundAsnByAsnNo(this.$route.query.asnNo).then(data => {
+      this.asn = data
+      this.skuConfirm()
+    })
+  },
+  methods: {
+
+    skuConfirm(){
+      wmsMobileInboundGetAsnSkuLinePage({
+        asnId: this.asn.id,
+        queryParam: this.sku.value,
+        pageNum: this.page.num,
+        pageSize: this.page.size
+      }).then(res=>{
+        this.showNotData = true
+        this.skuList = res.datas
+        this.page.total = res.total
+      })
+
+    },
+
+    // 打印
+    printClick(item){
+      this.printPopup.asnId = this.asn.id
+      this.printPopup.skuId = item.skuId
+      this.printPopup.show = true
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.row-box{
+  >div{
+    margin-bottom: 3px;
+  }
+}
+
+.num-box{
+  >div{
+    width: 33%;
+    flex-shrink: 0;
+  }
+}
+</style>

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

@@ -1,86 +1,92 @@
 <template>
   <div>
-    <lw-nav-bar title="收货品检"/>
+    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.esghuudd', '收货品检')"/>
     <div class="lw-global-page-box">
       <div class="lw-global-model-box">
         <quality-task-info :data="task"/>
       </div>
-      <div v-if="card" class="lw-global-model-box">
-        <quality-card :data="card"/>
-      </div>
+
+      <quality-card v-if="task"
+                    type="quality" :obj-id="task.taskId" :skuCode="task.sku.code"
+                    :delay-load="false" :card-mode="true"/>
+
       <div v-if="task" class="lw-global-tab-box" style="margin-top: 10px;">
         <van-tabs type="card" animated v-model="tabActive">
-          <van-tab title="品检">
+          <van-tab :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.nlclgbzy', '品检')">
+
             <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="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.ioqxkcmi', '托盘')"
+                        v-model="lpn.value" :get-focus.sync="lpn.focus" @confirm="scanLpn()"/>
               <template v-if="currentLpn">
                 <div class="lw-global-props">
                   <div>
-                    <div>当前托盘号</div>
+                    <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.vhdfrjzh', '当前托盘号')}}</div>
                     <div>{{currentLpn.lpn}}</div>
                   </div>
                 </div>
                 <div class="quality-table">
                   <div class="quality-table-header">
-                    <div>待检量</div>
-                    <div>抽检量</div>
-                    <div>异常量</div>
+                    <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.aurzznrt', '待检量')}}</div>
+                    <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.nrfvthli', '抽检量')}}</div>
+                    <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.zlucruch', '异常量')}}</div>
                   </div>
                   <div>
                     <div>{{currentLpn.canQualityQty}}</div>
                     <div>
-                      <lw-input name="抽检量" v-model="currentLpn.samplingQty"/>
+                      <lw-input :name="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.oqfkqbqb', '抽检量')" type="number" v-model="currentLpn.samplingQty"/>
                     </div>
                     <div>{{currentLpn.qualityLossQty}}</div>
                   </div>
                 </div>
               </template>
             </div>
-            <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="currentLpn && task.sku.needSn && !autoWholeSn" class="lw-global-model-box" style="margin-top: 10px;">
+              <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.desddnrq', '序列号条码')" required v-model="sn.value" :get-focus.sync="sn.focus"
+                        rule-key="sn" :rule-serve-query="barcodeQuery" @confirm="addSn"/>
               <div v-if="sns.length" class="tag-list">
                 <div class="tag-list-title">
-                  <div>当前扫描结果</div>
+                  <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.advmxjfh', '当前扫描结果')}}</div>
                   <div>SN <span>{{ sns.length }}</span></div>
                   <div style="display: flex; justify-content: center;">
-                    <div>数量 <span>{{ snsQty }}</span></div>
+                    <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.gymlbusg', '数量 ')}}<span>{{ snsQty }}</span></div>
                     <div style="margin-left: 10px;">
-                      <lw-button mini @click="showSns=true">全部</lw-button>
+                      <lw-button mini @click="showSns=true">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.zudsizru', '全部')}}</lw-button>
                     </div>
                   </div>
                 </div>
                 <div class="tag-list-head">
                   <div>SN</div>
-                  <div>数量</div>
-                  <div>操作</div>
+                  <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.zlyexphg', '数量')}}</div>
+                  <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.ktwpqwzu', '操作')}}</div>
                 </div>
                 <div class="tag-list-row" v-for="t in sns" :key="t.sn">
                   <div>{{ t.sn }}</div>
                   <div>{{ t.qty }}</div>
                   <div>
-                    <lw-button mini @click="removeSn(t)">剔除</lw-button>
+                    <lw-button mini @click="removeSn(t)">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.hieabfmy', '剔除')}}</lw-button>
                   </div>
                 </div>
               </div>
             </div>
+
             <div v-if="lotQuery" class="lw-global-model-box">
               <lw-lot-module :query="lotQuery" ref="lot"/>
             </div>
           </van-tab>
-          <van-tab title="托盘号">
+          <van-tab :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.bdnbtaov', '托盘号')">
             <div class="lw-global-model-box">
               <div class="lpn-table">
                 <div class="lpn-table-header">
-                  <div>托盘号</div>
-                  <div>数量</div>
-                  <div>抽检量</div>
-                  <div>异常量</div>
+                  <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.bozvcdno', '托盘号')}}</div>
+                  <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.zrpgabvw', '数量')}}</div>
+                  <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.nybhyotp', '抽检量')}}</div>
+                  <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.xwtacndt', '异常量')}}</div>
                 </div>
-                <div v-for="line in task.lines" :key="line.lpn" :class="{abnormal: line.qualityLossQty > 0}">
+                <div v-for="line in task.lines" :key="line.lpn" :class="{abnormal: line.canQualityQty <= 0}">
                   <div>{{line.lpn}}</div>
                   <div>{{line.qty}}</div>
-                  <div>{{line.qualityQty}}</div>
+                  <div>{{line.checkQty}}</div>
                   <div>{{line.qualityLossQty}}</div>
                 </div>
               </div>
@@ -90,20 +96,20 @@
       </div>
     </div>
     <lw-bottom-bar v-if="currentLpn">
-      <lw-button type="warning" @click="showAbnormalPop">品检异常</lw-button>
-      <lw-button plain @click="resetLpn">切换托盘</lw-button>
-      <lw-button @click="submitLpn">提交品检结果</lw-button>
+      <lw-button type="warning" @click="showAbnormalPop">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.omqljbkf', '品检异常')}}</lw-button>
+      <lw-button plain @click="resetLpn">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.nvvayspe', '切换托盘')}}</lw-button>
+      <lw-button @click="submitLpn">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.ieuwiphj', '提交品检结果')}}</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-button plain @click="resetSku" v-if="$route.query.lwComeFrom !== 'task'">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.utqhrvin', '切换商品')}}</lw-button>
+      <lw-button @click="finishSku">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.aqxsyete', '完成当前商品品检')}}</lw-button>
     </lw-bottom-bar>
-    <van-dialog v-model="showSns" title="当前扫描的SN列表">
+    <van-dialog v-model="showSns" :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.sfvcclzy', '当前扫描的SN列表')">
       <sns-list :sns="sns" @remove="removeSn"/>
     </van-dialog>
     <!-- 异常弹框 -->
     <lw-popup
-        title="品检异常"
+        :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.ocwlyfyt', '品检异常')"
         v-model="showAbnormal">
       <lw-inner-abnormal-module
           v-if="showAbnormal"
@@ -112,11 +118,12 @@
           :sku-name="task.sku.name"
           :qty="currentLpn.canQualityQty"
           :location="task.locationCode"
-          require-lpn
-          type="品检"
-          ab-type="品检异常"/>
+          :require-lpn="true"
+          import-lpn
+          :type="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.nzaftxkm', '品检')"
+          :ab-type="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.hoxntjgy', '品检异常')"/>
       <template #button>
-        <lw-button @click="submitAbnormal">上报异常</lw-button>
+        <lw-button @click="submitAbnormal">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.kzuugcny', '上报异常')}}</lw-button>
       </template>
     </lw-popup>
   </div>
@@ -125,13 +132,12 @@
 <script>
 import {
   finishSkuQuality,
-  getInboundFoundQualityCard,
   getInboundGetQualityDetail, submitQualityAbnormal,
   submitSkuQuality, submitSkuSnQuality
 } from '../../../../../api/inbound/quality'
-import QualityTaskInfo from '../../components/QualityTaskInfo'
-import QualityCard from '../../components/QualityCard'
-import SnsList from '../../components/SnsList'
+import QualityTaskInfo from '../../components/QualityTaskInfo.vue'
+import QualityCard from '../../components/QualityCard.vue'
+import SnsList from '../../components/SnsList.vue'
 import { getAsnSkuSnDetail } from '../../../../../api/inbound/receive'
 
 export default {
@@ -140,7 +146,6 @@ export default {
   data () {
     return {
       task: null,
-      card: null,
       tabActive: 0,
       lpn: {
         value: '',
@@ -155,6 +160,7 @@ export default {
       showSns: false,
       lotQuery: null,
       showAbnormal: false,
+      autoWholeSn: false,
     }
   },
   computed: {
@@ -168,6 +174,9 @@ export default {
       }
     },
     canFinish () {
+      if (!this.task || !this.task.sku) {
+        return  false
+      }
       return !this.task.sku.needSn && this.task.qualityQty > 0 && this.task.sku.qualityType === '200'
     }
   },
@@ -179,7 +188,7 @@ export default {
     if (taskId) {
       this.getTask(taskId)
     } else {
-      this.$lwShowErrorMsg('无效的任务Id')
+      this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.wzsytqjf', '无效的任务Id'))
     }
   },
   methods: {
@@ -187,7 +196,9 @@ export default {
       getInboundGetQualityDetail(taskId).then(res => {
         if (res) {
           this.task = res
-          getInboundFoundQualityCard(taskId).then(data => this.card = data)
+          if (res.finishQualityTask) {
+            this.$lwToast.toast(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.ludgcqwb', '当前任务品检完成'))
+          }
         }
       })
     },
@@ -200,16 +211,19 @@ export default {
         if (fromError) {
           this.resetLpn()
         } else {
-          return this.$lwShowErrorMsg('错误的托盘号')
+          return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.yjlvovxj', '错误的托盘号'))
         }
       }
       if (lpn.canQualityQty <= 0) {
         if (fromError) {
           this.resetLpn()
         } else {
-          return this.$lwShowErrorMsg('该托盘已品检')
+          return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.tkrjgdgb', '该托盘已品检'))
         }
       }
+
+      this.autoWholeSn = null==lpn.wholeSn ? false:lpn.wholeSn
+
       this.lotQuery = {
         warehouseId: this.task.asn.warehouseId,
         ownerId: this.task.asn.ownerId,
@@ -224,15 +238,22 @@ export default {
     },
     submitLpn () {
       if (!this.currentLpn) {
-        return this.$lwShowErrorMsg('请扫描LPN')
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.iuyvdwlp', '请扫描LPN'))
       }
-      if (this.currentLpn.samplingQty < 0 || this.currentLpn.samplingQty > this.currentLpn.canQualityQty) {
-        return this.$lwShowErrorMsg('抽检量必须大于0且小于待检量')
+      const checkQty = parseInt(this.currentLpn.samplingQty)
+
+      console.log("---------")
+      console.log(this.currentLpn.samplingQty)
+      console.log(checkQty)
+      console.log(this.currentLpn.canQualityQty)
+
+      if (isNaN(checkQty) || checkQty <= 0 || checkQty > this.currentLpn.canQualityQty) {
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.arxfirlt', '抽检量必须大于0且小于待检量'))
       }
-      if (this.task.sku.needSn) {
+      if (this.task.sku.needSn && !this.autoWholeSn) {
         const snQty = this.sns.map(i => parseInt(i.qty)).reduce((a, b) => a + b, 0)
         if (snQty !== parseInt(this.currentLpn.canQualityQty)) {
-          return this.$lwShowErrorMsg('商品序列号数量与待检量不符，请确认')
+          return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.qmeccorr', '商品序列号数量与待检量不符，请确认'))
         }
       }
       const lotData = this.$refs.lot.getData()
@@ -241,12 +262,12 @@ export default {
         ownerId: this.task.asn.ownerId,
         taskId: this.task.taskId,
         lpn: this.currentLpn.lpn,
-        checkQty: this.currentLpn.samplingQty,
+        checkQty,
       }
       if (lotData.success) {
         data.lotAttributes = lotData.data
         let method = null
-        if (this.task.sku.needSn) {
+        if (this.task.sku.needSn && !this.autoWholeSn) {
           data.snList = this.sns
           method = submitSkuSnQuality
         } else {
@@ -256,25 +277,35 @@ export default {
           if (res && res.quality) {
             this.task = res.quality
           }
-          this.resetLpn()
+          if (res.quality.finishQualityTask) {
+            this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.ludgcqwb', '当前任务品检完成'))
+            setTimeout(() => this.$router.back(), 1000)
+          } else {
+            this.resetLpn()
+            this.getTask(this.task.taskId)
+          }
         })
       }
     },
     addSn (sn, res) {
-      if (!res.data.sn) {
+      const snCode = res.bizType === 'SN' ? res.data.key : sn
+      if (!snCode) {
         this.sn.focus = true
-        return this.$lwShowErrorMsg('错误的商品条码序列号')
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.mscdlebn', '错误的商品条码序列号'))
       }
-      const osn = this.sns.find(i => i.sn === sn)
+      const osn = this.sns.find(i => i.sn === snCode)
       if (osn) {
         this.sn.focus = true
-        return this.$lwShowErrorMsg('重复的序列号')
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.lmerdzqw', '重复的序列号'))
       }
-      if (res.data.skuCode && res.data.skuCode !== this.task.sku.code) {
-        this.sn.focus = true
-        return this.$lwShowErrorMsg('序列号商品编码不符')
+      if (res.data) {
+        if (res.data.skuCode && res.data.skuCode !== this.task.sku.code) {
+          this.sn.focus = true
+          return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.wtwtirtd', '序列号商品编码不符'))
+        }
       }
-      getAsnSkuSnDetail(this.task.asn.id, this.task.sku.id, res.data.sn).then(data => {
+      const qty = res.data && res.data.qty || 1
+      getAsnSkuSnDetail(this.task.asn.id, this.task.sku.id, snCode, qty).then(data => {
         if (data && data.sn) {
           this.sns.unshift({
             sn: data.sn,
@@ -282,7 +313,7 @@ export default {
           })
           this.sn.value = ''
         } else {
-          return this.$lwShowErrorMsg('错误的序列号')
+          return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.iiwvemyp', '错误的序列号'))
         }
       })
     },
@@ -302,10 +333,11 @@ export default {
       this.$router.back()
     },
     finishSku () {
-      finishSkuQuality(this.task.id).then(res => {
+      finishSkuQuality(this.task.taskId).then(res => {
         if (res.quality) {
           this.task = res.quality
-          this.$lwToast.success('品检完成')
+          this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.kvntordk', '品检完成'))
+          setTimeout(() => this.$router.back(), 1000)
         }
       })
     },
@@ -331,7 +363,7 @@ export default {
         ...data
       }).then(res => {
         this.showAbnormal = false
-        this.$lwToast.success('异常上报成功')
+        this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.oxdbxfzn', '异常上报成功'))
         this.task = res
         this.lpn.value = this.currentLpn.lpn
         this.scanLpn(true)
@@ -399,7 +431,7 @@ export default {
   }
 
   &-title {
-    background: #0f90dd;
+    background: #f45858;
     color: white;
     margin: -10px -10px 0;
     padding: 8px;
@@ -422,4 +454,4 @@ export default {
     border-top: 1px solid lightgray;
   }
 }
-</style>
+</style>