diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue
index 105da516f..2e599dd83 100644
--- a/src/components/Form/src/Form.vue
+++ b/src/components/Form/src/Form.vue
@@ -276,6 +276,7 @@ export default defineComponent({
                   if(event.keyCode === 13){
                     //回车
                     emit('onEnter',item.field,formModel.value[item.field],event)
+                    event.target.blur();//回车之后自动失去焦点
                   }
               }} 
               onBlur={(e) => { onBlur(item.field,formModel.value[item.field]) }}
@@ -409,6 +410,7 @@ export default defineComponent({
                           if(event.keyCode === 13){
                             //回车
                             emit('onEnter',item.field,formModel.value[item.field],event)
+                            event.target.blur();//回车之后自动失去焦点
                           }
                       }} 
                       {...(notRenderOptions.includes(item?.component as string) &&
diff --git a/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue b/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue
index 3badcc8e2..5314a421e 100644
--- a/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue
@@ -220,32 +220,36 @@ const openForm = (type: string, row?: any) => {
 
 // form表单提交
 const formsSuccess = async (formType,data) => {
+  try{
       var isHave =Productionlineitem.allSchemas.formSchema.some(function (item) {
-        return item.field === 'activeTime' || item.field === 'expireTime';
-      });
-      if(isHave){
-        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
-          message.error('失效时间要大于生效时间')
-          return;
-        }
-      }
-      if(data.activeTime==0)data.activeTime = null;
-      if(data.expireTime==0)data.expireTime = null;
-      basicFormRef.value.formLoading = true
-      if (formType === 'create') {
-        await ProductionlineitemApi.createProductionlineitem(data)
-        message.success(t('common.createSuccess'))
-      } else {
-        await ProductionlineitemApi.updateProductionlineitem(data)
-        message.success(t('common.updateSuccess'))
-      }
-      basicFormRef.value.formLoading = false
-      basicFormRef.value.dialogVisible = false
-      if (formType === 'create') {
-        getList()
-      }else{
-        buttonBaseClick('refresh',null)
+      return item.field === 'activeTime' || item.field === 'expireTime';
+    });
+    if(isHave){
+      if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+        message.error('失效时间要大于生效时间')
+        return;
       }
+    }
+    if(data.activeTime==0)data.activeTime = null;
+    if(data.expireTime==0)data.expireTime = null;
+    basicFormRef.value.formLoading = true
+    if (formType === 'create') {
+      await ProductionlineitemApi.createProductionlineitem(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProductionlineitemApi.updateProductionlineitem(data)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.formLoading = false
+    basicFormRef.value.dialogVisible = false
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
+  } catch {
+    basicFormRef.value.formLoading = false
+  }
 }
 
 // 查询页面返回
diff --git a/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue b/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue
index d00607fb4..d1035afbe 100644
--- a/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue
@@ -206,33 +206,38 @@ const openForm = (type: string, row?: any) => {
 }
 
 // form表单提交
-const formsSuccess = async (formType,data) => {
-      var isHave =Stdcostprice.allSchemas.formSchema.some(function (item) {
-        return item.field === 'activeTime' || item.field === 'expireTime';
-      });
-      if(isHave){
-        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
-          message.error('失效时间要大于生效时间')
-          return;
-        }
-      }
-      if(data.activeTime==0)data.activeTime = null;
-      if(data.expireTime==0)data.expireTime = null;
-      basicFormRef.value.formLoading = true
-      if (formType === 'create') {
-        await StdcostpriceApi.createStdcostprice(data)
-        message.success(t('common.createSuccess'))
-      } else {
-        await StdcostpriceApi.updateStdcostprice(data)
-        message.success(t('common.updateSuccess'))
-      }
-      basicFormRef.value.dialogVisible = false
-      basicFormRef.value.formLoading = false
-      if (formType === 'create') {
-        getList()
-      }else{
-        buttonBaseClick('refresh',null)
+const formsSuccess = async (formType, data) => {
+  try{
+    var isHave =Stdcostprice.allSchemas.formSchema.some(function (item) {
+      return item.field === 'activeTime' || item.field === 'expireTime';
+    });
+    if(isHave){
+      if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+        message.error('失效时间要大于生效时间')
+        return;
       }
+    }
+    if(data.activeTime==0)data.activeTime = null;
+    if(data.expireTime==0)data.expireTime = null;
+    basicFormRef.value.formLoading = true
+    if (formType === 'create') {
+      await StdcostpriceApi.createStdcostprice(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await StdcostpriceApi.updateStdcostprice(data)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.dialogVisible = false
+    basicFormRef.value.formLoading = false
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
+  } catch {
+    basicFormRef.value.formLoading = false
+    
+  }
 }
 
 // 查询页面返回
diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
index 64665c60a..4101909ad 100644
--- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
@@ -378,7 +378,8 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   tableObject.params = {
-    available: true
+    available: true,
+    type: 'MakeLabel'
   }
   getList()
 })
diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts
index 4ea0ae2bf..147b93726 100644
--- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts
@@ -31,7 +31,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     label: '标签类型',
     field: 'type',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     dictType: DICT_TYPE.LABEL_TYPE,
     dictClass: 'string'
   },
@@ -52,6 +52,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     label: '关联号',
     field: 'relateNumber',
     sort: 'custom',
+    isSearch:true
   },
   {
     label: '标签条码字符串',
diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
index 96d5f49b4..dfe1acbee 100644
--- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
@@ -401,7 +401,8 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   tableObject.params = {
-    available: true
+    available: true,
+    type: 'PurchaseLabel'
   }
   getList()
 })
diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
index 838b2edb9..0acf47726 100644
--- a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
@@ -43,7 +43,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     label: '标签类型',
     field: 'type',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     dictType: DICT_TYPE.LABEL_TYPE,
     dictClass: 'string'
   },
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
index 4bc06a6d2..ce23a8b8f 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
@@ -53,54 +53,7 @@
           <div key="规则条件title" class="title">规则条件</div>
           <el-row key="规则条件row" :gutter="10">
             <el-col key="供应商和客户col" :span="24" v-for="(item, index) in formData.condition" :key="index">
-              <!-- 选择供应商和客户 -->
-<!--              <el-form-item key="供应商和客户formItem" label="" label-width="0" class="err-240" v-if="index == 0">-->
-<!--                <el-select key="供应商和客户"-->
-<!--                  v-model="item.ParamCode"-->
-<!--                  placeholder=""-->
-<!--                  style="width: 110px; margin-right: 10px"-->
-<!--                  @change="changeSupplierCustomer"-->
-<!--                  :disabled="formData.priority==0&&formType=='update'"-->
-<!--                >-->
-<!--                  <el-option-->
-<!--                    :label="cur.label"-->
-<!--                    :value="cur.value"-->
-<!--                    v-for="(cur, index) in options.typeOptions"-->
-<!--                    :key="'供应商和客户'+cur.value"-->
-<!--                  />-->
-<!--                </el-select>-->
-<!--                <el-select key="供应商和客户Operator"-->
-<!--                  v-model="item.Operator"-->
-<!--                  placeholder="请选择范围"-->
-<!--                  style="width: 110px; margin-right: 10px"-->
-<!--                  :disabled="formData.priority==0&&formType=='update'"-->
-<!--                >-->
-<!--                  <el-option-->
-<!--                    :label="cur.label"-->
-<!--                    :value="cur.value"-->
-<!--                    v-for="cur in options.rangeOptions1"-->
-<!--                    :key="'供应商和客户Operator'+cur.value"-->
-<!--                  />-->
-<!--                </el-select>-->
-<!--                <el-select key="供应商和客户Value"-->
-<!--                  v-model="item.Value"-->
-<!--                  :placeholder="`请选择${item.ParamCode == 'SupplierCode' ? '供应商' : '客户'}`"-->
-<!--                  style="flex: 1"-->
-<!--                  clearable-->
-<!--                  multiple-->
-<!--                  collapse-tags-->
-<!--                  filterable-->
-<!--                  :filter-method="filterMethod"-->
-<!--                  :disabled="formData.priority==0&&formType=='update'"-->
-<!--                >-->
-<!--                  <el-option-->
-<!--                    v-for="cur in options.supplierList"-->
-<!--                    :key="'供应商和客户Value'+cur.code"-->
-<!--                    :label="cur.name"-->
-<!--                    :value="cur.code"-->
-<!--                  />-->
-<!--                </el-select>-->
-<!--              </el-form-item>-->
+              
               <!-- 选择物料类型 -->
               <el-form-item key="物料类型formItem" label="" label-width="0" class="err-240" v-if="index == 1">
                 <el-select key="物料类型"
@@ -200,13 +153,6 @@
                     :value="cur.value"
                   />
                 </el-select>
-                <!-- <el-input key="物料分组"
-                  v-model="item.Value"
-                  placeholder="请输入物料分组，多个物料分组以逗号分隔"
-                  clearable
-                  style="flex: 1"
-                  v-else-if="item.ParamCode == 'ItemGroup'"
-                /> -->
                 <el-input key="项目"
                   v-model="item.Value"
                   placeholder="请输入项目，多个项目以逗号分隔"
@@ -223,109 +169,6 @@
                     </template>
                   </el-input>
               </el-form-item>
-              <!-- 选择重量体积还是面积 -->
-<!--              <el-form-item key="重量体积或面积formItem" label="" label-width="0" class="err-240" v-if="index == 2">-->
-<!--                <el-select key="重量体积或面积"-->
-<!--                  v-model="item.ParamCode"-->
-<!--                  placeholder=""-->
-<!--                  @change="changeCalculation"-->
-<!--                  style="width: 110px; margin-right: 10px"-->
-<!--                  :disabled="formData.priority==0&&formType=='update'"-->
-<!--                >-->
-<!--                  <el-option-->
-<!--                    :label="cur.label"-->
-<!--                    :value="cur.value"-->
-<!--                    v-for="cur in options.calculationTypeOptions"-->
-<!--                    :key="'重量体积或面积'+cur.value"-->
-<!--                  />-->
-<!--                </el-select>-->
-<!--                <el-select key="重量体积或面积Operator"-->
-<!--                  v-model="item.Operator"-->
-<!--                  placeholder="请选择范围"-->
-<!--                  style="width: 110px; margin-right: 10px"-->
-<!--                  :disabled="formData.priority==0&&formType=='update'"-->
-<!--                >-->
-<!--                  <el-option-->
-<!--                    :label="cur.label"-->
-<!--                    :value="cur.value"-->
-<!--                    v-for="cur in options.rangeOptions2"-->
-<!--                    :key="'重量体积或面积Operator'+cur.value"-->
-<!--                  />-->
-<!--                </el-select>-->
-<!--                <el-input key="重量体积或面积Value"-->
-<!--                  v-model="item.Value"-->
-<!--                  :placeholder="`请输入${-->
-<!--                    item.ParamCode == 'Weight' ? '重量' : item.ParamCode == 'Area' ? '面积' : '体积'-->
-<!--                  }`"-->
-<!--                  clearable-->
-<!--                  style="flex: 1"-->
-<!--                  :disabled="formData.priority==0&&formType=='update'"-->
-<!--                />-->
-<!--              </el-form-item>-->
-              <!-- 库存状态 -->
-<!--              <el-form-item key="库存状态formItem" label="库存状态" class="err-120" v-if="index == 3">-->
-<!--                <el-select key="库存状态Operator"-->
-<!--                  v-model="item.Operator"-->
-<!--                  placeholder="请选择范围"-->
-<!--                  style="width: 110px; margin-right: 10px"-->
-<!--                  :disabled="formData.priority==0&&formType=='update'"-->
-<!--                >-->
-<!--                  <el-option-->
-<!--                    :label="cur.label"-->
-<!--                    :value="cur.value"-->
-<!--                    v-for="cur in options.rangeOptions1"-->
-<!--                    :key="'库存状态Operator'+cur.value"-->
-<!--                  />-->
-<!--                </el-select>-->
-<!--                <el-select key="库存状态Value"-->
-<!--                  v-model="item.Value"-->
-<!--                  placeholder="请选择库存状态"-->
-<!--                  style="flex: 1"-->
-<!--                  clearable-->
-<!--                  multiple-->
-<!--                  collapse-tags-->
-<!--                  :disabled="formData.priority==0&&formType=='update'"-->
-<!--                >-->
-<!--                  <el-option-->
-<!--                    v-for="cur in getStrDictOptions(DICT_TYPE.INVENTORY_STATUS)"-->
-<!--                    :key="'库存状态Value'+cur.value"-->
-<!--                    :label="cur.label"-->
-<!--                    :value="cur.value"-->
-<!--                  />-->
-<!--                </el-select>-->
-<!--              </el-form-item>-->
-              <!-- 存储类型 -->
-<!--              <el-form-item key="存储类型formItem" label="存储类型" class="err-120" v-if="index == 4">-->
-<!--                <el-select key="存储类型Operator"-->
-<!--                  v-model="item.Operator"-->
-<!--                  placeholder="请选择范围"-->
-<!--                  style="width: 110px; margin-right: 10px"-->
-<!--                  :disabled="formData.priority==0&&formType=='update'"-->
-<!--                >-->
-<!--                  <el-option-->
-<!--                    :label="cur.label"-->
-<!--                    :value="cur.value"-->
-<!--                    v-for="cur in options.rangeOptions1"-->
-<!--                    :key="'存储类型Operator'+cur.value"-->
-<!--                  />-->
-<!--                </el-select>-->
-<!--                <el-select key="存储类型Value"-->
-<!--                  v-model="item.Value"-->
-<!--                  placeholder="请选择存储类型"-->
-<!--                  style="flex: 1"-->
-<!--                  clearable-->
-<!--                  multiple-->
-<!--                  collapse-tags-->
-<!--                  :disabled="formData.priority==0&&formType=='update'"-->
-<!--                >-->
-<!--                  <el-option-->
-<!--                    v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)"-->
-<!--                    :key="'存储类型Value'+cur.value"-->
-<!--                    :label="cur.label"-->
-<!--                    :value="cur.value"-->
-<!--                  />-->
-<!--                </el-select>-->
-<!--              </el-form-item>-->
               <!-- 生产线 -->
               <el-form-item key="生产线formItem" label="生产线" class="err-120" v-if="index == 5">
                 <el-select key="生产线Operator"
@@ -410,75 +253,6 @@
                       </el-button> 
                     </template>
                   </el-input>
-                <!-- <el-select
-                  v-model="formData.configuration.WarehouseCode"
-                  v-if="warehouseType == 'WarehouseCode'"
-                  placeholder="请选择仓库"
-                  key="请选择仓库"
-                  clearable
-                  style="flex: 1"
-                  filterable
-                  :filter-method="filterMethodWarehouseList"
-                >
-                  <el-option
-                    v-for="cur in options.warehouseList"
-                    :key="'请选择仓库WarehouseCode'+index+cur.code"
-                    :label="cur.code"
-                    :value="cur.code"
-                  />
-                </el-select>
-                <el-select
-                  v-model="formData.configuration.AreaCode"
-                  v-if="warehouseType == 'AreaCode'"
-                  placeholder="请选择库区"
-                  key="请选择库区"
-                  clearable
-                  style="flex: 1"
-                  filterable
-                  :filter-method="filterMethodWarehouseList"
-                >
-                  <el-option
-                    v-for="cur in options.warehouseList"
-                    :key="'请选择库区AreaCode'+cur.code"
-                    :label="cur.code"
-                    :value="cur.code"
-                  />
-                </el-select>
-                <el-select
-                  v-model="formData.configuration.LocationGroupCode"
-                  v-if="warehouseType == 'LocationGroupCode'"
-                  placeholder="请选择库位组"
-                  key="请选择库位组"
-                  clearable
-                  style="flex: 1"
-                  filterable
-                  :filter-method="filterMethodWarehouseList"
-                >
-                  <el-option
-                    v-for="cur in options.warehouseList"
-                    :key="'请选择库位组LocationGroupCode'+cur.code"
-                    :label="cur.code"
-                    :value="cur.code"
-                  />
-                </el-select>
-
-                <el-select
-                  v-model="formData.configuration.LocationCode"
-                  v-if="warehouseType == 'LocationCode'"
-                  placeholder="请选择库位"
-                  key="请选择库位"
-                  clearable
-                  style="flex: 1"
-                  filterable
-                  :filter-method="filterMethodWarehouseList"
-                >
-                  <el-option
-                    v-for="cur in options.warehouseList"
-                    :key="'请选择库位LocationCode'+cur.code"
-                    :label="cur.code"
-                    :value="cur.code"
-                  />
-                </el-select> -->
               </el-form-item>
             </el-col>
             <!-- 数量排序方向 -->
@@ -556,31 +330,6 @@
                 </div>
               </el-form-item>
             </el-col>
-            <!-- 优先整包 -->
-<!--            <el-col :span="24">-->
-<!--              <el-form-item key="优先整包formItem" label="优先整包">-->
-<!--                <el-switch key="优先整包"-->
-<!--                  v-model="formData.configuration.EntirePackageFirst"-->
-<!--                  active-value="TRUE"-->
-<!--                  inactive-value="FALSE"-->
-<!--                />-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
-            <!-- 发料包装类型 -->
-<!--            <el-col key="发料包装类型col" :span="24">-->
-<!--              <el-form-item key="发料包装类型formItem" label="发料包装类型">-->
-<!--                <div class="checkbox">-->
-<!--                  <el-radio-group key="发料包装类型" v-model="formData.configuration.IssueStorageType">-->
-<!--                    <el-radio-->
-<!--                      :label="cur.value"-->
-<!--                      v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)"-->
-<!--                      :key="'发料包装类型'+cur.value"-->
-<!--                      >{{ cur.label }}</el-radio-->
-<!--                    >-->
-<!--                  </el-radio-group>-->
-<!--                </div>-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
             <!-- 多次发料 -->
             <el-col key="多次发料col" :span="7">
               <el-form-item key="多次发料formItem" label="多次发料">
@@ -612,36 +361,6 @@
                 />小时
               </el-form-item>
             </el-col>
-            <!-- 使用整理库位-->
-<!--            <el-col key="使用整理库位col" :span="24">-->
-<!--              <el-form-item key="使用整理库位formItem" label="使用整理库位">-->
-<!--                <el-switch key="使用整理库位"-->
-<!--                  v-model="formData.configuration.UseOrganizeLocation"-->
-<!--                  active-value="TRUE"-->
-<!--                  inactive-value="FALSE"-->
-<!--                />-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
-            <!-- 使用在途库位 -->
-<!--            <el-col key="使用在途库位col" :span="24">-->
-<!--              <el-form-item key="使用在途库位formItem"  label="使用在途库位">-->
-<!--                <el-switch key="使用在途库位"-->
-<!--                  v-model="formData.configuration.UseTransportLocation"-->
-<!--                  active-value="TRUE"-->
-<!--                  inactive-value="FALSE"-->
-<!--                />-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
-            <!-- 生成接收任务 -->
-<!--            <el-col key="生成接收任务col" :span="24">-->
-<!--              <el-form-item key="生成接收任务formItem" label="生成接收任务">-->
-<!--                <el-switch key="生成接收任务"-->
-<!--                  v-model="formData.configuration.CreateReceiptJob"-->
-<!--                  active-value="TRUE"-->
-<!--                  inactive-value="FALSE"-->
-<!--                />-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
           </el-row>
         </div>
       </el-form>
@@ -727,22 +446,12 @@ const formData = ref({
     RowOrder: 'ASC',
     // 列排序方向
     ColumOrder: 'ASC',
-    // 优先整包
-    EntirePackageFirst: 'FALSE',
-    // 发料包装类型
-    IssueStorageType: 'SINGLE',
     // 是否拆分发料
     IsSplit: '',
     // 拆分数量
     EachTimeQty: '',
     // 时间间隔
     TimeInterval: '',
-    // 是否使用整理库位
-    UseOrganizeLocation: 'FALSE',
-    // 是否使用在途库位
-    UseTransportLocation: 'FALSE',
-    // 是否生成发料接收任务
-    CreateReceiptJob: 'FALSE'
   }
 })
 // 验证规则
@@ -777,14 +486,6 @@ const options = reactive({
   //范围下拉框列表
   rangeOptions1: formatRangeOptions('IN', 'NOT IN'),
   rangeOptions2: formatRangeOptions('>', '<', '>=', '<='),
-  // 供应商客户下拉框列表
-  typeOptions: [
-    { value: 'SupplierCode', label: '供应商' },
-    { value: 'CustomerCode', label: '客户' }
-  ],
-  //供应商列表
-  supplierList: [],
-  originSupplierList: [],
   // 物料类型列表
   itemTypeOptions: [
     { value: 'ItemType', label: '物料类型' },
@@ -794,12 +495,6 @@ const options = reactive({
     { value: 'AbcClass', label: 'ABC类' },
     { value: 'ItemStatus', label: '物料状态' }
   ],
-  // 重量体积面积类型列表
-  calculationTypeOptions: [
-    { value: 'Weight', label: '重量' },
-    { value: 'Volume', label: '体积' },
-    { value: 'Area', label: '面积' }
-  ],
   //仓库列表
   warehouseTypeOptions: [
     { value: 'WarehouseCode', label: '从仓库' },
@@ -807,8 +502,6 @@ const options = reactive({
     { value: 'LocationGroupCode', label: '从库位组' },
     { value: 'LocationCode', label: '从库位' }
   ],
-  warehouseList: [],
-  originWarehouseList: [],
   // 排列方式
   sortOptions: [
     { value: 'ASC', label: '从小到大' },
@@ -832,109 +525,10 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
-// 获取供应商列表
-const getFormSupplierList = async () => {
-  options.originSupplierList = await getSupplierList(null)
-  options.supplierList = [...options.originSupplierList]
-}
-// 获取客户列表
-const getFormCustomerList = async () => {
-  options.originSupplierList = await getCustomerList(null)
-  options.supplierList = [...options.originSupplierList]
-}
-const filterMethod = (query: string) => {
-  if (query) {
-    options.supplierList = options.originSupplierList.filter((item) => {
-      if(!item.name||item.name==''){
-        return item.code.includes(query)
-      }else{
-        return item.name.includes(query)
-      }
-    })
-  } else {
-    options.supplierList = [...options.originSupplierList]
-  }
-}
-// 选择客户还是承运商
-const changeSupplierCustomer = (e) => {
-  formData.value.condition[0].Value = ''
-  if (e == 'CustomerCode') {
-    getFormCustomerList()
-  } else if (e == 'SupplierCode') {
-    getFormSupplierList()
-  }
-}
-getFormSupplierList()
 // 选择物料类型/物料分组/abc类/物料/项目
 const changeItemsType = () => {
   formData.value.condition[1].Value = ''
 }
-// 选择重量/体积/面积
-const changeCalculation = () => {
-  formData.value.condition[2].Value = ''
-}
-// 获取仓库列表
-const getFormWarehouseList = async () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: t('ts.加载中'),
-    background: 'rgba(0, 0, 0, 0.7)',
-  })
-  options.originWarehouseList = await getWarehouseList()
-  options.warehouseList = [...options.originWarehouseList]
-  nextTick(()=>{
-    loading.close()
-  })
-}
-// 获取库区列表
-const getFormAreaList = async () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: t('ts.加载中'),
-    background: 'rgba(0, 0, 0, 0.7)',
-  })
-  options.originWarehouseList = await getAreaList()
-  options.warehouseList = [...options.originWarehouseList]
-  nextTick(()=>{
-    loading.close()
-  })
-}
-// 获取库位组列表
-const getFormLocationgrouList = async () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: t('ts.加载中'),
-    background: 'rgba(0, 0, 0, 0.7)',
-  })
-  options.originWarehouseList = await getLocationgroupList()
-  options.warehouseList = [...options.originWarehouseList]
-  nextTick(()=>{
-    loading.close()
-  })
-}
-// 获取库位列表
-const getFormLocationList = async () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: t('ts.加载中'),
-    background: 'rgba(0, 0, 0, 0.7)',
-  })
-  options.originWarehouseList =  await getLocationList()
-  options.warehouseList = [...options.originWarehouseList]
-  nextTick(()=>{
-    loading.close()
-  })
-}
-const filterMethodWarehouseList = (query: string) => {
-  if (query) {
-    options.warehouseList = options.originWarehouseList.filter((item) => {
-      return item.code.includes(query)
-    })
-  } else {
-    options.warehouseList = options.originWarehouseList
-  }
-}
-
 
 const searchTableRef = ref()
 
@@ -1177,23 +771,7 @@ const searchTableSuccess = (formField, searchField, val, type, row) => {
     }
   })
 }
-// getFormWarehouseList()
-// 选择仓库/库位/库位组/库区
-const changeWarehouse = (e) => {
-  formData.value.configuration.WarehouseCode = ''
-  formData.value.configuration.AreaCode = ''
-  formData.value.configuration.LocationGroupCode = ''
-  formData.value.configuration.LocationCode = ''
-  if (e == 'WarehouseCode') {
-    getFormWarehouseList()
-  } else if (e == 'AreaCode') {
-    getFormAreaList()
-  } else if (e == 'LocationGroupCode') {
-    getFormLocationgrouList()
-  } else if (e == 'LocationCode') {
-    getFormLocationList()
-  }
-}
+
 /** 打开弹窗 */
 const open = async (type: string, strategyCode: string, id?: number) => {
   formStrategyCode.value = strategyCode
@@ -1243,12 +821,7 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
       }
-      // 判断是获取客户列表还是供应上列表
-      if (formData.value.condition[0].ParamCode == 'SupplierCode') {
-        getFormSupplierList()
-      } else {
-        getFormCustomerList()
-      }
+     
       // 判断是获取仓库/库位/库位组/库区列表
       if (
         'WarehouseCode' in formData.value.configuration &&
@@ -1392,22 +965,12 @@ const resetForm = () => {
       RowOrder: 'ASC',
       // 列排序方向
       ColumOrder: 'ASC',
-      // 优先整包
-      EntirePackageFirst: 'FALSE',
-      // 发料包装类型
-      IssueStorageType: 'SINGLE',
       // 是否拆分发料
       IsSplit: '',
       // 拆分数量
       EachTimeQty: '',
       // 时间间隔
       TimeInterval: '',
-      // 是否使用整理库位
-      UseOrganizeLocation: 'FALSE',
-      // 是否使用在途库位
-      UseTransportLocation: 'FALSE',
-      // 是否生成发料接收任务
-      CreateReceiptJob: 'FALSE'
     }
   }
 }
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue
index 36f91fdf6..b033f9dc4 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue
@@ -191,7 +191,6 @@
                   v-model="item.ParamCode"
                   placeholder=""
                   style="width: 110px; margin-right: 10px"
-                  @change="changeWarehouse"
                   :disabled="formData.priority==0&&formType=='update'" 
                 >
                   <el-option
@@ -475,37 +474,6 @@ getFormSupplierList()
 const changeItemsType = () => {
   formData.value.condition[1].Value = ''
 }
-
-// 获取仓库列表
-const getFormWarehouseList = async () => {
-  options.warehouseList = await getWarehouseList()
-}
-// 获取库区列表
-const getFormAreaList = async () => {
-  options.warehouseList = await getAreaList()
-}
-// 获取库位组列表
-const getFormLocationgrouList = async () => {
-  options.warehouseList = await getLocationgroupList()
-}
-// 获取库位列表
-const getFormLocationList = async () => {
-  options.warehouseList = await getLocationList()
-}
-getFormLocationList()
-// 选择仓库/库位/库位组/库区
-const changeWarehouse = (e) => {
-  formData.value.condition[2].Value = ''
-  if (e == 'WarehouseCode') {
-    getFormWarehouseList()
-  } else if (e == 'AreaCode') {
-    getFormAreaList()
-  } else if (e == 'LocationGroupCode') {
-    getFormLocationgrouList()
-  } else if (e == 'LocationCode') {
-    getFormLocationList()
-  }
-}
 /** 打开弹窗 */
 const open = async (type: string, strategyCode: string, id?: number) => {
   formStrategyCode.value = strategyCode
@@ -553,16 +521,7 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       } else {
         getFormCustomerList()
       }
-      // 判断是获取仓库/库位/库位组/库区列表
-      if (formData.value.condition[2].ParamCode == 'WarehouseCode') {
-        getFormWarehouseList()
-      } else if (formData.value.condition[2].ParamCode == 'AreaCode') {
-        getFormAreaList()
-      } else if (formData.value.condition[2].ParamCode == 'LocationGroupCode') {
-        getFormLocationgrouList()
-      } else if (formData.value.condition[2].ParamCode == 'LocationCode') {
-        getFormLocationList()
-      }
+      
     } finally {
       formLoading.value = false
     }
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
index 90963a742..871342dee 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
@@ -442,45 +442,6 @@ const changeItemsType = () => {
   formData.value.condition[0].Value = ''
 }
 
-// 获取仓库列表
-const getFormWarehouseList = async () => {
-  options.warehouseList = await getWarehouseList()
-}
-// 获取库区列表
-const getFormAreaList = async () => {
-  options.warehouseList = await getAreaList()
-}
-// 获取库位组列表
-const getFormLocationgrouList = async () => {
-  options.warehouseList = await getLocationgroupList()
-}
-// 获取库位列表
-const getFormLocationList = async (queryParms) => {
-  if (queryParms) {
-    options.overflowWarehouseList = await getLocationList(queryParms)
-  } else {
-    options.warehouseList = await getLocationList()
-  }
-}
-getFormLocationList()
-// 获取溢流库位
-const queryParms = {
-  type: 'OVERFLOW'
-}
-getFormLocationList(queryParms)
-// 选择仓库/库位/库位组/库区
-const changeWarehouse = (e) => {
-  formData.value.condition[1].Value = ''
-  if (e == 'WarehouseCode') {
-    getFormWarehouseList()
-  } else if (e == 'AreaCode') {
-    getFormAreaList()
-  } else if (e == 'LocationGroupCode') {
-    getFormLocationgrouList()
-  } else if (e == 'LocationCode') {
-    getFormLocationList()
-  }
-}
 /** 打开弹窗 */
 const open = async (type: string, strategyCode: string, id?: number) => {
   formStrategyCode.value = strategyCode
@@ -523,16 +484,7 @@ const open = async (type: string, strategyCode: string, id?: number) => {
         formData.value.configuration = JSON.parse(data.configuration)
       }
 
-      // 判断是获取仓库/库位/库位组/库区列表
-      if (formData.value.condition[1].ParamCode == 'WarehouseCode') {
-        getFormWarehouseList()
-      } else if (formData.value.condition[1].ParamCode == 'AreaCode') {
-        getFormAreaList()
-      } else if (formData.value.condition[1].ParamCode == 'LocationGroupCode') {
-        getFormLocationgrouList()
-      } else if (formData.value.condition[1].ParamCode == 'LocationCode') {
-        getFormLocationList()
-      }
+      
     } finally {
       formLoading.value = false
     }
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
index 860ee09f5..7ebeee92e 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
@@ -435,45 +435,6 @@ const changeItemsType = () => {
   formData.value.condition[0].Value = ''
 }
 
-// 获取仓库列表
-const getFormWarehouseList = async () => {
-  options.warehouseList = await getWarehouseList()
-}
-// 获取库区列表
-const getFormAreaList = async () => {
-  options.warehouseList = await getAreaList()
-}
-// 获取库位组列表
-const getFormLocationgrouList = async () => {
-  options.warehouseList = await getLocationgroupList()
-}
-// 获取库位列表
-const getFormLocationList = async (queryParms) => {
-  if (queryParms) {
-    options.overflowWarehouseList = await getLocationList(queryParms)
-  } else {
-    options.warehouseList = await getLocationList()
-  }
-}
-getFormLocationList()
-// 获取溢流库位
-const queryParms = {
-  type: 'OVERFLOW'
-}
-getFormLocationList(queryParms)
-// 选择仓库/库位/库位组/库区
-const changeWarehouse = (e) => {
-  formData.value.condition[1].Value = ''
-  if (e == 'WarehouseCode') {
-    getFormWarehouseList()
-  } else if (e == 'AreaCode') {
-    getFormAreaList()
-  } else if (e == 'LocationGroupCode') {
-    getFormLocationgrouList()
-  } else if (e == 'LocationCode') {
-    getFormLocationList()
-  }
-}
 /** 打开弹窗 */
 const open = async (type: string, strategyCode: string, id?: number) => {
   formStrategyCode.value = strategyCode
@@ -515,16 +476,7 @@ const open = async (type: string, strategyCode: string, id?: number) => {
         formData.value.configuration = JSON.parse(data.configuration)
       }
 
-      // 判断是获取仓库/库位/库位组/库区列表
-      if (formData.value.condition[1].ParamCode == 'WarehouseCode') {
-        getFormWarehouseList()
-      } else if (formData.value.condition[1].ParamCode == 'AreaCode') {
-        getFormAreaList()
-      } else if (formData.value.condition[1].ParamCode == 'LocationGroupCode') {
-        getFormLocationgrouList()
-      } else if (formData.value.condition[1].ParamCode == 'LocationCode') {
-        getFormLocationList()
-      }
+      
     } finally {
       formLoading.value = false
     }
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
index ac3b3b11b..c226515df 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
@@ -380,45 +380,6 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
-// 获取仓库列表
-const getFormWarehouseList = async () => {
-  options.warehouseList = await getWarehouseList()
-}
-// 获取库区列表
-const getFormAreaList = async () => {
-  options.warehouseList = await getAreaList()
-}
-// 获取库位组列表
-const getFormLocationgrouList = async () => {
-  options.warehouseList = await getLocationgroupList()
-}
-// 获取库位列表
-const getFormLocationList = async (queryParms) => {
-  if (queryParms) {
-    options.overflowWarehouseList = await getLocationList(queryParms)
-  } else {
-    options.warehouseList = await getLocationList()
-  }
-}
-getFormWarehouseList()
-// 获取溢流库位
-const queryParms = {
-  type: 'OVERFLOW'
-}
-getFormLocationList(queryParms)
-// 选择仓库/库位/库位组/库区
-const changeWarehouse = (e) => {
-  formData.value.condition[0].Value = ''
-  if (e == 'WarehouseCode') {
-    getFormWarehouseList()
-  } else if (e == 'AreaCode') {
-    getFormAreaList()
-  } else if (e == 'LocationGroupCode') {
-    getFormLocationgrouList()
-  } else if (e == 'LocationCode') {
-    getFormLocationList()
-  }
-}
 /** 打开弹窗 */
 const open = async (type: string, strategyCode: string, id?: number) => {
   formStrategyCode.value = strategyCode
@@ -460,16 +421,7 @@ const open = async (type: string, strategyCode: string, id?: number) => {
         formData.value.configuration = JSON.parse(data.configuration)
       }
 
-      // 判断是获取仓库/库位/库位组/库区列表
-      if (formData.value.condition[0].ParamCode == 'WarehouseCode') {
-        getFormWarehouseList()
-      } else if (formData.value.condition[0].ParamCode == 'AreaCode') {
-        getFormAreaList()
-      } else if (formData.value.condition[0].ParamCode == 'LocationGroupCode') {
-        getFormLocationgrouList()
-      } else if (formData.value.condition[0].ParamCode == 'LocationCode') {
-        getFormLocationList()
-      }
+      
     } finally {
       formLoading.value = false
     }
diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts
index bde9903c6..226862371 100644
--- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts
@@ -941,7 +941,7 @@ export const DeliverRecordImport = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料类型',
+    label: '类型',
     field: 'type',
     sort: 'custom',
     dictType: DICT_TYPE.LEADERSHIP_MATERIAL_TYPE,
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
index 8d30ff991..3e2a1d128 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
@@ -1378,9 +1378,9 @@ export const ProductionreturnRequestDetailRules = reactive({
   qty:[
     { validator:validateQty, message: '数量必须大于0', trigger: 'change'}
   ],
-  // batch: [
-  //   { required: true, message: '请输入批次', trigger: 'blur' }
-  // ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
   inventoryStatus: [
     { required: true, message: '请选择库存状态', trigger: 'change' }
   ],
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
index 50a2cfd91..457dd5cd4 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -174,6 +174,10 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
+        }, {
+          key: 'type',
+          value: 'predict',//补给品类型
+          isMainValue: false
         }, {
           key: 'workshopCode',
           value: 'workshopCode',
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
index e632c9a82..4cec77298 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
@@ -182,6 +182,10 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
+        },{
+          key: 'type',
+          value: 'assemble',//号口品类型
+          isMainValue: false
         },{
           key: 'workshopCode',
           value: 'workshopCode',
@@ -1701,56 +1705,36 @@ export const BackflushDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
 
 
 /**
- * @returns {Array} 制品收货申请创建标签
+ * @returns {Array} 号口品收货申请创建标签
  */
 export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '生产线代码',
-    field: 'productionLineCodePackage',
+    label: '物料代码',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm:{
+    tableForm: {
       disabled: true
-      // isInpuFocusShow: true,
-      // searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
-      // searchField: 'productionLineCode', // 查询弹窗赋值字段
-      // searchTitle: '生产线物料关系信息', // 查询弹窗标题
-      // searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
-      // searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
-      // searchCondition:[{
-      //   key: 'itemCode',
-      //   value: 'itemCode',
-      //   isMainValue: true
-      // }]
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
     }
   },
   {
-    label: '供应商代码',
-    field: 'supplierItemCode',
+    label: '批次',
+    field: 'batch',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
-      searchField: 'supplierCode', // 查询弹窗赋值字段
-      searchTitle: '供应商信息', // 查询弹窗标题
-      searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
-      searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
-      searchCondition:[{
-        key: 'itemCode',
-        value: 'itemCode',
-        message: '请填写物料代码！',
-        isMainValue: true
-      }]
-    }
   },
   {
-    label: '物料代码',
-    field: 'itemCode',
+    label: '数量',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
@@ -1765,38 +1749,132 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '物料名称',
-    field: 'itemName',
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false,
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
   },
   {
-    label: '物料描述1',
-    field: 'itemDesc1',
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packUnit',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItemPackagingPageByItemCode,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+
+      }
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packUnit',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItemPackagingPageByItemCode,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
-    label: '物料描述2',
-    field: 'itemDesc2',
+    label: '标签生产线代码',
+    field: 'productionLineCodePackage',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable: false,
+    tableForm: {
+      disabled: true,
+    },
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierItemCode',
+    sort: 'custom',
     isTableForm: false,
     isForm: false,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+      searchField: 'supplierCode', // 查询弹窗赋值字段
+      searchTitle: '供应商信息', // 查询弹窗标题
+      searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+      searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'itemCode',
+        value: 'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      }]
+    }
   },
+
   {
-    label: '项目代码',
-    field: 'projectCode',
+    label: '物料名称',
+    field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
@@ -1805,56 +1883,36 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false,
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '物料描述1',
+    field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm: {
-      disabled: true,
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
+    isTableForm: false,
+    isForm: false,
   },
   {
-    label: '数量',
-    field: 'qty',
+    label: '物料描述2',
+    field: 'itemDesc2',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
+    isTableForm: false,
+    isForm: false,
   },
   {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
+    label: '项目代码',
+    field: 'projectCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
+    isTableForm: false,
+    isForm: false,
   },
+
   {
     label: '库存状态',
     field: 'inventoryStatus',
@@ -1862,6 +1920,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
+    isTableForm: false,
+    isForm: false,
     table: {
       width: 150
     },
@@ -1879,22 +1939,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     label: '来源生产线代码',
     field: 'productionLineCode',
     sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
-  {
-    label: '来源生产线代码',
-    field: 'productionLineCode',
-    sort: 'custom',
+    isTableForm: false,
+    isForm: false,
     table: {
       width: 150
     },
@@ -1911,6 +1957,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     label: '来源工位代码',
     field: 'workStationCode',
     sort: 'custom',
+    isTableForm: false,
+    isForm: false,
     table: {
       width: 150
     },
@@ -1927,6 +1975,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     label: '来源库位代码',
     field: 'fromLocationCode',
     sort: 'custom',
+    isTableForm: false,
+    isForm: false,
     table: {
       width: 150
     },
@@ -1953,78 +2003,13 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
-  {
-    label: '包装规格1',
-    field: 'packUnit',
-    sort: 'custom',
-    table: {
-      width: 150,
-      componentProps: {
-        disabled: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择包装',
-        searchField: 'packUnit',
-        searchTitle: '物品包装信息',
-        searchAllSchemas: Itempackaging.allSchemas,
-        searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
-        searchCondition: [
-          {
-            key: 'itemCode',
-            value: 'itemCode',
-            message: '请选择订单行',
-            isMainValue: true
-          },
-          {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          }
-        ]
 
-      }
-    },
-    tableForm: {
-      disabled: true,
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择包装',
-      searchField: 'packUnit',
-      searchTitle: '物品包装信息',
-      searchAllSchemas: Itempackaging.allSchemas,
-      searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
-      searchCondition: [
-        {
-          key: 'itemCode',
-          value: 'itemCode',
-          message: '请选择订单行',
-          isMainValue: true
-        },
-        {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-    }
-  },
-  {
-    label: '包装数量1',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    },
-    tableForm: {
-      disabled: true,
-    }
-  },
   {
     label: '包装规格2',
     field: 'secondPackUnit',
     sort: 'custom',
+    isTableForm: false,
+    isForm: false,
     table: {
       width: 150,
       componentProps: {
@@ -2052,6 +2037,7 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
     tableForm: {
+      enterSearch: true,
       disabled: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择包装',
@@ -2077,12 +2063,14 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     label: '包装数量2',
     field: 'secondPackQty',
     sort: 'custom',
+    isTableForm: false,
+    isForm: false,
     table: {
       width: 150
     },
     form: {
       componentProps: {
-        disabled:true
+        disabled: true
       }
     },
     tableForm: {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
index a4de606ac..92724f740 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
@@ -108,9 +108,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '计划员',
     field: 'planerId',
     sort: 'custom',
-    table: {
-      width: 150
-    },
+ 
     isTable:false,
     isForm: false,
     isSearch:true,
@@ -182,9 +180,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '物料代码',
     field: 'itemCode',
     sort: 'custom',
-    table: {
-      width: 150
-    },
+    
     isSearch:true,
     isTable:true,
     isForm: false,
@@ -217,9 +213,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '版本号',
     field: 'version',
     sort: 'custom',
-    table: {
-      width: 150
-    },
+   
     isSearch:true,
     search: {
       // labelMessage: '信息提示说明！！！',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index b9168dcd2..ba5671a8d 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -550,6 +550,21 @@ export const PurchasePlanMainRules = reactive({
  */
 export const PurchasePlanDetail = useCrudSchemas(
   reactive<CrudSchema[]>([
+    {
+      label: '要货计划单号',
+      field: 'number',
+      sort: 'custom',
+      isTableForm: false,
+      hiddenInMain: true,
+      table: {
+        width: 180
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      }
+    },
     {
       label: '采购订单号',
       field: 'poNumber',
@@ -861,21 +876,7 @@ export const PurchasePlanDetail = useCrudSchemas(
       }
     },
 
-    {
-      label: '要货计划单号',
-      field: 'number',
-      sort: 'custom',
-      isTableForm: false,
-      hiddenInMain: true,
-      table: {
-        width: 180
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
+    
     {
       label: '已收货数量',
       field: 'receivedQty',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 43f5db515..6bff0c144 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -88,6 +88,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         enterSearch: true,
+        isEnter:true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段