The open source simple and complete warehouse management system is derived from our many years of experience in implementing erp projects. We stripped the original commercial system wms function and opened it up for free, hoping to help the majority of small and medium-sized enterprises. At present, the system supports cross-platform。
fix(global): fix null val
809388027d1825744e1d8
diff --git a/frontend/src/api/wms/stockAsn.ts b/frontend/src/api/wms/stockAsn.tsindex 4795486..049fe5c 100644--- a/frontend/src/api/wms/stockAsn.ts+++ b/frontend/src/api/wms/stockAsn.ts@@ -124,6 +124,14 @@ export const deleteAsn = (id: number) => http({}})+export const deleteAsnByID = (id: number) => http({+ url: '/asn/asnmaster',+ method: 'delete',+ params: {+ id+ }+ })+export const confirmAsn = (id: number) => http({url: `/asn/confirm/${ id }`,method: 'put'diff --git a/frontend/src/utils/dataVerification/formRule.ts b/frontend/src/utils/dataVerification/formRule.tsindex ad3cf27..69c1bfd 100644--- a/frontend/src/utils/dataVerification/formRule.ts+++ b/frontend/src/utils/dataVerification/formRule.ts@@ -87,8 +87,8 @@ export function IsDecimal(// Judge string lengthexport function StringLength(value: string, min: number, max: number) {- if (value.length < min || value.length > max) {+ if (value && (value.length < min || value.length > max)) {return `${ i18n.global.t('system.checkText.lengthValid') }${ min }-${ max }`}return ''-}\ No newline at end of file+}diff --git a/frontend/src/view/base/commodityCategorySetting/add-or-update-category.vue b/frontend/src/view/base/commodityCategorySetting/add-or-update-category.vueindex 254f0f1..246e448 100644--- a/frontend/src/view/base/commodityCategorySetting/add-or-update-category.vue+++ b/frontend/src/view/base/commodityCategorySetting/add-or-update-category.vue@@ -39,6 +39,7 @@ import i18n from '@/languages/i18n'import { hookComponent } from '@/components/system/index'import { addCategory, updateCategory, getCategoryAll } from '@/api/base/commodityCategorySetting'import { StringLength } from '@/utils/dataVerification/formRule'+import { removeObjectNull } from '@/utils/common'const formRef = ref()const emit = defineEmits(['close', 'saveSuccess'])@@ -101,7 +102,8 @@ const method = reactive({submit: async () => {const { valid } = await formRef.value.validate()if (valid) {- const { data: res } = dialogTitle.value === 'add' ? await addCategory(data.form) : await updateCategory(data.form)+ const form = removeObjectNull(data.form)+ const { data: res } = dialogTitle.value === 'add' ? await addCategory(form) : await updateCategory(form)if (!res.isSuccess) {hookComponent.$message({type: 'error',diff --git a/frontend/src/view/base/commodityManagement/add-or-update-commodity.vue b/frontend/src/view/base/commodityManagement/add-or-update-commodity.vueindex 86bc0e6..c8efea5 100644--- a/frontend/src/view/base/commodityManagement/add-or-update-commodity.vue+++ b/frontend/src/view/base/commodityManagement/add-or-update-commodity.vue@@ -242,7 +242,7 @@ import { CategoryVO } from '@/types/Base/CommodityCategorySetting'import { SupplierVO } from '@/types/Base/Supplier'import { computedSelectTableSearchHeight, SYSTEM_HEIGHT, errorColor } from '@/constant/style'import tooltipBtn from '@/components/tooltip-btn.vue'-import { removeArrayNull } from '@/utils/common'+import { removeArrayNull, removeObjectNull } from '@/utils/common'import { StringLength } from '@/utils/dataVerification/formRule'import { isDecimal } from '@/utils/dataVerification/tableRule'import { exportData } from '@/utils/exportTable'@@ -562,7 +562,7 @@ const method = reactive({})return}- const form = { ...data.form }+ let form = { ...data.form }const insertRecords = $table.getInsertRecords()form.detailList = []// Processing detailed data@@ -577,6 +577,8 @@ const method = reactive({form.detailList.push(item)}}++ form = removeObjectNull(form)form.detailList = removeArrayNull(form.detailList)const { data: res } = dialogTitle.value === 'add' ? await addSpu(form) : await updateSpu(form)if (!res.isSuccess) {diff --git a/frontend/src/view/base/companySetting/add-or-update-company.vue b/frontend/src/view/base/companySetting/add-or-update-company.vueindex 80fc453..ed99e24 100644--- a/frontend/src/view/base/companySetting/add-or-update-company.vue+++ b/frontend/src/view/base/companySetting/add-or-update-company.vue@@ -48,6 +48,7 @@ import i18n from '@/languages/i18n'import { hookComponent } from '@/components/system/index'import { addCompany, updateCompany } from '@/api/base/companySetting'import { StringLength } from '@/utils/dataVerification/formRule'+import { removeObjectNull } from '@/utils/common'const formRef = ref()const emit = defineEmits(['close', 'saveSuccess'])@@ -94,7 +95,8 @@ const method = reactive({submit: async () => {const { valid } = await formRef.value.validate()if (valid) {- const { data: res } = dialogTitle.value === 'add' ? await addCompany(data.form) : await updateCompany(data.form)+ const form = removeObjectNull(data.form)+ const { data: res } = dialogTitle.value === 'add' ? await addCompany(form) : await updateCompany(form)if (!res.isSuccess) {hookComponent.$message({type: 'error',diff --git a/frontend/src/view/base/customer/add-or-update-customer.vue b/frontend/src/view/base/customer/add-or-update-customer.vueindex 2348fd2..0ed291b 100644--- a/frontend/src/view/base/customer/add-or-update-customer.vue+++ b/frontend/src/view/base/customer/add-or-update-customer.vue@@ -56,6 +56,7 @@ import i18n from '@/languages/i18n'import { hookComponent } from '@/components/system/index'import { addCustomer, updateCustomer } from '@/api/base/customer'import hprintDialog from '@/components/hiprint/hiprintFast.vue'+import { removeObjectNull } from '@/utils/common'const formRef = ref()const hprintDialogRef = ref()@@ -104,7 +105,8 @@ const method = reactive({submit: async () => {const { valid } = await formRef.value.validate()if (valid) {- const { data: res } = dialogTitle.value === 'add' ? await addCustomer(data.form) : await updateCustomer(data.form)+ const form = removeObjectNull(data.form)+ const { data: res } = dialogTitle.value === 'add' ? await addCustomer(form) : await updateCustomer(form)if (!res.isSuccess) {hookComponent.$message({type: 'error',diff --git a/frontend/src/view/base/freightSetting/add-or-update-freight.vue b/frontend/src/view/base/freightSetting/add-or-update-freight.vueindex c4bbe1c..fb26e0b 100644--- a/frontend/src/view/base/freightSetting/add-or-update-freight.vue+++ b/frontend/src/view/base/freightSetting/add-or-update-freight.vue@@ -66,6 +66,7 @@ import { hookComponent } from '@/components/system/index'import { addFreight, updateFreight } from '@/api/base/freightSetting'import { FreightVO } from '@/types/Base/Freight'import { StringLength, IsDecimal } from '@/utils/dataVerification/formRule'+import { removeObjectNull } from '@/utils/common'const formRef = ref()const emit = defineEmits(['close', 'saveSuccess'])@@ -134,7 +135,8 @@ const method = reactive({submit: async () => {const { valid } = await formRef.value.validate()if (valid) {- const { data: res } = dialogTitle.value === 'add' ? await addFreight(data.form) : await updateFreight(data.form)+ const form = removeObjectNull(data.form)+ const { data: res } = dialogTitle.value === 'add' ? await addFreight(form) : await updateFreight(form)if (!res.isSuccess) {hookComponent.$message({type: 'error',diff --git a/frontend/src/view/base/ownerOfCargo/add-or-update-owner-of-cargo.vue b/frontend/src/view/base/ownerOfCargo/add-or-update-owner-of-cargo.vueindex bd05ba5..df665a6 100644--- a/frontend/src/view/base/ownerOfCargo/add-or-update-owner-of-cargo.vue+++ b/frontend/src/view/base/ownerOfCargo/add-or-update-owner-of-cargo.vue@@ -48,6 +48,7 @@ import i18n from '@/languages/i18n'import { hookComponent } from '@/components/system/index'import { addOwnerOfCargo, updateOwnerOfCargo } from '@/api/base/ownerOfCargo'import { StringLength } from '@/utils/dataVerification/formRule'+import { removeObjectNull } from '@/utils/common'const formRef = ref()const emit = defineEmits(['close', 'saveSuccess'])@@ -94,7 +95,8 @@ const method = reactive({submit: async () => {const { valid } = await formRef.value.validate()if (valid) {- const { data: res } = dialogTitle.value === 'add' ? await addOwnerOfCargo(data.form) : await updateOwnerOfCargo(data.form)+ const form = removeObjectNull(data.form)+ const { data: res } = dialogTitle.value === 'add' ? await addOwnerOfCargo(form) : await updateOwnerOfCargo(form)if (!res.isSuccess) {hookComponent.$message({type: 'error',diff --git a/frontend/src/view/base/roleMenu/add-or-update-role-menu.vue b/frontend/src/view/base/roleMenu/add-or-update-role-menu.vueindex b5acf22..1f257ae 100644--- a/frontend/src/view/base/roleMenu/add-or-update-role-menu.vue+++ b/frontend/src/view/base/roleMenu/add-or-update-role-menu.vue@@ -52,6 +52,7 @@ import { addRoleMenu, getMenus, updateRoleMenu } from '@/api/base/roleMenu'import { getUserRoleAll } from '@/api/base/userRoleSetting'import { MenuItem } from '@/types/System/Store'import { actionDict } from './actionList'+import { removeObjectNull } from '@/utils/common'const formRef = ref()const emit = defineEmits(['close', 'saveSuccess'])@@ -179,7 +180,7 @@ const method = reactive({}const { valid } = await formRef.value.validate()if (valid) {- const form = { ...data.form }+ let form = { ...data.form }form.detailList = form.detailList.map((item: RoleMenuDetailVo) => {if (!item.id || item.id === 0) {@@ -190,6 +191,8 @@ const method = reactive({return item})+ form = removeObjectNull(form)+const { data: res } = data.dialogTitle === 'add'? await addRoleMenu(form): await updateRoleMenu({diff --git a/frontend/src/view/base/supplier/add-or-update-supplier.vue b/frontend/src/view/base/supplier/add-or-update-supplier.vueindex da9ad91..2f969e2 100644--- a/frontend/src/view/base/supplier/add-or-update-supplier.vue+++ b/frontend/src/view/base/supplier/add-or-update-supplier.vue@@ -48,6 +48,7 @@ import { SupplierVO } from '@/types/Base/Supplier'import i18n from '@/languages/i18n'import { hookComponent } from '@/components/system/index'import { addSupplier, updateSupplier } from '@/api/base/supplier'+import { removeObjectNull } from '@/utils/common'const formRef = ref()const emit = defineEmits(['close', 'saveSuccess'])@@ -95,7 +96,8 @@ const method = reactive({submit: async () => {const { valid } = await formRef.value.validate()if (valid) {- const { data: res } = dialogTitle.value === 'add' ? await addSupplier(data.form) : await updateSupplier(data.form)+ const form = removeObjectNull(data.form)+ const { data: res } = dialogTitle.value === 'add' ? await addSupplier(form) : await updateSupplier(form)if (!res.isSuccess) {hookComponent.$message({type: 'error',diff --git a/frontend/src/view/base/userManagement/add-or-update-user.vue b/frontend/src/view/base/userManagement/add-or-update-user.vueindex 98d51b1..315470e 100644--- a/frontend/src/view/base/userManagement/add-or-update-user.vue+++ b/frontend/src/view/base/userManagement/add-or-update-user.vue@@ -65,6 +65,7 @@ import i18n from '@/languages/i18n'import { hookComponent } from '@/components/system/index'import { addUser, updateUser, getSelectItem } from '@/api/base/userManagement'import { StringLength } from '@/utils/dataVerification/formRule'+import { removeObjectNull } from '@/utils/common'const formRef = ref()const emit = defineEmits(['close', 'saveSuccess'])@@ -149,7 +150,8 @@ const method = reactive({submit: async () => {const { valid } = await formRef.value.validate()if (valid) {- const { data: res } = dialogTitle.value === 'add' ? await addUser(data.form) : await updateUser(data.form)+ const form = removeObjectNull(data.form)+ const { data: res } = dialogTitle.value === 'add' ? await addUser(form) : await updateUser(form)if (!res.isSuccess) {hookComponent.$message({type: 'error',diff --git a/frontend/src/view/base/userRoleSetting/add-or-update-user-role.vue b/frontend/src/view/base/userRoleSetting/add-or-update-user-role.vueindex 3528b71..97a7022 100644--- a/frontend/src/view/base/userRoleSetting/add-or-update-user-role.vue+++ b/frontend/src/view/base/userRoleSetting/add-or-update-user-role.vue@@ -35,6 +35,7 @@ import i18n from '@/languages/i18n'import { hookComponent } from '@/components/system/index'import { addUserRole, updateUserRole } from '@/api/base/userRoleSetting'import { StringLength } from '@/utils/dataVerification/formRule'+import { removeObjectNull } from '@/utils/common'const formRef = ref()const emit = defineEmits(['close', 'saveSuccess'])@@ -75,7 +76,8 @@ const method = reactive({submit: async () => {const { valid } = await formRef.value.validate()if (valid) {- const { data: res } = dialogTitle.value === 'add' ? await addUserRole(data.form) : await updateUserRole(data.form)+ const form = removeObjectNull(data.form)+ const { data: res } = dialogTitle.value === 'add' ? await addUserRole(form) : await updateUserRole(form)if (!res.isSuccess) {hookComponent.$message({type: 'error',diff --git a/frontend/src/view/base/warehouseSetting/add-or-update-location.vue b/frontend/src/view/base/warehouseSetting/add-or-update-location.vueindex 692cfb1..29864e7 100644--- a/frontend/src/view/base/warehouseSetting/add-or-update-location.vue+++ b/frontend/src/view/base/warehouseSetting/add-or-update-location.vue@@ -133,6 +133,7 @@ import { addGoodsLocation, updateGoodsLocation, getWarehouseSelect, getWarehouseimport { GoodsLocationVO, AreaProperty } from '@/types/Base/Warehouse'import i18n from '@/languages/i18n'import { StringLength, IsDecimal } from '@/utils/dataVerification/formRule'+import { removeObjectNull } from '@/utils/common'const formRef = ref()const emit = defineEmits(['close', 'saveSuccess'])@@ -319,7 +320,8 @@ const method = reactive({submit: async () => {const { valid } = await formRef.value.validate()if (valid) {- const { data: res } = dialogTitle.value === 'add' ? await addGoodsLocation(data.form) : await updateGoodsLocation(data.form)+ const form = removeObjectNull(data.form)+ const { data: res } = dialogTitle.value === 'add' ? await addGoodsLocation(form) : await updateGoodsLocation(form)if (!res.isSuccess) {hookComponent.$message({type: 'error',diff --git a/frontend/src/view/base/warehouseSetting/add-or-update-reservoir.vue b/frontend/src/view/base/warehouseSetting/add-or-update-reservoir.vueindex 8635238..b61178c 100644--- a/frontend/src/view/base/warehouseSetting/add-or-update-reservoir.vue+++ b/frontend/src/view/base/warehouseSetting/add-or-update-reservoir.vue@@ -58,6 +58,7 @@ import { hookComponent } from '@/components/system/index'import { addWarehouseArea, updateWarehouseArea, getWarehouseSelect } from '@/api/base/warehouseSetting'import { WarehouseAreaVO, AreaProperty } from '@/types/Base/Warehouse'import { StringLength } from '@/utils/dataVerification/formRule'+import { removeObjectNull } from '@/utils/common'const formRef = ref()const emit = defineEmits(['close', 'saveSuccess'])@@ -171,7 +172,8 @@ const method = reactive({submit: async () => {const { valid } = await formRef.value.validate()if (valid) {- const { data: res } = dialogTitle.value === 'add' ? await addWarehouseArea(data.form) : await updateWarehouseArea(data.form)+ const form = removeObjectNull(data.form)+ const { data: res } = dialogTitle.value === 'add' ? await addWarehouseArea(form) : await updateWarehouseArea(form)if (!res.isSuccess) {hookComponent.$message({type: 'error',diff --git a/frontend/src/view/base/warehouseSetting/add-or-update-warehouse.vue b/frontend/src/view/base/warehouseSetting/add-or-update-warehouse.vueindex fa5c25b..420c7dc 100644--- a/frontend/src/view/base/warehouseSetting/add-or-update-warehouse.vue+++ b/frontend/src/view/base/warehouseSetting/add-or-update-warehouse.vue@@ -72,6 +72,7 @@ import { hookComponent } from '@/components/system/index'import { addWarehouse, updateWarehouse } from '@/api/base/warehouseSetting'import { WarehouseVO } from '@/types/Base/Warehouse'import { StringLength } from '@/utils/dataVerification/formRule'+import { removeObjectNull } from '@/utils/common'const formRef = ref()const emit = defineEmits(['close', 'saveSuccess'])@@ -131,7 +132,8 @@ const method = reactive({submit: async () => {const { valid } = await formRef.value.validate()if (valid) {- const { data: res } = dialogTitle.value === 'add' ? await addWarehouse(data.form) : await updateWarehouse(data.form)+ const form = removeObjectNull(data.form)+ const { data: res } = dialogTitle.value === 'add' ? await addWarehouse(form) : await updateWarehouse(form)if (!res.isSuccess) {hookComponent.$message({type: 'error',diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/add-or-update-shipment.vue b/frontend/src/view/deliveryManagement/deliveryManagement/add-or-update-shipment.vueindex 631d2cb..6cd3b3e 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/add-or-update-shipment.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/add-or-update-shipment.vue@@ -118,6 +118,7 @@ import skuSelect from '@/components/select/sku-select.vue'import { CommodityDetailJoinMainVO } from '@/types/Base/CommodityManagement'import { IsInteger } from '@/utils/dataVerification/formRule'import customFilterSelect from '@/components/custom-filter-select.vue'+import { removeObjectNull } from '@/utils/common'const formRef = ref()const emit = defineEmits(['close', 'saveSuccess'])@@ -272,10 +273,11 @@ const method = reactive({const { valid } = await formRef.value.validate()if (valid) {const reqList: addRequestVO[] = []- for (const item of data.form.detailList) {+ const form = removeObjectNull(data.form)+ for (const item of form.detailList) {reqList.push({- customer_id: data.form.customer_id ? data.form.customer_id : 0,- customer_name: data.form.customer_name ? data.form.customer_name : '',+ customer_id: form.customer_id ? form.customer_id : 0,+ customer_name: form.customer_name ? form.customer_name : '',qty: item.qty,sku_id: item.sku_id ? item.sku_id : 0})diff --git a/frontend/src/view/wms/stockAsn/add-or-update-notice.vue b/frontend/src/view/wms/stockAsn/add-or-update-notice.vueindex a90f03b..7f5bef4 100644--- a/frontend/src/view/wms/stockAsn/add-or-update-notice.vue+++ b/frontend/src/view/wms/stockAsn/add-or-update-notice.vue@@ -89,6 +89,7 @@ import { addAsn, updateAsn } from '@/api/wms/stockAsn'import { getSupplierAll } from '@/api/base/supplier'import { getOwnerOfCargoAll } from '@/api/base/ownerOfCargo'import skuSelect from '@/components/select/sku-select.vue'+import { removeObjectNull } from '@/utils/common'const formRef = ref()const emit = defineEmits(['close', 'saveSuccess'])@@ -204,7 +205,8 @@ const method = reactive({submit: async () => {const { valid } = await formRef.value.validate()if (valid) {- const { data: res } = dialogTitle.value === 'add' ? await addAsn(data.form) : await updateAsn(data.form)+ const form = removeObjectNull(data.form)+ const { data: res } = dialogTitle.value === 'add' ? await addAsn(form) : await updateAsn(form)if (!res.isSuccess) {hookComponent.$message({type: 'error',diff --git a/frontend/src/view/wms/stockAsn/new-add-or-update-notice.vue b/frontend/src/view/wms/stockAsn/new-add-or-update-notice.vueindex 24024c0..96ff0fc 100644--- a/frontend/src/view/wms/stockAsn/new-add-or-update-notice.vue+++ b/frontend/src/view/wms/stockAsn/new-add-or-update-notice.vue@@ -165,6 +165,7 @@ import { getOwnerOfCargoAll } from '@/api/base/ownerOfCargo'import { checkDetailRepeatGetBool } from '@/utils/dataVerification/page'import { formatDate } from '@/utils/format/formatSystem'import customFilterSelect from '@/components/custom-filter-select.vue'+import { removeObjectNull } from '@/utils/common'const formRef = ref()const emit = defineEmits(['close', 'saveSuccess'])@@ -355,9 +356,10 @@ const method = reactive({}const { valid } = await formRef.value.validate()if (valid) {- const { data: res } = data.form.id && data.form.id > 0- ? await updateAsnNew({ ...data.form, detailList: [...data.form.detailList, ...data.removeDetailList] })- : await addAsnNew(data.form)+ const form = removeObjectNull(data.form)+ const { data: res } = form.id && form.id > 0+ ? await updateAsnNew({ ...form, detailList: [...form.detailList, ...data.removeDetailList] })+ : await addAsnNew(form)if (!res.isSuccess) {hookComponent.$message({type: 'error',diff --git a/frontend/src/view/wms/stockAsn/tabNotice.vue b/frontend/src/view/wms/stockAsn/tabNotice.vueindex a2a2ce0..3baa8e4 100644--- a/frontend/src/view/wms/stockAsn/tabNotice.vue+++ b/frontend/src/view/wms/stockAsn/tabNotice.vue@@ -125,7 +125,7 @@ import { hookComponent } from '@/components/system'import { DEBOUNCE_TIME } from '@/constant/system'import { setSearchObject, getMenuAuthorityList } from '@/utils/common'import { SearchObject, btnGroupItem } from '@/types/System/Form'-import { listNew as getStockAsnList, deleteAsn } from '@/api/wms/stockAsn'+import { listNew as getStockAsnList, deleteAsnByID } from '@/api/wms/stockAsn'import tooltipBtn from '@/components/tooltip-btn.vue'import i18n from '@/languages/i18n'import addOrUpdateNotice from './new-add-or-update-notice.vue'@@ -238,7 +238,7 @@ const method = reactive({content: i18n.global.t('system.tips.beforeDeleteMessage'),handleConfirm: async () => {if (row.id) {- const { data: res } = await deleteAsn(row.id)+ const { data: res } = await deleteAsnByID(row.id)if (!res.isSuccess) {// 2023-12-06 Add automatic refresh of expired dataif (httpCodeJudge(res.errorMessage)) {