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

package/src/views/wms/mixin/pickMixin.js

@@ -0,0 +1,68 @@
+/*
+* 拣选混入
+* @author: 张文
+* @date  2023-08-11
+* */
+
+export const pickMixin = {
+  methods: {
+    // 判断跳转页面
+    mixinCheckPage(data, jumpType = 'push') {
+      const query = {
+        lwPickId: data.pickId
+      }
+
+      // 边拣边分
+      if (data.pickMethod === '400') {
+        this.$router[jumpType]({
+          path: '/outbound/pick/lwSowAction',
+          query
+        })
+        return
+      }
+
+      // 整箱
+      if (data.pickUom === 'CASE') {
+        this.$router[jumpType]({
+          path: '/outbound/pick/lwBoxAction',
+          query
+        })
+        return
+      }
+
+      // 整托盘
+      if (data.pickUom === 'LPN') {
+        this.$router[jumpType]({
+          path: '/outbound/pick/lwLpnAction',
+          query
+        })
+        return
+      }
+
+      // 容器
+      if (data.pickSkuType === 'CONTAINER') {
+        this.$router[jumpType]({
+          path: '/outbound/pick/lwContainerAction',
+          query
+        })
+        return
+      }
+
+      // 独立件
+      if (data.pickPackType === 'ALONE') {
+        this.$router[jumpType]({
+          path: '/outbound/pick/lwAloneAction',
+          query
+        })
+        return
+      }
+
+      // 非独立件
+      this.$router[jumpType]({
+        path: '/outbound/pick/lwNotAloneAction',
+        query
+      })
+
+    }
+  }
+}

package/src/views/wms/module/AbnormalInput/index.vue

@@ -53,13 +53,12 @@
     />
 
     <!-- 异常量 -->
-    <lw-input
+    <lw-get-qty-by-type
       :title="$lwLanguage.get('wms_project.pda.module.inboundAbn.abnQty','异常量')"
-      v-model="abnormal.abnQty"
-      :get-focus.sync="abnormalFocus.qty"
-      type="digit"
-      input-align="right"
-      required
+      ref="abnQty"
+      :owner-id="ownerId"
+      :sku-id="skuId"
+      :init-focus="false"
       @confirm="abnQtyConfirm"
     />
 
@@ -134,6 +133,18 @@ export default {
       default: false,
     },
 
+    // 商品id
+    skuId: {
+      type: String,
+      default: '',
+      required: true
+    },
+    // 货主id
+    ownerId: {
+      type: String,
+      default: '',
+    },
+
   },
   data() {
     return {
@@ -145,8 +156,6 @@ export default {
         abnType:'',
         // 异常子类型
         abnSubType:'',
-        // 异常量
-        abnQty:'',
         // 异常库位
         abnLocationCode:'',
         // 异常托盘
@@ -207,13 +216,12 @@ export default {
     },
     // 异常量校验
     abnQtyCheck(){
-      const num = Number(this.abnormal.abnQty || 0)
+      const num = this.$refs.abnQty.getQty()
       if (!num){
-        this.abnormalFocus.qty = true
+        this.$refs.abnQty.getFocus()
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.module.inboundAbn.skuNull','异常量不能为空，且应当是大于0的整数')
+          this.$lwLanguage.get('wms_project.pda.module.inboundAbn.skuNull', '异常量不能为空，且应当是大于0的整数')
         )
-        this.abnormal.abnQty = ''
         return false
       }
 
@@ -224,11 +232,11 @@ export default {
         this.qty &&
         num > this.qty
       ){
-        this.abnormalFocus.qty = true
+        this.$refs.abnQty.getFocus()
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.module.inboundAbn.skuMore','异常量不能大于待处理量')
+          this.$lwLanguage.get('wms_project.pda.module.inboundAbn.skuMore', '异常量不能大于待处理量')
         )
-        this.abnormal.abnQty = ''
+        this.$refs.abnQty.clearInput()
         return false
       }
 
@@ -303,6 +311,7 @@ export default {
           success: true,
           data: {
             ...this.abnormal,
+            abnQty: this.$refs.abnQty.getQty(),
             abnImg: this.abnormal.abnImgArr.join('|')
           }
         }

package/src/views/wms/module/GetQtyByType/index.js

@@ -0,0 +1,11 @@
+/*
+* 根据类型填写商品
+* @author: 张文
+* @date: 2022-02-25
+* */
+
+import lwGetQtyByType from "./index.vue";
+
+lwGetQtyByType.install = Vue => Vue.component(lwGetQtyByType.name, lwGetQtyByType)
+
+export default lwGetQtyByType

package/src/views/wms/module/GetQtyByType/index.vue

@@ -0,0 +1,400 @@
+<!--
+  根据类型填写商品
+  @author: 张文
+  @date: 2023-12-01
+-->
+<template>
+  <div>
+
+    <lw-input
+      v-if="onlyForEa.yes"
+      :title="title || $lwLanguage.get('', '数量')"
+      v-model="onlyForEa.qty"
+      :get-focus.sync="onlyForEa.focus"
+      type="digit"
+      :show-bottom-border="showBottomBorder"
+      required
+      @confirm="uomConfirm()"
+    >
+      <template #button>
+        <slot name="button"></slot>
+      </template>
+    </lw-input>
+
+    <template v-else>
+      <lw-cell-popup-radio
+        :title="$lwLanguage.get('','包装')"
+        required
+        v-model="type"
+        :columns="typeList"
+        :is-edit="false"
+        @confirm="typeConfirm"
+      />
+
+      <div
+        style="flex-wrap: wrap"
+        class="lw-global-flex-between"
+      >
+        <lw-input
+          style="flex: 1;min-width: 25%"
+          v-for="(i,k) in uomList"
+          :key="k"
+          :title="i.uomName"
+          v-model="i._value"
+          :get-focus="i._focus"
+          :show-scan-icon="false"
+          :placeholder="$lwLanguage.get('', '输入') + i.uomName + $lwLanguage.get('', '数')"
+          type="digit"
+          @confirm="uomConfirm(k)"
+        />
+      </div>
+
+      <lw-input
+        :title="title || $lwLanguage.get('', '数量')"
+        v-model="qty"
+        disabled
+        type="digit"
+        :show-bottom-border="showBottomBorder"
+        required
+      >
+        <template #button>
+          <slot name="button"></slot>
+        </template>
+      </lw-input>
+
+    </template>
+
+
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "lwGetQtyByType",
+  props: {
+    // 数量标题
+    title: String,
+    // 是否在组件加载时自动初始化
+    autoInit: {
+      type: Boolean,
+      default: true
+    },
+    // 是否显示底部边框
+    showBottomBorder: {
+      type: Boolean,
+      default: true
+    },
+    // 是否在初始化时自动获取焦点
+    initFocus: {
+      type: Boolean,
+      default: false
+    },
+    // 初始化预填的数据
+    initQty: {
+      type: [Number, String],
+      default: ''
+    },
+
+
+    // 货主id
+    ownerId: {
+      type: [String, Number],
+      default: ''
+    },
+    // 商品id
+    skuId: {
+      type: [String, Number],
+      default: ''
+    },
+    // 包装id
+    packId: {
+      type: [String, Number],
+      default: ''
+    },
+    // 包装id列表
+    packIdList: {
+      type: Array,
+      default: () => []
+    },
+    // 单位编码
+    uomTypeList: {
+      type: Array,
+      default: () => []
+    },
+    // 额外参数
+    args: {
+      type: Object,
+      default: () => {
+      }
+    }
+  },
+  data() {
+    return {
+      // 基础数据
+      baseData: {
+        label: this.$lwLanguage.get('', '最小销售数'),
+        value: 1,
+        uomList: [
+          {
+            uomName: this.$lwLanguage.get('', '最小销售数'),
+            _value: '',
+            _focus: false,
+            baseQty: 1
+          }
+        ]
+      },
+
+      // 是否只有 EA
+      onlyForEa: {
+        yes: false,
+        qty: '',
+        focus: false
+      },
+      type: '',
+      typeList: [],
+
+      // 类型
+      uomList: [],
+
+      // 原始的包装信息
+      baseUom: {},
+    }
+  },
+  computed: {
+    qty() {
+      return this.uomList.reduce((pre, cur) => pre + (Number(cur._value || 0) * Number(cur.baseQty || 1)), 0)
+    }
+  },
+  mounted() {
+    this.autoInit && this.init(this.initQty, this.initFocus)
+  },
+  methods: {
+    // 暴露给外部使用 - 初始化，qty->需要回显的数量，focus->是否获取焦点
+    init(qty, focus) {
+      this.$lwApi.common.skuUomSpecList({
+        ownerId: this.ownerId,
+        skuId: this.skuId,
+        packId: this.packId,
+        packIdList: this.packIdList,
+        uomList: this.uomTypeList,
+        args: this.args,
+      }).then(res => {
+        this.baseUom = this.$lwDeepCopy(res)
+
+        this.onlyForEa.yes = res.onlyForEa
+
+        if (!this.onlyForEa.yes) {
+          this.typeList = res.specList || []
+
+          // 如果没有类型，则默认添加一条
+          if (!this.typeList.length) {
+            this.typeList.push(this.$lwDeepCopy(this.baseData))
+          }
+
+          // 提前绑定赋值，防止数据无法绑定
+          this.typeList.forEach(i => {
+            i.uomList.forEach(j => {
+              this.$set(j, '_value', '')
+              this.$set(j, '_focus', false)
+            })
+          })
+
+          // 初始化时默认选中第一个类型
+          const item = this.typeList[0]
+          this.type = item.value
+          this.uomList = item.uomList
+        }
+
+        this.setQty(qty)
+
+        this.$nextTick(() => {
+          focus && this.getFocus()
+        })
+      })
+    },
+
+    // 暴露给外部使用 - 获取最终数量
+    getQty() {
+      return this.onlyForEa.yes ? Number(this.onlyForEa.qty || 0) : this.qty
+    },
+
+    // 暴露给外部使用 - 获取填写的数量
+    getInputData() {
+
+      const obj = {
+        // 录入的数据，包含录入的数量、单位、单位名称、相对于ea的数量
+        all: [],
+        // 最终转换的数据
+        eaQty: this.getQty(),
+        // 根据录入信息转换成文字 ---> xx托xx箱
+        qtyLabel: ''
+      }
+
+
+      if (this.onlyForEa.yes) {
+        obj.all.push({
+          qty: obj.eaQty,
+          uom: 'EA',
+          uomLabel: Number(this.onlyForEa.qty || 0),
+          baseQty: 1
+        })
+        obj.qtyLabel = obj.eaQty
+
+      } else {
+
+        this.uomList.forEach(i => {
+          obj.all.push({
+            qty: Number(i._value || 0),
+            uom: i.uomValue,
+            uomLabel: i.uomName,
+            baseQty: i.baseQty,
+          })
+        })
+
+        obj.all.forEach(item => {
+          if (item.qty) {
+            obj.qtyLabel += item.qty + item.uomLabel
+          }
+        })
+      }
+
+
+      return obj
+    },
+
+    // 暴露给外部使用 - 用于清空输入
+    clearInput() {
+      this.onlyForEa.qty = ''
+      this.uomList.forEach(i => {
+        i._value = ''
+      })
+    },
+
+    // 暴露给外部可用 - 数据回显计算，qty-数量
+    setQty(qty) {
+
+      let numQty = qty || this.qty
+
+      if (this.onlyForEa.yes) {
+        this.onlyForEa.qty = Number(numQty || 0) === 0 ? '' : numQty.toString()
+        return
+      }
+
+      // 解决设置数量先于初始化完成时，导致的数量回显错误的问题
+      if (!this.uomList.length) {
+        this.uomList = this.$lwDeepCopy(this.baseData.uomList)
+      }
+
+      for (let i = 0; i < this.uomList.length; i++) {
+
+        const uomItem = this.uomList[i]
+        const num = Math.floor(numQty / uomItem.baseQty)
+
+        uomItem._value = num === 0 ? '' : num.toString()
+        numQty %= uomItem.baseQty
+      }
+
+    },
+
+    // 暴露给外部使用 - 让第一个输入框获取焦点，index为输入框的索引，默认第一个
+    getFocus(index = 0) {
+
+      if (this.onlyForEa.yes) {
+        this.onlyForEa.focus = true
+        return
+      }
+
+      // 如果需要获取焦点的输入框不存在，则获取第一个
+      const item = this.uomList[index] || this.uomList[0]
+      item._focus = true
+    },
+
+    // 暴露给外部使用 - 获取原始的包装信息列表
+    getBaseUom() {
+      return this.$lwDeepCopy(this.baseUom)
+    },
+
+    // 暴露给外部使用 - 根据包装信息将ea数量转换为箱数量，如果没有箱则返回ea包装信息
+    eaToCase(eaQty) {
+      let qty = Number(eaQty || 0)
+      qty = isNaN(qty) ? 0 : qty
+      const skuPackUomType = this.$lwDict.get('SkuPackUomType') || []
+      const eaLabel = skuPackUomType.find(i => i.value === 'EA').label
+      const uomInfo = {
+        onlyForEa: false,
+        hasCase: false,
+        eaQty: qty,
+        eaLabel,
+        caseQty: 0,
+        caseLabel: '',
+        label: qty + eaLabel
+      }
+      if (this.baseUom.onlyForEa) {
+        uomInfo.onlyForEa = true
+        return uomInfo
+      }
+
+      // 排在第一个且有箱包装的包装信息
+      let hasCaseUom = null
+      for (const item of this.baseUom.specList) {
+        let hasCase = false
+        for (const uom of item.uomList) {
+          if (uom.uomValue === 'CS') {
+            hasCaseUom = item
+            hasCase = true
+            break
+          }
+        }
+        if (hasCase) break
+      }
+
+      if (hasCaseUom === null) return uomInfo
+
+      hasCaseUom.uomObj = {}
+      for (const item of hasCaseUom.uomList) {
+        hasCaseUom.uomObj[item.uomValue] = item
+      }
+      uomInfo.hasCase = true
+      uomInfo.caseQty = Math.floor(qty / hasCaseUom.uomObj.CS.baseQty)
+      uomInfo.caseLabel = hasCaseUom.uomObj.CS.uomName
+      uomInfo.eaQty = qty % hasCaseUom.uomObj.CS.baseQty
+      uomInfo.eaLabel = hasCaseUom.uomObj.EA.uomName
+      uomInfo.label = uomInfo.caseQty ? uomInfo.caseQty + uomInfo.caseLabel : ''
+      uomInfo.label += uomInfo.eaQty ? uomInfo.eaQty + uomInfo.eaLabel : ''
+      return uomInfo
+    },
+
+    // 类型确认
+    typeConfirm(item) {
+      const qty = this.qty
+      this.uomList = item.uomList.map(i => {
+        return {
+          ...i,
+          _value: ''
+        }
+      })
+      this.setQty(qty)
+      this.$nextTick(() => {
+        this.getFocus()
+      })
+    },
+
+    // 数量确认
+    uomConfirm(index) {
+
+
+      if (this.onlyForEa.yes || index === this.uomList.length - 1) {
+        this.$emit('confirm', this.getQty())
+        return
+      }
+
+      this.getFocus(index + 1)
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/wms/module/InnerAbnormal/index.vue

@@ -29,7 +29,7 @@
         {{ $lwLanguage.get('wms_project.pda.module.inboundAbn.wait','待处理量') }}
       </div>
 
-      <div class="lw-global-value-bold" style="color: #D50000">{{ qty }}</div>
+      <div class="lw-global-value-bold" style="color: #D50000">{{ qtyLabel || qty }}</div>
     </div>
 
     <!-- 库位 -->
@@ -48,6 +48,8 @@
       :ab-type="abType"
       :abn-type-key="abnTypeKey"
       :require-lpn="requireLpn"
+      :owner-id="ownerId"
+      :sku-id="skuId"
     />
 
 
@@ -59,19 +61,35 @@
 
 export default {
   name: "lwInnerAbnormalModule",
-  props:{
+  props: {
     // 商品号
     skuCode: String,
-
     // 商品名称
     skuName: String,
+    // 商品id
+    skuId: {
+      type: String,
+      default: '',
+      required: true
+    },
+    // 货主id
+    ownerId: {
+      type: String,
+      default: '',
+    },
 
     // 待处理量
-    qty:{
+    qty: {
       type: Number,
       default: 0
     },
 
+    // 待处理量 - 用于显示
+    qtyLabel: {
+      type: [Number, String],
+      default: 0
+    },
+
     // 库位
     location: String,
 
@@ -97,14 +115,14 @@ export default {
     }
   },
   mounted() {
-    this.getPrint()
+    this.checkPrint()
   },
   methods: {
     // 获取填写的异常数据
     getAbnormalData(){
       const obj = this.$refs.abnInput.getAbnormalInputData()
 
-      if (obj.success)  return obj
+      if (obj.success) return obj
 
       return {
         success: false,
@@ -113,18 +131,22 @@ export default {
     },
 
     // 获取异常打印机
-    getPrint(){
-      const {printData} = this.$lwPrint.test(
+    checkPrint(needCheck) {
+
+      if (this.printData.printId) return true
+
+      const {printData, success} = this.$lwPrint.test(
         'ABNORMAL_RECORD_LABEL',
-        this.$lwLanguage.get('wms_project.pda.components.module.InnerAbnormal.index.tiotjfak','异常标识卡'),
-        false
+        this.$lwLanguage.get('wms_project.pda.components.module.InnerAbnormal.index.tiotjfak', '异常标识卡'),
+        needCheck
       )
       this.printData = printData
+      return success
     },
 
     // 调用打印服务
-    printLabel(){
-      if (!Object.keys(this.printData).length) return
+    printLabel() {
+      if (!this.checkPrint(true)) return
 
       this.$lwPrint.bluetoothPrint({
         templateCode: 'ABNORMAL_RECORD_LABEL',