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

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

@@ -136,25 +136,57 @@
               <!-- 输入框 -->
               <div class="lw-global-model-box">
 
-                <!-- 商品条码 -->
-                <lw-input
-                  :title="$lwLanguage.get('wms_project.pda.receive.skuAction.skuCode','商品条码')"
-                  v-model="input.sku.value"
-                  :get-focus.sync="input.sku.focus"
-                  required
-                  rule-key="sku"
-                  @confirm="skuCodeConfirm"
-                />
-
-                <!-- 数量 -->
-                <lw-input
-                  :title="$lwLanguage.get('wms_project.pda.receive.skuAction.qty','数量')"
-                  v-model="input.num.value"
-                  :get-focus.sync="input.num.focus"
-                  type="digit"
-                  required
-                  @confirm="numConfirm"
-                />
+                <div v-if="itemShowSn">
+                  <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.receive.putaway.sku.sn.lab', '序列号条码')" required v-model="input.sn.value" :get-focus.sync="input.sn.focus"
+                            rule-key="sn" @confirm="addSn"/>
+
+                  <div class="lw-global-model-box tag-list">
+                    <div class="tag-list-title">
+                      <div>{{$lwLanguage.get('wms_project.pda.components.page.receive.putaway.sku.sn.scan.lab', '当前扫描结果')}}</div>
+                      <div>SN <span>{{ sns.length }}</span></div>
+                      <div style="display: flex; justify-content: center;">
+                        <div>{{$lwLanguage.get('wms_project.pda.components.page.receive.putaway.sku.sn.scan.qty', '数量')}}<span>{{ ' ' + snsQty }}</span></div>
+                        <div style="margin-left: 10px;">
+                          <lw-button mini @click="showSns=true">{{$lwLanguage.get('wms_project.pda.components.page.receive.putaway.sku.sn.all', '全部')}}</lw-button>
+                        </div>
+                      </div>
+                    </div>
+                    <div class="tag-list-head">
+                      <div>SN</div>
+                      <div>{{$lwLanguage.get('wms_project.pda.components.page.receive.putaway.sku.sn.lab.qty', '数量')}}</div>
+                      <div>{{$lwLanguage.get('wms_project.pda.components.page.receive.putaway.sku.sn.lab.op', '操作')}}</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)">{{$lwLanguage.get('wms_project.pda.components.page.receive.putaway.sku.sn.remove', '剔除')}}</lw-button>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+
+                <div v-else>
+                  <!-- 商品条码 -->
+                  <lw-input
+                    :title="$lwLanguage.get('wms_project.pda.receive.skuAction.skuCode','商品条码')"
+                    v-model="input.sku.value"
+                    :get-focus.sync="input.sku.focus"
+                    required
+                    rule-key="sku"
+                    @confirm="skuCodeConfirm"
+                  />
+
+                  <!-- 数量 -->
+                  <lw-input
+                    :title="$lwLanguage.get('wms_project.pda.receive.skuAction.qty','数量')"
+                    v-model="input.num.value"
+                    :get-focus.sync="input.num.focus"
+                    type="digit"
+                    required
+                    @confirm="numConfirm"
+                  />
+                </div>
 
                 <!-- 接力上架开关 -->
                 <lw-cell
@@ -305,6 +337,14 @@
 
     </lw-bottom-bar>
 
+    <van-dialog v-model="showSns" :title="$lwLanguage.get('', '当前扫描的SN列表')">
+      <div class="lw-global-page-box">
+        <div class="lw-global-model-box">
+          <sns-list :sns="sns" @remove="removeSn"/>
+        </div>
+      </div>
+    </van-dialog>
+
     <!-- 异常弹框 -->
     <lw-popup
       :title="$lwLanguage.get('wms_project.pda.receive.skuAction.upAbnLocal','入库上架异常')"
@@ -396,13 +436,17 @@ import SkuPutawayInfo from './../components/SkuPutAwayInfo/index.vue'
 import {
   wmsMobileQueryPutawayLinesByTasks,
   wmsMobileSubmitPutawayByAbnormal,
-  wmsMobileSubmitPutawayBySku
+  wmsMobileSubmitPutawayBySku,
+  wmsMobileQueryPutawaySkuSn,
+  wmsMobileSubmitPutawayBySkuSn,
 } from "../../../../../api/receive/putaway";
+import SnsList from '../../../inbound/components/SnsList.vue'
+import {scanUtils} from '../../../inbound/util/InboundUtils'
 
 export default {
   name: "lwReceivePutawaySkuActionPage",
   components:{
-    SkuPutawayInfo
+    SkuPutawayInfo,SnsList
   },
   data() {
     return {
@@ -417,6 +461,10 @@ export default {
       // 当前商品的索引
       skuIndex: 0,
 
+      // 扫描 sn
+      sns: [],
+      showSns: false,
+
       // 输入框
       input:{
         // 商品
@@ -424,6 +472,11 @@ export default {
           value:'',
           focus: true
         },
+        // 序列号
+        sn:{
+          value:'',
+          focus: true
+        },
         // 数量
         num:{
           value:'',
@@ -463,6 +516,16 @@ export default {
       }
     }
   },
+  computed:{
+    snsQty () {
+      return this.sns.map(i => parseInt(i.qty)).reduce((a, b) => a + b, 0)
+    },
+    itemShowSn(){
+      const item = this.skuListData[this.skuIndex]
+
+      return item && item.needSn
+    },
+  },
   mounted() {
     this.backStep = Number('-' + this.$route.query.lwBack)
     this.getData()
@@ -490,9 +553,16 @@ export default {
           return
         }
 
+        this.skuIndex = this.$lwUtils.cutCardIndexCount(this.skuIndex, res.length)
         this.skuListData = res
 
-        this.skuIndex + 1 > this.skuListData.length ? this.skuIndex-- : ''
+        const item = this.skuListData[this.skuIndex]
+
+        if(item.needSn){
+          this.input.sn.focus = true
+        }else{
+          this.input.sku.focus = true
+        }
 
       }).catch(()=>{
         history.go(this.backStep)
@@ -501,12 +571,24 @@ export default {
 
     // 清空输入框
     clearInput(){
-      this.input.sku.value = ''
-      this.input.sku.focus = true // 打开后会导致屏幕滚动到当前位置无法显示在头部
+      this.sns = []
       this.input.num.value = ''
       this.input.wait = false
       this.input.local.value = ''
       this.input.lpn.value = ''
+
+      this.input.sku.value = ''
+      this.input.sn.value = ''
+
+      // 打开后会导致屏幕滚动到当前位置无法显示在头部
+      if(this.itemShowSn){
+        this.input.sku.focus = false
+        this.input.sn.focus = true
+      } else {
+        this.input.sku.focus = true
+        this.input.sn.focus = false
+      }
+
       this.scrollTop()
     },
 
@@ -623,7 +705,14 @@ export default {
       this.$lwToast.success(
         this.$lwLanguage.get('wms_project.pda.receive.skuAction.jump','已跳转至任务行：') + (index + 1)
       )
-      this.input.sku.focus = true
+      this.input.sn.value = ''
+      this.input.sku.value = ''
+
+      if(this.itemShowSn) {
+        this.input.sn.focus = true
+      } else {
+        this.input.sku.focus = true
+      }
       this.scrollTop()
     },
 
@@ -691,6 +780,14 @@ export default {
 
     // 确认上架 - 不区分是否接力上架
     putawayConfirm(){
+      console.log("putawayConfirm")
+      console.log(this.itemShowSn)
+      console.log(this.skuListData[this.skuIndex])
+      if(this.itemShowSn){
+        this.putawaySnConfirm()
+        return;
+      }
+
       if (
         !(this.skuCodeCheck() &&
           this.numCheck() &&
@@ -700,7 +797,7 @@ export default {
 
       const item = this.skuListData[this.skuIndex]
       if (!this.input.wait && this.input.local.value !== item.toLocationCode){
-        this.$dialog.confirm({
+        this.$lwDialog.confirm({
           title: this.$lwLanguage.get('wms_project.pda.receive.skuAction.total','提示'),
           message: this.$lwLanguage.get('wms_project.pda.receive.skuAction.confirmMsg','当前目标库位与推荐库位不一致，确认上架？')
         }).then(()=>{
@@ -731,12 +828,162 @@ export default {
         this.clearInput()
         this.getData()
       })
-    }
+    },
+
+    addSn (sn, res) {
+      const scanData = scanUtils.getScanSnData(sn, res)
+      if(!scanData.success){
+        this.input.sn.focus = true
+        return
+      }
 
+      const osn = this.sns.find(i => i.sn === scanData.sn)
+      if (osn) {
+        this.input.sn.focus = true
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.receive.putaway.sku.sn.error.repeat', '重复的序列号'))
+      }
+
+      const item = this.skuListData[this.skuIndex]
+
+      if (scanData.skuCode && scanData.skuCode !== item.sku.code) {
+        this.input.sn.focus = true
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.receive.putaway.sku.sn.error.sku', '商品编码：{sku} 与当前商品：{currentSku} 不符',{sku:scanData.skuCode,currentSku:item.sku.code}))
+      }
+
+      wmsMobileQueryPutawaySkuSn({
+        taskId: item.task.taskId,
+        skuId: item.sku.id,
+        groupKey: item.groupKey,
+        sn:scanData.sn,
+      }).then(data => {
+        console.log(data)
+        if (data && data.sn) {
+          this.sns.unshift({
+            sn: data.sn,
+            qty: data.qty
+          })
+          this.input.sn.value = ''
+        } else {
+          this.input.sn.value = ''
+          return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.receive.putaway.sku.sn.error', '错误的序列号'))
+        }
+      }).catch(() =>{
+        this.input.sn.value = ''
+      })
+    },
+    removeSn (sn) {
+      const idx = this.sns.indexOf(sn)
+      if (idx > -1) {
+        this.sns.splice(idx, 1)
+      }
+    },
+
+    snCheck (){
+      if(!this.sns || this.sns.length===0){
+        this.input.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.components.page.receive.putaway.sku.sn.null','序列号不能为空')
+        )
+        return false
+      }
+      return true
+    },
+
+    // 确认上架 - 不区分是否接力上架
+    putawaySnConfirm(){
+      if (
+        !(this.snCheck() &&
+          this.localCheck() &&
+          this.lpnCheck())
+      ) return
+
+      const item = this.skuListData[this.skuIndex]
+      if (!this.input.wait && this.input.local.value !== item.toLocationCode){
+        this.$lwDialog.confirm({
+          title: this.$lwLanguage.get('wms_project.pda.receive.skuAction.total','提示'),
+          message: this.$lwLanguage.get('wms_project.pda.receive.skuAction.confirmMsg','当前目标库位与推荐库位不一致，确认上架？')
+        }).then(()=>{
+          this.putawaySnSubmit(item)
+        }).catch(()=>{})
+
+        return
+      }
+
+      this.putawaySnSubmit(item)
+    },
+    // 提交上架数据
+    putawaySnSubmit(item){
+      wmsMobileSubmitPutawayBySkuSn({
+        taskId: item.task.taskId,
+        groupKey: item.groupKey,
+        skuId: item.sku.id,
+        toLocationCode: this.input.local.value,
+        toLpn: this.input.lpn.value,
+        relay: this.input.wait,
+        lines: this.sns
+      }).then(()=>{
+        this.$lwToast.success(
+          this.$lwLanguage.get('wms_project.pda.receive.skuAction.unSuccess','上架成功')
+        )
+
+        this.clearInput()
+        this.getData()
+      })
+    },
   }
 }
 </script>
 
 <style scoped lang="less">
+.tag-list {
+  margin-top: 10px;
 
+  &.dialog {
+    max-height: 50vh;
+    overflow-y: auto;
+  }
+
+  & > div {
+    display: flex;
+    align-items: center;
+
+    & > div:first-child {
+      flex-basis: 40%;
+    }
+
+    & > div:nth-child(2) {
+      flex-basis: 20%;
+      text-align: center;
+    }
+
+    & > div:last-child {
+      flex-basis: 40%;
+      text-align: center;
+    }
+  }
+
+  &-title {
+    background: #f45858;
+    color: white;
+    margin: -10px -10px 0;
+    padding: 8px;
+
+    span {
+      color: yellow;
+      font-weight: bold;
+    }
+  }
+
+  &-head {
+    font-size: 0.9em;
+    color: gray;
+    padding: 5px 0;
+  }
+
+  &-row {
+    font-size: 0.9em;
+    height: 36px;
+    border-top: 1px solid lightgray;
+  }
+}
 </style>

package/src/components/page/receive/receipt/action/index.vue

@@ -6,7 +6,10 @@
 <template>
   <div>
 
-    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.receive.receipt.title','收货回单')"/>
+    <lw-nav-bar
+      :title="receive ?
+        $lwLanguage.get('wms_project.pda.receive.receipt.title','收货回单') :
+        $lwLanguage.get('wms_project.pda.advance.receive.return.title','预收货回单')"/>
 
 
     <div class="lw-global-page-box">
@@ -28,7 +31,7 @@
               <!-- 到货通知单 -->
               <div class="lw-global-row-start">
                 <span class="lw-global-title lw-receive-receipt-title">
-                  {{ $lwLanguage.get('wms_project.pda.receive.receipt.asnNo','到货通知单') }}
+                  {{ $lwLanguage.get('wms_project.pda.receive.receipt.asnNo', '到货通知单') }}
                 </span>
                 <span class="lw-global-value-bold">{{ i.asnNo }}</span>
               </div>
@@ -36,7 +39,7 @@
               <!-- ERP单号 -->
               <div class="lw-global-row">
                 <span class="lw-global-title lw-receive-receipt-title">
-                  {{ $lwLanguage.get('wms_project.pda.receive.receipt.erp','ERP单号') }}
+                  {{ $lwLanguage.get('wms_project.pda.receive.receipt.erp', 'ERP单号') }}
                 </span>
                 <span class="lw-global-value-bold">{{ i.extNo }}</span>
               </div>
@@ -44,7 +47,7 @@
               <!-- 入库计划单号 -->
               <div class="lw-global-row">
                 <span class="lw-global-title lw-receive-receipt-title">
-                  {{ $lwLanguage.get('wms_project.pda.receive.receipt.planNo','入库计划单号') }}
+                  {{ $lwLanguage.get('wms_project.pda.receive.receipt.planNo', '入库计划单号') }}
                 </span>
                 <span class="lw-global-value-bold">{{ i.planNo }}</span>
               </div>
@@ -52,7 +55,7 @@
               <!-- 采购单编号 -->
               <div class="lw-global-row">
                 <span class="lw-global-title lw-receive-receipt-title">
-                  {{ $lwLanguage.get('wms_project.pda.receive.receipt.purchaseNo','采购单编号') }}
+                  {{ $lwLanguage.get('wms_project.pda.receive.receipt.purchaseNo', '采购单编号') }}
                 </span>
                 <span class="lw-global-value-bold">{{ i.purchaseNo }}</span>
               </div>
@@ -60,7 +63,7 @@
               <!-- 供应商 -->
               <div class="lw-global-row">
                 <span class="lw-global-title lw-receive-receipt-title">
-                  {{ $lwLanguage.get('wms_project.pda.receive.receipt.supplier','供应商') }}
+                  {{ $lwLanguage.get('wms_project.pda.receive.receipt.supplier', '供应商') }}
                 </span>
                 <span class="lw-global-value-bold">
                   {{ i.supplierCode }} - {{ i.supplierName }}
@@ -70,7 +73,7 @@
               <!-- 到货日期 -->
               <div class="lw-global-row">
                 <span class="lw-global-title lw-receive-receipt-title">
-                  {{ $lwLanguage.get('wms_project.pda.receive.receipt.arrivalTime','到货日期') }}
+                  {{ $lwLanguage.get('wms_project.pda.receive.receipt.arrivalTime', '到货日期') }}
                 </span>
                 <span class="lw-global-value-bold">
                   {{ $lwDate.format(i.arrivalTime, 'yyyy-MM-dd hh:mm') }}
@@ -80,7 +83,7 @@
               <!-- 到货数量 -->
               <div class="lw-global-row">
                 <span class="lw-global-title lw-receive-receipt-title">
-                  {{ $lwLanguage.get('wms_project.pda.receive.receipt.arrivalQty','到货数量') }}
+                  {{ $lwLanguage.get('wms_project.pda.receive.receipt.arrivalQty', '到货数量') }}
                 </span>
                 <span class="lw-global-value-bold">
                   {{ i.arrivalQty }}
@@ -90,7 +93,7 @@
               <!-- 预约信息 -->
               <div class="lw-global-row">
                 <span class="lw-global-title lw-receive-receipt-title">
-                  {{ $lwLanguage.get('wms_project.pda.receive.receipt.carrier','预约信息') }}
+                  {{ $lwLanguage.get('wms_project.pda.receive.receipt.carrier', '预约信息') }}
                 </span>
                 <span class="lw-global-value-bold">
                   {{ i.carrierPlateNum }} - {{ i.carrierCarType }}
@@ -100,7 +103,7 @@
               <!-- 收货时间 -->
               <div class="lw-global-row">
                 <span class="lw-global-title lw-receive-receipt-title">
-                  {{ $lwLanguage.get('wms_project.pda.receive.receipt.receiveTime','收货时间') }}
+                  {{ $lwLanguage.get('wms_project.pda.receive.receipt.receiveTime', '收货时间') }}
                 </span>
                 <span class="lw-global-value-bold">
                   {{ $lwDate.format(i.receiveTime, 'yyyy-MM-dd hh:mm') }}
@@ -110,7 +113,7 @@
               <!-- 总行数 -->
               <div class="lw-global-row" style="padding-bottom: 0;border-bottom: 0">
                 <span class="lw-global-title lw-receive-receipt-title">
-                  {{ $lwLanguage.get('wms_project.pda.receive.receipt.lineCount','总行数') }}
+                  {{ $lwLanguage.get('wms_project.pda.receive.receipt.lineCount', '总行数') }}
                 </span>
                 <span class="lw-global-value-bold">
                   {{ i.lineCount }}
@@ -134,7 +137,8 @@
                   style="flex-shrink: 0"
                   round
                   plain
-                >{{ item.sku.skuUrgencyLabel }}</lw-tag>
+                >{{ item.sku.skuUrgencyLabel }}
+                </lw-tag>
 
               </div>
 
@@ -142,14 +146,14 @@
 
                 <div>
                   <span class="lw-global-title">
-                    {{ $lwLanguage.get('wms_project.pda.receive.receipt.receiveQty','收货量') }}
+                    {{ $lwLanguage.get('wms_project.pda.receive.receipt.receiveQty', '收货量') }}
                   </span>
                   <span class="lw-global-value-bold">{{ item.receiveQty }}</span>
                 </div>
 
                 <div>
                   <span class="lw-global-title">
-                    {{ $lwLanguage.get('wms_project.pda.receive.receipt.abnQty','异常量') }}
+                    {{ $lwLanguage.get('wms_project.pda.receive.receipt.abnQty', '异常量') }}
                   </span>
                   <span
                     class="lw-global-value-bold"
@@ -168,9 +172,12 @@
     </div>
 
     <lw-bottom-bar>
-      <lw-button @click="confirmReceive">
+      <lw-button v-if="receive" @click="confirmReceive">
         {{ $lwLanguage.get('wms_project.pda.receive.receipt.confirmReceipt', '确认收货回单') }}
       </lw-button>
+      <lw-button v-else @click="confirmAdvanceReceive">
+        {{ $lwLanguage.get('wms_project.pda.advance.receive.return.btn', '确认预收货回单') }}
+      </lw-button>
     </lw-bottom-bar>
 
   </div>
@@ -180,7 +187,8 @@
 
 import {
   wmsMobileQueryReturnReceiptOrder,
-  wmsMobileReturnReceiptOrder
+  wmsMobileReturnReceiptOrder,
+  wmsMobileReturnAdvanceReceiptOrder
 } from "../../../../../api/receive/receipt";
 
 export default {
@@ -188,60 +196,68 @@ export default {
   data() {
     return {
       // tab激活项
-      tabActive:'',
+      tabActive: '',
 
       // 回单数据
-      receiptData:[]
+      receiptData: [],
+      receive: true,
     }
   },
   mounted() {
-    const {lwOrder, lwDate} = this.$route.query
+    const {lwOrder, lwDate, lwType} = this.$route.query
+    this.receive = "receive" === lwType
 
     wmsMobileQueryReturnReceiptOrder({
       no: lwOrder,
       time: lwDate
-    }).then(res=>{
+    }).then(res => {
 
       this.receiptData = res
 
-      if(this.receiptData.length){
+      if (this.receiptData.length) {
         this.tabActive = 0
         return
       }
 
       this.$lwShowErrorMsg(
-        this.$lwLanguage.get('wms_project.pda.receive.receipt.notData','当前订单没有查询到任何数据')
+        this.$lwLanguage.get('wms_project.pda.receive.receipt.notData', '当前订单没有查询到任何数据')
       )
       history.go(-1)
 
-    }).catch(()=>history.go(-1))
+    }).catch(() => history.go(-1))
 
   },
   methods: {
+    onConfirmAfter() {
+      // 删除当前提交的数据
+      this.receiptData.splice(this.tabActive, 1)
+
+      if (this.receiptData.length) {
+        this.tabActive = 0
+        this.$lwToast.success(
+          this.$lwLanguage.get('wms_project.pda.receive.receipt.changeSuccess', '操作成功')
+        )
+        return
+      }
+
+      this.$lwToast.success(
+        this.$lwLanguage.get('wms_project.pda.receive.receipt.allOver', '当前订单已全部回单')
+      )
+      history.go(-1)
+    },
     // 确认收货回单
     confirmReceive() {
       wmsMobileReturnReceiptOrder({
         id: this.receiptData[this.tabActive].id
-      }).then(()=>{
-
-        // 删除当前提交的数据
-        this.receiptData.splice(this.tabActive, 1)
-
-
-        if (this.receiptData.length){
-
-          this.tabActive = 0
-          this.$lwToast.success(
-            this.$lwLanguage.get('wms_project.pda.receive.receipt.changeSuccess','操作成功')
-          )
-          return
-
-        }
-
-        this.$lwToast.success(
-          this.$lwLanguage.get('wms_project.pda.receive.receipt.allOver','当前订单已全部回单')
-        )
-        history.go(-1)
+      }).then(() => {
+        this.onConfirmAfter()
+      })
+    },
+    confirmAdvanceReceive() {
+      wmsMobileReturnAdvanceReceiptOrder({
+        id: this.receiptData[this.tabActive].id
+      }).then(() => {
+        this.onConfirmAfter()
       })
     }
   }
@@ -251,7 +267,7 @@ export default {
 <style scoped lang="less">
 
 
-.lw-receive-receipt-title{
+.lw-receive-receipt-title {
   display: inline-block;
   width: 85px;
   text-align: right;

package/src/components/page/receive/receipt/index/index.vue

@@ -44,7 +44,7 @@
         v-if="showReceiptBtn"
         @click="receiveOrder"
       >
-        {{ $lwLanguage.get('wms_project.pda.receive.receipt.waitOrder','收货回单') }}
+        {{ $lwLanguage.get('wms_project.pda.receive.receipt.qazwsxed','收货回单') }}
       </lw-button>
 
     </lw-bottom-bar>
@@ -100,7 +100,14 @@ export default {
     waitOrder(){
       if (!this.orderCheck()) return
 
-      console.warn('预收货回单按钮点击')
+      this.$router.push({
+        path:'/receive/receipt/lwReceiptConfirm',
+        query:{
+          lwOrder: this.order.value,
+          lwDate: this.date,
+          lwType: "advanceReceive"
+        }
+      })
     },
 
     // 收货回单按钮
@@ -111,7 +118,8 @@ export default {
         path:'/receive/receipt/lwReceiptConfirm',
         query:{
           lwOrder: this.order.value,
-          lwDate: this.date
+          lwDate: this.date,
+          lwType: "receive"
         }
       })
     }