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

package/src/api/common/barcode.js

@@ -1,165 +1,165 @@
-import lwAxios from "../../utils/Axios";
-import { DateTime } from 'luxon'
-
-// 条码工具
-const barcodeUtils = {
-    /**
-     *
-     * @param {string} barcode 条码
-     * @param {string} seperator 分隔符
-     * @param {string} fields 属性列表
-     * @returns 根据分隔符和属性解析的对象，解析失败返回null
-     */
-    split (barcode, seperator, fields) {
-        if (!barcode || !fields) {
-            return null
-        }
-        const values = typeof seperator === 'string' ? barcode.split(seperator) : [ barcode ]
-        const fs = Array.isArray(fields) ? fields : (typeof seperator === 'string' ? fields.split(seperator) : [ fields ])
-        if (fs.length === 0 || values.length !== fs.length) {
-            return null
-        }
-        const data = {}
-        for (let i in fs) {
-            data[fs[i]] = values[i]
-        }
-        return data
-    }
-}
-
-/**
- * 内部方法：属性操作符验证
- * @param {*} value 验证值
- * @param {*} validType 验证类型
- * @param {*} content 验证参数内容
- * @returns 验证是否通过
- */
-const operatorValid = (value, validType, content) => {
-    if (!value) {
-        return true
-    }
-    switch (validType) {
-        case 'EQ': return value == content
-        case 'NEQ': return value != content
-        case 'GT': return parseFloat(value) > parseFloat(content)
-        case 'GE': return parseFloat(value) >= parseFloat(content)
-        case 'LT': return parseFloat(value) < parseFloat(content)
-        case 'LE': return parseFloat(value) <= parseFloat(content)
-        case 'IN': return content && content.split(',').includes(value)
-        case 'NOTIN': return !content || !content.split(',').includes(value)
-        case 'LENGTH': return (value.length || (!value ? 0 : 1)) === parseInt(content)
-        case 'MATCH': return !!content && !!value && new RegExp(content).test(value)
-    }
-    return false
-}
-
-const dataTypeValid = (value, dataType, format) => {
-    if (!value) {
-        return true
-    }
-    switch(dataType) {
-        case 'int': return Number.isInteger(Number(value))
-        case 'decimal': return !Number.isNaN(Number(value))
-        case 'string': return typeof value === 'string'
-        case 'date':
-        case 'datetime':
-        case 'time':
-            return (format ? DateTime.fromFormat(value, format) : DateTime.fromISO(value)).toISO() !== null
-    }
-    return false
-}
-
-/**
- * 内部方法：根据验证规则对对象属性进行验证
- * @author dhc
- * @param {*} data 验证对象
- * @param {*} rules 验证规则列表
- * @returns 验证是否通过
- */
-const ruleValidation = (data, rules) => {
-    if (!rules || !Array.isArray(rules) || rules.length === 0) {
-        return true;
-    }
-    const rs = rules.filter(i => i.field)
-    for (let r of rs) {
-        const value = data[r.field]
-        if (r.required && !value) {
-            return false
-        }
-        if (value !== null && value !== undefined) {
-            if (r.dataType && !dataTypeValid(value, r.dataType, r.format)) {
-                return false
-            }
-            if (r.validType && !operatorValid(value, r.validType, r.content)) {
-                return false
-            }
-        }
-    }
-    return true
-}
-
-/**
- * 内部方法：验证条码解析结果
- * @author dhc
- * @param {*} param 请求参数
- * @param {*} results 请求结果
- * @returns {*} 验证结果，成功返回结果对象，失败返回null
- */
-const resolveActionResult = (param, results) => {
-    if (!Array.isArray(results) || results.length === 0) {
-        return null
-    }
-    for (let t of results) {
-        if (Array.isArray(t.resolvers) && t.resolvers.length > 0) {
-            for (let r of t.resolvers) {
-                if (r.clientHandle && r.clientScript && typeof r.clientScript === 'string') {
-                    try {
-                        const data = (new Function('$param', '$utils', r.clientScript))(param, barcodeUtils)
-                        if (data && ruleValidation(data, t.valids) && (!(r.validScript && typeof r.validScript === 'string') || (new Function('$param', '$utils', '$data', r.validScript))(param, barcodeUtils, data))) {
-                            return { code: t.code, name: t.name, type: t.bizType, data }
-                        }
-                    } catch (e) {
-                        console.log('客户端处理条码解析错误：' + r.handler, e)
-                    }
-                }
-            }
-        }
-        if (t.data) {
-            return { code: t.code, name: t.name, type: t.bizType, data: t.data }
-        }
-    }
-    return null
-}
-
-export default {
-    /**
-     * 条码解析
-     * @author dhc
-     * @param data {{
-     *   componentId: String,
-     *   barcode: String,
-     *   warehouseId: Number | null | undefined,
-     *   ownerId: Number | null | undefined,
-     *   args: Record<String, any> | null | undefined,
-     * }} 请求参数
-     *
-     * @returns {Promise<{
-     *   code: String,
-     *   name: String,
-     *   type: String,
-     *   data: any,
-     * }>}
-     */
-    resolver(data) {
-        return new Promise((resolve, reject) => {
-            return lwAxios.action({ url: "commonWmsBarcodeResolver", data }).then(actionResult => {
-                const result = resolveActionResult(data, actionResult)
-                if (result) {
-                    resolve(result)
-                } else {
-                    reject('解析失败')
-                }
-            }).catch(e => reject(e))
-        })
-    }
-}
+import lwAxios from "../../utils/Axios";
+import { DateTime } from 'luxon'
+
+// 条码工具
+const barcodeUtils = {
+    /**
+     *
+     * @param {string} barcode 条码
+     * @param {string} seperator 分隔符
+     * @param {string} fields 属性列表
+     * @returns 根据分隔符和属性解析的对象，解析失败返回null
+     */
+    split (barcode, seperator, fields) {
+        if (!barcode || !fields) {
+            return null
+        }
+        const values = typeof seperator === 'string' ? barcode.split(seperator) : [ barcode ]
+        const fs = Array.isArray(fields) ? fields : (typeof seperator === 'string' ? fields.split(seperator) : [ fields ])
+        if (fs.length === 0 || values.length !== fs.length) {
+            return null
+        }
+        const data = {}
+        for (let i in fs) {
+            data[fs[i]] = values[i]
+        }
+        return data
+    }
+}
+
+/**
+ * 内部方法：属性操作符验证
+ * @param {*} value 验证值
+ * @param {*} validType 验证类型
+ * @param {*} content 验证参数内容
+ * @returns 验证是否通过
+ */
+const operatorValid = (value, validType, content) => {
+    if (!value) {
+        return true
+    }
+    switch (validType) {
+        case 'EQ': return value == content
+        case 'NEQ': return value != content
+        case 'GT': return parseFloat(value) > parseFloat(content)
+        case 'GE': return parseFloat(value) >= parseFloat(content)
+        case 'LT': return parseFloat(value) < parseFloat(content)
+        case 'LE': return parseFloat(value) <= parseFloat(content)
+        case 'IN': return content && content.split(',').includes(value)
+        case 'NOTIN': return !content || !content.split(',').includes(value)
+        case 'LENGTH': return (value.length || (!value ? 0 : 1)) === parseInt(content)
+        case 'MATCH': return !!content && !!value && new RegExp(content).test(value)
+    }
+    return false
+}
+
+const dataTypeValid = (value, dataType, format) => {
+    if (!value) {
+        return true
+    }
+    switch(dataType) {
+        case 'int': return Number.isInteger(Number(value))
+        case 'decimal': return !Number.isNaN(Number(value))
+        case 'string': return typeof value === 'string'
+        case 'date':
+        case 'datetime':
+        case 'time':
+            return (format ? DateTime.fromFormat(value, format) : DateTime.fromISO(value)).toISO() !== null
+    }
+    return false
+}
+
+/**
+ * 内部方法：根据验证规则对对象属性进行验证
+ * @author dhc
+ * @param {*} data 验证对象
+ * @param {*} rules 验证规则列表
+ * @returns 验证是否通过
+ */
+const ruleValidation = (data, rules) => {
+    if (!rules || !Array.isArray(rules) || rules.length === 0) {
+        return true;
+    }
+    const rs = rules.filter(i => i.field)
+    for (let r of rs) {
+        const value = data[r.field]
+        if (r.required && !value) {
+            return false
+        }
+        if (value !== null && value !== undefined) {
+            if (r.dataType && !dataTypeValid(value, r.dataType, r.format)) {
+                return false
+            }
+            if (r.validType && !operatorValid(value, r.validType, r.content)) {
+                return false
+            }
+        }
+    }
+    return true
+}
+
+/**
+ * 内部方法：验证条码解析结果
+ * @author dhc
+ * @param {*} param 请求参数
+ * @param {*} results 请求结果
+ * @returns {*} 验证结果，成功返回结果对象，失败返回null
+ */
+const resolveActionResult = (param, results) => {
+    if (!Array.isArray(results) || results.length === 0) {
+        return null
+    }
+    for (let t of results) {
+        if (Array.isArray(t.resolvers) && t.resolvers.length > 0) {
+            for (let r of t.resolvers) {
+                if (r.clientHandle && r.clientScript && typeof r.clientScript === 'string') {
+                    try {
+                        const data = (new Function('$param', '$utils', r.clientScript))(param, barcodeUtils)
+                        if (data && ruleValidation(data, t.valids) && (!(r.validScript && typeof r.validScript === 'string') || (new Function('$param', '$utils', '$data', r.validScript))(param, barcodeUtils, data))) {
+                            return { code: t.code, name: t.name, type: t.bizType, data }
+                        }
+                    } catch (e) {
+                        console.log('客户端处理条码解析错误：' + r.handler, e)
+                    }
+                }
+            }
+        }
+        if (t.data) {
+            return { code: t.code, name: t.name, type: t.bizType, data: t.data }
+        }
+    }
+    return null
+}
+
+export default {
+    /**
+     * 条码解析
+     * @author dhc
+     * @param data {{
+     *   componentId: String,
+     *   barcode: String,
+     *   warehouseId: Number | null | undefined,
+     *   ownerId: Number | null | undefined,
+     *   args: Record<String, any> | null | undefined,
+     * }} 请求参数
+     *
+     * @returns {Promise<{
+     *   code: String,
+     *   name: String,
+     *   type: String,
+     *   data: any,
+     * }>}
+     */
+    resolver(data) {
+        return new Promise((resolve, reject) => {
+            return lwAxios.action({ url: "commonWmsBarcodeResolver", data }).then(actionResult => {
+                const result = resolveActionResult(data, actionResult)
+                if (result) {
+                    resolve(result)
+                } else {
+                    reject('解析失败')
+                }
+            }).catch(e => reject(e))
+        })
+    }
+}

package/src/api/common/common.js

@@ -1,33 +1,48 @@
-/*
-* 公共使用
-* @author: 张文
-* @date  2022-05-12
-* */
-
-import lwAxios from "../../utils/Axios";
-
-export const common = {
-
-  // 获取货主列表
-  getOwnerList(){
-    return lwAxios.action({
-      url: 'wmsMobileGetOwnerList',
-    })
-  },
-
-  // 根据零件号和货主查询零件信息
-  fromSkuAndOwnerGetSkuInfo(data){
-    return lwAxios.action({
-      url: 'wmsMobileQuerySku',
-      data
-    })
-  },
-
-  // 获取条码解析的规则
-  commonWmsLoadAllComponentConfig(data){
-    return lwAxios.action({
-      url: 'commonWmsLoadAllComponentConfig',
-      data
-    })
-  }
-}
+/*
+* 公共使用
+* @author: 张文
+* @date  2022-05-12
+* */
+
+import lwAxios from "../../utils/Axios";
+
+export const common = {
+
+  // 获取货主列表
+  getOwnerList(){
+    return lwAxios.action({
+      url: 'wmsMobileGetOwnerList',
+    })
+  },
+
+  // 根据商品号和货主查询商品信息
+  fromSkuAndOwnerGetSkuInfo(data){
+    return lwAxios.action({
+      url: 'wmsMobileQuerySku',
+      data
+    })
+  },
+
+  // 获取条码解析的规则
+  commonWmsLoadAllComponentConfig(data){
+    return lwAxios.action({
+      url: 'commonWmsLoadAllComponentConfig',
+      data
+    })
+  },
+
+  // 获取颜色配置
+  baseWmsLoadPdaClientConfig(){
+    return lwAxios.action({
+      url: 'baseWmsLoadPdaClientConfig'
+    })
+  },
+
+  // 没有条码解析数据时获取
+  commonWmsLoadAndInitComponentConfig(data){
+    return lwAxios.action({
+      url: 'commonWmsLoadAndInitComponentConfig',
+      data
+    })
+  }
+}

package/src/api/config/masterLocation/masterLocationConfig/action.js

@@ -0,0 +1,61 @@
+/*
+* 新品配置 - 起始页
+* @author: 杨震天
+* @date  2022-06-28
+* */
+
+
+
+import lwAxios from "../../../../utils/Axios";
+
+
+
+
+// 查找主库位配置详情
+export function WmsProjectMobileQuerySkuLocationConfigInfo(data){
+    return lwAxios.action({
+        url:'wmsProjectMobileQuerySkuLocationConfigInfo',
+        data
+    })
+}
+
+// 计算主库位
+export function WmsProjectMobileCalculateSkuMasterLocation(data){
+    return lwAxios.action({
+        url:'wmsProjectMobileCalculateSkuMasterLocation',
+        data
+    })
+}
+
+// 确认主库位
+export function WmsProjectMobileConfirmSkuMasterLocationConfirm(data){
+    return lwAxios.action({
+        url:'wmsProjectMobileConfirmSkuMasterLocationConfirm',
+        data
+    })
+}
+
+// 查询共享/溢出 库区
+export function WmsProjectMobileQueryStorageZone(data){
+    return lwAxios.action({
+        url:'wmsProjectMobileQueryStorageZone',
+        data
+    })
+}
+
+// 通过商品编码查询主库位
+export function WmsProjectMobileQuerySkuLocationConfigBySkuCode(data){
+    return lwAxios.action({
+        url:'wmsProjectMobileQuerySkuLocationConfigBySkuCode',
+        data
+    })
+}
+
+// 通过库位编码查询主库位
+export function WmsProjectMobileQuerySkuLocationConfigByLocationCode(data){
+    return lwAxios.action({
+        url:'wmsProjectMobileQuerySkuLocationConfigByLocationCode',
+        data
+    })
+}
+

package/src/api/config/masterLocation/masterLocationConfig/index.js

@@ -0,0 +1,18 @@
+/*
+* 新品配置 - 起始页
+* @author: 杨震天
+* @date  2022-06-28
+* */
+
+
+
+import lwAxios from "../../../../utils/Axios";
+
+
+// 查找商品货主
+export function WmsProjectMobileSkuLocationConfigGetOwnerOfSku(data){
+    return lwAxios.action({
+        url:'wmsProjectMobileSkuLocationConfigGetOwnerOfSku',
+        data
+    })
+}

package/src/api/config/masterLocation/masterLocationQuery/action.js

@@ -0,0 +1,28 @@
+/*
+* 新品配置 - 起始页
+* @author: 杨震天
+* @date  2022-06-28
+* */
+
+
+
+import lwAxios from "../../../../utils/Axios";
+
+
+
+
+// 商品编码查询主库位
+export function WmsProjectMobileQuerySkuLocationConfigBySkuCode(data){
+    return lwAxios.action({
+        url:'wmsProjectMobileQuerySkuLocationConfigBySkuCode',
+        data
+    })
+}
+
+// 库位编码查询主库位
+export function WmsProjectMobileQuerySkuLocationConfigByLocationCode(data){
+    return lwAxios.action({
+        url:'wmsProjectMobileQuerySkuLocationConfigByLocationCode',
+        data
+    })
+}

package/src/api/{inner → config}/newProject/action.js

@@ -44,7 +44,7 @@ export function WmsProjectMobileQueryContainerStandard(data){
     })
 }
 
-// 保存零件信息
+// 保存商品信息
 export function WmsProjectMobileSaveSkuBaseInfo(data){
     return lwAxios.action({
         url:'wmsProjectMobileSaveSkuBaseInfo',