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

package/src/components/page/outbound/pick/notAlone/index.vue

@@ -23,7 +23,7 @@
       class="lw-global-model-box"
     >
       <lw-input
-        :title="$lwLanguage.get('','拣选容器号')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.unljebyh','拣选容器号')"
         v-model="container.value"
         :get-focus.sync="container.focus"
         :disabled="container.confirm"
@@ -37,8 +37,8 @@
             @click="containerBtnClick"
           >{{
             container.confirm ?
-            $lwLanguage.get('','切换容器') :
-            $lwLanguage.get('','确定')
+            $lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.txptjnap','切换容器') :
+            $lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.qfccyeko','确定')
           }}</lw-button>
         </template>
       </lw-input>
@@ -57,27 +57,35 @@
 
           <!-- 正在拣选 -->
           <van-tab
-            :title="$lwLanguage.get('','正在拣选')"
+            :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.sfecqvpr','正在拣选')"
             name="ing"
           >
             <div class="lw-global-model-box">
 
               <sku-location-info
-                :item="pickData.pendingPickLineList[taskIndex]"
+                :item="nowPickData"
                 wait-pick
               />
 
               <!-- 托盘号 -->
               <lw-title-value-cell
-                v-if="hasLpn"
-                :title="$lwLanguage.get('','托盘号')"
-                :value="pickData.pendingPickLineList[taskIndex].fromLpn"
+                v-if="nowPickData.fromLpn"
+                :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.gpsjuyqm','托盘号')"
+                :value="nowPickData.fromLpn"
+                val-bold
+              />
+
+              <!-- 箱号 -->
+              <lw-title-value-cell
+                v-if="nowPickData.fromCase"
+                :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.gpcsjuyqm','箱号')"
+                :value="nowPickData.fromCase"
                 val-bold
               />
 
               <!-- 库位 -->
               <lw-input
-                :title="$lwLanguage.get('','拣选库位')"
+                :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.riqyoozc','拣选库位')"
                 v-model="locationCode.value"
                 :get-focus.sync="locationCode.focus"
                 required
@@ -88,7 +96,7 @@
               <!-- 托盘号 -->
               <lw-input
                 v-if="hasLpn"
-                :title="$lwLanguage.get('','托盘号')"
+                :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.gpsjuyqm','托盘号')"
                 v-model="lpn.value"
                 :get-focus.sync="lpn.focus"
                 required
@@ -96,17 +104,53 @@
                 @confirm="lpnConfirm"
               />
 
+              <!-- 箱号 -->
+              <lw-input
+                v-if="nowPickData.fromCase"
+                :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.gpcsjuyqm','箱号')"
+                v-model="box.value"
+                :get-focus.sync="box.focus"
+                required
+                rule-key="case"
+                :create-rule="$lwScanRule.create('非独立件拣选-箱号','CASE')"
+                @confirm="boxConfirm"
+              />
+
               <!-- 商品号 -->
               <lw-input
-                :title="$lwLanguage.get('','商品号')"
+                :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.wunzopak','商品号')"
                 v-model="sku.value"
                 :get-focus.sync="sku.focus"
                 required
                 rule-key="sku"
                 @confirm="skuConfirm"
               />
+
+              <!-- 托盘号 -->
+              <lw-title-value-cell
+                :title="$lwLanguage.get('','当前扫描')"
+                :value="nowScan.value || '-'"
+                val-bold
+              />
+
+              <template v-if="nowPickData.needHandleSn">
+                <lw-input
+                  :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.index.gwtjldug','序列号')"
+                  v-model="sn.value"
+                  :get-focus.sync="sn.focus"
+                  required
+                  :create-rule="$lwScanRule.create('拣选-混箱件-SN','SN')"
+                  rule-key="sn"
+                  @confirm="snConfirm"
+                />
+                <lw-scan-data-list-module
+                  class="lw-global-row"
+                  v-model="sn.list"
+                />
+              </template>
               <lw-input
-                :title="$lwLanguage.get('','数量')"
+                v-else
+                :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.rwiwdjks','数量')"
                 v-model="qty.value"
                 :get-focus.sync="qty.focus"
                 required
@@ -119,7 +163,7 @@
                     mini
                     round
                     @click="qtyConfirm"
-                  >{{ $lwLanguage.get('','确认') }}</lw-button>
+                  >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.cwcxalqk','确认') }}</lw-button>
                 </template>
               </lw-input>
 
@@ -138,7 +182,7 @@
 
           <!-- 拣选明细行 -->
           <van-tab
-            :title="$lwLanguage.get('','拣选明细行')"
+            :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.gzyjrunq','拣选明细行')"
             name="wait"
           >
 
@@ -178,13 +222,13 @@
 
     <!-- 切换容器号弹框弹框 -->
     <lw-popup
-      :title="$lwLanguage.get('','切换容器')"
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.txptjnap','切换容器')"
       v-model="container.popup.show"
       @closed="container.popup.value=''"
     >
 
       <lw-input
-        :title="$lwLanguage.get('','新容器号')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.dqarkhkg','新容器号')"
         v-model="container.popup.value"
         :get-focus.sync="container.popup.focus"
         rule-key="cutContainer"
@@ -193,7 +237,7 @@
 
       <template #button>
         <lw-button @click="containerConfirm">
-          {{ $lwLanguage.get('','切换容器') }}
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.txptjnap','切换容器') }}
         </lw-button>
       </template>
 
@@ -213,6 +257,7 @@ import {
   projectWmsOutboundPickCheckContainer,
   projectWmsOutboundStandardPick
 } from "../../../../../api/outbound/pick/notAlone";
+import {projectWmsOutboundPickCheckSn} from "../../../../../api/outbound/pick/alone";
 
 export default {
   name: "lwOutboundPickNotAloneActionPage",
@@ -225,7 +270,15 @@ export default {
   computed:{
     // 是否有lpn
     hasLpn(){
-      return !!this.pickData.pendingPickLineList[this.taskIndex].fromLpn
+      return !this.nowPickData.fromCase && this.nowPickData.fromLpn
+    },
+
+    // 当前拣选数据
+    nowPickData(){
+      if (this.pickData.pendingPickLineList && this.pickData.pendingPickLineList.length){
+        return this.pickData.pendingPickLineList[this.taskIndex]
+      }
+      return {}
     }
   },
   data() {
@@ -266,12 +319,30 @@ export default {
         focus: false
       },
 
+      // 箱号
+      box:{
+        value:'',
+        focus: false
+      },
+
       // 商品
       sku:{
         value:'',
         focus: false
       },
 
+      // 当前扫描的商品
+      nowScan:{
+        value:''
+      },
+
+      // 序列号
+      sn:{
+        value:'',
+        focus: false,
+        list: []
+      },
+
       // 商品数量
       qty:{
         value:'',
@@ -284,7 +355,9 @@ export default {
         show: false,
         // 后端返回的全部数据
         data:{},
-      }
+      },
+
+      printData:{}
     }
   },
   mounted() {
@@ -313,7 +386,7 @@ export default {
         pickContainer: container
       }).then(()=>{
         this.$lwToast.success(
-          this.$lwLanguage.get('','容器绑定成功')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.atjhrrvp','容器绑定成功')
         )
         this.container.popup.show = false
         this.container.value = container
@@ -333,7 +406,7 @@ export default {
       }
 
       this.$lwShowErrorMsg(
-        this.$lwLanguage.get('','拣选容器号不能为空')
+        this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.jlnfibwb','拣选容器号不能为空')
       )
       return false
     },
@@ -354,6 +427,8 @@ export default {
       if (this.locationCodeCheck()){
         if (this.hasLpn){
           this.lpn.focus = true
+        }else if (this.nowPickData.fromCase){
+          this.box.focus = true
         }else {
           this.sku.focus = true
         }
@@ -364,7 +439,7 @@ export default {
 
       return this.inputCheck({
         key: 'locationCode',
-        checkVal: this.pickData.pendingPickLineList[this.taskIndex].fromLocationCode,
+        checkVal: this.nowPickData.fromLocationCode,
       })
     },
 
@@ -379,7 +454,22 @@ export default {
 
       return this.inputCheck({
         key: 'lpn',
-        checkVal: this.pickData.pendingPickLineList[this.taskIndex].fromLpn,
+        needCheck: false
+      })
+    },
+
+    // 箱号确认
+    boxConfirm(){
+      if (this.boxCheck()) this.sku.focus = true
+    },
+    // 箱号校验
+    boxCheck(){
+
+      if (!this.nowPickData.fromCase) return true
+
+      return this.inputCheck({
+        key: 'box',
+        needCheck: false
       })
     },
 
@@ -388,21 +478,73 @@ export default {
 
       if (!this.skuCheck()) return
 
-      let newQty = 0
-      // 如果条码解析成功，并且能解析出数量就加法运算
-      if (data.qty){
-        newQty = data.qty
-      }
+      this.nowScan.value = this.sku.value
+
+      if (this.nowPickData.needHandleSn){
+        this.sn.focus = true
+      }else {
+        let newQty = 0
+        // 如果条码解析成功，并且能解析出数量就加法运算
+        if (data.qty){
+          newQty = data.qty
+        }
+
+        newQty = Number(this.nowPickData.uomQty)
+        this.qty.value = Number(this.qty.value || 0) + newQty
 
-      newQty = Number(this.pickData.pendingPickLineList[this.taskIndex].uomQty)
-      this.qty.value = Number(this.qty.value || 0) + newQty
-      this.qty.focus = true
+        const waitQty = Number(this.nowPickData.totalQty || 0) - Number(this.nowPickData.pickQty || 0)
+        if (this.qty.value === waitQty){
+          this.pickConfirm()
+          return;
+        }
+
+        this.sku.value = ''
+        this.sku.focus = true
+      }
     },
     // 商品检查
     skuCheck(){
       return this.inputCheck({
         key: 'sku',
-        checkVal: this.pickData.pendingPickLineList[this.taskIndex].skuCode,
+        checkVal: this.nowPickData.skuCode,
+      })
+    },
+
+    // 序列号确认
+    snConfirm(val,{data}){
+
+      if (!data.key) {
+        this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.index.xazaxefu','序列号不能为空')
+        this.sn.focus = true
+        return
+      }
+
+      if (this.sn.list.some(item=>item.sn===data.key)){
+        this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.index.sjmbdggh','当前序列号已存在扫描列表中')
+        this.sn.value = ''
+        this.sn.focus = true
+        return
+      }
+
+      const item = this.nowPickData
+      projectWmsOutboundPickCheckSn({
+        ownerId: item.ownerId,
+        skuId: item.skuId,
+        sn: data.key,
+        qty: data.qty || 0
+      }).then(res=>{
+        this.sn.list.unshift(res)
+        this.sn.focus = true
+        this.sn.value = ''
+
+        // 如果拣选量复核要求就自动提交
+        let qty = 0
+        this.sn.list.forEach(item=>{
+          qty = qty + item.qty
+        })
+        if (qty === (item.totalQty - item.pickQty)){
+          this.pickConfirm()
+        }
       })
     },
 
@@ -416,24 +558,24 @@ export default {
       if (!qty){
         this.qty.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','拣选数量不能为空，且应当是大于0的整数')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.reczyytt','拣选数量不能为空，且应当是大于0的整数')
         )
         this.qty.value = ''
         return false
       }
 
-      const item = this.pickData.pendingPickLineList[this.taskIndex]
+      const item = this.nowPickData
       const uomQty = Number(item.uomQty || 0)
 
       if (uomQty === 0){
-        console.warn('拣选最小单位数据异常，值为：', uomQty)
+        console.warn(this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.jhatfwzc', '拣选最小单位数据异常，值为：'), uomQty)
         return true
       }
 
       if (qty%item.uomQty !== 0){
         this.qty.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','拣选数量应当为') + item.uomLabel.top + this.$lwLanguage.get('','的倍数')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.qlwquwbn','拣选数量应当为') + item.uomLabel.top + this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.ectkxfbd','的倍数')
         )
         this.qty.value = ''
         return false
@@ -443,7 +585,7 @@ export default {
       if (qty > waitQty){
         this.qty.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','拣选数量不能大于待拣量')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.priuzexu','拣选数量不能大于待拣量')
         )
         this.qty.value = ''
         return false
@@ -455,65 +597,91 @@ export default {
     // 任务行切换前
     cutStart(){
       return this.checkInputVal(
-        ['locationCode', 'lpn', 'sku', 'qty'],
+        ['locationCode', 'lpn', 'box', 'sku', 'qty','sn'],
       )
 
     },
     // 任务行切换后
     cutEnd(){
       this.clearInputVal(
-        ['locationCode', 'lpn', 'sku', 'qty'],
+        ['locationCode', 'lpn', 'box', 'sku', 'nowScan', 'qty', 'sn'],
       )
+      this.locationCode.focus = true
     },
 
 
     // 确认拣选
-    pickConfirm(){
+    async pickConfirm(){
+      const item = this.nowPickData
 
       if (!(
         this.locationCodeCheck() &&
         this.lpnCheck() &&
-        this.skuCheck() &&
-        this.qtyCheck()
+        this.boxCheck() &&
+        this.nowScan.value &&
+        (item.needHandleSn || this.qtyCheck())
       )) return
 
-      const item = this.pickData.pendingPickLineList[this.taskIndex]
-      projectWmsOutboundStandardPick({
+      let data = {}
+      if (item.needHandleSn){
+        let qty = 0
+        this.sn.list.forEach(item=>{
+          qty += Number(item.qty || 0)
+        })
+        data = {
+          currentPickQty: qty,
+          snList: this.sn.list
+        }
+      }else {
+        data = {
+          currentPickQty: this.qty.value,
+        }
+      }
+
+      const res = await projectWmsOutboundStandardPick({
         pickId: this.pickData.pickId,
         pickNo: this.pickData.pickNo,
         fromLocationId: item.fromLocationId,
         fromLpn: item.fromLpn,
+        fromCase: item.fromCase,
         ownerId: item.ownerId,
         skuId: item.skuId,
         uom: item.uom,
         uomQty: item.uomQty,
         needHandleSn: item.needHandleSn,
         allocationOrder: this.pickData.allocationOrder,
-        currentPickQty: this.qty.value,
         pickContainer: this.container.value,
         lineGroupKey: item.lineGroupKey,
-      }).then(res=>{
+        actualPickLpn: this.lpn.value,
+        actualPickCaseNum: this.box.value,
+        ...data
+      })
 
-        // 判断是否需要打印箱票
-        if(res.needPrintBox){
-          this.$refs.dataLookAndChange.print(res)
+      this.sn.list = []
+
+      // 判断是否需要打印箱票
+      if(res.needPrintBox){
+        try {
+          await this.$refs.dataLookAndChange.print(res)
+        }catch (e) {
+          console.warn('独立件打印箱票失败：', e)
         }
+      }
 
-        this.splitPopup.data = res
+      this.splitPopup.data = res
 
-        this.$lwToast.success(
-          this.$lwLanguage.get('','拣选成功')
-        )
+      this.$lwToast.success(
+        this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.bxmfgbup','拣选成功')
+      )
 
-        // 是否需要拆板下架
-        if(res.needSplitDown){
-          this.splitPopup.show = true
-          this.splitPopup.container.focus = true
-          return
-        }
+      // 是否需要拆板下架
+      if(res.needSplitDown){
+        this.splitPopup.show = true
+        this.splitPopup.container.focus = true
+        return
+      }
 
-        this.splitOff()
-      })
+      this.splitOff()
     },
   }
 }

package/src/components/page/outbound/pick/sow/index.js

@@ -0,0 +1,11 @@
+/*
+* 边拣边分
+* @author: 张文
+* @date: 2022-08-15
+* */
+
+import lwOutboundPickSowPage from "./index.vue";
+
+lwOutboundPickSowPage.install = Vue => Vue.component(lwOutboundPickSowPage.name, lwOutboundPickSowPage)
+
+export default lwOutboundPickSowPage