zs
2025-05-16 0e4ee9eeb9552babb6541d7be3b60400ce69df79
报错解决
已修改6个文件
36 ■■■■ 文件已修改
HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsAreaDrawer.ts 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/GetWmsContainerInput.cs 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialDto.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsContainerController.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial导出模板.xlsx 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx
@@ -34,6 +34,7 @@
  const disabled = ref(false)
  const materialTypeList = ref([])
  const current = computed(() => {
    return props.row || null
  })
@@ -404,6 +405,9 @@
      purchaseType_FilterMode: formData.value.purchaseType_FilterMode || '',
      materialTypeCode: formData.value.materialTypeCode || '',
      materialType_FilterMode: formData.value.materialType_FilterMode || '',
      materialTypeDesc: materialTypeList.value.find(
        (item) => item.materialTypeCode === formData.value.materialTypeCode
      )?.materialTypeDesc,
      primaryUnit: formData.value.primaryUnit || '',
      primaryUnit_FilterMode: formData.value.primaryUnit_FilterMode || '',
      standard: formData.value.standard || '',
@@ -542,6 +546,8 @@
    const materialTypeEnum = await wmsMaterialDrawer.getMaterialType()
    updateFormTypeOptions('materialTypeCode', materialTypeEnum)
    materialTypeList.value = materialTypeEnum
    const purchaseTypeEnum = await wmsMaterialDrawer.getWmsEnumData({
      EnumName: 'PurchaseTypeEnum',
    })
HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsAreaDrawer.ts
@@ -17,6 +17,7 @@
   */
  const initiateData: Ref<Record<string, any>> = ref({})
  const formData = ref<Record<string, any>>({})
  const storeList = ref([])
  // ref
  const formRef = ref()
  const disabled = ref(false)
@@ -75,10 +76,16 @@
      label: '仓库代码',
      prop: 'storeCode',
      el: 'select',
      placeholder: '请选择仓库代码',
      options: [],
      // storeValueAndLabel: true,
      placeholder: '请输入仓库代码',
    },
    // {
    //   label: '仓库代码',
    //   prop: 'storeCode',
    //   el: 'select',
    //   options: [],
    //   placeholder: '请输入仓库代码',
    // },
    // {
    //   label: '仓库名称',
    //   prop: 'storeName',
@@ -145,8 +152,10 @@
      areaDesc: formData.value.areaDesc, // æè¿°
      areaStatus: formData.value.areaStatus, // åº“区状态
      areaType: formData.value.areaType, // åº“区类型
      storeCode: formData.value.storeCode.areaCode, // ä»“库代码
      storeName: formData.value.storeCode.storeName, // ä»“库名称
      storeCode: formData.value.storeCode, // ä»“库代码
      storeName: storeList.value.find(
        (item) => item.storeCode === formData.value.storeCode
      )?.materialTypeDesc, // ä»“库名称
      remark: formData.value.remark, // å¤‡æ³¨
    }
    if (!current.value) {
@@ -198,8 +207,12 @@
    })
    updateFormItemOptions('areaType', areaTypeEnum)
    const storeList = await getStoreDataList()
    updateFormStoreOptions('storeCode', storeList)
    const stores = await getStoreDataList()
    storeList.value = stores
    console.log('storeList', stores)
    updateFormStoreOptions('storeCode', stores)
    console.log(formItems)
    if (current.value) {
      const res = await wmsAreaDrawer.getWmsAreaDetail(current.value)
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/GetWmsContainerInput.cs
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialDto.cs
@@ -43,12 +43,12 @@
            } 
        } 
        /// <summary>
        /// ç‰©æ–™ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
        /// ç‰©æ–™ç±»åž‹ç¼–码
        /// </summary>
        public string MaterialTypeCode { get; set; }
        /// <summary>
        /// ç‰©æ–™ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
    /// ç‰©æ–™ç±»åž‹æè¿°
        /// </summary>
        public string MaterialTypeDesc { get; set; }
        
HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsContainerController.cs
@@ -52,6 +52,7 @@
        /// <param name="input">输入.</param>
        /// <returns></returns>
        [HttpGet]
        [Route("Page")]
        public virtual Task<PagedResultDto<WmsContainerDto>> GetListAsync([FromQuery] GetWmsContainerInput input)
        {
            return _wmscontainerAppService.GetListAsync(input);
HIAWms/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterialµ¼³öÄ£°å.xlsx
Binary files differ