From 3a4b2114c4bb687ccbc09b585b7d650f94e16979 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周一, 19 5月 2025 18:03:27 +0800
Subject: [PATCH] 单据记录高级查询

---
 HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Views/Pages/Dialog/WmsInOutStockOrderQueryDrawer/WmsInOutStockOrderQueryDrawer.tsx                   |  142 +-
 Weben_CMS专用代码生成器/Code/File/GenerateCodeConfigParamFiles/出库单据.txt                                                                                      |   14 
 HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Views/Pages/WmsInOutStockOrder/WmsInOutStockOrder.tsx                                                |  119 +-
 HIAWms/hiawms_web/src/widgets/WmsInOutStockRecord/Views/Pages/Dialog/WmsInOutStockRecordQueryDrawer/WmsInOutStockRecordQueryDrawer.tsx                |    8 
 HIAWms/hiawms_web/src/widgets/WmsInOutStockOrderDetail/Views/Pages/WmsInOutStockOrderDetail/WmsInOutStockOrderDetail.tsx                              |   76 +
 Weben_CMS专用代码生成器/Code/File/GenerateCodeConfigParamFiles/出入库单据详情.txt                                                                                   |   14 
 HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Controllers/WmsInOutStockOrderQueryDrawer.tsx                                                        |  234 ++++-
 HIAWms/hiawms_web/src/widgets/WmsInOutStockOrderDetail/Views/Pages/Dialog/WmsInOutStockOrderDetailQueryDrawer/WmsInOutStockOrderDetailQueryDrawer.tsx |  142 +-
 /dev/null                                                                                                                                             |   14 
 HIAWms/hiawms_web/src/widgets/WmsInOutStockOrderDetail/Controllers/WmsInOutStockOrderDetailQueryDrawer.tsx                                            |  153 +++
 HIAWms/hiawms_web/src/widgets/WmsInOutStockRecord/Views/Pages/WmsInOutStockRecord/WmsInOutStockRecord.tsx                                             |   79 +
 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockOrderDetail/GetWmsInOutStockOrderDetailInput.cs                           |  336 ++++----
 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/GetWmsInOutStockRecordInput.cs                                     |  382 +++++----
 HIAWms/hiawms_web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordQueryDrawer.tsx                                                      |   93 +-
 Weben_CMS专用代码生成器/Code/File/GenerateCodeConfigParamFiles/出入库记录.txt                                                                                     |   14 
 HIAWms/hiawms_web/src/widgets/WmsInOutStockOrderDetail/Views/Pages/WmsInOutStockOrderDetail/Config.ts                                                 |    8 
 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockOrder/GetWmsInOutStockOrderInput.cs                                       |  416 +++++-----
 17 files changed, 1,310 insertions(+), 934 deletions(-)

diff --git a/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Controllers/WmsInOutStockOrderQueryDrawer.tsx b/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Controllers/WmsInOutStockOrderQueryDrawer.tsx
index 8ffb0d0..3b06328 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Controllers/WmsInOutStockOrderQueryDrawer.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Controllers/WmsInOutStockOrderQueryDrawer.tsx
@@ -14,9 +14,16 @@
 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 useWmsInOutStockOrderQueryDrawer = (props: any, ctx?: any) => {
-  const wmsInOutStockOrderDrawer = injectModel<WmsInOutStockOrderDrawer>(
+  const WmsInOutStockOrderDrawer = injectModel<WmsInOutStockOrderDrawer>(
     'WmsInOutStockOrderDrawer'
   )
   /**
@@ -77,7 +84,7 @@
     },
   })
   /**
-   * 娣诲姞鐨刦orm瀛楁
+   * 楂樼骇鏌ヨ鐨刦orm瀛楁
    */
   const formItems = reactive([
     {
@@ -86,13 +93,57 @@
       el: 'input',
       //disabled: disabled,
       placeholder: '璇疯緭鍏ュ崟鎹紪鍙�',
+      highSelectAttrs: {
+        prop: 'orderNo_FilterMode',
+        el: 'select',
+        placeholder: '璇烽�夋嫨',
+        options: FILTER_MODE_OPTIONS_STRING,
+      },
     },
     {
       label: '鍗曟嵁鐘舵��',
       prop: 'orderStatus',
       el: 'select',
+      clearable: true,
+      option: [],
       //disabled: disabled,
       placeholder: '璇疯緭鍏ュ崟鎹姸鎬�',
+      highSelectAttrs: {
+        prop: 'orderStatus_FilterMode',
+        el: 'select',
+        placeholder: '璇烽�夋嫨',
+        options: FILTER_MODE_OPTIONS_BOOL,
+      },
+    },
+    {
+      label: '鍗曟嵁绫诲瀷',
+      prop: 'orderType',
+      el: 'select',
+      clearable: true,
+      option: [],
+      //disabled: disabled,
+      placeholder: '璇疯緭鍏ュ崟鎹被鍨�',
+      highSelectAttrs: {
+        prop: 'orderType_FilterMode',
+        el: 'select',
+        placeholder: '璇烽�夋嫨',
+        options: FILTER_MODE_OPTIONS_BOOL,
+      },
+    },
+    {
+      label: '鎿嶄綔绫诲瀷',
+      prop: 'stockType',
+      el: 'select',
+      clearable: true,
+      option: [],
+      //disabled: disabled,
+      placeholder: '璇疯緭鍏ユ搷浣滅被鍨�',
+      highSelectAttrs: {
+        prop: 'stockType_FilterMode',
+        el: 'select',
+        placeholder: '璇烽�夋嫨',
+        options: FILTER_MODE_OPTIONS_BOOL,
+      },
     },
     {
       label: '鐗╂枡鍚嶇О',
@@ -100,6 +151,12 @@
       el: 'input',
       //disabled: disabled,
       placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�',
+      highSelectAttrs: {
+        prop: 'materialName_FilterMode',
+        el: 'select',
+        placeholder: '璇烽�夋嫨',
+        options: FILTER_MODE_OPTIONS_STRING,
+      },
     },
     {
       label: '鐗╂枡浠跺彿',
@@ -107,6 +164,12 @@
       el: 'input',
       //disabled: disabled,
       placeholder: '璇疯緭鍏ョ墿鏂欎欢鍙�',
+      highSelectAttrs: {
+        prop: 'materialNo_FilterMode',
+        el: 'select',
+        placeholder: '璇烽�夋嫨',
+        options: FILTER_MODE_OPTIONS_STRING,
+      },
     },
     {
       label: '鍨嬪彿',
@@ -114,6 +177,12 @@
       el: 'input',
       //disabled: disabled,
       placeholder: '璇疯緭鍏ュ瀷鍙�',
+      highSelectAttrs: {
+        prop: 'materialModel_FilterMode',
+        el: 'select',
+        placeholder: '璇烽�夋嫨',
+        options: FILTER_MODE_OPTIONS_STRING,
+      },
     },
     {
       label: '鎵规鍙�',
@@ -121,20 +190,12 @@
       el: 'input',
       //disabled: disabled,
       placeholder: '璇疯緭鍏ユ壒娆″彿',
-    },
-    {
-      label: '鍗曟嵁绫诲瀷',
-      prop: 'orderType',
-      el: 'select',
-      //disabled: disabled,
-      placeholder: '璇疯緭鍏ュ崟鎹被鍨�',
-    },
-    {
-      label: '鎿嶄綔绫诲瀷',
-      prop: 'stockType',
-      el: 'select',
-      //disabled: disabled,
-      placeholder: '璇疯緭鍏ユ搷浣滅被鍨�',
+      highSelectAttrs: {
+        prop: 'materialBatch_FilterMode',
+        el: 'select',
+        placeholder: '璇烽�夋嫨',
+        options: FILTER_MODE_OPTIONS_STRING,
+      },
     },
     {
       label: '鍗曟嵁鏁伴噺',
@@ -151,6 +212,12 @@
       precision: 0,
       //disabled: disabled,
       placeholder: '璇疯緭鍏ュ崟鎹暟閲�',
+      highSelectAttrs: {
+        prop: 'materialNumber_FilterMode',
+        el: 'select',
+        placeholder: '璇烽�夋嫨',
+        options: FILTER_MODE_OPTIONS_NUM,
+      },
     },
     {
       label: '涓嬪彂鏁伴噺',
@@ -167,6 +234,12 @@
       precision: 0,
       //disabled: disabled,
       placeholder: '璇疯緭鍏ヤ笅鍙戞暟閲�',
+      highSelectAttrs: {
+        prop: 'distributeNumber_FilterMode',
+        el: 'select',
+        placeholder: '璇烽�夋嫨',
+        options: FILTER_MODE_OPTIONS_NUM,
+      },
     },
     {
       label: '瀹屾垚鏁伴噺',
@@ -183,6 +256,12 @@
       precision: 0,
       //disabled: disabled,
       placeholder: '璇疯緭鍏ュ畬鎴愭暟閲�',
+      highSelectAttrs: {
+        prop: 'completeNumber_FilterMode',
+        el: 'select',
+        placeholder: '璇烽�夋嫨',
+        options: FILTER_MODE_OPTIONS_NUM,
+      },
     },
     {
       label: '浼樺厛绾�',
@@ -199,6 +278,12 @@
       precision: 0,
       //disabled: disabled,
       placeholder: '璇疯緭鍏ヤ紭鍏堢骇',
+      highSelectAttrs: {
+        prop: 'priority_FilterMode',
+        el: 'select',
+        placeholder: '璇烽�夋嫨',
+        options: FILTER_MODE_OPTIONS_NUM,
+      },
     },
     {
       label: '鍏宠仈璁″垝缂栧彿',
@@ -206,6 +291,25 @@
       el: 'input',
       //disabled: disabled,
       placeholder: '璇疯緭鍏ュ叧鑱旇鍒掔紪鍙�',
+      highSelectAttrs: {
+        prop: 'planNo_FilterMode',
+        el: 'select',
+        placeholder: '璇烽�夋嫨',
+        options: FILTER_MODE_OPTIONS_STRING,
+      },
+    },
+    {
+      label: '澶囨敞',
+      prop: 'remark',
+      el: 'input',
+      //disabled: disabled,
+      placeholder: '璇疯緭鍏ュ娉�',
+      highSelectAttrs: {
+        prop: 'remark_FilterMode',
+        el: 'select',
+        placeholder: '璇烽�夋嫨',
+        options: FILTER_MODE_OPTIONS_STRING,
+      },
     },
     {
       label: '鎿嶄綔鏃堕棿',
@@ -220,24 +324,7 @@
       width: '100%',
       //disabled: disabled,
       placeholder: '璇疯緭鍏ユ搷浣滄椂闂�',
-    },
-    {
-      label: '澶囨敞',
-      prop: 'remark',
-      el: 'input',
-      //disabled: disabled,
-      placeholder: '璇疯緭鍏ュ娉�',
-    },
-    {
-      label: '鏄惁绂佺敤',
-      prop: 'isDisabled',
-      el: 'select',
-      //disabled: disabled,
-      placeholder: '璇疯緭鍏ユ槸鍚︾鐢�',
-      options: [
-        { label: '鏄�', value: true },
-        { label: '鍚�', value: false },
-      ],
+      isDateControl: true, // 鏄惧紡鏍囪涓烘棩鏈熸帶浠�
     },
     {
       label: '鍒涘缓鏃堕棿',
@@ -251,7 +338,8 @@
       },
       width: '100%',
       //disabled: disabled,
-      placeholder: '璇疯緭鍏ュ垱寤烘椂闂�',
+      placeholder: '璇疯緭鍏�',
+      isDateControl: true, // 鏄惧紡鏍囪涓烘棩鏈熸帶浠�
     },
   ])
   /**
@@ -267,22 +355,37 @@
   const commonGetFormData = () => {
     const data = {
       orderNo: formData.value.orderNo || '',
+      orderNo_FilterMode: formData.value.orderNo_FilterMode || '',
       orderStatus: formData.value.orderStatus || '',
+      orderStatus_FilterMode: formData.value.orderStatus_FilterMode || '',
       materialName: formData.value.materialName || '',
+      materialName_FilterMode: formData.value.materialName_FilterMode || '',
       materialNo: formData.value.materialNo || '',
+      materialNo_FilterMode: formData.value.materialNo_FilterMode || '',
       materialModel: formData.value.materialModel || '',
+      materialModel_FilterMode: formData.value.materialModel_FilterMode || '',
       materialBatch: formData.value.materialBatch || '',
+      materialBatch_FilterMode: formData.value.materialBatch_FilterMode || '',
       orderType: formData.value.orderType || '',
+      orderType_FilterMode: formData.value.orderType_FilterMode || '',
       stockType: formData.value.stockType || '',
+      stockType_FilterMode: formData.value.stockType_FilterMode || '',
       materialNumber: formData.value.materialNumber || '',
+      materialNumber_FilterMode: formData.value.materialNumber_FilterMode || '',
       distributeNumber: formData.value.distributeNumber || '',
+      distributeNumber_FilterMode:
+        formData.value.distributeNumber_FilterMode || '',
       completeNumber: formData.value.completeNumber || '',
+      completeNumber_FilterMode: formData.value.completeNumber_FilterMode || '',
       priority: formData.value.priority || '',
+      priority_FilterMode: formData.value.priority_FilterMode || '',
       planNo: formData.value.planNo || '',
+      planNo_FilterMode: formData.value.planNo_FilterMode || '',
       operateTime: formData.value.operateTime || '',
       remark: formData.value.remark || '',
-      isDisabled: formData.value.isDisabled || '',
+      remark_FilterMode: formData.value.remark_FilterMode || '',
       creationTime: formData.value.creationTime || '',
+      lastModificationTime: formData.value.lastModificationTime || '',
     }
     return data
   }
@@ -301,25 +404,47 @@
     ctx.emit('confirmQuery', data)
   }
   /**
+   * 閲嶇疆鍏叡select鏌ヨ
+   */
+  const onResetForHighSelect = async () => {
+    formData.value.orderNo_FilterMode = 1
+    formData.value.orderStatus_FilterMode = 2
+    formData.value.materialName_FilterMode = 1
+    formData.value.materialNo_FilterMode = 1
+    formData.value.materialModel_FilterMode = 1
+    formData.value.materialBatch_FilterMode = 1
+    formData.value.orderType_FilterMode = 2
+    formData.value.stockType_FilterMode = 2
+    formData.value.materialNumber_FilterMode = 2
+    formData.value.distributeNumber_FilterMode = 2
+    formData.value.completeNumber_FilterMode = 2
+    formData.value.priority_FilterMode = 2
+    formData.value.planNo_FilterMode = 1
+    formData.value.remark_FilterMode = 1
+  }
+  /**
    * 閲嶇疆鏌ヨ
    */
   const onReset = async () => {
     formData.value = {}
-    formData.value.OrderNo = ''
-    formData.value.OrderStatus = ''
-    formData.value.MaterialName = ''
-    formData.value.MaterialNo = ''
-    formData.value.MaterialModel = ''
-    formData.value.MaterialBatch = ''
-    formData.value.OrderType = ''
-    formData.value.StockType = ''
-    formData.value.MaterialNumber = ''
-    formData.value.DistributeNumber = ''
-    formData.value.CompleteNumber = ''
-    formData.value.Priority = ''
-    formData.value.PlanNo = ''
-    formData.value.OperateTime = ''
-    formData.value.Remark = ''
+    onResetForHighSelect() //閲嶇疆鍏叡select鏌ヨ
+    formData.value.orderNo = ''
+    formData.value.orderStatus = ''
+    formData.value.materialName = ''
+    formData.value.materialNo = ''
+    formData.value.materialModel = ''
+    formData.value.materialBatch = ''
+    formData.value.orderType = ''
+    formData.value.stockType = ''
+    formData.value.materialNumber = ''
+    formData.value.distributeNumber = ''
+    formData.value.completeNumber = ''
+    formData.value.priority = ''
+    formData.value.planNo = ''
+    formData.value.operateTime = ''
+    formData.value.remark = ''
+    formData.value.creationTime = ''
+    formData.value.lastModificationTime = ''
     //鍚戠埗缁勪欢鍙戦�佽嚜瀹氫箟浜嬩欢
     ctx.emit('restQuery')
   }
@@ -344,20 +469,21 @@
    * 閫氱敤鏌ヨ鏋氫妇
    */
   const commonQueryEnumForFrom = async () => {
-    const orderStatusEnumEnum = await wmsInOutStockOrderDrawer.getWmsEnumData({
+    const orderStatusEnumEnum = await WmsInOutStockOrderDrawer.getWmsEnumData({
       EnumName: 'OrderStatusEnum',
     })
     updateFormItemOptions('orderStatus', orderStatusEnumEnum)
-    const orderTypeEnumEnum = await wmsInOutStockOrderDrawer.getWmsEnumData({
+    const orderTypeEnumEnum = await WmsInOutStockOrderDrawer.getWmsEnumData({
       EnumName: 'OrderTypeEnum',
     })
     updateFormItemOptions('orderType', orderTypeEnumEnum)
-    const stockTypeEnumEnum = await wmsInOutStockOrderDrawer.getWmsEnumData({
+    const stockTypeEnumEnum = await WmsInOutStockOrderDrawer.getWmsEnumData({
       EnumName: 'StockTypeEnum',
     })
     updateFormItemOptions('stockType', stockTypeEnumEnum)
   }
   commonQueryEnumForFrom()
+  onResetForHighSelect() //閲嶇疆鍏叡select鏌ヨ
   /**
    * 寮圭獥鎵撳紑鑾峰彇璇︽儏
    */
diff --git a/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Views/Pages/Dialog/WmsInOutStockOrderQueryDrawer/WmsInOutStockOrderQueryDrawer.tsx b/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Views/Pages/Dialog/WmsInOutStockOrderQueryDrawer/WmsInOutStockOrderQueryDrawer.tsx
index ef5ff4a..edd88cb 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Views/Pages/Dialog/WmsInOutStockOrderQueryDrawer/WmsInOutStockOrderQueryDrawer.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Views/Pages/Dialog/WmsInOutStockOrderQueryDrawer/WmsInOutStockOrderQueryDrawer.tsx
@@ -1,71 +1,71 @@
-/* 
- * 鐗╂枡鍩虹淇℃伅鏌ヨ寮瑰嚭妗� 
-*/ 
-import { SetupContext, defineComponent } from 'vue' 
-import BaseQueryDrawer from '@/components/BaseQueryDrawer/BaseQueryDrawer' 
-import styles from './WmsInOutStockOrderQueryDrawer.module.scss' 
-import { useWmsInOutStockOrderQueryDrawer } from '../../../../Controllers/WmsInOutStockOrderQueryDrawer.tsx' 
-import DyForm from '@/components/DyForm/DyForm' 
- 
-// @ts-ignore 
-export default defineComponent<{ 
-  [key: string]: any 
-}>({ 
-  name: '寮圭獥', 
-  props: { 
-    //鏋氫妇绫诲瀷瀛楀吀 
-    enumListDict:{ 
-      type: Array as () => Array<{ key: string; value: object }>, // 瀹氫箟鏁扮粍鍏冪礌绫诲瀷 
-      default: () => [] // 榛樿鍊� 
-    }, 
-    modelValue: { 
-      type: Boolean, 
-      default: false, 
-    }, 
-    title: { 
-      type: String, 
-      default: '', 
-    }, 
-    row: { 
-      type: Object, 
-    }, 
-    sort: { 
-      type: Number, 
-      default: 0, 
-    }, 
-  }, 
-  emits: ['update:modelValue', 'close', 'submit', 'confirmquery1'], 
-  setup(props: Record<string, any>, ctx: SetupContext) { 
-    const { 
-      onClose, 
-      onConfirmQuery, 
-      onOpen, 
-      onReset, 
-      formRef, 
-      visible, 
-      formItems, 
-      formData, 
-    } = useWmsInOutStockOrderQueryDrawer(props, ctx) 
-    return () => ( 
-      <BaseQueryDrawer 
-        class={styles.drawer} 
-        size="800px" 
-        title={props.title || '楂樼骇鏌ヨ'} 
-        v-model={visible.value} 
-        close-on-click-modal={true} 
-        onReset={onReset} 
-        onConfirmQueryForBase={onConfirmQuery} 
-        onOpen={onOpen} 
-        before-close={onClose} 
-        onClose={onClose} 
-      > 
-        <DyForm 
-          ref={formRef} 
-          formData={formData.value} 
-          labelWidth="106px" 
-          formItemProps={formItems} 
-        ></DyForm> 
-      </BaseQueryDrawer> 
-    ) 
-  }, 
-}) 
+/*
+ * 鐗╂枡鍩虹淇℃伅鏌ヨ寮瑰嚭妗�
+ */
+import { SetupContext, defineComponent } from 'vue'
+import BaseQueryDrawer from '@/components/BaseQueryDrawer/BaseQueryDrawer'
+import styles from './WmsInOutStockOrderQueryDrawer.module.scss'
+import { useWmsInOutStockOrderQueryDrawer } from '../../../../Controllers/WmsInOutStockOrderQueryDrawer.tsx'
+import DyFormForHighQuery from '@/components/DyFormForHighQuery/DyFormForHighQuery'
+
+// @ts-ignore
+export default defineComponent<{
+  [key: string]: any
+}>({
+  name: '寮圭獥',
+  props: {
+    //鏋氫妇绫诲瀷瀛楀吀
+    enumListDict: {
+      type: Array as () => Array<{ key: string; value: object }>, // 瀹氫箟鏁扮粍鍏冪礌绫诲瀷
+      default: () => [], // 榛樿鍊�
+    },
+    modelValue: {
+      type: Boolean,
+      default: false,
+    },
+    title: {
+      type: String,
+      default: '',
+    },
+    row: {
+      type: Object,
+    },
+    sort: {
+      type: Number,
+      default: 0,
+    },
+  },
+  emits: ['update:modelValue', 'close', 'submit', 'confirmquery1'],
+  setup(props: Record<string, any>, ctx: SetupContext) {
+    const {
+      onClose,
+      onConfirmQuery,
+      onOpen,
+      onReset,
+      formRef,
+      visible,
+      formItems,
+      formData,
+    } = useWmsInOutStockOrderQueryDrawer(props, ctx)
+    return () => (
+      <BaseQueryDrawer
+        class={styles.drawer}
+        size="800px"
+        title={props.title || '楂樼骇鏌ヨ'}
+        v-model={visible.value}
+        close-on-click-modal={true}
+        onReset={onReset}
+        onConfirmQueryForBase={onConfirmQuery}
+        onOpen={onOpen}
+        before-close={onClose}
+        onClose={onClose}
+      >
+        <DyFormForHighQuery
+          ref={formRef}
+          formData={formData.value}
+          labelWidth="106px"
+          formItemProps={formItems}
+        ></DyFormForHighQuery>
+      </BaseQueryDrawer>
+    )
+  },
+})
diff --git a/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Views/Pages/WmsInOutStockOrder/WmsInOutStockOrder.tsx b/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Views/Pages/WmsInOutStockOrder/WmsInOutStockOrder.tsx
index f651ce0..b94bb0c 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Views/Pages/WmsInOutStockOrder/WmsInOutStockOrder.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Views/Pages/WmsInOutStockOrder/WmsInOutStockOrder.tsx
@@ -26,6 +26,8 @@
   ElMessage,
 } from 'element-plus'
 import { injectModel } from '@/libs/Provider/Provider'
+// 寮曞叆鍏叡閫夐」閰嶇疆
+import { FILTER_MODE_OPTIONS_STRING } from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions'
 
 interface RenderTableType {
   url?: string
@@ -52,7 +54,7 @@
       tableRef,
       current,
       search,
-      selection,
+      // selection,
       sort,
       headers,
       onError,
@@ -69,19 +71,26 @@
     } = useWmsInOutStockOrder(props, ctx)
 
     //瀹氫箟楂樼骇鏌ヨ寮曠敤
-    const wmsInOutStockOrderQueryDrawerRef = ref(null)
+    const WmsInOutStockOrderQueryDrawerRef = ref(null)
     // 鏂板鐨勬煡璇㈡潯浠�
     const queryForm = ref({
       searchVal: '',
       str_searchFormInputAttrs: [],
+      searchVal_FilterMode: '',
     })
     //瀹氫箟鏁翠綋妯＄硦鏌ヨ鐨勫垪鏁扮粍(娉ㄦ剰锛氬繀椤诲ぇ灏忓啓璺熷悗绔殑瀹炰綋绫诲睘鎬у悕涓�鑷达紝鍚﹀垯浼氬鑷村尮閰嶄笉瀵圭殑闂)
     const _searchFormInputAttrs = ref([
       'OrderNo',
+      'MaterialName',
       'MaterialNo',
+      'MaterialModel',
       'MaterialBatch',
+      'PlanNo',
+      'Remark',
     ])
-    const searchFormInputAttrs_Placeholder = ref('璇疯緭鍏ュ崟鎹彿/鐗╂枡缂栧彿/鎵规')
+    const searchFormInputAttrs_Placeholder = ref(
+      '璇疯緭鍏ュ崟鎹紪鍙�/鐗╂枡鍚嶇О/鐗╂枡浠跺彿/鍨嬪彿/鎵规鍙�/鍏宠仈璁″垝缂栧彿/澶囨敞'
+    )
 
     // 鍔ㄦ�佹灇涓鹃�夐」
     const enumOptions = reactive({
@@ -119,19 +128,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)
@@ -145,6 +163,8 @@
     // 鏂扮増鐨勬煡璇㈤噸缃�
     const resetQuery = () => {
       queryForm.value.searchVal = ''
+      queryForm.value.searchVal_FilterMode =
+        FILTER_MODE_OPTIONS_STRING[0]?.value || ''
       queryForm.value.str_searchFormInputAttrs = _searchFormInputAttrs.value
     }
     //鏂扮増鐨勫鍑烘柟娉�
@@ -162,6 +182,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
     }
@@ -176,6 +198,7 @@
       )
       //缁勫悎妯＄硦鏌ヨ
       filteredData.searchVal = queryForm.value.searchVal
+      filteredData.searchVal_FilterMode = queryForm.value.searchVal_FilterMode
       filteredData.str_searchFormInputAttrs = _searchFormInputAttrs.value
       return filteredData
     }
@@ -188,15 +211,15 @@
     })
 
     // 鎵撳紑鍙枡寮圭獥
-    const openCallMaterialDialog = () => {
-      console.log('閫変腑鐨勬暟鎹�:', callMaterialDialog.selectedItems)
-      if (selection.value.length === 0) {
-        ElMessage.warning('璇疯嚦灏戦�夋嫨涓�鏉¤褰�')
-        return
-      }
-      callMaterialDialog.selectedItems = [...selection.value]
-      callMaterialDialog.visible = true
-    }
+    // const openCallMaterialDialog = () => {
+    //   console.log('閫変腑鐨勬暟鎹�:', callMaterialDialog.selectedItems)
+    //   if (selection.value.length === 0) {
+    //     ElMessage.warning('璇疯嚦灏戦�夋嫨涓�鏉¤褰�')
+    //     return
+    //   }
+    //   callMaterialDialog.selectedItems = [...selection.value]
+    //   callMaterialDialog.visible = true
+    // }
 
     // 纭鍙枡
     const confirmCallMaterial = () => {
@@ -352,45 +375,37 @@
                 娣诲姞
               </IconButton>
               <el-divider direction="vertical" />
-              {/* <IconButton
-                v-permission="wmsInOutStockOrder-add"
-                icon="add-p"
-                onClick={openCallMaterialDialog}
-                type="primary"
-              >
-                鍙枡
-              </IconButton>
-              <el-divider direction="vertical" /> */}
-              {/* <el-upload
-                v-permission="wmsInOutStockOrder-import"
-                name="file"
-                accept=".xlsx,.xls,.csv"
-                show-file-list={false}
-                onError={onError}
-                onSuccess={onSuccess}
-                before-upload={onBeforeUpload}
-                headers={headers.value}
-                action="/api/v1/HIAWms/wmsInOutStockOrder/import"
-              >
-                <IconButton icon="in">瀵煎叆</IconButton>
-              </el-upload>
-
-              <IconButton
-                v-permission="wmsInOutStockOrder-output"
-                icon="out"
-                onClick={handleExport}
-              >
-                瀵煎嚭
-              </IconButton> */}
             </div>
             <ElFormItem style={{ marginTop: '15px' }}>
               <ElFormItem label="鍏抽敭瀛�">
-                <ElInput
-                  v-model={queryForm.value.searchVal}
-                  placeholder={searchFormInputAttrs_Placeholder.value}
-                  clearable
+                <el-tooltip
+                  class="box-item"
+                  effect="dark"
+                  content={searchFormInputAttrs_Placeholder.value}
+                  placement="top-start"
+                >
+                  <ElInput
+                    v-model={queryForm.value.searchVal}
+                    placeholder={searchFormInputAttrs_Placeholder.value}
+                    clearable
+                    class={styles.formItem}
+                  />
+                </el-tooltip>
+              </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"
diff --git a/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrderDetail/Controllers/WmsInOutStockOrderDetailQueryDrawer.tsx b/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrderDetail/Controllers/WmsInOutStockOrderDetailQueryDrawer.tsx
index 2c514b4..0ba3362 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrderDetail/Controllers/WmsInOutStockOrderDetailQueryDrawer.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrderDetail/Controllers/WmsInOutStockOrderDetailQueryDrawer.tsx
@@ -14,12 +14,19 @@
 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 useWmsInOutStockOrderDetailQueryDrawer = (
   props: any,
   ctx?: any
 ) => {
-  const wmsInOutStockOrderDetailDrawer =
+  const WmsInOutStockOrderDetailDrawer =
     injectModel<WmsInOutStockOrderDetailDrawer>(
       'WmsInOutStockOrderDetailDrawer'
     )
@@ -81,7 +88,7 @@
     },
   })
   /**
-   * 娣诲姞鐨刦orm瀛楁
+   * 楂樼骇鏌ヨ鐨刦orm瀛楁
    */
   const formItems = reactive([
     {
@@ -90,6 +97,12 @@
       el: 'input',
       //disabled: disabled,
       placeholder: '璇疯緭鍏ュ崟鎹紪鍙�',
+      highSelectAttrs: {
+        prop: 'orderNo_FilterMode',
+        el: 'select',
+        placeholder: '璇烽�夋嫨',
+        options: FILTER_MODE_OPTIONS_STRING,
+      },
     },
     {
       label: '鐗╂枡鍞竴鐮�',
@@ -97,13 +110,27 @@
       el: 'input',
       //disabled: disabled,
       placeholder: '璇疯緭鍏ョ墿鏂欏敮涓�鐮�',
+      highSelectAttrs: {
+        prop: 'materialId_FilterMode',
+        el: 'select',
+        placeholder: '璇烽�夋嫨',
+        options: FILTER_MODE_OPTIONS_STRING,
+      },
     },
     {
       label: '鍗曟嵁绫诲瀷',
       prop: 'orderType',
       el: 'select',
+      clearable: true,
+      option: [],
       //disabled: disabled,
       placeholder: '璇疯緭鍏ュ崟鎹被鍨�',
+      highSelectAttrs: {
+        prop: 'orderType_FilterMode',
+        el: 'select',
+        placeholder: '璇烽�夋嫨',
+        options: FILTER_MODE_OPTIONS_BOOL,
+      },
     },
     {
       label: '鐗╂枡浠跺彿',
@@ -111,6 +138,12 @@
       el: 'input',
       //disabled: disabled,
       placeholder: '璇疯緭鍏ョ墿鏂欎欢鍙�',
+      highSelectAttrs: {
+        prop: 'materialNo_FilterMode',
+        el: 'select',
+        placeholder: '璇烽�夋嫨',
+        options: FILTER_MODE_OPTIONS_STRING,
+      },
     },
     {
       label: '鐗╂枡鍚嶇О',
@@ -118,6 +151,12 @@
       el: 'input',
       //disabled: disabled,
       placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�',
+      highSelectAttrs: {
+        prop: 'materialName_FilterMode',
+        el: 'select',
+        placeholder: '璇烽�夋嫨',
+        options: FILTER_MODE_OPTIONS_STRING,
+      },
     },
     {
       label: '瀹瑰櫒缂栧彿',
@@ -125,21 +164,51 @@
       el: 'input',
       //disabled: disabled,
       placeholder: '璇疯緭鍏ュ鍣ㄧ紪鍙�',
+      highSelectAttrs: {
+        prop: 'containerNo_FilterMode',
+        el: 'select',
+        placeholder: '璇烽�夋嫨',
+        options: FILTER_MODE_OPTIONS_STRING,
+      },
     },
     {
-      label: '鍨嬪彿',
+      label: '鏈哄瀷',
       prop: 'materialModel',
       el: 'input',
       //disabled: disabled,
-      placeholder: '璇疯緭鍏ュ瀷鍙�',
+      placeholder: '璇疯緭鍏ユ満鍨�',
+      highSelectAttrs: {
+        prop: 'materialModel_FilterMode',
+        el: 'select',
+        placeholder: '璇烽�夋嫨',
+        options: FILTER_MODE_OPTIONS_STRING,
+      },
     },
     {
       label: '鐗╂枡鎵规',
       prop: 'materialBatch',
       el: 'input',
-      width: '100%',
       //disabled: disabled,
       placeholder: '璇疯緭鍏ョ墿鏂欐壒娆�',
+      highSelectAttrs: {
+        prop: 'materialBatch_FilterMode',
+        el: 'select',
+        placeholder: '璇烽�夋嫨',
+        options: FILTER_MODE_OPTIONS_STRING,
+      },
+    },
+    {
+      label: '澶囨敞',
+      prop: 'remark',
+      el: 'input',
+      //disabled: disabled,
+      placeholder: '璇疯緭鍏ュ娉�',
+      highSelectAttrs: {
+        prop: 'remark_FilterMode',
+        el: 'select',
+        placeholder: '璇烽�夋嫨',
+        options: FILTER_MODE_OPTIONS_STRING,
+      },
     },
     {
       label: '鍒涘缓鏃堕棿',
@@ -154,14 +223,23 @@
       width: '100%',
       //disabled: disabled,
       placeholder: '璇疯緭鍏ユ槸鍚︾鐢�',
+      isDateControl: true, // 鏄惧紡鏍囪涓烘棩鏈熸帶浠�
     },
-    {
-      label: '澶囨敞',
-      prop: 'remark',
-      el: 'input',
-      //disabled: disabled,
-      placeholder: '璇疯緭鍏ュ娉�',
-    },
+    // {
+    //   label: '',
+    //   prop: 'lastModificationTime',
+    //   el: (props: any, { attrs }: SetupContext) => {
+    //     return h(dateTimePickerRange, {
+    //       ...props,
+    //       clearable: true,
+    //       ...attrs,
+    //     })
+    //   },
+    //   width: '100%',
+    //   //disabled: disabled,
+    //   placeholder: '璇疯緭鍏�',
+    //   isDateControl: true, // 鏄惧紡鏍囪涓烘棩鏈熸帶浠�
+    // },
   ])
   /**
    * 鏍￠獙鏄惁鏈夋暟鎹彉鍖�
@@ -176,16 +254,25 @@
   const commonGetFormData = () => {
     const data = {
       orderNo: formData.value.orderNo || '',
+      orderNo_FilterMode: formData.value.orderNo_FilterMode || '',
       materialId: formData.value.materialId || '',
+      materialId_FilterMode: formData.value.materialId_FilterMode || '',
       orderType: formData.value.orderType || '',
+      orderType_FilterMode: formData.value.orderType_FilterMode || '',
       materialNo: formData.value.materialNo || '',
+      materialNo_FilterMode: formData.value.materialNo_FilterMode || '',
       materialName: formData.value.materialName || '',
+      materialName_FilterMode: formData.value.materialName_FilterMode || '',
       containerNo: formData.value.containerNo || '',
+      containerNo_FilterMode: formData.value.containerNo_FilterMode || '',
       materialModel: formData.value.materialModel || '',
+      materialModel_FilterMode: formData.value.materialModel_FilterMode || '',
       materialBatch: formData.value.materialBatch || '',
-      creationTime: formData.value.creationTime || '',
-      isDisabled: formData.value.isDisabled || '',
+      materialBatch_FilterMode: formData.value.materialBatch_FilterMode || '',
       remark: formData.value.remark || '',
+      remark_FilterMode: formData.value.remark_FilterMode || '',
+      creationTime: formData.value.creationTime || '',
+      lastModificationTime: formData.value.lastModificationTime || '',
     }
     return data
   }
@@ -204,19 +291,36 @@
     ctx.emit('confirmQuery', data)
   }
   /**
+   * 閲嶇疆鍏叡select鏌ヨ
+   */
+  const onResetForHighSelect = async () => {
+    formData.value.orderNo_FilterMode = 1
+    formData.value.materialId_FilterMode = 1
+    formData.value.orderType_FilterMode = 2
+    formData.value.materialNo_FilterMode = 1
+    formData.value.materialName_FilterMode = 1
+    formData.value.containerNo_FilterMode = 1
+    formData.value.materialModel_FilterMode = 1
+    formData.value.materialBatch_FilterMode = 1
+    formData.value.remark_FilterMode = 1
+  }
+  /**
    * 閲嶇疆鏌ヨ
    */
   const onReset = async () => {
     formData.value = {}
-    formData.value.OrderNo = ''
-    formData.value.MaterialId = ''
-    formData.value.OrderType = ''
-    formData.value.MaterialNo = ''
-    formData.value.MaterialName = ''
-    formData.value.ContainerNo = ''
-    formData.value.MaterialModel = ''
-    formData.value.MaterialBatch = ''
-    formData.value.Remark = ''
+    onResetForHighSelect() //閲嶇疆鍏叡select鏌ヨ
+    formData.value.orderNo = ''
+    formData.value.materialId = ''
+    formData.value.orderType = ''
+    formData.value.materialNo = ''
+    formData.value.materialName = ''
+    formData.value.containerNo = ''
+    formData.value.materialModel = ''
+    formData.value.materialBatch = ''
+    formData.value.remark = ''
+    formData.value.creationTime = ''
+    formData.value.lastModificationTime = ''
     //鍚戠埗缁勪欢鍙戦�佽嚜瀹氫箟浜嬩欢
     ctx.emit('restQuery')
   }
@@ -242,12 +346,13 @@
    */
   const commonQueryEnumForFrom = async () => {
     const orderTypeEnumEnum =
-      await wmsInOutStockOrderDetailDrawer.getWmsEnumData({
+      await WmsInOutStockOrderDetailDrawer.getWmsEnumData({
         EnumName: 'OrderTypeEnum',
       })
     updateFormItemOptions('orderType', orderTypeEnumEnum)
   }
   commonQueryEnumForFrom()
+  onResetForHighSelect() //閲嶇疆鍏叡select鏌ヨ
   /**
    * 寮圭獥鎵撳紑鑾峰彇璇︽儏
    */
diff --git a/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrderDetail/Views/Pages/Dialog/WmsInOutStockOrderDetailQueryDrawer/WmsInOutStockOrderDetailQueryDrawer.tsx b/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrderDetail/Views/Pages/Dialog/WmsInOutStockOrderDetailQueryDrawer/WmsInOutStockOrderDetailQueryDrawer.tsx
index 7c2386b..0f83d71 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrderDetail/Views/Pages/Dialog/WmsInOutStockOrderDetailQueryDrawer/WmsInOutStockOrderDetailQueryDrawer.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrderDetail/Views/Pages/Dialog/WmsInOutStockOrderDetailQueryDrawer/WmsInOutStockOrderDetailQueryDrawer.tsx
@@ -1,71 +1,71 @@
-/* 
- * 鐗╂枡鍩虹淇℃伅鏌ヨ寮瑰嚭妗� 
-*/ 
-import { SetupContext, defineComponent } from 'vue' 
-import BaseQueryDrawer from '@/components/BaseQueryDrawer/BaseQueryDrawer' 
-import styles from './WmsInOutStockOrderDetailQueryDrawer.module.scss' 
-import { useWmsInOutStockOrderDetailQueryDrawer } from '../../../../Controllers/WmsInOutStockOrderDetailQueryDrawer.tsx' 
-import DyForm from '@/components/DyForm/DyForm' 
- 
-// @ts-ignore 
-export default defineComponent<{ 
-  [key: string]: any 
-}>({ 
-  name: '寮圭獥', 
-  props: { 
-    //鏋氫妇绫诲瀷瀛楀吀 
-    enumListDict:{ 
-      type: Array as () => Array<{ key: string; value: object }>, // 瀹氫箟鏁扮粍鍏冪礌绫诲瀷 
-      default: () => [] // 榛樿鍊� 
-    }, 
-    modelValue: { 
-      type: Boolean, 
-      default: false, 
-    }, 
-    title: { 
-      type: String, 
-      default: '', 
-    }, 
-    row: { 
-      type: Object, 
-    }, 
-    sort: { 
-      type: Number, 
-      default: 0, 
-    }, 
-  }, 
-  emits: ['update:modelValue', 'close', 'submit', 'confirmquery1'], 
-  setup(props: Record<string, any>, ctx: SetupContext) { 
-    const { 
-      onClose, 
-      onConfirmQuery, 
-      onOpen, 
-      onReset, 
-      formRef, 
-      visible, 
-      formItems, 
-      formData, 
-    } = useWmsInOutStockOrderDetailQueryDrawer(props, ctx) 
-    return () => ( 
-      <BaseQueryDrawer 
-        class={styles.drawer} 
-        size="800px" 
-        title={props.title || '楂樼骇鏌ヨ'} 
-        v-model={visible.value} 
-        close-on-click-modal={true} 
-        onReset={onReset} 
-        onConfirmQueryForBase={onConfirmQuery} 
-        onOpen={onOpen} 
-        before-close={onClose} 
-        onClose={onClose} 
-      > 
-        <DyForm 
-          ref={formRef} 
-          formData={formData.value} 
-          labelWidth="106px" 
-          formItemProps={formItems} 
-        ></DyForm> 
-      </BaseQueryDrawer> 
-    ) 
-  }, 
-}) 
+/*
+ * 鐗╂枡鍩虹淇℃伅鏌ヨ寮瑰嚭妗�
+ */
+import { SetupContext, defineComponent } from 'vue'
+import BaseQueryDrawer from '@/components/BaseQueryDrawer/BaseQueryDrawer'
+import styles from './WmsInOutStockOrderDetailQueryDrawer.module.scss'
+import { useWmsInOutStockOrderDetailQueryDrawer } from '../../../../Controllers/WmsInOutStockOrderDetailQueryDrawer.tsx'
+import DyFormForHighQuery from '@/components/DyFormForHighQuery/DyFormForHighQuery'
+
+// @ts-ignore
+export default defineComponent<{
+  [key: string]: any
+}>({
+  name: '寮圭獥',
+  props: {
+    //鏋氫妇绫诲瀷瀛楀吀
+    enumListDict: {
+      type: Array as () => Array<{ key: string; value: object }>, // 瀹氫箟鏁扮粍鍏冪礌绫诲瀷
+      default: () => [], // 榛樿鍊�
+    },
+    modelValue: {
+      type: Boolean,
+      default: false,
+    },
+    title: {
+      type: String,
+      default: '',
+    },
+    row: {
+      type: Object,
+    },
+    sort: {
+      type: Number,
+      default: 0,
+    },
+  },
+  emits: ['update:modelValue', 'close', 'submit', 'confirmquery1'],
+  setup(props: Record<string, any>, ctx: SetupContext) {
+    const {
+      onClose,
+      onConfirmQuery,
+      onOpen,
+      onReset,
+      formRef,
+      visible,
+      formItems,
+      formData,
+    } = useWmsInOutStockOrderDetailQueryDrawer(props, ctx)
+    return () => (
+      <BaseQueryDrawer
+        class={styles.drawer}
+        size="800px"
+        title={props.title || '楂樼骇鏌ヨ'}
+        v-model={visible.value}
+        close-on-click-modal={true}
+        onReset={onReset}
+        onConfirmQueryForBase={onConfirmQuery}
+        onOpen={onOpen}
+        before-close={onClose}
+        onClose={onClose}
+      >
+        <DyFormForHighQuery
+          ref={formRef}
+          formData={formData.value}
+          labelWidth="106px"
+          formItemProps={formItems}
+        ></DyFormForHighQuery>
+      </BaseQueryDrawer>
+    )
+  },
+})
diff --git a/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrderDetail/Views/Pages/WmsInOutStockOrderDetail/Config.ts b/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrderDetail/Views/Pages/WmsInOutStockOrderDetail/Config.ts
index 57a5110..851a2cd 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrderDetail/Views/Pages/WmsInOutStockOrderDetail/Config.ts
+++ b/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrderDetail/Views/Pages/WmsInOutStockOrderDetail/Config.ts
@@ -40,10 +40,10 @@
   //   field: 'creationTime',
   //   title: '鏄惁绂佺敤',
   // },
-  // {
-  //   field: 'deletionTime',
-  //   title: '',
-  // },
+  {
+    field: 'creationTime',
+    title: '鍒涘缓鏃堕棿',
+  },
   {
     field: 'remark',
     title: '澶囨敞',
diff --git a/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrderDetail/Views/Pages/WmsInOutStockOrderDetail/WmsInOutStockOrderDetail.tsx b/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrderDetail/Views/Pages/WmsInOutStockOrderDetail/WmsInOutStockOrderDetail.tsx
index 90f8d95..54db9ac 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrderDetail/Views/Pages/WmsInOutStockOrderDetail/WmsInOutStockOrderDetail.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrderDetail/Views/Pages/WmsInOutStockOrderDetail/WmsInOutStockOrderDetail.tsx
@@ -21,6 +21,8 @@
   ElFormItem,
 } from 'element-plus'
 import { injectModel } from '@/libs/Provider/Provider'
+// 寮曞叆鍏叡閫夐」閰嶇疆
+import { FILTER_MODE_OPTIONS_STRING } from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions'
 
 interface RenderTableType {
   url?: string
@@ -62,15 +64,27 @@
     } = useWmsInOutStockOrderDetail(props, ctx)
 
     //瀹氫箟楂樼骇鏌ヨ寮曠敤
-    const wmsInOutStockOrderDetailQueryDrawerRef = ref(null)
+    const WmsInOutStockOrderDetailQueryDrawerRef = ref(null)
     // 鏂板鐨勬煡璇㈡潯浠�
     const queryForm = ref({
       searchVal: '',
       str_searchFormInputAttrs: [],
+      searchVal_FilterMode: '',
     })
     //瀹氫箟鏁翠綋妯＄硦鏌ヨ鐨勫垪鏁扮粍(娉ㄦ剰锛氬繀椤诲ぇ灏忓啓璺熷悗绔殑瀹炰綋绫诲睘鎬у悕涓�鑷达紝鍚﹀垯浼氬鑷村尮閰嶄笉瀵圭殑闂)
-    const _searchFormInputAttrs = ref(['OrderNo', 'MaterialNo', 'MaterialId'])
-    const searchFormInputAttrs_Placeholder = ref('璇疯緭鍏ュ崟鎹彿/鐗╂枡缂栧彿/鐗╂枡ID')
+    const _searchFormInputAttrs = ref([
+      'OrderNo',
+      'MaterialId',
+      'MaterialNo',
+      'MaterialName',
+      'ContainerNo',
+      'MaterialModel',
+      'MaterialBatch',
+      'Remark',
+    ])
+    const searchFormInputAttrs_Placeholder = ref(
+      '璇疯緭鍏ュ崟鎹紪鍙�/鐗╂枡鍞竴鐮�/鐗╂枡浠跺彿/鐗╂枡鍚嶇О/瀹瑰櫒缂栧彿/鏈哄瀷/鐗╂枡鎵规/澶囨敞'
+    )
 
     // 鍔ㄦ�佹灇涓鹃�夐」
     const enumOptions = reactive({
@@ -92,19 +106,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)
@@ -118,6 +141,8 @@
     // 鏂扮増鐨勬煡璇㈤噸缃�
     const resetQuery = () => {
       queryForm.value.searchVal = ''
+      queryForm.value.searchVal_FilterMode =
+        FILTER_MODE_OPTIONS_STRING[0]?.value || ''
       queryForm.value.str_searchFormInputAttrs = _searchFormInputAttrs.value
     }
     //鏂扮増鐨勫鍑烘柟娉�
@@ -135,6 +160,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
     }
@@ -149,6 +176,7 @@
       )
       //缁勫悎妯＄硦鏌ヨ
       filteredData.searchVal = queryForm.value.searchVal
+      filteredData.searchVal_FilterMode = queryForm.value.searchVal_FilterMode
       filteredData.str_searchFormInputAttrs = _searchFormInputAttrs.value
       return filteredData
     }
@@ -321,12 +349,34 @@
             </div>
             <ElFormItem style={{ marginTop: '15px' }}>
               <ElFormItem label="鍏抽敭瀛�">
-                <ElInput
-                  v-model={queryForm.value.searchVal}
-                  placeholder={searchFormInputAttrs_Placeholder.value}
-                  clearable
+                <el-tooltip
+                  class="box-item"
+                  effect="dark"
+                  content={searchFormInputAttrs_Placeholder.value}
+                  placement="top-start"
+                >
+                  <ElInput
+                    v-model={queryForm.value.searchVal}
+                    placeholder={searchFormInputAttrs_Placeholder.value}
+                    clearable
+                    class={styles.formItem}
+                  />
+                </el-tooltip>
+              </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"
diff --git a/HIAWms/hiawms_web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordQueryDrawer.tsx b/HIAWms/hiawms_web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordQueryDrawer.tsx
index a7c29a5..ca5853b 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordQueryDrawer.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordQueryDrawer.tsx
@@ -88,6 +88,34 @@
       placeholder: '璇疯緭鍏ュ崟鎹紪鍙�',
     },
     {
+      label: '鐗╂枡ID',
+      prop: 'materialId',
+      el: 'input',
+      //disabled: disabled,
+      placeholder: '璇疯緭鍏ョ墿鏂橧D',
+    },
+    {
+      label: '浠诲姟鍙�',
+      prop: 'taskNo',
+      el: 'input',
+      //disabled: disabled,
+      placeholder: '璇疯緭鍏ヤ换鍔″彿',
+    },
+    {
+      label: '璧峰搴撲綅',
+      prop: 'sourcePlace',
+      el: 'input',
+      //disabled: disabled,
+      placeholder: '璇疯緭鍏ヨ捣濮嬪簱浣�',
+    },
+    {
+      label: '鐩爣搴撲綅',
+      prop: 'toPlace',
+      el: 'input',
+      //disabled: disabled,
+      placeholder: '璇疯緭鍏ョ洰鏍囧簱浣�',
+    },
+    {
       label: '鐗╂枡鍚嶇О',
       prop: 'materialName',
       el: 'input',
@@ -123,6 +151,13 @@
       placeholder: '璇疯緭鍏ュ瀷鍙�',
     },
     {
+      label: '澶囨敞',
+      prop: 'remark',
+      el: 'input',
+      //disabled: disabled,
+      placeholder: '璇疯緭鍏ュ娉�',
+    },
+    {
       label: '鎿嶄綔鏃堕棿',
       prop: 'operateTime',
       el: (props: any, { attrs }: SetupContext) => {
@@ -136,52 +171,18 @@
       //disabled: disabled,
       placeholder: '璇疯緭鍏ユ搷浣滄椂闂�',
     },
-    {
-      label: '澶囨敞',
-      prop: 'remark',
-      el: 'input',
-      //disabled: disabled,
-      placeholder: '璇疯緭鍏ュ娉�',
-    },
-    {
-      label: '鐗╂枡ID',
-      prop: 'materialId',
-      el: 'input',
-      //disabled: disabled,
-      placeholder: '璇疯緭鍏ョ墿鏂橧D',
-    },
-    {
-      label: '浠诲姟鍙�',
-      prop: 'taskNo',
-      el: 'input',
-      //disabled: disabled,
-      placeholder: '璇疯緭鍏ヤ换鍔″彿',
-    },
-    {
-      label: '璧峰搴撲綅',
-      prop: 'sourcePlace',
-      el: 'input',
-      //disabled: disabled,
-      placeholder: '璇疯緭鍏ヨ捣濮嬪簱浣�',
-    },
-    {
-      label: '鐩爣搴撲綅',
-      prop: 'toPlace',
-      el: 'input',
-      //disabled: disabled,
-      placeholder: '璇疯緭鍏ョ洰鏍囧簱浣�',
-    },
-    {
-      label: '鏄惁绂佺敤',
-      prop: 'isDisabled',
-      el: 'select',
-      //disabled: disabled,
-      placeholder: '璇疯緭鍏ユ槸鍚︾鐢�',
-      options: [
-        { label: '鏄�', value: 'true' },
-        { label: '鍚�', value: 'false' },
-      ],
-    },
+
+    // {
+    //   label: '鏄惁绂佺敤',
+    //   prop: 'isDisabled',
+    //   el: 'select',
+    //   //disabled: disabled,
+    //   placeholder: '璇疯緭鍏ユ槸鍚︾鐢�',
+    //   options: [
+    //     { label: '鏄�', value: 'true' },
+    //     { label: '鍚�', value: 'false' },
+    //   ],
+    // },
     {
       label: '鍒涘缓鏃堕棿',
       prop: 'creationTime',
diff --git a/HIAWms/hiawms_web/src/widgets/WmsInOutStockRecord/Views/Pages/Dialog/WmsInOutStockRecordQueryDrawer/WmsInOutStockRecordQueryDrawer.tsx b/HIAWms/hiawms_web/src/widgets/WmsInOutStockRecord/Views/Pages/Dialog/WmsInOutStockRecordQueryDrawer/WmsInOutStockRecordQueryDrawer.tsx
index db7c61e..2a26ffc 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsInOutStockRecord/Views/Pages/Dialog/WmsInOutStockRecordQueryDrawer/WmsInOutStockRecordQueryDrawer.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsInOutStockRecord/Views/Pages/Dialog/WmsInOutStockRecordQueryDrawer/WmsInOutStockRecordQueryDrawer.tsx
@@ -5,7 +5,7 @@
 import BaseQueryDrawer from '@/components/BaseQueryDrawer/BaseQueryDrawer'
 import styles from './WmsInOutStockRecordQueryDrawer.module.scss'
 import { useWmsInOutStockRecordQueryDrawer } from '../../../../Controllers/WmsInOutStockRecordQueryDrawer.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="106px"
           formItemProps={formItems}
-        ></DyForm>
+        ></DyFormForHighQuery>
       </BaseQueryDrawer>
     )
   },
diff --git a/HIAWms/hiawms_web/src/widgets/WmsInOutStockRecord/Views/Pages/WmsInOutStockRecord/WmsInOutStockRecord.tsx b/HIAWms/hiawms_web/src/widgets/WmsInOutStockRecord/Views/Pages/WmsInOutStockRecord/WmsInOutStockRecord.tsx
index 45b6773..d0fdb69 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsInOutStockRecord/Views/Pages/WmsInOutStockRecord/WmsInOutStockRecord.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsInOutStockRecord/Views/Pages/WmsInOutStockRecord/WmsInOutStockRecord.tsx
@@ -21,6 +21,8 @@
   ElFormItem,
 } from 'element-plus'
 import { injectModel } from '@/libs/Provider/Provider'
+// 寮曞叆鍏叡閫夐」閰嶇疆
+import { FILTER_MODE_OPTIONS_STRING } from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions'
 
 interface RenderTableType {
   url?: string
@@ -62,15 +64,30 @@
     } = useWmsInOutStockRecord(props, ctx)
 
     //瀹氫箟楂樼骇鏌ヨ寮曠敤
-    const wmsInOutStockRecordQueryDrawerRef = ref(null)
+    const WmsInOutStockRecordQueryDrawerRef = ref(null)
     // 鏂板鐨勬煡璇㈡潯浠�
     const queryForm = ref({
       searchVal: '',
       str_searchFormInputAttrs: [],
+      searchVal_FilterMode: '',
     })
     //瀹氫箟鏁翠綋妯＄硦鏌ヨ鐨勫垪鏁扮粍(娉ㄦ剰锛氬繀椤诲ぇ灏忓啓璺熷悗绔殑瀹炰綋绫诲睘鎬у悕涓�鑷达紝鍚﹀垯浼氬鑷村尮閰嶄笉瀵圭殑闂)
-    const _searchFormInputAttrs = ref(['MaterialNo', 'ContainerNo'])
-    const searchFormInputAttrs_Placeholder = ref('璇疯緭鍏ョ墿鏂欑紪鐮�/鎵樼洏')
+    const _searchFormInputAttrs = ref([
+      'OrderNo',
+      'MaterialName',
+      'MaterialNo',
+      'MaterialBatch',
+      'ContainerNo',
+      'MaterialModel',
+      'Remark',
+      'MaterialId',
+      'TaskNo',
+      'SourcePlace',
+      'ToPlace',
+    ])
+    const searchFormInputAttrs_Placeholder = ref(
+      '璇疯緭鍏ュ崟鎹紪鍙�/鐗╂枡鍚嶇О/鐗╂枡浠跺彿/鐗╂枡鎵规/瀹瑰櫒缂栧彿/鏈哄瀷/澶囨敞/鐗╂枡ID/浠诲姟鍙�/璧峰搴撲綅/鐩爣搴撲綅'
+    )
 
     // 鍔ㄦ�佹灇涓鹃�夐」
     const enumOptions = reactive({
@@ -92,19 +109,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)
@@ -118,6 +144,8 @@
     // 鏂扮増鐨勬煡璇㈤噸缃�
     const resetQuery = () => {
       queryForm.value.searchVal = ''
+      queryForm.value.searchVal_FilterMode =
+        FILTER_MODE_OPTIONS_STRING[0]?.value || ''
       queryForm.value.str_searchFormInputAttrs = _searchFormInputAttrs.value
     }
     //鏂扮増鐨勫鍑烘柟娉�
@@ -135,6 +163,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
     }
@@ -149,6 +179,7 @@
       )
       //缁勫悎妯＄硦鏌ヨ
       filteredData.searchVal = queryForm.value.searchVal
+      filteredData.searchVal_FilterMode = queryForm.value.searchVal_FilterMode
       filteredData.str_searchFormInputAttrs = _searchFormInputAttrs.value
       return filteredData
     }
@@ -288,12 +319,34 @@
             </div>
             <ElFormItem style={{ marginTop: '15px' }}>
               <ElFormItem label="鍏抽敭瀛�">
-                <ElInput
-                  v-model={queryForm.value.searchVal}
-                  placeholder={searchFormInputAttrs_Placeholder.value}
-                  clearable
+                <el-tooltip
+                  class="box-item"
+                  effect="dark"
+                  content={searchFormInputAttrs_Placeholder.value}
+                  placement="top-start"
+                >
+                  <ElInput
+                    v-model={queryForm.value.searchVal}
+                    placeholder={searchFormInputAttrs_Placeholder.value}
+                    clearable
+                    class={styles.formItem}
+                  />
+                </el-tooltip>
+              </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"
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockOrder/GetWmsInOutStockOrderInput.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockOrder/GetWmsInOutStockOrderInput.cs
index 7b56035..939af2c 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockOrder/GetWmsInOutStockOrderInput.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockOrder/GetWmsInOutStockOrderInput.cs
@@ -1,3 +1,4 @@
+using CMS.Plugin.HIAWms.Domain.Shared.Enums;
 using CmsQueryExtensions.Extension; 
 using Volo.Abp.Application.Dtos; 
  
@@ -7,273 +8,272 @@
 /// 鍑哄叆搴撳崟鎹煡璇㈠弬鏁� 
 /// </summary> 
 public class GetWmsInOutStockOrderInput : ExtensiblePagedAndSortedResultRequestDto 
-{ 
- 
+{
+
     #region 鍏抽敭瀛楁煡璇� 
- 
+
     /// <summary> 
     /// 鍏抽敭瀛楁ā绯婃煡璇紙娉ㄦ剰鏄皬鍐欙紒锛� 
     /// </summary> 
-    public string searchVal { get; set; } 
- 
+    public string searchVal { get; set; }
+
     /// <summary> 
     /// 閫氱敤鏌ヨ閰嶇疆 (1:妯＄硦鏌ヨ , 2:绮惧噯鏌ヨ)锛堟敞鎰忔槸灏忓啓锛侊級 
     /// </summary> 
-    public SearchFilterModeEnum searchVal_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ; 
- 
+    public SearchFilterModeEnum searchVal_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+
     /// <summary> 
     /// 瀛愭悳绱㈢粍浠朵紶閫掔殑閫氱敤鏌ヨ閰嶇疆鐨勫睘鎬у悕锛堟敞鎰忔槸灏忓啓锛侊級 
     /// </summary> 
-    [NoAutoQuery] 
-    public string str_searchFormInputAttrs { get; set; } 
+    [NoAutoQuery]
+    public string str_searchFormInputAttrs { get; set; }
     /// <summary> 
     /// 瀛愭悳绱㈢粍浠朵紶閫掔殑閫氱敤鏌ヨ閰嶇疆鐨勫睘鎬у悕锛堟敞鎰忔槸灏忓啓锛侊級 
     /// </summary> 
-    public List<string> searchFormInputAttrs 
-    { 
-        get 
-        { 
-            if (!string.IsNullOrEmpty(str_searchFormInputAttrs)) 
-            { 
-                return str_searchFormInputAttrs.Split(',').ToList(); 
-            } 
-            return new List<string>(); 
-        } 
-    } 
- 
-    #endregion 
- 
-            /// <summary>
-        /// 鍗曟嵁缂栧彿
-        /// </summary>
-        public string OrderNo { get; set; }
+    public List<string> searchFormInputAttrs
+    {
+        get
+        {
+            if (!string.IsNullOrEmpty(str_searchFormInputAttrs))
+            {
+                return str_searchFormInputAttrs.Split(',').ToList();
+            }
+            return new List<string>();
+        }
+    }
 
-        /// <summary>
-        /// 鍗曟嵁缂栧彿-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum OrderNo_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    #endregion
 
-        /// <summary>
-        /// 鍗曟嵁鐘舵��
-        /// </summary>
-        public int?  OrderStatus { get; set; }
+    /// <summary>
+    /// 鍗曟嵁缂栧彿
+    /// </summary>
+    public string OrderNo { get; set; }
 
-        /// <summary>
-        /// 鍗曟嵁鐘舵��-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum OrderStatus_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+    /// <summary>
+    /// 鍗曟嵁缂栧彿-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum OrderNo_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-        /// <summary>
-        /// 鐗╂枡鍚嶇О
-        /// </summary>
-        public string MaterialName { get; set; }
+    /// <summary>
+    /// 鍗曟嵁鐘舵��
+    /// </summary>
+    public OrderStatusEnum? OrderStatus { get; set; }
 
-        /// <summary>
-        /// 鐗╂枡鍚嶇О-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum MaterialName_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    /// <summary>
+    /// 鍗曟嵁鐘舵��-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum OrderStatus_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
 
-        /// <summary>
-        /// 鐗╂枡浠跺彿
-        /// </summary>
-        public string MaterialNo { get; set; }
+    /// <summary>
+    /// 鐗╂枡鍚嶇О
+    /// </summary>
+    public string MaterialName { get; set; }
 
-        /// <summary>
-        /// 鐗╂枡浠跺彿-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum MaterialNo_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    /// <summary>
+    /// 鐗╂枡鍚嶇О-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum MaterialName_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-        /// <summary>
-        /// 鍨嬪彿
-        /// </summary>
-        public string MaterialModel { get; set; }
+    /// <summary>
+    /// 鐗╂枡浠跺彿
+    /// </summary>
+    public string MaterialNo { get; set; }
 
-        /// <summary>
-        /// 鍨嬪彿-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum MaterialModel_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    /// <summary>
+    /// 鐗╂枡浠跺彿-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum MaterialNo_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-        /// <summary>
-        /// 鎵规鍙�
-        /// </summary>
-        public string MaterialBatch { get; set; }
+    /// <summary>
+    /// 鍨嬪彿
+    /// </summary>
+    public string MaterialModel { get; set; }
 
-        /// <summary>
-        /// 鎵规鍙�-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum MaterialBatch_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    /// <summary>
+    /// 鍨嬪彿-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum MaterialModel_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-        /// <summary>
-        /// 鍗曟嵁绫诲瀷
-        /// </summary>
-        public int?  OrderType { get; set; }
+    /// <summary>
+    /// 鎵规鍙�
+    /// </summary>
+    public string MaterialBatch { get; set; }
 
-        /// <summary>
-        /// 鍗曟嵁绫诲瀷-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum OrderType_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+    /// <summary>
+    /// 鎵规鍙�-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum MaterialBatch_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-        /// <summary>
-        /// 鎿嶄綔绫诲瀷锛堟灇涓惧�硷級
-        /// </summary>
-        public int?  StockType { get; set; }
+    /// <summary>
+    /// 鍗曟嵁绫诲瀷
+    /// </summary>
+    public OrderTypeEnum? OrderType { get; set; }
 
-        /// <summary>
-        /// 鎿嶄綔绫诲瀷锛堟灇涓惧�硷級-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum StockType_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+    /// <summary>
+    /// 鍗曟嵁绫诲瀷-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum OrderType_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
 
-        /// <summary>
-        /// 鍗曟嵁鏁伴噺
-        /// </summary>
-        public int?  MaterialNumber { get; set; }
+    /// <summary>
+    /// 鎿嶄綔绫诲瀷锛堟灇涓惧�硷級
+    /// </summary>
+    public StockTypeEnum? StockType { get; set; }
 
-        /// <summary>
-        /// 鍗曟嵁鏁伴噺-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum MaterialNumber_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+    /// <summary>
+    /// 鎿嶄綔绫诲瀷锛堟灇涓惧�硷級-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum StockType_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
 
-        /// <summary>
-        /// 涓嬪彂鏁伴噺
-        /// </summary>
-        public int?  DistributeNumber { get; set; }
+    /// <summary>
+    /// 鍗曟嵁鏁伴噺
+    /// </summary>
+    public int? MaterialNumber { get; set; }
 
-        /// <summary>
-        /// 涓嬪彂鏁伴噺-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum DistributeNumber_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+    /// <summary>
+    /// 鍗曟嵁鏁伴噺-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum MaterialNumber_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
 
-        /// <summary>
-        /// 瀹屾垚鏁伴噺
-        /// </summary>
-        public int?  CompleteNumber { get; set; }
+    /// <summary>
+    /// 涓嬪彂鏁伴噺
+    /// </summary>
+    public int? DistributeNumber { get; set; }
 
-        /// <summary>
-        /// 瀹屾垚鏁伴噺-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum CompleteNumber_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+    /// <summary>
+    /// 涓嬪彂鏁伴噺-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum DistributeNumber_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
 
-        /// <summary>
-        /// 浼樺厛绾�
-        /// </summary>
-        public int?  Priority { get; set; }
+    /// <summary>
+    /// 瀹屾垚鏁伴噺
+    /// </summary>
+    public int? CompleteNumber { get; set; }
 
-        /// <summary>
-        /// 浼樺厛绾�-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum Priority_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+    /// <summary>
+    /// 瀹屾垚鏁伴噺-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum CompleteNumber_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
 
-        /// <summary>
-        /// 鍏宠仈璁″垝缂栧彿
-        /// </summary>
-        public string PlanNo { get; set; }
+    /// <summary>
+    /// 浼樺厛绾�
+    /// </summary>
+    public int? Priority { get; set; }
 
-        /// <summary>
-        /// 鍏宠仈璁″垝缂栧彿-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum PlanNo_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    /// <summary>
+    /// 浼樺厛绾�-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum Priority_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
 
-        /// <summary>
-        /// 鎿嶄綔鏃堕棿
-        /// </summary>
-        //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
-        [HighSearchRangeAttribute]
-        public List<string> OperateTime { get; set; }
+    /// <summary>
+    /// 鍏宠仈璁″垝缂栧彿
+    /// </summary>
+    public string PlanNo { get; set; }
+
+    /// <summary>
+    /// 鍏宠仈璁″垝缂栧彿-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum PlanNo_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+    /// <summary>
+    /// 鎿嶄綔鏃堕棿
+    /// </summary>
+    //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+    [HighSearchRangeAttribute]
+    public string OperateTime { get; set; }
 
 
-        /// <summary>
-        /// 澶囨敞
-        /// </summary>
-        public string Remark { get; set; }
+    /// <summary>
+    /// 澶囨敞
+    /// </summary>
+    public string Remark { get; set; }
 
-        /// <summary>
-        /// 澶囨敞-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum Remark_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    /// <summary>
+    /// 澶囨敞-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum Remark_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-        /// <summary>
-        /// 鎺掑簭
-        /// </summary>
-        public int?  Sort { get; set; }
+    /// <summary>
+    /// 鎺掑簭
+    /// </summary>
+    public int? Sort { get; set; }
 
-        /// <summary>
-        /// 鎺掑簭-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum Sort_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+    /// <summary>
+    /// 鎺掑簭-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum Sort_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
 
-        /// <summary>
-        /// 鏄惁绂佺敤
-        /// </summary>
-        public bool?  IsDisabled { get; set; }
+    /// <summary>
+    /// 鏄惁绂佺敤
+    /// </summary>
+    public bool? IsDisabled { get; set; }
 
-        /// <summary>
-        /// 鏄惁绂佺敤-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum IsDisabled_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+    /// <summary>
+    /// 鏄惁绂佺敤-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum IsDisabled_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
 
-        /// <summary>
-        /// 鍒涘缓鏃堕棿
-        /// </summary>
-        //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
-        [HighSearchRangeAttribute]
-        public List<string> CreationTime { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+    [HighSearchRangeAttribute]
+    public string CreationTime { get; set; }
 
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public string CreatorId { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string CreatorId { get; set; }
 
-        /// <summary>
-        /// -鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum CreatorId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    /// <summary>
+    /// -鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum CreatorId_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-        /// <summary>
-        /// 
-        /// </summary>
-        //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
-        [HighSearchRangeAttribute]
-        public List<string> LastModificationTime { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+    [HighSearchRangeAttribute]
+    public string LastModificationTime { get; set; }
 
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public string LastModifierId { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string LastModifierId { get; set; }
 
-        /// <summary>
-        /// -鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum LastModifierId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    /// <summary>
+    /// -鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum LastModifierId_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public bool?  IsDeleted { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public bool? IsDeleted { get; set; }
 
-        /// <summary>
-        /// -鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum IsDeleted_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+    /// <summary>
+    /// -鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum IsDeleted_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public string DeleterId { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string DeleterId { get; set; }
 
-        /// <summary>
-        /// -鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum DeleterId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    /// <summary>
+    /// -鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum DeleterId_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-        /// <summary>
-        /// 
-        /// </summary>
-        //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
-        [HighSearchRangeAttribute]
-        public List<string> DeletionTime { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+    [HighSearchRangeAttribute]
+    public string DeletionTime { get; set; }
 
 
- 
 } 
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockOrderDetail/GetWmsInOutStockOrderDetailInput.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockOrderDetail/GetWmsInOutStockOrderDetailInput.cs
index d669326..2942b25 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockOrderDetail/GetWmsInOutStockOrderDetailInput.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockOrderDetail/GetWmsInOutStockOrderDetailInput.cs
@@ -1,3 +1,4 @@
+using CMS.Plugin.HIAWms.Domain.Shared.Enums;
 using CmsQueryExtensions.Extension; 
 using Volo.Abp.Application.Dtos; 
  
@@ -7,215 +8,214 @@
 /// 鍑哄叆搴撳崟鎹鎯呮煡璇㈠弬鏁� 
 /// </summary> 
 public class GetWmsInOutStockOrderDetailInput : ExtensiblePagedAndSortedResultRequestDto 
-{ 
- 
+{
+
     #region 鍏抽敭瀛楁煡璇� 
- 
+
     /// <summary> 
     /// 鍏抽敭瀛楁ā绯婃煡璇紙娉ㄦ剰鏄皬鍐欙紒锛� 
     /// </summary> 
-    public string searchVal { get; set; } 
- 
+    public string searchVal { get; set; }
+
     /// <summary> 
     /// 閫氱敤鏌ヨ閰嶇疆 (1:妯＄硦鏌ヨ , 2:绮惧噯鏌ヨ)锛堟敞鎰忔槸灏忓啓锛侊級 
     /// </summary> 
-    public SearchFilterModeEnum searchVal_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ; 
- 
+    public SearchFilterModeEnum searchVal_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+
     /// <summary> 
     /// 瀛愭悳绱㈢粍浠朵紶閫掔殑閫氱敤鏌ヨ閰嶇疆鐨勫睘鎬у悕锛堟敞鎰忔槸灏忓啓锛侊級 
     /// </summary> 
-    [NoAutoQuery] 
-    public string str_searchFormInputAttrs { get; set; } 
+    [NoAutoQuery]
+    public string str_searchFormInputAttrs { get; set; }
     /// <summary> 
     /// 瀛愭悳绱㈢粍浠朵紶閫掔殑閫氱敤鏌ヨ閰嶇疆鐨勫睘鎬у悕锛堟敞鎰忔槸灏忓啓锛侊級 
     /// </summary> 
-    public List<string> searchFormInputAttrs 
-    { 
-        get 
-        { 
-            if (!string.IsNullOrEmpty(str_searchFormInputAttrs)) 
-            { 
-                return str_searchFormInputAttrs.Split(',').ToList(); 
-            } 
-            return new List<string>(); 
-        } 
-    } 
- 
-    #endregion 
- 
-            /// <summary>
-        /// 鍗曟嵁缂栧彿
-        /// </summary>
-        public string OrderNo { get; set; }
+    public List<string> searchFormInputAttrs
+    {
+        get
+        {
+            if (!string.IsNullOrEmpty(str_searchFormInputAttrs))
+            {
+                return str_searchFormInputAttrs.Split(',').ToList();
+            }
+            return new List<string>();
+        }
+    }
 
-        /// <summary>
-        /// 鍗曟嵁缂栧彿-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum OrderNo_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    #endregion
 
-        /// <summary>
-        /// 鐗╂枡鍞竴鐮�
-        /// </summary>
-        public string MaterialId { get; set; }
+    /// <summary>
+    /// 鍗曟嵁缂栧彿
+    /// </summary>
+    public string OrderNo { get; set; }
 
-        /// <summary>
-        /// 鐗╂枡鍞竴鐮�-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum MaterialId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    /// <summary>
+    /// 鍗曟嵁缂栧彿-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum OrderNo_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-        /// <summary>
-        /// 鍗曟嵁绫诲瀷锛堟灇涓惧�硷級
-        /// </summary>
-        public int?  OrderType { get; set; }
+    /// <summary>
+    /// 鐗╂枡鍞竴鐮�
+    /// </summary>
+    public string MaterialId { get; set; }
 
-        /// <summary>
-        /// 鍗曟嵁绫诲瀷锛堟灇涓惧�硷級-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum OrderType_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+    /// <summary>
+    /// 鐗╂枡鍞竴鐮�-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum MaterialId_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-        /// <summary>
-        /// 鐗╂枡浠跺彿
-        /// </summary>
-        public string MaterialNo { get; set; }
+    /// <summary>
+    /// 鍗曟嵁绫诲瀷锛堟灇涓惧�硷級
+    /// </summary>
+    public OrderTypeEnum? OrderType { get; set; }
 
-        /// <summary>
-        /// 鐗╂枡浠跺彿-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum MaterialNo_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    /// <summary>
+    /// 鍗曟嵁绫诲瀷锛堟灇涓惧�硷級-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum OrderType_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
 
-        /// <summary>
-        /// 鐗╂枡鍚嶇О
-        /// </summary>
-        public string MaterialName { get; set; }
+    /// <summary>
+    /// 鐗╂枡浠跺彿
+    /// </summary>
+    public string MaterialNo { get; set; }
 
-        /// <summary>
-        /// 鐗╂枡鍚嶇О-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum MaterialName_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    /// <summary>
+    /// 鐗╂枡浠跺彿-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum MaterialNo_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-        /// <summary>
-        /// 瀹瑰櫒缂栧彿
-        /// </summary>
-        public string ContainerNo { get; set; }
+    /// <summary>
+    /// 鐗╂枡鍚嶇О
+    /// </summary>
+    public string MaterialName { get; set; }
 
-        /// <summary>
-        /// 瀹瑰櫒缂栧彿-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum ContainerNo_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    /// <summary>
+    /// 鐗╂枡鍚嶇О-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum MaterialName_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-        /// <summary>
-        /// 鏈哄瀷
-        /// </summary>
-        public string MaterialModel { get; set; }
+    /// <summary>
+    /// 瀹瑰櫒缂栧彿
+    /// </summary>
+    public string ContainerNo { get; set; }
 
-        /// <summary>
-        /// 鏈哄瀷-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum MaterialModel_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    /// <summary>
+    /// 瀹瑰櫒缂栧彿-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum ContainerNo_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-        /// <summary>
-        /// 鐗╂枡鎵规
-        /// </summary>
-        public string?  MaterialBatch { get; set; }
+    /// <summary>
+    /// 鏈哄瀷
+    /// </summary>
+    public string MaterialModel { get; set; }
 
-        /// <summary>
-        /// 鐗╂枡鎵规-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum MaterialBatch_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+    /// <summary>
+    /// 鏈哄瀷-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum MaterialModel_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-        /// <summary>
-        /// 鏄惁绂佺敤
-        /// </summary>
-        //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
-        [HighSearchRangeAttribute]
-        public List<string> CreationTime { get; set; }
+    /// <summary>
+    /// 鐗╂枡鎵规
+    /// </summary>
+    public string MaterialBatch { get; set; }
+
+    /// <summary>
+    /// 鐗╂枡鎵规-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum MaterialBatch_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+    /// <summary>
+    /// 澶囨敞
+    /// </summary>
+    public string Remark { get; set; }
+
+    /// <summary>
+    /// 澶囨敞-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum Remark_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+    /// <summary>
+    /// 鎺掑簭
+    /// </summary>
+    public int? Sort { get; set; }
+
+    /// <summary>
+    /// 鎺掑簭-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum Sort_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+    /// <summary>
+    /// 鏄惁绂佺敤
+    /// </summary>
+    //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+    [HighSearchRangeAttribute]
+    public string CreationTime { get; set; }
 
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public string CreatorId { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string CreatorId { get; set; }
 
-        /// <summary>
-        /// -鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum CreatorId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    /// <summary>
+    /// -鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum CreatorId_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public string DeleterId { get; set; }
+    /// <summary>
+    /// 鏄惁绂佺敤
+    /// </summary>
+    public bool? IsDisabled { get; set; }
 
-        /// <summary>
-        /// -鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum DeleterId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    /// <summary>
+    /// 鏄惁绂佺敤-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum IsDisabled_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
 
-        /// <summary>
-        /// 
-        /// </summary>
-        //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
-        [HighSearchRangeAttribute]
-        public List<string> DeletionTime { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string DeleterId { get; set; }
+
+    /// <summary>
+    /// -鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum DeleterId_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+    [HighSearchRangeAttribute]
+    public string DeletionTime { get; set; }
 
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public bool?  IsDeleted { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public bool? IsDeleted { get; set; }
 
-        /// <summary>
-        /// -鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum IsDeleted_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+    /// <summary>
+    /// -鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum IsDeleted_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
 
-        /// <summary>
-        /// 鏄惁绂佺敤
-        /// </summary>
-        public bool?  IsDisabled { get; set; }
-
-        /// <summary>
-        /// 鏄惁绂佺敤-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum IsDisabled_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
-
-        /// <summary>
-        /// 
-        /// </summary>
-        //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
-        [HighSearchRangeAttribute]
-        public List<string> LastModificationTime { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+    [HighSearchRangeAttribute]
+    public string LastModificationTime { get; set; }
 
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public string LastModifierId { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string LastModifierId { get; set; }
 
-        /// <summary>
-        /// -鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum LastModifierId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    /// <summary>
+    /// -鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum LastModifierId_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-        /// <summary>
-        /// 澶囨敞
-        /// </summary>
-        public string Remark { get; set; }
-
-        /// <summary>
-        /// 澶囨敞-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum Remark_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
-
-        /// <summary>
-        /// 鎺掑簭
-        /// </summary>
-        public int?  Sort { get; set; }
-
-        /// <summary>
-        /// 鎺掑簭-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum Sort_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
-
- 
 } 
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/GetWmsInOutStockRecordInput.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/GetWmsInOutStockRecordInput.cs
index fc34c79..80f28c1 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/GetWmsInOutStockRecordInput.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/GetWmsInOutStockRecordInput.cs
@@ -1,3 +1,4 @@
+using CMS.Plugin.HIAWms.Domain.Shared.Enums;
 using CmsQueryExtensions.Extension; 
 using Volo.Abp.Application.Dtos; 
  
@@ -7,243 +8,254 @@
 /// 鍑哄叆搴撹褰曟煡璇㈠弬鏁� 
 /// </summary> 
 public class GetWmsInOutStockRecordInput : ExtensiblePagedAndSortedResultRequestDto 
-{ 
- 
+{
+
     #region 鍏抽敭瀛楁煡璇� 
- 
+
     /// <summary> 
     /// 鍏抽敭瀛楁ā绯婃煡璇紙娉ㄦ剰鏄皬鍐欙紒锛� 
     /// </summary> 
-    public string searchVal { get; set; } 
- 
+    public string searchVal { get; set; }
+
     /// <summary> 
     /// 閫氱敤鏌ヨ閰嶇疆 (1:妯＄硦鏌ヨ , 2:绮惧噯鏌ヨ)锛堟敞鎰忔槸灏忓啓锛侊級 
     /// </summary> 
-    public SearchFilterModeEnum searchVal_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ; 
- 
+    public SearchFilterModeEnum searchVal_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+
     /// <summary> 
     /// 瀛愭悳绱㈢粍浠朵紶閫掔殑閫氱敤鏌ヨ閰嶇疆鐨勫睘鎬у悕锛堟敞鎰忔槸灏忓啓锛侊級 
     /// </summary> 
-    [NoAutoQuery] 
-    public string str_searchFormInputAttrs { get; set; } 
+    [NoAutoQuery]
+    public string str_searchFormInputAttrs { get; set; }
     /// <summary> 
     /// 瀛愭悳绱㈢粍浠朵紶閫掔殑閫氱敤鏌ヨ閰嶇疆鐨勫睘鎬у悕锛堟敞鎰忔槸灏忓啓锛侊級 
     /// </summary> 
-    public List<string> searchFormInputAttrs 
-    { 
-        get 
-        { 
-            if (!string.IsNullOrEmpty(str_searchFormInputAttrs)) 
-            { 
-                return str_searchFormInputAttrs.Split(',').ToList(); 
-            } 
-            return new List<string>(); 
-        } 
-    } 
- 
-    #endregion 
- 
-            /// <summary>
-        /// 鍗曟嵁缂栧彿
-        /// </summary>
-        public string OrderNo { get; set; }
+    public List<string> searchFormInputAttrs
+    {
+        get
+        {
+            if (!string.IsNullOrEmpty(str_searchFormInputAttrs))
+            {
+                return str_searchFormInputAttrs.Split(',').ToList();
+            }
+            return new List<string>();
+        }
+    }
 
-        /// <summary>
-        /// 鍗曟嵁缂栧彿-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum OrderNo_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    #endregion
 
-        /// <summary>
-        /// 鐗╂枡鍚嶇О
-        /// </summary>
-        public string MaterialName { get; set; }
+    /// <summary>
+    /// 鍗曟嵁缂栧彿
+    /// </summary>
+    public string OrderNo { get; set; }
 
-        /// <summary>
-        /// 鐗╂枡鍚嶇О-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum MaterialName_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    /// <summary>
+    /// 鍗曟嵁缂栧彿-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum OrderNo_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-        /// <summary>
-        /// 鐗╂枡浠跺彿
-        /// </summary>
-        public string MaterialNo { get; set; }
+    /// <summary>
+    /// 鐗╂枡鍚嶇О
+    /// </summary>
+    public string MaterialName { get; set; }
 
-        /// <summary>
-        /// 鐗╂枡浠跺彿-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum MaterialNo_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    /// <summary>
+    /// 鐗╂枡鍚嶇О-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum MaterialName_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-        /// <summary>
-        /// 鎿嶄綔绫诲瀷
-        /// </summary>
-        public int?  StockType { get; set; }
+    /// <summary>
+    /// 鐗╂枡浠跺彿
+    /// </summary>
+    public string MaterialNo { get; set; }
 
-        /// <summary>
-        /// 鎿嶄綔绫诲瀷-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum StockType_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+    /// <summary>
+    /// 鐗╂枡浠跺彿-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum MaterialNo_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-        /// <summary>
-        /// 瀹瑰櫒缂栧彿
-        /// </summary>
-        public string ContainerNo { get; set; }
+    /// <summary>
+    /// 鎿嶄綔绫诲瀷
+    /// </summary>
+    public StockTypeEnum? StockType { get; set; }
 
-        /// <summary>
-        /// 瀹瑰櫒缂栧彿-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum ContainerNo_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    /// <summary>
+    /// 鎿嶄綔绫诲瀷-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum StockType_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
 
-        /// <summary>
-        /// 鏈哄瀷
-        /// </summary>
-        public string MaterialModel { get; set; }
+    /// <summary>
+    /// 鐗╂枡鎵规
+    /// </summary>
+    public string MaterialBatch { get; set; }
 
-        /// <summary>
-        /// 鏈哄瀷-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum MaterialModel_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    /// <summary>
+    /// 鐗╂枡鎵规-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum MaterialBatch_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-        /// <summary>
-        /// 鎿嶄綔鏃堕棿
-        /// </summary>
-        //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
-        [HighSearchRangeAttribute]
-        public List<string> OperateTime { get; set; }
+    /// <summary>
+    /// 瀹瑰櫒缂栧彿
+    /// </summary>
+    public string ContainerNo { get; set; }
+
+    /// <summary>
+    /// 瀹瑰櫒缂栧彿-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum ContainerNo_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+    /// <summary>
+    /// 鏈哄瀷
+    /// </summary>
+    public string MaterialModel { get; set; }
+
+    /// <summary>
+    /// 鏈哄瀷-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum MaterialModel_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+    /// <summary>
+    /// 鎿嶄綔鏃堕棿
+    /// </summary>
+    //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+    [HighSearchRangeAttribute]
+    public string OperateTime { get; set; }
 
 
-        /// <summary>
-        /// 澶囨敞
-        /// </summary>
-        public string Remark { get; set; }
+    /// <summary>
+    /// 澶囨敞
+    /// </summary>
+    public string Remark { get; set; }
 
-        /// <summary>
-        /// 澶囨敞-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum Remark_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    /// <summary>
+    /// 澶囨敞-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum Remark_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-        /// <summary>
-        /// 鐗╂枡ID
-        /// </summary>
-        public string MaterialId { get; set; }
+    /// <summary>
+    /// 鐗╂枡ID
+    /// </summary>
+    public string MaterialId { get; set; }
 
-        /// <summary>
-        /// 鐗╂枡ID-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum MaterialId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    /// <summary>
+    /// 鐗╂枡ID-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum MaterialId_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-        /// <summary>
-        /// 浠诲姟鍙�
-        /// </summary>
-        public string TaskNo { get; set; }
+    /// <summary>
+    /// 浠诲姟鍙�
+    /// </summary>
+    public string TaskNo { get; set; }
 
-        /// <summary>
-        /// 浠诲姟鍙�-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum TaskNo_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    /// <summary>
+    /// 浠诲姟鍙�-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum TaskNo_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-        /// <summary>
-        /// 璧峰搴撲綅
-        /// </summary>
-        public string SourcePlace { get; set; }
+    /// <summary>
+    /// 璧峰搴撲綅
+    /// </summary>
+    public string SourcePlace { get; set; }
 
-        /// <summary>
-        /// 璧峰搴撲綅-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum SourcePlace_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    /// <summary>
+    /// 璧峰搴撲綅-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum SourcePlace_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-        /// <summary>
-        /// 鐩爣搴撲綅
-        /// </summary>
-        public string ToPlace { get; set; }
+    /// <summary>
+    /// 鐩爣搴撲綅
+    /// </summary>
+    public string ToPlace { get; set; }
 
-        /// <summary>
-        /// 鐩爣搴撲綅-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum ToPlace_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    /// <summary>
+    /// 鐩爣搴撲綅-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum ToPlace_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-        /// <summary>
-        /// 鎺掑簭
-        /// </summary>
-        public int?  Sort { get; set; }
+    /// <summary>
+    /// 鎺掑簭
+    /// </summary>
+    public int? Sort { get; set; }
 
-        /// <summary>
-        /// 鎺掑簭-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum Sort_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+    /// <summary>
+    /// 鎺掑簭-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum Sort_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
 
-        /// <summary>
-        /// 鏄惁绂佺敤
-        /// </summary>
-        public bool?  IsDisabled { get; set; }
+    /// <summary>
+    /// 鏄惁绂佺敤
+    /// </summary>
+    public bool? IsDisabled { get; set; }
 
-        /// <summary>
-        /// 鏄惁绂佺敤-鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum IsDisabled_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+    /// <summary>
+    /// 鏄惁绂佺敤-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum IsDisabled_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
 
-        /// <summary>
-        /// 
-        /// </summary>
-        //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
-        [HighSearchRangeAttribute]
-        public List<string> CreationTime { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+    [HighSearchRangeAttribute]
+    public string CreationTime { get; set; }
 
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public string CreatorId { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string CreatorId { get; set; }
 
-        /// <summary>
-        /// -鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum CreatorId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    /// <summary>
+    /// -鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum CreatorId_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-        /// <summary>
-        /// 
-        /// </summary>
-        //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
-        [HighSearchRangeAttribute]
-        public List<string> LastModificationTime { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+    [HighSearchRangeAttribute]
+    public string LastModificationTime { get; set; }
 
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public string LastModifierId { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string LastModifierId { get; set; }
 
-        /// <summary>
-        /// -鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum LastModifierId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    /// <summary>
+    /// -鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum LastModifierId_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public bool?  IsDeleted { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public bool? IsDeleted { get; set; }
 
-        /// <summary>
-        /// -鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum IsDeleted_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+    /// <summary>
+    /// -鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum IsDeleted_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public string DeleterId { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string DeleterId { get; set; }
 
-        /// <summary>
-        /// -鏌ヨ鍏崇郴杩愮畻绗� 
-        /// </summary>
-        public SearchFilterModeEnum DeleterId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+    /// <summary>
+    /// -鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum DeleterId_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-        /// <summary>
-        /// 
-        /// </summary>
-        //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
-        [HighSearchRangeAttribute]
-        public List<string> DeletionTime { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+    [HighSearchRangeAttribute]
+    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/\345\207\272\345\205\245\345\272\223\345\215\225\346\215\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/\345\207\272\345\205\245\345\272\223\345\215\225\346\215\256.txt"
deleted file mode 100644
index a59d60b..0000000
--- "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/\345\207\272\345\205\245\345\272\223\345\215\225\346\215\256.txt"
+++ /dev/null
@@ -1,14 +0,0 @@
-[琛ㄥ悕]:scms_wmsinoutstockorder
-[瀹炰綋绫诲悕]:WmsInOutStockOrder
-[瀹炰綋绫诲璞″悕]:wmsInOutStockOrder
-[椤甸潰鑿滃崟鍚峕:鍑哄叆搴撳崟鎹�
-[椤甸潰鑿滃崟瀵硅薄缂╁啓]:wmsInOutStockOrder
-[琛ㄧ殑涓枃娉ㄨВ]:鍑哄叆搴撳崟鎹�
-[閲嶅鎬ф牎楠屽瓧娈礭:OrderNo
-[鍒犻櫎鎻愮ず瀛楁]:OrderNo
-[妯＄硦鏌ヨ瀛楁]:'OrderNo', 'MaterialNo', 'MaterialBatch'
-[妯＄硦鏌ヨ瀛楁鍚峕:璇疯緭鍏ュ崟鎹彿/鐗╂枡缂栧彿/鎵规
-[椤圭洰鍛藉悕绌洪棿]:HIAWms
-[鏋氫妇绫诲瀷瀛楁闆嗗悎]:OrderStatus,OrderStatusEnum&OrderType,OrderTypeEnum&StockType,StockTypeEnum
-[鍓嶇鏍规枃浠跺す鍚嶇О]:web
-[鎺掑簭]:CreationTime
\ No newline at end of file
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/\345\207\272\345\205\245\345\272\223\345\215\225\346\215\256\350\257\246\346\203\205.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/\345\207\272\345\205\245\345\272\223\345\215\225\346\215\256\350\257\246\346\203\205.txt"
index 3b619b8..34096e4 100644
--- "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/\345\207\272\345\205\245\345\272\223\345\215\225\346\215\256\350\257\246\346\203\205.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/\345\207\272\345\205\245\345\272\223\345\215\225\346\215\256\350\257\246\346\203\205.txt"
@@ -1,13 +1,13 @@
 [琛ㄥ悕]:scms_wmsinoutstockorderdetail
 [瀹炰綋绫诲悕]:WmsInOutStockOrderDetail
 [瀹炰綋绫诲璞″悕]:wmsInOutStockOrderDetail
-[椤甸潰鑿滃崟鍚峕:鍑哄叆搴撳崟鎹鎯�
-[椤甸潰鑿滃崟瀵硅薄缂╁啓]:wmsInOutStockOrderDetail
-[琛ㄧ殑涓枃娉ㄨВ]:鍑哄叆搴撳崟鎹鎯�
-[閲嶅鎬ф牎楠屽瓧娈礭:MaterialId
-[鍒犻櫎鎻愮ず瀛楁]:MaterialId
-[妯＄硦鏌ヨ瀛楁]:'OrderNo', 'MaterialNo', 'MaterialId'
-[妯＄硦鏌ヨ瀛楁鍚峕:璇疯緭鍏ュ崟鎹彿/鐗╂枡缂栧彿/鐗╂枡ID
+[椤甸潰鑿滃崟鍚峕:鍑哄簱鍗曟嵁璇︽儏
+[椤甸潰鑿滃崟瀵硅薄缂╁啓]:WmsInOutStockOrderDetail
+[琛ㄧ殑涓枃娉ㄨВ]:鍑哄簱鍗曟嵁璇︽儏
+[閲嶅鎬ф牎楠屽瓧娈礭:OrderNo
+[鍒犻櫎鎻愮ず瀛楁]:OrderNo
+[妯＄硦鏌ヨ瀛楁]:
+[妯＄硦鏌ヨ瀛楁鍚峕:
 [椤圭洰鍛藉悕绌洪棿]:HIAWms
 [鏋氫妇绫诲瀷瀛楁闆嗗悎]:OrderType,OrderTypeEnum
 [鍓嶇鏍规枃浠跺す鍚嶇О]:web
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/\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225.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/\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225.txt"
new file mode 100644
index 0000000..7ebf809
--- /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/\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225.txt"
@@ -0,0 +1,14 @@
+[琛ㄥ悕]:scms_wmsinoutstockrecords
+[瀹炰綋绫诲悕]:WmsInOutStockRecord
+[瀹炰綋绫诲璞″悕]:wmsInOutStockRecord
+[椤甸潰鑿滃崟鍚峕:鍑哄叆搴撹褰�
+[椤甸潰鑿滃崟瀵硅薄缂╁啓]:WmsInOutStockRecord
+[琛ㄧ殑涓枃娉ㄨВ]:鍑哄叆搴撹褰�
+[閲嶅鎬ф牎楠屽瓧娈礭:TaskNo
+[鍒犻櫎鎻愮ず瀛楁]:TaskNo
+[妯＄硦鏌ヨ瀛楁]:
+[妯＄硦鏌ヨ瀛楁鍚峕:
+[椤圭洰鍛藉悕绌洪棿]:HIAWms
+[鏋氫妇绫诲瀷瀛楁闆嗗悎]:StockType,StockTypeEnum
+[鍓嶇鏍规枃浠跺す鍚嶇О]:web
+[鎺掑簭]:CreationTime
\ No newline at end of file
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/\345\207\272\345\272\223\345\215\225\346\215\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/\345\207\272\345\272\223\345\215\225\346\215\256.txt"
new file mode 100644
index 0000000..7b7b78b
--- /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/\345\207\272\345\272\223\345\215\225\346\215\256.txt"
@@ -0,0 +1,14 @@
+[琛ㄥ悕]:scms_wmsinoutstockorder
+[瀹炰綋绫诲悕]:WmsInOutStockOrder
+[瀹炰綋绫诲璞″悕]:wmsInOutStockOrder
+[椤甸潰鑿滃崟鍚峕:鍑哄簱鍗曟嵁
+[椤甸潰鑿滃崟瀵硅薄缂╁啓]:WmsInOutStockOrder
+[琛ㄧ殑涓枃娉ㄨВ]:鍑哄簱鍗曟嵁
+[閲嶅鎬ф牎楠屽瓧娈礭:OrderNo
+[鍒犻櫎鎻愮ず瀛楁]:OrderNo
+[妯＄硦鏌ヨ瀛楁]:
+[妯＄硦鏌ヨ瀛楁鍚峕:
+[椤圭洰鍛藉悕绌洪棿]:HIAWms
+[鏋氫妇绫诲瀷瀛楁闆嗗悎]:OrderStatus,OrderStatusEnum&OrderType,OrderTypeEnum&StockType,StockTypeEnum
+[鍓嶇鏍规枃浠跺す鍚嶇О]:web
+[鎺掑簭]:CreationTime
\ No newline at end of file

--
Gitblit v1.9.3