From 8944412929ca57bf921d4dd12f419778bd6cce62 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 14 5月 2025 16:19:05 +0800
Subject: [PATCH] 任务管理高级查询
---
Weben_CMS专用代码生成器/Code/File/GenerateCodeConfigParamFiles/任务管理配置.txt | 14 +
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/GetWmsTaskInput.cs | 44 +++--
HIAWms/hiawms_web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.tsx | 62 ++++++
HIAWms/hiawms_web/src/widgets/WmsTask/Views/Pages/Dialog/WmsTaskQueryDrawer/WmsTaskQueryDrawer.tsx | 8
HIAWms/hiawms_web/src/widgets/WmsTask/Controllers/WmsTaskQueryDrawer.tsx | 349 +++++++++++++++++++++++++++++++++----------
5 files changed, 365 insertions(+), 112 deletions(-)
diff --git a/HIAWms/hiawms_web/src/widgets/WmsTask/Controllers/WmsTaskQueryDrawer.tsx b/HIAWms/hiawms_web/src/widgets/WmsTask/Controllers/WmsTaskQueryDrawer.tsx
index ba0127f..6bdecb8 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsTask/Controllers/WmsTaskQueryDrawer.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsTask/Controllers/WmsTaskQueryDrawer.tsx
@@ -14,6 +14,13 @@
import isEqual from 'lodash/isEqual'
import { ConfirmBox } from '@/components/ConfirmBox/ConfirmBox'
import { cloneDeep } from 'lodash'
+// 寮曞叆鍏叡閫夐」閰嶇疆
+import {
+ FILTER_MODE_OPTIONS_STRING,
+ FILTER_MODE_OPTIONS_NUM,
+ FILTER_MODE_OPTIONS_BOOL,
+} from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions'
+import { BOOLEAN_OPTIONS } from '@/utils/commonOptionConstants'
export const useWmsTaskQueryDrawer = (props: any, ctx?: any) => {
const wmsTaskDrawer = injectModel<WmsTaskDrawer>('WmsTaskDrawer')
@@ -75,7 +82,7 @@
},
})
/**
- * 娣诲姞鐨刦orm瀛楁
+ * 楂樼骇鏌ヨ鐨刦orm瀛楁
*/
const formItems = reactive([
{
@@ -84,13 +91,27 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ヤ换鍔″彿',
+ highSelectAttrs: {
+ prop: 'taskNo_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
},
{
label: '浠诲姟绫诲瀷',
prop: 'taskType',
el: 'select',
+ clearable: true,
+ option: [],
//disabled: disabled,
placeholder: '璇疯緭鍏ヤ换鍔＄被鍨�',
+ highSelectAttrs: {
+ prop: 'taskType_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_BOOL,
+ },
},
{
label: '浠诲姟绛夌骇',
@@ -107,13 +128,27 @@
precision: 0,
//disabled: disabled,
placeholder: '璇疯緭鍏ヤ换鍔＄瓑绾�',
+ highSelectAttrs: {
+ prop: 'taskLevel_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_NUM,
+ },
},
{
label: '浠诲姟鐘舵��',
prop: 'taskStatus',
el: 'select',
+ clearable: true,
+ option: [],
//disabled: disabled,
placeholder: '璇疯緭鍏ヤ换鍔＄姸鎬�',
+ highSelectAttrs: {
+ prop: 'taskStatus_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_BOOL,
+ },
},
{
label: '鎵樼洏缂栧彿',
@@ -121,6 +156,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ユ墭鐩樼紪鍙�',
+ highSelectAttrs: {
+ prop: 'containerNo_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
},
{
label: '璧峰搴撲綅',
@@ -128,6 +169,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ヨ捣濮嬪簱浣�',
+ highSelectAttrs: {
+ prop: 'sourcePlace_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
},
{
label: '鐩爣搴撲綅',
@@ -135,6 +182,34 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ョ洰鏍囧簱浣�',
+ highSelectAttrs: {
+ prop: 'toPlace_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
+ },
+ {
+ label: 'PLC浠诲姟鍙�',
+ prop: 'plcTaskId',
+ el: (props: any, { attrs }: SetupContext) => {
+ return h(inputNumber, {
+ ...props,
+ clearable: true,
+ ...attrs,
+ })
+ },
+ width: '100%',
+ step: 1,
+ precision: 0,
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏�',
+ highSelectAttrs: {
+ prop: 'plcTaskId_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_NUM,
+ },
},
{
label: '宸烽亾',
@@ -151,6 +226,12 @@
precision: 0,
//disabled: disabled,
placeholder: '璇疯緭鍏ュ贩閬�',
+ highSelectAttrs: {
+ prop: 'aisle_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_NUM,
+ },
},
{
label: '鍫嗗灈鏈篒D',
@@ -167,38 +248,42 @@
precision: 0,
//disabled: disabled,
placeholder: '璇疯緭鍏ュ爢鍨涙満ID',
+ highSelectAttrs: {
+ prop: 'dodeviceId_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_NUM,
+ },
},
{
label: '璁惧绫诲瀷',
prop: 'dodevicetype',
- el: (props: any, { attrs }: SetupContext) => {
- return h(inputNumber, {
- ...props,
- clearable: true,
- ...attrs,
- })
- },
- width: '100%',
- step: 1,
- precision: 0,
+ el: 'select',
+ clearable: true,
+ option: [],
//disabled: disabled,
placeholder: '璇疯緭鍏ヨ澶囩被鍨�',
+ highSelectAttrs: {
+ prop: 'dodevicetype_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_BOOL,
+ },
},
{
label: '璁惧浠诲姟鐘舵��',
prop: 'taskDodeviceStatus',
- el: (props: any, { attrs }: SetupContext) => {
- return h(inputNumber, {
- ...props,
- clearable: true,
- ...attrs,
- })
- },
- width: '100%',
- step: 1,
- precision: 0,
+ el: 'select',
+ clearable: true,
+ option: [],
//disabled: disabled,
placeholder: '璇疯緭鍏ヨ澶囦换鍔＄姸鎬�',
+ highSelectAttrs: {
+ prop: 'taskDodeviceStatus_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_BOOL,
+ },
},
{
label: 'WCS鏄惁鍙互璇诲彇',
@@ -206,17 +291,29 @@
el: 'select',
//disabled: disabled,
placeholder: '璇疯緭鍏CS鏄惁鍙互璇诲彇',
- options: [
- { label: '鏄�', value: 'true' },
- { label: '鍚�', value: 'false' },
- ],
+ clearable: true,
+ options: BOOLEAN_OPTIONS,
+ highSelectAttrs: {
+ prop: 'isRead_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_BOOL,
+ },
},
{
label: '瀛愪换鍔＄被鍨�',
prop: 'sonTaskType',
el: 'select',
+ clearable: true,
+ option: [],
//disabled: disabled,
placeholder: '璇疯緭鍏ュ瓙浠诲姟绫诲瀷',
+ highSelectAttrs: {
+ prop: 'sonTaskType_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_BOOL,
+ },
},
{
label: '鏉ユ簮鍗曟嵁鍙�',
@@ -224,59 +321,73 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ユ潵婧愬崟鎹彿',
+ highSelectAttrs: {
+ prop: 'sourceOrderNo_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
},
{
label: '涓嬩釜浠诲姟鏄惁鐢熸垚',
prop: 'isNextTask',
- // el: (props: any, { attrs }: SetupContext) => {
- // return h(inputNumber, {
- // ...props,
- // clearable: true,
- // ...attrs,
- // })
- // },
- el: 'select',
- options: [
- { label: '鏄�', value: 1 },
- { label: '鍚�', value: 0 },
- ],
+ el: (props: any, { attrs }: SetupContext) => {
+ return h(inputNumber, {
+ ...props,
+ clearable: true,
+ ...attrs,
+ })
+ },
width: '100%',
step: 1,
precision: 0,
//disabled: disabled,
placeholder: '璇疯緭鍏ヤ笅涓换鍔℃槸鍚︾敓鎴�',
+ highSelectAttrs: {
+ prop: 'isNextTask_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_NUM,
+ },
},
- // {
- // label: '鍙彉鍙橀噺1',
- // prop: 'mutableParam1',
- // el: 'input',
- // //disabled: disabled,
- // placeholder: '璇疯緭鍏ュ彲鍙樺彉閲�1',
- // },
- // {
- // label: '鍙彉鍙橀噺2',
- // prop: 'mutableParam2',
- // el: 'input',
- // //disabled: disabled,
- // placeholder: '璇疯緭鍏ュ彲鍙樺彉閲�2',
- // },
+ {
+ label: '鍨嬪彿',
+ prop: 'mutableParam1',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ュ瀷鍙�',
+ highSelectAttrs: {
+ prop: 'mutableParam1_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
+ },
+ {
+ label: '鍘熸枡鏍囪瘑',
+ prop: 'mutableParam2',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ュ師鏂欐爣璇�',
+ highSelectAttrs: {
+ prop: 'mutableParam2_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options: FILTER_MODE_OPTIONS_STRING,
+ },
+ },
// {
// label: '鍙彉鍙橀噺3',
// prop: 'mutableParam3',
// el: 'input',
// //disabled: disabled,
// placeholder: '璇疯緭鍏ュ彲鍙樺彉閲�3',
- // },
- // {
- // label: '鏄惁绂佺敤',
- // prop: 'isDisabled',
- // el: 'select',
- // //disabled: disabled,
- // placeholder: '璇疯緭鍏ユ槸鍚︾鐢�',
- // options: [
- // { label: '鏄�', value: 'true' },
- // { label: '鍚�', value: 'false' },
- // ],
+ // highSelectAttrs: {
+ // prop: 'mutableParam3_FilterMode',
+ // el: 'select',
+ // placeholder: '璇烽�夋嫨',
+ // options: FILTER_MODE_OPTIONS_STRING,
+ // },
// },
{
label: '鍒涘缓鏃堕棿',
@@ -290,8 +401,24 @@
},
width: '100%',
//disabled: disabled,
- placeholder: '璇疯緭鍏�',
+ placeholder: '璇疯緭鍏ュ垱寤烘椂闂�',
+ isDateControl: true, // 鏄惧紡鏍囪涓烘棩鏈熸帶浠�
},
+ // {
+ // label: '',
+ // prop: 'lastModificationTime',
+ // el: (props: any, { attrs }: SetupContext) => {
+ // return h(dateTimePickerRange, {
+ // ...props,
+ // clearable: true,
+ // ...attrs,
+ // })
+ // },
+ // width: '100%',
+ // //disabled: disabled,
+ // placeholder: '璇疯緭鍏�',
+ // isDateControl: true, // 鏄惧紡鏍囪涓烘棩鏈熸帶浠�
+ // },
])
/**
* 鏍￠獙鏄惁鏈夋暟鎹彉鍖�
@@ -306,25 +433,46 @@
const commonGetFormData = () => {
const data = {
taskNo: formData.value.taskNo || '',
+ taskNo_FilterMode: formData.value.taskNo_FilterMode || '',
taskType: formData.value.taskType || '',
+ taskType_FilterMode: formData.value.taskType_FilterMode || '',
taskLevel: formData.value.taskLevel || '',
+ taskLevel_FilterMode: formData.value.taskLevel_FilterMode || '',
taskStatus: formData.value.taskStatus || '',
+ taskStatus_FilterMode: formData.value.taskStatus_FilterMode || '',
containerNo: formData.value.containerNo || '',
+ containerNo_FilterMode: formData.value.containerNo_FilterMode || '',
sourcePlace: formData.value.sourcePlace || '',
+ sourcePlace_FilterMode: formData.value.sourcePlace_FilterMode || '',
toPlace: formData.value.toPlace || '',
+ toPlace_FilterMode: formData.value.toPlace_FilterMode || '',
+ plcTaskId: formData.value.plcTaskId || '',
+ plcTaskId_FilterMode: formData.value.plcTaskId_FilterMode || '',
aisle: formData.value.aisle || '',
+ aisle_FilterMode: formData.value.aisle_FilterMode || '',
dodeviceId: formData.value.dodeviceId || '',
+ dodeviceId_FilterMode: formData.value.dodeviceId_FilterMode || '',
dodevicetype: formData.value.dodevicetype || '',
+ dodevicetype_FilterMode: formData.value.dodevicetype_FilterMode || '',
taskDodeviceStatus: formData.value.taskDodeviceStatus || '',
+ taskDodeviceStatus_FilterMode:
+ formData.value.taskDodeviceStatus_FilterMode || '',
isRead: formData.value.isRead || '',
+ isRead_FilterMode: formData.value.isRead_FilterMode || '',
sonTaskType: formData.value.sonTaskType || '',
+ sonTaskType_FilterMode: formData.value.sonTaskType_FilterMode || '',
sourceOrderNo: formData.value.sourceOrderNo || '',
+ sourceOrderNo_FilterMode: formData.value.sourceOrderNo_FilterMode || '',
isNextTask: formData.value.isNextTask || '',
+ isNextTask_FilterMode: formData.value.isNextTask_FilterMode || '',
mutableParam1: formData.value.mutableParam1 || '',
+ mutableParam1_FilterMode: formData.value.mutableParam1_FilterMode || '',
mutableParam2: formData.value.mutableParam2 || '',
+ mutableParam2_FilterMode: formData.value.mutableParam2_FilterMode || '',
mutableParam3: formData.value.mutableParam3 || '',
- isDisabled: formData.value.isDisabled || '',
+ mutableParam3_FilterMode: formData.value.mutableParam3_FilterMode || '',
creationTime: formData.value.creationTime || '',
+ lastModificationTime: formData.value.lastModificationTime || '',
}
return data
}
@@ -343,28 +491,56 @@
ctx.emit('confirmQuery', data)
}
/**
+ * 閲嶇疆鍏叡select鏌ヨ
+ */
+ const onResetForHighSelect = async () => {
+ formData.value.taskNo_FilterMode = 1
+ formData.value.taskType_FilterMode = 2
+ formData.value.taskLevel_FilterMode = 2
+ formData.value.taskStatus_FilterMode = 2
+ formData.value.containerNo_FilterMode = 1
+ formData.value.sourcePlace_FilterMode = 1
+ formData.value.toPlace_FilterMode = 1
+ formData.value.plcTaskId_FilterMode = 2
+ formData.value.aisle_FilterMode = 2
+ formData.value.dodeviceId_FilterMode = 2
+ formData.value.dodevicetype_FilterMode = 2
+ formData.value.taskDodeviceStatus_FilterMode = 2
+ formData.value.isRead_FilterMode = 2
+ formData.value.sonTaskType_FilterMode = 2
+ formData.value.sourceOrderNo_FilterMode = 1
+ formData.value.isNextTask_FilterMode = 2
+ formData.value.mutableParam1_FilterMode = 1
+ formData.value.mutableParam2_FilterMode = 1
+ formData.value.mutableParam3_FilterMode = 1
+ }
+ /**
* 閲嶇疆鏌ヨ
*/
const onReset = async () => {
formData.value = {}
- formData.value.TaskNo = ''
- formData.value.TaskType = ''
- formData.value.TaskLevel = ''
- formData.value.TaskStatus = ''
- formData.value.ContainerNo = ''
- formData.value.SourcePlace = ''
- formData.value.ToPlace = ''
- formData.value.Aisle = ''
- formData.value.DodeviceId = ''
- formData.value.Dodevicetype = ''
- formData.value.TaskDodeviceStatus = ''
- formData.value.IsRead = ''
- formData.value.SonTaskType = ''
- formData.value.SourceOrderNo = ''
- formData.value.IsNextTask = ''
- formData.value.MutableParam1 = ''
- formData.value.MutableParam2 = ''
- formData.value.MutableParam3 = ''
+ onResetForHighSelect() //閲嶇疆鍏叡select鏌ヨ
+ formData.value.taskNo = ''
+ formData.value.taskType = ''
+ formData.value.taskLevel = ''
+ formData.value.taskStatus = ''
+ formData.value.containerNo = ''
+ formData.value.sourcePlace = ''
+ formData.value.toPlace = ''
+ formData.value.plcTaskId = ''
+ formData.value.aisle = ''
+ formData.value.dodeviceId = ''
+ formData.value.dodevicetype = ''
+ formData.value.taskDodeviceStatus = ''
+ formData.value.isRead = ''
+ formData.value.sonTaskType = ''
+ formData.value.sourceOrderNo = ''
+ formData.value.isNextTask = ''
+ formData.value.mutableParam1 = ''
+ formData.value.mutableParam2 = ''
+ formData.value.mutableParam3 = ''
+ formData.value.creationTime = ''
+ formData.value.lastModificationTime = ''
//鍚戠埗缁勪欢鍙戦�佽嚜瀹氫箟浜嬩欢
ctx.emit('restQuery')
}
@@ -397,12 +573,21 @@
EnumName: 'WmsTaskStatus',
})
updateFormItemOptions('taskStatus', wmsTaskStatusEnum)
+ const dodevicetypeEnumEnum = await wmsTaskDrawer.getWmsEnumData({
+ EnumName: 'DodevicetypeEnum',
+ })
+ updateFormItemOptions('dodevicetype', dodevicetypeEnumEnum)
+ const taskDodeviceStatusEnum = await wmsTaskDrawer.getWmsEnumData({
+ EnumName: 'TaskDodeviceStatus',
+ })
+ updateFormItemOptions('taskDodeviceStatus', taskDodeviceStatusEnum)
const sonTaskTypeEnumEnum = await wmsTaskDrawer.getWmsEnumData({
EnumName: 'SonTaskTypeEnum',
})
updateFormItemOptions('sonTaskType', sonTaskTypeEnumEnum)
}
commonQueryEnumForFrom()
+ onResetForHighSelect() //閲嶇疆鍏叡select鏌ヨ
/**
* 寮圭獥鎵撳紑鑾峰彇璇︽儏
*/
diff --git a/HIAWms/hiawms_web/src/widgets/WmsTask/Views/Pages/Dialog/WmsTaskQueryDrawer/WmsTaskQueryDrawer.tsx b/HIAWms/hiawms_web/src/widgets/WmsTask/Views/Pages/Dialog/WmsTaskQueryDrawer/WmsTaskQueryDrawer.tsx
index c297537..3583983 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsTask/Views/Pages/Dialog/WmsTaskQueryDrawer/WmsTaskQueryDrawer.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsTask/Views/Pages/Dialog/WmsTaskQueryDrawer/WmsTaskQueryDrawer.tsx
@@ -5,7 +5,7 @@
import BaseQueryDrawer from '@/components/BaseQueryDrawer/BaseQueryDrawer'
import styles from './WmsTaskQueryDrawer.module.scss'
import { useWmsTaskQueryDrawer } from '../../../../Controllers/WmsTaskQueryDrawer.tsx'
-import DyForm from '@/components/DyForm/DyForm'
+import DyFormForHighQuery from '@/components/DyFormForHighQuery/DyFormForHighQuery'
// @ts-ignore
export default defineComponent<{
@@ -59,12 +59,12 @@
before-close={onClose}
onClose={onClose}
>
- <DyForm
+ <DyFormForHighQuery
ref={formRef}
formData={formData.value}
- labelWidth="150px"
+ labelWidth="140px"
formItemProps={formItems}
- ></DyForm>
+ ></DyFormForHighQuery>
</BaseQueryDrawer>
)
},
diff --git a/HIAWms/hiawms_web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.tsx b/HIAWms/hiawms_web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.tsx
index e62dc46..be3f592 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.tsx
@@ -22,6 +22,7 @@
ElFormItem,
} from 'element-plus'
import { injectModel } from '@/libs/Provider/Provider'
+import { FILTER_MODE_OPTIONS_STRING } from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions'
interface RenderTableType {
url?: string
@@ -69,15 +70,19 @@
const queryForm = ref({
searchVal: '',
str_searchFormInputAttrs: [],
+ searchVal_FilterMode: '',
})
//瀹氫箟鏁翠綋妯＄硦鏌ヨ鐨勫垪鏁扮粍(娉ㄦ剰锛氬繀椤诲ぇ灏忓啓璺熷悗绔殑瀹炰綋绫诲睘鎬у悕涓�鑷达紝鍚﹀垯浼氬鑷村尮閰嶄笉瀵圭殑闂)
- const _searchFormInputAttrs = ref(['TaskNo', 'ContainerNo'])
- const searchFormInputAttrs_Placeholder = ref('璇疯緭鍏ヤ换鍔＄紪鐮�/鎵樼洏缂栫爜')
+ const _searchFormInputAttrs = ref(['taskNo', 'SourcePlace', 'ToPlace'])
+ const searchFormInputAttrs_Placeholder =
+ ref('璇疯緭鍏ヤ换鍔″彿/璧峰搴撲綅鍙�/鐩爣搴撲綅鍙�')
// 鍔ㄦ�佹灇涓鹃�夐」
const enumOptions = reactive({
taskType: [] as Array<{ label: string; value: any }>,
taskStatus: [] as Array<{ label: string; value: any }>,
+ dodevicetype: [] as Array<{ label: string; value: any }>,
+ taskDodeviceStatus: [] as Array<{ label: string; value: any }>,
sonTaskType: [] as Array<{ label: string; value: any }>,
})
@@ -98,6 +103,20 @@
label: item.description,
value: item.value,
}))
+ const dodevicetypeEnumData = await getWmsEnumData({
+ EnumName: 'DodevicetypeEnum',
+ })
+ enumOptions.dodevicetype = dodevicetypeEnumData.map((item) => ({
+ label: item.description,
+ value: item.value,
+ }))
+ const taskDodeviceStatusData = await getWmsEnumData({
+ EnumName: 'TaskDodeviceStatus',
+ })
+ enumOptions.taskDodeviceStatus = taskDodeviceStatusData.map((item) => ({
+ label: item.description,
+ value: item.value,
+ }))
const sonTaskTypeEnumData = await getWmsEnumData({
EnumName: 'SonTaskTypeEnum',
})
@@ -110,19 +129,28 @@
}
}
- // 缁勪欢鎸傝浇鏃惰幏鍙栨灇涓炬暟鎹�
- onMounted(() => {
- fetchEnumData()
- })
-
// 瀹氫箟鍝嶅簲寮忔煡璇㈡暟鎹�
const _curHighQueryData = ref({
searchVal: '',
str_searchFormInputAttrs: [],
+ searchVal_FilterMode: '',
})
+ // 缁勪欢鎸傝浇鏃惰幏鍙栨灇涓炬暟鎹�
+ onMounted(() => {
+ fetchEnumData()
+ queryForm.value.searchVal_FilterMode =
+ FILTER_MODE_OPTIONS_STRING[0]?.value || ''
+ _curHighQueryData.value.searchVal_FilterMode =
+ queryForm.value.searchVal_FilterMode
+ _curHighQueryData.value.str_searchFormInputAttrs =
+ _searchFormInputAttrs.value
+ })
+
// 鏂扮増鐨勬煡璇㈡柟娉曪紙涓婚〉闈腑鐨勬寜閽�愭煡璇€�戯級
const handleQueryForMain = async () => {
_curHighQueryData.value.searchVal = queryForm.value.searchVal
+ _curHighQueryData.value.searchVal_FilterMode =
+ queryForm.value.searchVal_FilterMode
_curHighQueryData.value.str_searchFormInputAttrs =
_searchFormInputAttrs.value
tableRef.value.getList(_curHighQueryData.value)
@@ -136,6 +164,8 @@
// 鏂扮増鐨勬煡璇㈤噸缃�
const resetQuery = () => {
queryForm.value.searchVal = ''
+ queryForm.value.searchVal_FilterMode =
+ FILTER_MODE_OPTIONS_STRING[0]?.value || ''
queryForm.value.str_searchFormInputAttrs = _searchFormInputAttrs.value
}
//鏂扮増鐨勫鍑烘柟娉�
@@ -153,6 +183,8 @@
const commonSaveCurHighQueryData = (filteredData = {}) => {
_curHighQueryData.value = { ..._curHighQueryData.value, ...filteredData }
_curHighQueryData.value.searchVal = queryForm.value.searchVal
+ _curHighQueryData.value.searchVal_FilterMode =
+ queryForm.value.searchVal_FilterMode
_curHighQueryData.value.str_searchFormInputAttrs =
_searchFormInputAttrs.value
}
@@ -167,6 +199,7 @@
)
//缁勫悎妯＄硦鏌ヨ
filteredData.searchVal = queryForm.value.searchVal
+ filteredData.searchVal_FilterMode = queryForm.value.searchVal_FilterMode
filteredData.str_searchFormInputAttrs = _searchFormInputAttrs.value
return filteredData
}
@@ -328,6 +361,21 @@
class={styles.formItem}
/>
</ElFormItem>
+ <ElFormItem label="" style="width:100px;">
+ <ElSelect
+ v-model={queryForm.value.searchVal_FilterMode}
+ placeholder="璇烽�夋嫨"
+ class={styles.formItem}
+ >
+ {FILTER_MODE_OPTIONS_STRING.map((option) => (
+ <ElOption
+ key={option.value}
+ label={option.label}
+ value={option.value}
+ />
+ ))}
+ </ElSelect>
+ </ElFormItem>
<IconButton
type="primary"
icon="search"
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/GetWmsTaskInput.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/GetWmsTaskInput.cs
index 973d40a..6ed6df2 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/GetWmsTaskInput.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/GetWmsTaskInput.cs
@@ -1,10 +1,11 @@
+using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using CmsQueryExtensions.Extension;
using Volo.Abp.Application.Dtos;
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsTask;
/// <summary>
-/// Wms浠诲姟绠＄悊鏌ヨ鍙傛暟
+/// 浠诲姟绠＄悊鏌ヨ鍙傛暟
/// </summary>
public class GetWmsTaskInput : ExtensiblePagedAndSortedResultRequestDto
{
@@ -48,20 +49,15 @@
/// </summary>
public string TaskNo { get; set; }
- /// <summary>
- /// PLC浠诲姟鍙�
- /// </summary>
- public int PlcTaskId { get; set; }
-
- /// <summary>
- /// 浠诲姟鍙�-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum TaskNo_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+ /// <summary>
+ /// 浠诲姟鍙�-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum TaskNo_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
/// <summary>
/// 浠诲姟绫诲瀷
/// </summary>
- public int? TaskType { get; set; }
+ public TaskTypeEnum? TaskType { get; set; }
/// <summary>
/// 浠诲姟绫诲瀷-鏌ヨ鍏崇郴杩愮畻绗�
@@ -81,7 +77,7 @@
/// <summary>
/// 浠诲姟鐘舵��
/// </summary>
- public int? TaskStatus { get; set; }
+ public WmsTaskStatus? TaskStatus { get; set; }
/// <summary>
/// 浠诲姟鐘舵��-鏌ヨ鍏崇郴杩愮畻绗�
@@ -119,6 +115,16 @@
public SearchFilterModeEnum ToPlace_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
/// <summary>
+ ///
+ /// </summary>
+ public int? PlcTaskId { get; set; }
+
+ /// <summary>
+ /// -鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum PlcTaskId_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+ /// <summary>
/// 宸烽亾
/// </summary>
public int? Aisle { get; set; }
@@ -141,7 +147,7 @@
/// <summary>
/// 璁惧绫诲瀷
/// </summary>
- public int? Dodevicetype { get; set; }
+ public DodevicetypeEnum? Dodevicetype { get; set; }
/// <summary>
/// 璁惧绫诲瀷-鏌ヨ鍏崇郴杩愮畻绗�
@@ -151,7 +157,7 @@
/// <summary>
/// 璁惧浠诲姟鐘舵��
/// </summary>
- public int? TaskDodeviceStatus { get; set; }
+ public TaskDodeviceStatus? TaskDodeviceStatus { get; set; }
/// <summary>
/// 璁惧浠诲姟鐘舵��-鏌ヨ鍏崇郴杩愮畻绗�
@@ -171,7 +177,7 @@
/// <summary>
/// 瀛愪换鍔＄被鍨�
/// </summary>
- public int? SonTaskType { get; set; }
+ public SonTaskTypeEnum? SonTaskType { get; set; }
/// <summary>
/// 瀛愪换鍔＄被鍨�-鏌ヨ鍏崇郴杩愮畻绗�
@@ -249,11 +255,11 @@
public SearchFilterModeEnum IsDisabled_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
/// <summary>
- ///
+ /// 鍒涘缓鏃堕棿
/// </summary>
//琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
[HighSearchRangeAttribute]
- public List<string> CreationTime { get; set; }
+ public string CreationTime { get; set; }
/// <summary>
@@ -271,7 +277,7 @@
/// </summary>
//琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
[HighSearchRangeAttribute]
- public List<string> LastModificationTime { get; set; }
+ public string LastModificationTime { get; set; }
/// <summary>
@@ -309,7 +315,7 @@
/// </summary>
//琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
[HighSearchRangeAttribute]
- public List<string> DeletionTime { get; set; }
+ public string DeletionTime { get; set; }
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/File/GenerateCodeConfigParamFiles/\344\273\273\345\212\241\347\256\241\347\220\206\351\205\215\347\275\256.txt" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/File/GenerateCodeConfigParamFiles/\344\273\273\345\212\241\347\256\241\347\220\206\351\205\215\347\275\256.txt"
new file mode 100644
index 0000000..cd7955a
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/File/GenerateCodeConfigParamFiles/\344\273\273\345\212\241\347\256\241\347\220\206\351\205\215\347\275\256.txt"
@@ -0,0 +1,14 @@
+[琛ㄥ悕]:scms_wmstasks
+[瀹炰綋绫诲悕]:WmsTask
+[瀹炰綋绫诲璞″悕]:WmsTask
+[椤甸潰鑿滃崟鍚峕:浠诲姟绠＄悊
+[椤甸潰鑿滃崟瀵硅薄缂╁啓]:wmsTask
+[琛ㄧ殑涓枃娉ㄨВ]:浠诲姟绠＄悊
+[閲嶅鎬ф牎楠屽瓧娈礭:taskNo
+[鍒犻櫎鎻愮ず瀛楁]:taskNo
+[妯＄硦鏌ヨ瀛楁]:'taskNo','SourcePlace','ToPlace'
+[妯＄硦鏌ヨ瀛楁鍚峕:璇疯緭鍏ヤ换鍔″彿/璧峰搴撲綅鍙�/鐩爣搴撲綅鍙�
+[椤圭洰鍛藉悕绌洪棿]:HIAWms
+[鏋氫妇绫诲瀷瀛楁闆嗗悎]:TaskType,TaskTypeEnum&TaskStatus,WmsTaskStatus&Dodevicetype,DodevicetypeEnum&TaskDodeviceStatus,TaskDodeviceStatus&SonTaskType,SonTaskTypeEnum
+[鍓嶇鏍规枃浠跺す鍚嶇О]:web
+[鎺掑簭]:CreationTime
\ No newline at end of file
--
Gitblit v1.9.3