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µ¼³öÄ£°å.xlsxBinary files differ