From f99638e9d69cce5d0bbb7b99cbaff2f758c3c810 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周五, 16 5月 2025 10:25:17 +0800
Subject: [PATCH] 物料类型
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/LMesOperateAppService.cs | 6
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs | 4
HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterialDrawer.tsx | 29 +++-
HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx | 27 +++-
HIAWms/hiawms_web/src/widgets/HIAWms/Models/WmsMaterialDrawer.ts | 6 +
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs | 18 ++
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs | 226 +++++++++++++++++++------------------
HIAWms/project/Wms.cmsproj | 0
HIAWms/hiawms_web/src/widgets/HIAWms/Views/Pages/WmsMaterialType/Config.ts | 15 --
HIAWms/hiawms_web/src/widgets/HIAWms/Models/Service/WmsMaterialDrawer.ts | 8 +
10 files changed, 193 insertions(+), 146 deletions(-)
diff --git a/HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterialDrawer.tsx b/HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterialDrawer.tsx
index 1c0af31..b44960a 100644
--- a/HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterialDrawer.tsx
+++ b/HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterialDrawer.tsx
@@ -25,6 +25,8 @@
// ref
const formRef = ref()
+ const materialTypeList = ref([])
+
const disabled = ref(false)
const current = computed(() => {
@@ -79,10 +81,11 @@
},
{
label: '鐗╂枡绫诲瀷',
- prop: 'materialType',
+ prop: 'materialTypeCode',
el: 'select',
placeholder: '璇烽�夋嫨鐗╂枡绫诲瀷',
options: [],
+ // valueAndLabel: true,
rules: [{ required: true, message: '璇烽�夋嫨鐗╂枡绫诲瀷', trigger: 'change' }],
},
{
@@ -213,11 +216,15 @@
*/
const onConfirm = async () => {
await formRef.value?.validate()
+ console.log(formData.value.materialTypeCode)
const data = {
materialNo: formData.value.materialNo,
materialName: formData.value.materialName,
purchaseType: formData.value.purchaseType,
- materialType: formData.value.materialType,
+ materialTypeCode: formData.value.materialTypeCode,
+ materialTypeDesc: materialTypeList.value.find(
+ (item) => item.materialTypeCode === formData.value.materialTypeCode
+ )?.materialTypeDesc,
primaryUnit: formData.value.primaryUnit,
standard: formData.value.standard,
materialModel: formData.value.materialModel,
@@ -256,14 +263,22 @@
}))
}
}
+ const updateFormTypeOptions = (propName: string, enumData: any[]) => {
+ const item = formItems.find((item) => item.prop === propName)
+ if (item && enumData) {
+ item.options = enumData.map((item) => ({
+ label: item.materialTypeDesc,
+ value: item.materialTypeCode,
+ }))
+ }
+ }
/**
* 寮圭獥鎵撳紑鑾峰彇璇︽儏
*/
const onOpen = async () => {
- const materialTypeEnum = await wmsMaterialDrawer.getWmsEnumData({
- EnumName: 'MaterialTypeEnum',
- })
- updateFormItemOptions('materialType', materialTypeEnum)
+ const materialTypeEnum = await wmsMaterialDrawer.getMaterialType()
+ updateFormTypeOptions('materialTypeCode', materialTypeEnum)
+ materialTypeList.value = materialTypeEnum
const purchaseTypeEnum = await wmsMaterialDrawer.getWmsEnumData({
EnumName: 'PurchaseTypeEnum',
@@ -282,7 +297,7 @@
materialNo: res.materialNo,
materialName: res.materialName,
purchaseType: res.purchaseType,
- materialType: res.materialType,
+ materialTypeCode: res.materialTypeCode,
primaryUnit: res.primaryUnit,
standard: res.standard,
materialModel: res.materialModel,
diff --git a/HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx b/HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx
index be02cb5..d99653e 100644
--- a/HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx
+++ b/HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx
@@ -141,10 +141,11 @@
},
{
label: '鐗╂枡绫诲瀷',
- prop: 'materialType',
+ prop: 'materialTypeCode',
el: 'select',
clearable: true,
option: [],
+ storeValueAndLabel: true,
//disabled: disabled,
placeholder: '璇疯緭鍏ョ墿鏂欑被鍨�',
highSelectAttrs: {
@@ -401,7 +402,7 @@
materialName_FilterMode: formData.value.materialName_FilterMode || '',
purchaseType: formData.value.purchaseType || '',
purchaseType_FilterMode: formData.value.purchaseType_FilterMode || '',
- materialType: formData.value.materialType || '',
+ materialTypeCode: formData.value.materialTypeCode || '',
materialType_FilterMode: formData.value.materialType_FilterMode || '',
primaryUnit: formData.value.primaryUnit || '',
primaryUnit_FilterMode: formData.value.primaryUnit_FilterMode || '',
@@ -488,7 +489,7 @@
formData.value.materialNo = ''
formData.value.materialName = ''
formData.value.purchaseType = ''
- formData.value.materialType = ''
+ formData.value.materialTypeCode = ''
formData.value.primaryUnit = ''
formData.value.standard = ''
formData.value.outerDiameter = ''
@@ -525,18 +526,26 @@
}))
}
}
+ const updateFormTypeOptions = (propName: string, enumData: any[]) => {
+ const item = formItems.find((item) => item.prop === propName)
+ if (item && enumData) {
+ item.options = enumData.map((item) => ({
+ label: item.materialTypeDesc,
+ value: item.materialTypeCode,
+ }))
+ }
+ }
/**
* 閫氱敤鏌ヨ鏋氫妇
*/
const commonQueryEnumForFrom = async () => {
- const purchaseTypeEnumEnum = await wmsMaterialDrawer.getWmsEnumData({
+ const materialTypeEnum = await wmsMaterialDrawer.getMaterialType()
+ updateFormTypeOptions('materialTypeCode', materialTypeEnum)
+
+ const purchaseTypeEnum = await wmsMaterialDrawer.getWmsEnumData({
EnumName: 'PurchaseTypeEnum',
})
- updateFormItemOptions('purchaseType', purchaseTypeEnumEnum)
- const materialTypeEnumEnum = await wmsMaterialDrawer.getWmsEnumData({
- EnumName: 'MaterialTypeEnum',
- })
- updateFormItemOptions('materialType', materialTypeEnumEnum)
+ updateFormItemOptions('purchaseType', purchaseTypeEnum)
const yesNoEnumEnum = await wmsMaterialDrawer.getWmsEnumData({
EnumName: 'YesNoEnum',
})
diff --git a/HIAWms/hiawms_web/src/widgets/HIAWms/Models/Service/WmsMaterialDrawer.ts b/HIAWms/hiawms_web/src/widgets/HIAWms/Models/Service/WmsMaterialDrawer.ts
index bcf4aa3..13ac12b 100644
--- a/HIAWms/hiawms_web/src/widgets/HIAWms/Models/Service/WmsMaterialDrawer.ts
+++ b/HIAWms/hiawms_web/src/widgets/HIAWms/Models/Service/WmsMaterialDrawer.ts
@@ -64,3 +64,11 @@
export const getAisleDataList = () => {
return request.get('/api/v1/hIAWms/WmsEnum/AisleList')
}
+
+/**
+ * 鑾峰彇绫诲瀷鍒楄〃
+ * @returns
+ */
+export const getMaterialTypeList = ()=>{
+ return request.get('/api/v1/hIAWms/WmsEnum/MaterialTypeList')
+}
diff --git a/HIAWms/hiawms_web/src/widgets/HIAWms/Models/WmsMaterialDrawer.ts b/HIAWms/hiawms_web/src/widgets/HIAWms/Models/WmsMaterialDrawer.ts
index 4194408..ce19385 100644
--- a/HIAWms/hiawms_web/src/widgets/HIAWms/Models/WmsMaterialDrawer.ts
+++ b/HIAWms/hiawms_web/src/widgets/HIAWms/Models/WmsMaterialDrawer.ts
@@ -4,6 +4,7 @@
getWmsMaterial,
updateWmsMaterial,
getWmsEnumData,
+ getMaterialTypeList
} from './Service/WmsMaterialDrawer'
import { useGlobalState } from '@/libs/Store/Store'
@@ -41,4 +42,9 @@
async getWmsEnumData(data: Record<string, any>) {
return getWmsEnumData(data)
}
+
+ // 鑾峰彇绫诲瀷鍒楄〃
+ async getMaterialType(){
+ return getMaterialTypeList()
+ }
}
diff --git a/HIAWms/hiawms_web/src/widgets/HIAWms/Views/Pages/WmsMaterialType/Config.ts b/HIAWms/hiawms_web/src/widgets/HIAWms/Views/Pages/WmsMaterialType/Config.ts
index ae4f82a..59a3536 100644
--- a/HIAWms/hiawms_web/src/widgets/HIAWms/Views/Pages/WmsMaterialType/Config.ts
+++ b/HIAWms/hiawms_web/src/widgets/HIAWms/Views/Pages/WmsMaterialType/Config.ts
@@ -7,36 +7,25 @@
{
field: 'materialTypeDesc',
title: '绫诲瀷鎻忚堪',
- width:160,
},
{
field: 'materialTypeCode',
title: '绫诲瀷缂栫爜',
- width:160,
},
{
field: 'creationTime',
title: '鍒涘缓鏃堕棿',
- width:180,
},
{
field: 'lastModificationTime',
- title: '鏈�鍚庝慨鏀规椂闂�',
- width:180,
+ title: '鏈�鍚庝慨鏀规椂闂�',
},
{
field: 'creatorName',
- title: '',
- width:160,
-},
-{
- field: 'lastModifierName',
- title: '',
- width:160,
+ title: '鍒涘缓浜�',
},
{
field: 'remark',
title: '澶囨敞',
- width:160,
},
]
diff --git a/HIAWms/project/Wms.cmsproj b/HIAWms/project/Wms.cmsproj
index 6a194c5..f48000d 100644
--- a/HIAWms/project/Wms.cmsproj
+++ b/HIAWms/project/Wms.cmsproj
Binary files differ
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs
index 69982a3..2a9b91f 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs
@@ -1,140 +1,146 @@
-using CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using System;
-using Volo.Abp.Application.Dtos;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
-
+using CMS.Plugin.HIAWms.Domain.Shared.Enums;
+using System;
+using Volo.Abp.Application.Dtos;
+
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
+
/// <summary>
/// 鐗╂枡鍩虹淇℃伅鍒涘缓鎴栨洿鏂板熀绫�
/// </summary>
-public abstract class WmsMaterialCreateOrUpdateDtoBase : ExtensibleEntityDto
-{
- /// <summary>
- /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�
- /// </summary>
- public string MaterialCode { get; set; }
+public abstract class WmsMaterialCreateOrUpdateDtoBase : ExtensibleEntityDto
+{
+ /// <summary>
+ /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�
+ /// </summary>
+ public string MaterialCode { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�
- /// </summary>
- public string MaterialNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�
+ /// </summary>
+ public string MaterialNo { get; set; }
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string MaterialName { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public string MaterialName { get; set; }
- /// <summary>
- /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級
- /// </summary>
- public PurchaseTypeEnum PurchaseType { get; set; }
+ /// <summary>
+ /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級
+ /// </summary>
+ public PurchaseTypeEnum PurchaseType { get; set; }
- /// <summary>
- /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
- /// </summary>
- public string MaterialTypeCode { get; set; }
+ /// <summary>
+ /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
+ /// </summary>
+ public string MaterialTypeCode { get; set; }
- /// <summary>
- /// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�
- /// </summary>
- public string? PrimaryUnit { get; set; }
- /// <summary>
- /// 瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�
- /// </summary>
- public string? Standard { get; set; }
+ /// <summary>
+ /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
+ /// </summary>
+ public string MaterialTypeDesc { get; set; }
- /// <summary>
- /// 澶栧緞锛堝崟浣嶏細mm锛�
- /// </summary>
- public decimal OuterDiameter { get; set; }
+ /// <summary>
+ /// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�
+ /// </summary>
+ public string? PrimaryUnit { get; set; }
- /// <summary>
- /// 澹佸帤锛堝崟浣嶏細mm锛�
- /// </summary>
- public decimal WallThickness { get; set; }
+ /// <summary>
+ /// 瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�
+ /// </summary>
+ public string? Standard { get; set; }
- /// <summary>
- /// 鏉愯川锛堝锛�304涓嶉攬閽級
- /// </summary>
- public string? MaterialQuality { get; set; }
+ /// <summary>
+ /// 澶栧緞锛堝崟浣嶏細mm锛�
+ /// </summary>
+ public decimal OuterDiameter { get; set; }
- /// <summary>
- /// 闀垮害锛堝崟浣嶏細m锛�
- /// </summary>
- public decimal Length { get; set; }
+ /// <summary>
+ /// 澹佸帤锛堝崟浣嶏細mm锛�
+ /// </summary>
+ public decimal WallThickness { get; set; }
- /// <summary>
- /// 鏄惁涓轰富鏀
- /// </summary>
- public YesNoEnum IsMainBranch { get; set; }
+ /// <summary>
+ /// 鏉愯川锛堝锛�304涓嶉攬閽級
+ /// </summary>
+ public string? MaterialQuality { get; set; }
- /// <summary>
- /// 鐢熶骇宸ュ巶
- /// </summary>
- public string? Factory { get; set; }
+ /// <summary>
+ /// 闀垮害锛堝崟浣嶏細m锛�
+ /// </summary>
+ public decimal Length { get; set; }
- /// <summary>
- /// 璇佷功缂栧彿
- /// </summary>
- public string? Certification { get; set; }
+ /// <summary>
+ /// 鏄惁涓轰富鏀
+ /// </summary>
+ public YesNoEnum IsMainBranch { get; set; }
- /// <summary>
- /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string? RedundantField1 { get; set; }
+ /// <summary>
+ /// 鐢熶骇宸ュ巶
+ /// </summary>
+ public string? Factory { get; set; }
- /// <summary>
- /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string? RedundantField2 { get; set; }
+ /// <summary>
+ /// 璇佷功缂栧彿
+ /// </summary>
+ public string? Certification { get; set; }
- /// <summary>
- /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string? RedundantField3 { get; set; }
+ /// <summary>
+ /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
+ /// </summary>
+ public string? RedundantField1 { get; set; }
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- public int Sort { get; set; }
+ /// <summary>
+ /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
+ /// </summary>
+ public string? RedundantField2 { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string? Remark { get; set; }
+ /// <summary>
+ /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
+ /// </summary>
+ public string? RedundantField3 { get; set; }
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public bool? IsDisabled { get; set; }
+ /// <summary>
+ /// 鎺掑簭
+ /// </summary>
+ public int Sort { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string? CreatorId { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ public string? Remark { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string? LastModifierId { get; set; }
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ public bool? IsDisabled { get; set; }
- /// <summary>
- ///
- /// </summary>
- public DateTime? DeletionTime { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string? CreatorId { get; set; }
- /// <summary>
- /// 鍨嬪彿
- /// </summary>
- public string? MaterialModel { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string? LastModifierId { get; set; }
-
-
+ /// <summary>
+ ///
+ /// </summary>
+ public DateTime? DeletionTime { get; set; }
+
+ /// <summary>
+ /// 鍨嬪彿
+ /// </summary>
+ public string? MaterialModel { get; set; }
+
+
+
/// <summary>
/// Initializes a new instance of the <see cref="WmsMaterialCreateOrUpdateDtoBase"/> class.
/// </summary>
- public WmsMaterialCreateOrUpdateDtoBase() : base(false)
- {
- }
-}
+ public WmsMaterialCreateOrUpdateDtoBase() : base(false)
+ {
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/LMesOperateAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/LMesOperateAppService.cs
index f2586a5..74cce40 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/LMesOperateAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/LMesOperateAppService.cs
@@ -85,7 +85,11 @@
MaterialName = materiaL.MaterialName,
MaterialModel = item.MaterialMode,
MaterialNumber = 1,
- MaterialBatch = item.MaterialMode
+ MaterialBatch = item.MaterialMode,
+ OrderStatus = Domain.Shared.Enums.OrderStatusEnum.Executing,
+ OperateTime = DateTime.Now,
+ DistributeNumber = 1,
+
};
var createResult = await _wmsInOutStockOrderAppService.CreateAsync(createOrderInput);
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs
index 5bb3deb..2d20ac3 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs
@@ -71,15 +71,15 @@
/// <returns></returns>
public async Task<List<AreaForListOuptut>> GetAreaListAsync()
{
- var list = await _wmsAreaRepository.GetListForSelectAsync();
+ var list = await _wmsAreaRepository.GetListForSelectAsync();
if (list == null || list.Count <= 0) { return new List<AreaForListOuptut>(); }
- var result = list.Select(x=>new AreaForListOuptut
+ var result = list.Select(x => new AreaForListOuptut
{
AreaName = x.AreaName,
AreaNo = x.AreaNo,
}).ToList();
- return result;
+ return result;
}
/// <summary>
@@ -142,9 +142,17 @@
{
var queryInput = new GetWmsMaterialTypeInput();
var whereConditions = DynamicGetQueryParams(queryInput);
- var list = await _WmsMaterialTypeRepository.GetListAsync(whereConditions);
+ var list = await _WmsMaterialTypeRepository.GetListAsync(whereConditions);
- return ObjectMapper.Map<List<WmsMaterialType>, List<MaterialTypeOutput>>(list);
+ var result = new List<MaterialTypeOutput>();
+ if (list == null || list.Count <= 0) return result;
+
+ result = list.Select(x => new MaterialTypeOutput
+ {
+ MaterialTypeCode = x.MaterialTypeCode,
+ MaterialTypeDesc = x.MaterialTypeDesc,
+ }).ToList();
+ return result;
}
private FunReturnResultModel<Expression<Func<WmsMaterialType, bool>>> DynamicGetQueryParams(GetWmsMaterialTypeInput input)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs
index ada2978..926d105 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs
@@ -136,7 +136,7 @@
wmsmaterial.Factory = input.Factory;
wmsmaterial.MaterialModel = input.MaterialModel;
wmsmaterial.Certification = input.Certification;
-
+ wmsmaterial.MaterialTypeDesc = input.MaterialTypeDesc;
await _wmsmaterialRepository.UpdateAsync(wmsmaterial);
return ObjectMapper.Map<WmsMaterial, WmsMaterialDto>(wmsmaterial);
@@ -272,6 +272,7 @@
MaterialName = wmsmaterial.MaterialName,
PurchaseType = wmsmaterial.PurchaseType,
MaterialTypeCode = wmsmaterial.MaterialTypeCode,
+ MaterialTypeDesc = wmsmaterial.MaterialTypeDesc,
PrimaryUnit = wmsmaterial.PrimaryUnit,
Standard = wmsmaterial.Standard,
OuterDiameter = wmsmaterial.OuterDiameter,
@@ -294,6 +295,7 @@
MaterialName = wmsmaterial.MaterialName,
PurchaseType = wmsmaterial.PurchaseType,
MaterialTypeCode = wmsmaterial.MaterialTypeCode,
+ MaterialTypeDesc = wmsmaterial.MaterialTypeDesc,
PrimaryUnit = wmsmaterial.PrimaryUnit,
Standard = wmsmaterial.Standard,
OuterDiameter = wmsmaterial.OuterDiameter,
--
Gitblit v1.9.3