From ae4e29f352975c2197521cf3c0b7179868d8cb84 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周四, 25 4月 2024 15:43:04 +0800
Subject: [PATCH] bug
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainer/WmsContainerService.cs | 13 +++++++++++++
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/editForm.vue | 3 ++-
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainer/Dto/WmsContainerInput.cs | 2 +-
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/addForm.vue | 2 +-
4 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/addForm.vue
index 478e054..c1b129e 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/addForm.vue
@@ -14,7 +14,7 @@
<a-form-item label="绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<!-- <a-input placeholder="璇疯緭鍏ョ被鍨�" v-decorator="['containerTypeId', {rules: [{required: true, message: '璇疯緭鍏ョ被鍨婭D锛�'}]}]" /> -->
<a-select style="width: 100%" placeholder="璇烽�夋嫨绫诲瀷" v-decorator="['containerTypeId']">
- <a-select-option v-for="(item, index) in selectTypeData" :key="index" :value="item.typeCode">{{
+ <a-select-option v-for="(item, index) in selectTypeData" :key="index" :value="item.id">{{
item.typeName }}</a-select-option>
</a-select>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/editForm.vue
index e07393f..e785f8b 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/editForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/editForm.vue
@@ -93,7 +93,8 @@
visible: false,
confirmLoading: false,
form: this.$form.createForm(this),
- selectTypeData2:[]
+ selectTypeData2:[],
+ selectTypeData:[]
}
},
created() {
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainer/Dto/WmsContainerInput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainer/Dto/WmsContainerInput.cs
index 665f26c..8ef5f2a 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainer/Dto/WmsContainerInput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainer/Dto/WmsContainerInput.cs
@@ -245,7 +245,7 @@
/// <summary>
/// 绫诲瀷鍚嶇О
/// </summary>
- [Required(ErrorMessage = "绫诲瀷鍚嶇О涓嶈兘涓虹┖")]
+
public virtual string ContainerTypeName { get; set; }
/// <summary>
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainer/WmsContainerService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainer/WmsContainerService.cs
index a1ed450..e6a9b96 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainer/WmsContainerService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsContainer/WmsContainerService.cs
@@ -26,6 +26,7 @@
private readonly IRepository<SysDictType, MasterDbContextLocator> _sysDictTypeRep;
private readonly IRepository<SysDictData, MasterDbContextLocator> _sysDictDataRep;
private readonly ISysExcelTemplateService _sysExcelTemplateService;
+ private readonly IRepository<WmsContainerType, MasterDbContextLocator> _wmsContainerTypeRep;
private readonly static object _lock = new();
public WmsContainerService(
@@ -33,12 +34,15 @@
,IRepository<SysDictType, MasterDbContextLocator> sysDictTypeRep
,IRepository<SysDictData, MasterDbContextLocator> sysDictDataRep
,ISysExcelTemplateService sysExcelTemplateService
+ , IRepository<WmsContainerType, MasterDbContextLocator> wmsContainerTypeRep
+
)
{
_wmsContainerRep = wmsContainerRep;
_sysDictTypeRep = sysDictTypeRep;
_sysDictDataRep = sysDictDataRep;
_sysExcelTemplateService = sysExcelTemplateService;
+ _wmsContainerTypeRep = wmsContainerTypeRep;
}
/// <summary>
@@ -164,9 +168,18 @@
public async Task Add(AddWmsContainerInput input)
{
var wmsContainer = input.Adapt<WmsContainer>();
+
//楠岃瘉
await CheckExisit(wmsContainer);
+ //瀹瑰櫒绫诲瀷id
+ var ContainerTypeInfo = _wmsContainerTypeRep.Where(x => x.Id == input.ContainerTypeId).FirstOrDefault();
+ if (ContainerTypeInfo == null)
+ {
+ throw Oops.Oh(errorMessage: @$"绫诲瀷涓嶅瓨鍦紒");
+ }
+ wmsContainer.ContainerTypeName = ContainerTypeInfo.TypeName;
+
wmsContainer.CreatedUserId = wmsContainer.UpdatedUserId = SysHelper.GetUserId();
wmsContainer.CreatedUserName = wmsContainer.UpdatedUserName = SysHelper.GetUserName();
wmsContainer.CreatedTime = wmsContainer.UpdatedTime = SysHelper.GetNowTime();
--
Gitblit v1.9.3