diff --git a/src/api/wms/plansetting/index.ts b/src/api/wms/plansetting/index.ts
new file mode 100644
index 000000000..28b3df1ee
--- /dev/null
+++ b/src/api/wms/plansetting/index.ts
@@ -0,0 +1,57 @@
+import request from '@/config/axios'
+
+export interface PlansettingVO {
+ id: number
+ code: string
+ requestMode: string
+ autoCommit: string
+ autoAgree: string
+ autoExecute: string
+ directCreateRecord: string
+ available: string
+ activeTime: Date
+ expireTime: Date
+ remark: string
+ concurrencyStamp: number
+}
+
+// 查询计划设置列表
+export const getPlansettingPage = async (params) => {
+ if (params.isSearch) {
+ delete params.isSearch
+ const data = {...params}
+ return await request.post({ url: '/wms/plansetting/senior', data })
+ } else {
+ return await request.get({ url: `/wms/plansetting/page`, params })
+ }
+}
+
+// 查询计划设置详情
+export const getPlansetting = async (id: number) => {
+ return await request.get({ url: `/wms/plansetting/get?id=` + id })
+}
+
+// 新增计划设置
+export const createPlansetting = async (data: PlansettingVO) => {
+ return await request.post({ url: `/wms/plansetting/create`, data })
+}
+
+// 修改计划设置
+export const updatePlansetting = async (data: PlansettingVO) => {
+ return await request.put({ url: `/wms/plansetting/update`, data })
+}
+
+// 删除计划设置
+export const deletePlansetting = async (id: number) => {
+ return await request.delete({ url: `/wms/plansetting/delete?id=` + id })
+}
+
+// 导出计划设置 Excel
+export const exportPlansetting = async (params) => {
+ return await request.download({ url: `/wms/plansetting/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+ return request.download({ url: '/wms/plansetting/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 060b1bb1b..1418edfc1 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -273,4 +273,5 @@ export enum DICT_TYPE {
BIND_TYPE = 'bind_type', // 器具绑定类型
CONTAINER_STATUS = 'container_status', // 容器状态
PREDICT_TIME_TYPE = 'predict_time_type', // 预测时间类型
+ PACK_UNIT_TYPE = 'pack_unit_type', // 包装规格类型
}
diff --git a/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue b/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue
new file mode 100644
index 000000000..db0555ea9
--- /dev/null
+++ b/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue
@@ -0,0 +1,242 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.code }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/documentSetting/plansetting/plansetting.data.ts b/src/views/wms/basicDataManage/documentSetting/plansetting/plansetting.data.ts
new file mode 100644
index 000000000..88e08994d
--- /dev/null
+++ b/src/views/wms/basicDataManage/documentSetting/plansetting/plansetting.data.ts
@@ -0,0 +1,259 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 计划设置
+ */
+export const Plansetting = useCrudSchemas(reactive([
+ {
+ label: '代码',
+ field: 'code',
+ sort: 'custom',
+ table: {
+ width: 180,
+ fixed: 'left'
+ },
+ isSearch: true,
+ form: {
+ componentProps: {
+ disabled: true
+ }
+ }
+ },
+ {
+ label: '申请模式',
+ field: 'requestMode',
+ dictType: DICT_TYPE.REQEUST_MODE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled: true
+ }
+ }
+ },
+ {
+ label: '自动提交',
+ field: 'autoCommit',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
+ },
+ },
+ {
+ label: '自动通过',
+ field: 'autoAgree',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
+ },
+ },
+ {
+ label: '自动执行',
+ field: 'autoExecute',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
+ },
+ },
+ {
+ label: '跳过任务生成记录',
+ field: 'directCreateRecord',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
+ },
+ },
+ {
+ label: '是否可用',
+ field: 'available',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
+ },
+ isTable: false,
+ isForm: false
+ },
+ {
+ label: '生效时间',
+ field: 'activeTime',
+ isTable: true,
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: {width:'100%'},
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x',
+ }
+ },
+ },
+ {
+ label: '失效时间',
+ field: 'expireTime',
+ isTable: true,
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: {width:'100%'},
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x',
+ }
+ },
+ },
+ {
+ label: '创建时间',
+ field: 'createTime',
+ formatter: dateFormatter,
+ isTable: false,
+ isForm: false,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: {width:'100%'},
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x',
+ }
+ },
+ },
+ {
+ label: '备注',
+ field: 'remark',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isSearch: true,
+ },
+ {
+ label: '创建者',
+ field: 'creator',
+ isTable: false,
+ isForm: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '操作',
+ field: 'action',
+ isDetail: false,
+ isForm: false ,
+ table: {
+ width: 150,
+ fixed: 'right'
+ }
+ }
+]))
+
+//表单校验
+export const PlansettingRules = reactive({
+ code: [
+ { required: true, message: '请输入代码', trigger: 'blur' },
+ { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+ ],
+ requestMode: [
+ { required: true, message: '请选择申请模式', trigger: 'change' }
+ ],
+ autoCommit: [
+ { required: true, message: '请选择是否自动提交', trigger: 'change' }
+ ],
+ autoAgree: [
+ { required: true, message: '请选择是否自动通过', trigger: 'change' }
+ ],
+ autoExecute: [
+ { required: true, message: '请选择是否自动执行', trigger: 'change' }
+ ],
+ directCreateRecord: [
+ { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+ ],
+ remark: [
+ { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+ ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
index 1ba659561..61633f20b 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
@@ -132,47 +132,6 @@ export const Supplieritem = useCrudSchemas(reactive([
}
},
},
- {
- label: '供应商替代包装单位',
- field: 'altPackUnit',
- dictType: DICT_TYPE.PACK_UNIT,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 180
- }
- },
- {
- label: '供应商替代包装量',
- field: 'altPackQty',
- sort: 'custom',
- table: {
- width: 170
- },
- form: {
- component: 'InputNumber',
- componentProps: {
- min: 0,
- precision: 6
- }
- },
- },
- {
- label: '每器具包装数',
- field: 'packQtyOfContainer',
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'InputNumber',
- componentProps: {
- min: 0,
- precision: 6
- }
- },
- },
{
label: '默认收货仓库',
field: 'defaultWarehouseCode',
diff --git a/src/views/wms/inventoryManage/balance/balance.data.ts b/src/views/wms/inventoryManage/balance/balance.data.ts
index 428cd540e..13b27264d 100644
--- a/src/views/wms/inventoryManage/balance/balance.data.ts
+++ b/src/views/wms/inventoryManage/balance/balance.data.ts
@@ -62,6 +62,33 @@ export const Balance = useCrudSchemas(reactive([
width: 150
},
},
+ {
+ label: '库区类型',
+ field: 'areaType',
+ sort: 'custom',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isTable: true,
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '包装规格',
+ field: 'packUnit',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '包装数量',
+ field: 'packQty',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
{
label: '库位代码',
field: 'locationCode',
diff --git a/src/views/wms/inventoryManage/package/package.data.ts b/src/views/wms/inventoryManage/package/package.data.ts
index 1f6f169fc..ea1b83ac7 100644
--- a/src/views/wms/inventoryManage/package/package.data.ts
+++ b/src/views/wms/inventoryManage/package/package.data.ts
@@ -68,6 +68,14 @@ export const Package = useCrudSchemas(reactive([
width: 150,
},
},
+ {
+ label: '器具号',
+ field: 'containerNumber',
+ sort: 'custom',
+ table: {
+ width: 150,
+ },
+ },
{
label: '生产日期',
field: 'produceDate',
diff --git a/src/views/wms/inventoryManage/transaction/transaction.data.ts b/src/views/wms/inventoryManage/transaction/transaction.data.ts
index cf934cf7a..0e6c6f9da 100644
--- a/src/views/wms/inventoryManage/transaction/transaction.data.ts
+++ b/src/views/wms/inventoryManage/transaction/transaction.data.ts
@@ -88,6 +88,33 @@ export const Transaction = useCrudSchemas(reactive([
width: 150
},
},
+ {
+ label: '库区类型',
+ field: 'areaType',
+ sort: 'custom',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isTable: true,
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '包装规格',
+ field: 'packUnit',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '包装数量',
+ field: 'packQty',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
{
label: '单价',
field: 'singlePrice',