From 873f69e7f1e681cbd1dacd7a39f9140885756fcc Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周四, 25 4月 2024 16:37:45 +0800
Subject: [PATCH] 修改
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs | 156 +++++++++++++++++++++++++++-------------------------
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterialCustomer/Dto/WmsMaterialCustomerOutput.cs | 2
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue | 6 +-
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs | 16 ++++-
4 files changed, 98 insertions(+), 82 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
index 8c7c415..512197a 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -29,7 +29,7 @@
<a-form-item label="鐗╂枡绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select style="width: 100%" placeholder="璇烽�夋嫨鐗╂枡绫诲瀷" v-decorator="['materialType']">
- <a-select-option v-for="(item, index) in materialTypeData" :key="index" :value="item.materialTypeCode">{{
+ <a-select-option v-for="(item, index) in materialTypeData" :key="index" :value="item.id">{{
item.materialTypeName }}</a-select-option>
</a-select>
</a-form-item>
@@ -61,7 +61,7 @@
<!-- <a-input placeholder="璇疯緭鍏ュ簱瀛樺崟浣�" v-decorator="['materialUnit']" /> -->
<a-select style="width: 100%" placeholder="璇烽�夋嫨搴撳瓨鍗曚綅" v-decorator="['materialUnit']">
- <a-select-option v-for="(item, index) in selectTypeData1" :key="index" :value="item.unitCode">{{
+ <a-select-option v-for="(item, index) in selectTypeData1" :key="index" :value="item.unitName">{{
item.unitName }}</a-select-option>
</a-select>
@@ -71,7 +71,7 @@
<!-- <a-input placeholder="璇疯緭鍏ラ噰璐崟浣�" v-decorator="['pOUnit']" /> -->
<a-select style="width: 100%" placeholder="璇烽�夋嫨閲囪喘鍗曚綅" v-decorator="['pOUnit']">
- <a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="item.unitCode">{{
+ <a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="item.unitName">{{
item.unitName }}</a-select-option>
</a-select>
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs
index 8fa596f..0505eef 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs
@@ -3,8 +3,8 @@
using System.ComponentModel.DataAnnotations;
namespace Admin.NET.Application
-{
-
+{
+
/// <summary>
/// 鐗╂枡淇℃伅琛ㄦ煡璇㈠弬鏁�
/// </summary>
@@ -14,42 +14,42 @@
/// 鐗╂枡鍚嶇О
/// </summary>
public virtual string MaterialName { get; set; }
-
+
/// <summary>
/// 鐗╂枡缂栧彿
/// </summary>
public virtual string MaterialCode { get; set; }
-
+
/// <summary>
/// ERP缂栧彿
/// </summary>
public virtual string ErpCode { get; set; }
-
+
/// <summary>
/// 鐗╂枡绫诲瀷鍚嶇О
/// </summary>
public virtual string MaterialTypeName { get; set; }
-
+
/// <summary>
/// 鐗╂枡绫诲瀷鎻忚堪
/// </summary>
public virtual string MaterialTypeDescr { get; set; }
-
+
/// <summary>
/// 鐗╂枡绫诲瀷
/// </summary>
public virtual int? MaterialType { get; set; }
-
+
/// <summary>
/// 鐗╂枡缁�
/// </summary>
public virtual string MaterialGroup { get; set; }
-
+
/// <summary>
/// ABC鍒嗙被鍚嶇О
/// </summary>
public virtual string ABCClassName { get; set; }
-
+
/// <summary>
/// ABC鍒嗙被
@@ -61,85 +61,85 @@
/// 鐗╂枡瑙勬牸
/// </summary>
public virtual string MaterialSpec { get; set; }
-
+
/// <summary>
/// 榛樿鍏ュ簱搴撲綅
/// </summary>
public virtual string InPlaceCode { get; set; }
-
+
/// <summary>
/// 搴撳瓨鍗曚綅
/// </summary>
public virtual string MaterialUnit { get; set; }
-
+
/// <summary>
/// 閲囪喘鍗曚綅
/// </summary>
public virtual string POUnit { get; set; }
-
+
/// <summary>
/// 棰滆壊
/// </summary>
public virtual string Color { get; set; }
-
+
/// <summary>
/// 閲嶉噺
/// </summary>
public virtual string Weight { get; set; }
-
+
/// <summary>
/// 鏍囧寘鏁伴噺
/// </summary>
public virtual decimal? SNP { get; set; }
-
+
/// <summary>
/// 鎹㈢畻鐜�
/// </summary>
public virtual decimal? TranslateRate { get; set; }
-
+
/// <summary>
/// 鎵规灞炴�ц鍒�
/// </summary>
public virtual long? BatchRuleId { get; set; }
-
+
/// <summary>
/// 鎺у埗灞炴�ц鍒�
/// </summary>
public virtual long? ControlRuleId { get; set; }
-
+
/// <summary>
/// 鏄惁绂佺敤
/// </summary>
public virtual bool? IsDisabled { get; set; }
-
+
/// <summary>
/// 鎻忚堪
/// </summary>
public virtual string MaterialDesc { get; set; }
-
+
/// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
public virtual List<string> CreatedTime { get; set; }
-
+
/// <summary>
/// 鏇存柊鏃堕棿
/// </summary>
public virtual List<string> UpdatedTime { get; set; }
-
+
/// <summary>
/// 鍒涘缓鑰呭悕绉�
/// </summary>
public virtual string CreatedUserName { get; set; }
-
+
/// <summary>
/// 淇敼鑰呭悕绉�
/// </summary>
public virtual string UpdatedUserName { get; set; }
-
+
}
- /// <summary>
+ /// <summary>
/// 鐗╂枡淇℃伅琛ㄤ笉鍒嗛〉鏌ヨ鍙傛暟
/// </summary>
public class WmsMaterialSearchNonPage : PageInputNonPageBase
@@ -148,37 +148,37 @@
/// 鐗╂枡鍚嶇О
/// </summary>
public virtual string MaterialName { get; set; }
-
+
/// <summary>
/// 鐗╂枡缂栧彿
/// </summary>
public virtual string MaterialCode { get; set; }
-
+
/// <summary>
/// ERP缂栧彿
/// </summary>
public virtual string ErpCode { get; set; }
-
+
/// <summary>
/// 鐗╂枡绫诲瀷鍚嶇О
/// </summary>
public virtual string MaterialTypeName { get; set; }
-
+
/// <summary>
/// 鐗╂枡绫诲瀷鎻忚堪
/// </summary>
public virtual string MaterialTypeDescr { get; set; }
-
+
/// <summary>
/// 鐗╂枡绫诲瀷
/// </summary>
public virtual int? MaterialType { get; set; }
-
+
/// <summary>
/// 鐗╂枡缁�
/// </summary>
public virtual string MaterialGroup { get; set; }
-
+
/// <summary>
/// ABC鍒嗙被鍚嶇О
/// </summary>
@@ -193,82 +193,82 @@
/// 鐗╂枡瑙勬牸
/// </summary>
public virtual string MaterialSpec { get; set; }
-
+
/// <summary>
/// 榛樿鍏ュ簱搴撲綅
/// </summary>
public virtual string InPlaceCode { get; set; }
-
+
/// <summary>
/// 搴撳瓨鍗曚綅
/// </summary>
public virtual string MaterialUnit { get; set; }
-
+
/// <summary>
/// 閲囪喘鍗曚綅
/// </summary>
public virtual string POUnit { get; set; }
-
+
/// <summary>
/// 棰滆壊
/// </summary>
public virtual string Color { get; set; }
-
+
/// <summary>
/// 閲嶉噺
/// </summary>
public virtual string Weight { get; set; }
-
+
/// <summary>
/// 鏍囧寘鏁伴噺
/// </summary>
public virtual decimal? SNP { get; set; }
-
+
/// <summary>
/// 鎹㈢畻鐜�
/// </summary>
public virtual decimal? TranslateRate { get; set; }
-
+
/// <summary>
/// 鎵规灞炴�ц鍒�
/// </summary>
public virtual long? BatchRuleId { get; set; }
-
+
/// <summary>
/// 鎺у埗灞炴�ц鍒�
/// </summary>
public virtual long? ControlRuleId { get; set; }
-
+
/// <summary>
/// 鏄惁绂佺敤
/// </summary>
public virtual bool? IsDisabled { get; set; }
-
+
/// <summary>
/// 鎻忚堪
/// </summary>
public virtual string MaterialDesc { get; set; }
-
+
/// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
- public virtual List<DateTimeOffset>? CreatedTime { get; set; }
-
+ public virtual List<DateTimeOffset>? CreatedTime { get; set; }
+
/// <summary>
/// 鏇存柊鏃堕棿
/// </summary>
- public virtual List<DateTimeOffset>? UpdatedTime { get; set; }
-
+ public virtual List<DateTimeOffset>? UpdatedTime { get; set; }
+
/// <summary>
/// 鍒涘缓鑰呭悕绉�
/// </summary>
public virtual string CreatedUserName { get; set; }
-
+
/// <summary>
/// 淇敼鑰呭悕绉�
/// </summary>
public virtual string UpdatedUserName { get; set; }
-
+
}
/// <summary>
@@ -281,108 +281,108 @@
/// </summary>
[Required(ErrorMessage = "鐗╂枡鍚嶇О涓嶈兘涓虹┖")]
public virtual string MaterialName { get; set; }
-
+
/// <summary>
/// 鐗╂枡缂栧彿
/// </summary>
[Required(ErrorMessage = "鐗╂枡缂栧彿涓嶈兘涓虹┖")]
public virtual string MaterialCode { get; set; }
-
+
/// <summary>
/// ERP缂栧彿
/// </summary>
public virtual string ErpCode { get; set; }
-
+
/// <summary>
/// 鐗╂枡绫诲瀷鍚嶇О
/// </summary>
public virtual string MaterialTypeName { get; set; }
-
+
/// <summary>
/// 鐗╂枡绫诲瀷鎻忚堪
/// </summary>
public virtual string MaterialTypeDescr { get; set; }
-
+
/// <summary>
/// 鐗╂枡绫诲瀷
/// </summary>
public virtual long? MaterialType { get; set; }
-
+
/// <summary>
/// 鐗╂枡缁�
/// </summary>
public virtual string MaterialGroup { get; set; }
-
+
/// <summary>
/// ABC鍒嗙被鍚嶇О
/// </summary>
public virtual string ABCClassName { get; set; }
-
+
/// <summary>
/// ABC鍒嗙被
/// </summary>
public virtual int? ABCClass { get; set; }
-
+
/// <summary>
/// 鐗╂枡瑙勬牸
/// </summary>
public virtual string MaterialSpec { get; set; }
-
+
/// <summary>
/// 榛樿鍏ュ簱搴撲綅
/// </summary>
public virtual string InPlaceCode { get; set; }
-
+
/// <summary>
/// 搴撳瓨鍗曚綅
/// </summary>
public virtual string MaterialUnit { get; set; }
-
+
/// <summary>
/// 閲囪喘鍗曚綅
/// </summary>
public virtual string POUnit { get; set; }
-
+
/// <summary>
/// 棰滆壊
/// </summary>
public virtual string Color { get; set; }
-
+
/// <summary>
/// 閲嶉噺
/// </summary>
public virtual string Weight { get; set; }
-
+
/// <summary>
/// 鏍囧寘鏁伴噺
/// </summary>
public virtual decimal? SNP { get; set; }
-
+
/// <summary>
/// 鎹㈢畻鐜�
/// </summary>
public virtual decimal? TranslateRate { get; set; }
-
+
/// <summary>
/// 鎵规灞炴�ц鍒�
/// </summary>
public virtual long? BatchRuleId { get; set; }
-
+
/// <summary>
/// 鎺у埗灞炴�ц鍒�
/// </summary>
public virtual long? ControlRuleId { get; set; }
-
+
/// <summary>
/// 鏄惁绂佺敤
/// </summary>
public virtual bool? IsDisabled { get; set; }
-
+
/// <summary>
/// 鎻忚堪
/// </summary>
public virtual string MaterialDesc { get; set; }
-
+
}
/// <summary>
@@ -409,7 +409,7 @@
/// </summary>
[Required(ErrorMessage = "Id涓婚敭涓嶈兘涓虹┖")]
public long? Id { get; set; }
-
+
}
/// <summary>
@@ -455,7 +455,13 @@
/// <summary>
/// 寰�鏉ュ叧绯�
/// </summary>
- public List<BaseCustomerInput> BaseCustomerList { get; set; }
+ public List<BaseCustomerInput> BaseCustomerList { get; set; }
+
+
+ /// <summary>
+ /// 瀹㈡埛妗ｆID鍒楄〃
+ /// </summary>
+ public List<long> BaseCustomerList { get; set; }
}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs
index 2f34e10..4d6c0c2 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs
@@ -191,16 +191,26 @@
.ProjectToType<WmsControlRuleDetailOutput>()
.ToListAsync();
+ //鐗╂枡瀹㈡埛鍏宠仈
+ var wmsMaterialCustomerList = await _wmsMaterialCustomerRep.DetachedEntities
+ .Where(u => u.MaterialId == wmsMaterialInfo.Id)
+ .Where(u => u.IsDeleted == false)
+ .OrderBy(o => o.CreatedTime)
+ .ProjectToType<WmsMaterialCustomerOutput>()
+ .ToListAsync();
+ List<long> custIds = wmsMaterialCustomerList.Select(s => s.CustId).ToList();
//鏍规嵁鐗╂枡瀹㈡埛鍏宠仈琛ㄨ幏鍙栧線鏉ヤ俊鎭�
- var baseCustomers = await _baseCustomerRep.DetachedEntities.Join(_wmsMaterialCustomerRep.DetachedEntities, bc => bc.Id, mc => mc.CustId, (bc, mc) => new { bc, mc })
- .Where(p =>p.mc.MaterialId== wmsMaterialInfo.Id)
- .OrderBy(o => o.mc.CreatedTime)
+ var baseCustomers = await _baseCustomerRep.DetachedEntities
+ .Where(p => custIds.Contains(p.Id))
+ .OrderBy(o => o.CreatedTime)
.ProjectToType<BaseCustomerOutput>()
.ToListAsync();
+
resultInfo.MaterialInfo = wmsMaterialInfo;
resultInfo.SubstituteGoodList = wmsSubstituteGoods;
resultInfo.ControlRuleDetailList = wmsControlRuleDetails;
+ resultInfo.BaseCustomerList = baseCustomers;
return resultInfo;
}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterialCustomer/Dto/WmsMaterialCustomerOutput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterialCustomer/Dto/WmsMaterialCustomerOutput.cs
index 5753c7d..5519dc2 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterialCustomer/Dto/WmsMaterialCustomerOutput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterialCustomer/Dto/WmsMaterialCustomerOutput.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 瀹㈡埛ID
/// </summary>
- public long? CustId { get; set; }
+ public long CustId { get; set; }
/// <summary>
/// 瀹㈡埛缂栧彿
--
Gitblit v1.9.3