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

package/src/views/wms/page/outbound/pick/mixin/all.js

@@ -4,7 +4,10 @@
 * @date  2022-06-17
 * */
 
+import {pickMixin} from "./../../../../mixin/pickMixin";
+
 export const all = {
+  mixins: [pickMixin],
   data() {
     return {
       // 是否是用户主动切换表示
@@ -12,12 +15,78 @@ export const all = {
 
       // 拣选tab激活项
       tabActive: 'ing',
+
+
+      // 当前任务索引
+      taskIndex: 0,
+
+      // 拣选数据
+      pickData: {},
+
+      // 拣选库位
+      locationCode: {
+        value: '',
+        focus: false
+      },
+
+      // 托盘号
+      lpn: {
+        value: '',
+        focus: false
+      },
+
+      // 箱号
+      box: {
+        value: '',
+        focus: false
+      },
+
+      // 打印数据
+      printData: {},
+
+      // 混合拣选，边拣边分使用的包装
+      uomList: ['CS'],
+      // 是否显示包装录入商品数量的组件
+      showUomQty: false,
+    }
+  },
+  computed: {
+    // 是否需要确认库位
+    mixinNeedInputLoc() {
+      return this.$lwWarehouseConfig.get('systemConfig.OUTBOUND_PICK_WORK_NEED_SCAN_LOCATION') === 'true'
+    },
+    // 是否需要确认商品
+    mixinNeedInputSku() {
+      // 当不需要sn时必须扫描商品号，当需要sn时就看配置是否需要扫描sku
+      return !this.nowPickData.needHandleSn || this.nowPickData.needScanSku
     }
   },
   methods: {
+    // 初始化获取焦点
+    mixinAllInitGetFocus(needGet) {
+      this.$nextTick(() => {
+        if (this.mixinNeedInputLoc) {
+          this.locationCode.focus = true
+          return
+        }
+        if (needGet === 'lpn' || this.hasLpn) {
+          this.lpn.focus = true
+          return
+        }
+        if (needGet === 'box' || this.nowPickData.fromCase) {
+          this.box.focus = true
+          return
+        }
+        if (this.mixinNeedInputSku) {
+          this.sku.focus = true
+          return
+        }
+        this.sn.focus = true
+      })
+    },
 
-    // 输入框校验
-    inputCheck({key, checkVal, needCheck = true}) {
+    // 输入框校验{key-校验的key，checkVal-比较的值，needCheck-是否必须校验一致性，value-需要比较的值，type-使用key或是value比较}
+    mixinAllInputCheck({key, checkVal, value, needCheck = true, type = 'key'}) {
       const msg = {
         locationCode: {
           nullMsg: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.all.locNull', '拣选库位不能为空'),
@@ -33,32 +102,69 @@ export const all = {
         },
         sku: {
           nullMsg: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.all.skuNull', '商品号不能为空'),
-          checkMsg: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.all.skuErr', '当前商品与商品不一致')
+          checkMsg: this.$lwLanguage.get('', '当前商品与所需商品不一致')
         },
       }
 
-      const val = this[key].value
+      // 当value有值时使用value的值比较
+      const val = type === 'key' ? this[key].value : value
 
       // 非空判断
       if (!val) {
-        this[key].focus = true
+        type === 'key' ? this[key].focus = true : ''
         this.$lwShowErrorMsg(msg[key].nullMsg)
         return false
       }
 
       // 一致性判断
       if (needCheck && val !== checkVal) {
-        this[key].focus = true
+
+        if (type === 'key') {
+          this[key].focus = true
+          this[key].value = ''
+        }
+
         this.$lwShowErrorMsg(msg[key].checkMsg)
-        this[key].value = ''
         return false
       }
 
       return true
     },
 
+    // 检查拣选库位
+    mixinAllLocationCodeCheck() {
+      if (!this.mixinNeedInputLoc) return true
+
+      return this.mixinAllInputCheck({
+        key: 'locationCode',
+        checkVal: this.nowPickData.fromLocationCode,
+      })
+    },
+
+    // 托盘号校验
+    mixinAllLpnCheck() {
+
+      if (!this.hasLpn) return true
+
+      return this.mixinAllInputCheck({
+        key: 'lpn',
+        needCheck: false
+      })
+    },
+
+    // 箱号校验
+    mixinAllBoxCheck() {
+
+      if (!this.nowPickData.fromCase) return true
+
+      return this.mixinAllInputCheck({
+        key: 'box',
+        needCheck: false
+      })
+    },
+
     // 回到tab页面顶部
-    goTop() {
+    mixinAllGoTop() {
       const dom = document.querySelector('#tab-top')
       dom && dom.scrollIntoView({
         behavior: "smooth",
@@ -67,25 +173,25 @@ export const all = {
     },
 
     // 校验当前索引是否满足未拣选的行数
-    checkTaskIndex(length) {
+    mixinAllCheckTaskIndex(length) {
       this.taskIndex = this.$lwUtils.cutCardIndexCount(this.taskIndex, length)
       this.cutEnd()
     },
 
     // 待拣选列表点击
-    waitPickClick(index) {
+    mixinAllWaitPickClick(index) {
       this.tabActive = 'ing'
       this.taskIndex = index
       this.cutEnd()
     },
 
     // 检查给定的数据是否有值，并返回一个异步函数
-    checkInputVal(arr, need = false) {
+    mixinAllCheckInputVal(arr, need = false) {
       return new Promise((res, err) => {
 
         if (
-            need ||
-            arr.some(item => !!this[item].value)
+          need ||
+          arr.some(item => !!this[item].value)
         ) {
           this.$lwDialog.confirm({
             title: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.all.warn', '警告'),
@@ -102,47 +208,76 @@ export const all = {
     },
 
     // 清空给定的数据，并滚动到顶部
-    clearInputVal(checkArr, clearArr, getFocus) {
+    mixinAllClearInputVal(checkArr, clearArr, getFocus) {
 
       let all = []
       let focus = 'sku'
-      if (this.isUserClickCut) {
-        all = ['locationCode', 'lpn', 'box']
-        focus = checkArr[0]
-      } else {
-        const {fromLocationCode, fromLpn, fromCase} = this.nowPickData
+      const {fromLocationCode, fromLpn, fromCase} = this.nowPickData
+
+      // 盘点是否是用户手动点击的切换
+      if (!this.isUserClickCut) {
 
-        const checkLoc = this.locationCode && this.locationCode.value !== fromLocationCode
-        const checkLpn = this.lpn && this.lpn.value !== fromLpn
-        const checkBox = this.box && this.box.value !== fromCase
+        /*
+        * 【需求】当上一次输入的数据和本次拣选数据一致时不清空对应的输入框
+        * 【场景】
+        *   1、当库位不一致时，清空全部。库位、托盘、箱号、商品号、序列号，计算最大维度获取焦点
+        *   2、当库位一致、托盘不一致时。保留库位输入框内容，清空托盘、箱号、商品号、序列号。托盘获取焦点
+        *   3、当库位、托盘一致，箱号不一致时。保留库位、托盘输入框内容，清空箱号、商品号。序列号，箱号获取焦点
+        *   4、当库位、托盘、箱号一致时。清空商品号、序列号，计算商品号或序列号输入获取焦点
+        */
 
-        const hasLoc = checkArr.includes('locationCode') && checkLoc
-        const hasLpn = checkArr.includes('lpn') && checkLpn
-        const hasBox = checkArr.includes('box') && checkBox
+        // 判断需要清空的项
+        if (this.mixinNeedInputLoc && this.locationCode && this.locationCode.value !== fromLocationCode) {
+          all = ['locationCode', 'lpn', 'box']
+        } else if (this.lpn && this.lpn.value !== fromLpn) {
+          all = ['lpn', 'box']
+        } else if (this.box && this.box.value !== fromCase) {
+          all = ['box']
+        }
 
+      } else {
+        all = ['locationCode', 'lpn', 'box']
+      }
 
-        if (checkLoc) {
-          all.push('locationCode')
-          hasLoc ? focus = 'locationCode' : ''
+      for (const key of all) {
+        if (
+          key === 'location' &&
+          this.mixinNeedInputLoc &&
+          checkArr.includes('locationCode')
+        ) {
+          focus = 'locationCode'
+          break
         }
 
-        if (checkLpn) {
-          all.push('lpn')
-          !hasLoc && hasLpn ? focus = 'lpn' : ''
+        if (
+          key === 'lpn' &&
+          this.hasLpn &&
+          checkArr.includes('lpn')
+        ) {
+          focus = 'lpn'
+          break
         }
 
-        if (checkBox) {
-          all.push('box')
-          !hasLoc && !hasLpn && hasBox ? focus = 'box' : ''
+        if (
+          key === 'box' &&
+          fromCase &&
+          checkArr.includes('box')
+        ) {
+          focus = 'box'
+          break
         }
+
       }
 
+      // 当获取焦点的为商品时，需要校验是否需要扫描商品号，不需要就让sn获取焦点
+      if (focus === 'sku' && !this.mixinNeedInputSku) focus = 'sn'
+
       const arr = [...all, ...clearArr]
       arr.forEach(item => {
         this[item] ? this[item].value = '' : ''
       })
 
-      this.goTop()
+      this.mixinAllGoTop()
 
       getFocus && this[focus] ? this[focus].focus = true : ''
       this.isUserClickCut = false
@@ -153,14 +288,59 @@ export const all = {
     },
 
     // 获取需要校验不清空输入框的数组
-    getCheckInputKeyArr(hasBox = true) {
+    mixinAllGetCheckInputKeyArr(hasBox = true) {
       let clearArr = ['locationCode']
 
       if (this.hasLpn) clearArr.push('lpn')
 
       hasBox && clearArr.push('box')
-      console.log(clearArr, 999)
+
       return clearArr
+    },
+
+    // 校验数量输入框是否输入 - 非独立件拣选和边拣边分使用
+    mixinAllCheckQty() {
+      let qty = this.$refs.qty.getQty()
+
+      if (!qty) {
+        this.$refs.qty.getFocus()
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '拣选数量不能为空，且应当是大于0的整数')
+        )
+        return false
+      }
+
+      if (qty > Number(this.nowPickData.waitPickQty)) {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '拣选数量不能大于待拣量')
+        )
+        return false
+      }
+
+      return true
+    },
+    // 获取商品数量 - 非独立件拣选和边拣边分使用
+    mixinAllGetQty() {
+      return this.$refs.qty?.getQty() || 0
+    },
+
+    // 待拣列表商品点击
+    mixinAllWaitPickSkuClick(showLineKey) {
+
+      const pending = this.pickData.pendingPickLineList
+      for (let i = 0; i < pending.length; i++) {
+        if (pending[i].showLineKey === showLineKey) {
+          this.taskIndex = i
+          this.tabActive = 'ing'
+          this.cutEnd()
+          return
+        }
+      }
+
+      this.$lwToast.fail(
+          this.$lwLanguage.get('', '未查询到待拣明细')
+      )
+
     }
   }
 }

package/src/views/wms/page/outbound/pick/mixin/aloneAndNotAlone.js

@@ -5,52 +5,209 @@
 * */
 
 import {
+  projectWmsOutboundPickCheckSn,
   projectWmsOutboundSubmitPickAbnormal,
   projectWmsOutboundSubmitPickSplitDown,
   projectWmsOutboundSubmitPickStockout
 } from "../../../../api/outbound/pick/alone";
 
 export const aloneAndNotAlone = {
+  data() {
+    return {
+
+
+      // 商品
+      sku: {
+        value: '',
+        focus: false,
+        disabled: false,
+      },
+      // 当前扫描的商品
+      nowScanVal: '',
+
+      // 序列号
+      sn: {
+        value: '',
+        focus: false,
+        list: []
+      },
+      // 商品数量
+      qty: {
+        value: '',
+        focus: false,
+      },
+      // 拆板下架弹出层
+      splitPopup: {
+        show: false,
+        // 后端返回的全部数据
+        data: {},
+      },
+    }
+  },
+  computed: {
+    // 是否有lpn
+    hasLpn() {
+      return !this.nowPickData.fromCase && this.nowPickData.fromLpn
+    },
+    // 当前拣选数据
+    nowPickData() {
+      if (this.pickData.pendingPickLineList && this.pickData.pendingPickLineList.length) {
+        return this.pickData.pendingPickLineList[this.taskIndex]
+      }
+      return {}
+    },
+    // 是否禁用商品输入框
+    disabledSku() {
+      return this.nowPickData.needHandleSn && this.sku.disabled
+    }
+  },
   methods: {
+    // 商品检查
+    mixinAloneSkuCheck() {
+      if (!this.mixinNeedInputSku) return true
+      return this.mixinAllInputCheck({
+        key: 'sku',
+        checkVal: this.nowPickData.skuCode,
+      })
+    },
 
-    // 格式化数据
-    formatData(res){
-      // 拣选单位中文翻译
-      const uomLabel = {
-        EA: {
-          top: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.aloneAndNotAlone.min','最小销售数'),
-          table: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.aloneAndNotAlone.minNum','最小销售')
-        },
-        IP: {
-          top: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.aloneAndNotAlone.inNum','内装数'),
-          table: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.aloneAndNotAlone.in','内装'),
-        },
-        CS: {
-          top: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.aloneAndNotAlone.boxNum','箱装数'),
-          table: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.aloneAndNotAlone.box','箱'),
-        },
-        PL: {
-          top: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.aloneAndNotAlone.lpnNum','托装数'),
-          table: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.aloneAndNotAlone.lpn','托'),
-        },
-        LPN: {
-          top: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.aloneAndNotAlone.allLpn','整托盘'),
-          table: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.aloneAndNotAlone.lpn','托'),
-        },
-        CASE: {
-          top: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.aloneAndNotAlone.allBox','整箱'),
-          table: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.aloneAndNotAlone.box','箱'),
+    // 数据处理
+    mixinAloneFormatData(res) {
+      this.pickData = res
+      this.mixinAllCheckTaskIndex(this.pickData.pendingPickLineList.length)
+    },
+
+    // 拣选库位确认
+    mixinAloneLocationCodeConfirm() {
+      if (this.mixinAllLocationCodeCheck()) {
+        if (this.hasLpn) {
+          this.lpn.focus = true
+        } else if (this.nowPickData.fromCase) {
+          this.box.focus = true
+        } else {
+          this.mixinAloneSkuOrSnFocus()
         }
       }
+    },
+
+    // 托盘号确认
+    mixinAloneLpnConfirm() {
+      if (this.mixinAllLpnCheck()) this.mixinAloneSkuOrSnFocus()
+    },
+
+    // 箱号确认
+    mixinAloneBoxConfirm() {
+      if (this.mixinAllBoxCheck()) this.mixinAloneSkuOrSnFocus()
+    },
+
+    // 商品或者sn输入框获取焦点
+    mixinAloneSkuOrSnFocus() {
+      if (this.mixinNeedInputSku) {
+        this.sku.focus = true
+      } else {
+        this.sn.focus = true
+      }
+    },
+
+    // 序列号确认
+    mixinAloneSnConfirm(val, {data}) {
+
+      const sn = data.sn || data.key
+      if (!sn) {
+        this.$lwLanguage.get('', '序列号不能为空')
+        this.sn.focus = true
+        return
+      }
+
+
+      // 校验序列号是否重复
+      if (this.$lwUtils.checkRepeat(this.sn.list, sn).repeat) {
+        this.$lwToast.fail(
+          this.$lwLanguage.get('', '当前序列号已存在列表中')
+        )
+        return
+      }
+
+      const item = this.nowPickData
+      projectWmsOutboundPickCheckSn({
+        ownerId: item.ownerId,
+        skuId: item.skuId,
+        sn,
+        qty: data.qty || 0
+      }).then(res => {
+        // 校验序列号的商品号是否为当前拣选的商品
+        if (res.skuCode && !this.mixinAllInputCheck({
+          key: 'sku',
+          checkVal: this.nowPickData.skuCode,
+          value: res.skuCode,
+          type: 'value'
+        })) return
 
-      res.pendingPickLineList.forEach(item=>{
-        item.uomLabel = uomLabel[item.uom]
+        if (this.mixinAloneCheckPickQtyBySn(res).success) {
+          this.sn.list.unshift(res)
+        }
+        this.sn.focus = true
+        this.sn.value = ''
       })
-      return res
     },
 
+    // 任务行切换前
+    mixinAloneCutStart() {
+      return this.mixinAllCheckInputVal(
+        ['locationCode', 'lpn', 'box', 'sku', 'qty', 'sn'],
+        !!this.sn.list.length
+      )
+    },
+    // 任务行切换后
+    mixinAloneCutEnd() {
+      this.showUomQty = false
+      this.mixinAllClearInputVal(
+        this.mixinAllGetCheckInputKeyArr(this.nowPickData.fromCase),
+        ['sku', 'nowScan', 'qty', 'sn'],
+        true
+      )
+      this.sku.disabled = false
+      this.sn.list = []
+      this.nowScanVal = ''
+
+      this.$nextTick(() => this.showUomQty = true)
+    },
+
+    // 检查必填项是否输入
+    checkAllInput() {
+      // 商品信息需要判断是否需要输入商品号，如果不需要输入商品号就不需要校验一致性
+      if (
+        this.mixinAllLocationCodeCheck() &&
+        this.mixinAllLpnCheck() &&
+        this.mixinAllBoxCheck()
+      ) {
+        // 先获取是否需要强制输入商品号，如果需要就判断是否扫描且是否一致
+        if (this.mixinNeedInputSku) {
+
+          if (!this.nowScanVal) {
+            this.sku.focus = true
+            this.$lwShowErrorMsg(
+              this.$lwLanguage.get('', '请确认商品号')
+            )
+            return false
+          }
+
+          if (this.nowScanVal !== this.nowPickData.skuCode) {
+            this.sku.focus = true
+            this.$lwShowErrorMsg(
+              this.$lwLanguage.get('', '录入商品与拣选商品不一致')
+            )
+            return false
+          }
+
+        }
+      }
+      return true
+    },
+
+
     // 确认缺货
-    lackConfirm(data){
+    mixinAloneLackConfirm(data) {
       const item = this.pickData.pendingPickLineList[this.taskIndex]
       return projectWmsOutboundSubmitPickStockout({
         pickId: this.pickData.pickId,
@@ -65,7 +222,7 @@ export const aloneAndNotAlone = {
     },
 
     // 确认异常
-    abnConfirm(data){
+    mixinAloneAbnConfirm(data) {
       const item = this.pickData.pendingPickLineList[this.taskIndex]
       return projectWmsOutboundSubmitPickAbnormal({
         pickId: this.pickData.pickId,
@@ -81,7 +238,7 @@ export const aloneAndNotAlone = {
     },
 
     // 确认拆板下架
-    splitConfirm(data){
+    mixinAloneSplitConfirm(data) {
       const item = this.pickData.pendingPickLineList[this.taskIndex]
       const split = this.splitPopup.data.splitDownData
       projectWmsOutboundSubmitPickSplitDown({
@@ -102,31 +259,67 @@ export const aloneAndNotAlone = {
       })
     },
     // 拆板下架弹出框关闭
-    splitOff(){
-
+    mixinAloneSplitOff() {
       // 判断当前拣选任务是否完成
-      if (this.splitPopup.data.pickOrderFinish){
+      if (this.splitPopup.data.pickOrderFinish) {
         this.$refs.dataLookAndChange.openPickSuccessPopup()
         return
       }
-
-      this.pickData = this.formatData(this.splitPopup.data.pickTaskData)
-      this.checkTaskIndex(this.pickData.pendingPickLineList.length)
+      this.mixinAloneFormatData(this.splitPopup.data.pickTaskData)
     },
 
-    // 拣选明细行点击未拣选行
-    allPickClick(item){
-      if (item.pickStatus === '300') return
+    // 确认拣选后的校验
+    async mixinAlonePickSuccessCheck(res, pickContainer) {
+      pickContainer ? this.container.value = pickContainer : ''
 
-      const wait = this.pickData.pendingPickLineList
-      for (let i = 0; i < wait.length; i++) {
-        if (wait[i].lineGroupKey === item.lineGroupKey){
-          this.taskIndex = i
-          this.tabActive = 'ing'
-          this.cutEnd()
-          return;
-        }
+      // 判断是否需要打印箱票
+      try {
+        await this.$refs.dataLookAndChange.print(res)
+      } catch (e) {
+        console.warn('打印箱票失败：', e)
+      }
+
+      this.splitPopup.data = res
+
+      this.$lwToast.success(
+        this.$lwLanguage.get('', '拣选成功')
+      )
+
+      // 是否需要拆板下架
+      if (res.needSplitDown) {
+        this.splitPopup.show = true
+        this.splitPopup.container.focus = true
+        return
       }
+
+      this.mixinAloneSplitOff()
+    },
+
+    // 拣选数量校验是否超过待拣量 - 公共
+    mixinAloneCheckPickQty(nowQty, total) {
+      const waitPickQty = Number(this.nowPickData.waitPickQty || 0)
+      const waitQty = waitPickQty - total
+      if (nowQty > waitQty) {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '当前拣选量{now}大于剩余待拣量{waitQty}，拣选失败！', {now: nowQty, waitQty})
+        )
+        return {success: false}
+      }
+      return {success: true, total}
+    },
+    // 拣选数量校验是否超过待拣量 - 数量
+    mixinAloneCheckPickQtyByQty(nowPickQty) {
+      return this.mixinAloneCheckPickQty(
+        Number(nowPickQty || 0),
+        this.$refs.qty.getQty()
+      )
+    },
+    // 拣选数量校验是否超过待拣量 - 序列号
+    mixinAloneCheckPickQtyBySn(nowPickSn) {
+      return this.mixinAloneCheckPickQty(
+        Number(nowPickSn.qty || 0),
+        this.sn.list.reduce((t, i) => t + Number(i.qty || 0), 0)
+      )
     },
   }
 }