From 363e6f4abb1361e1a87361be5344102360f9685f Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Mon, 18 Sep 2023 13:30:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=9F=BA=E7=A1=80=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BE=9B=E5=BA=94=E5=95=86=E5=88=AB=E5=90=8D=E3=80=81?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=20=E8=A1=A8=E6=B7=BB=E5=8A=A0=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E5=88=AB=E5=90=8D=E5=AD=97=E6=AE=B5=E3=80=82?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=88=AB=E5=90=8D=E4=B8=8D=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=E5=88=99=E4=BE=9B=E5=BA=94=E5=95=86=E5=90=8D=E7=A7=B0=E5=8F=96?= =?UTF-8?q?=E5=88=AB=E5=90=8D=E3=80=82=E5=A7=94=E5=A4=96=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=AD=9B=E9=80=89=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/SCP_BARCODE_CONTROLLER.cs | 8 +- Controller/SCP_PO_CONTROLLER.cs | 10 +- Controller/SCP_TA_LANGUAGE_CONTROLLER.cs | 4 +- .../SCP_VENDER_PART_EXPORT.cs | 2 +- Models/ScpEntity/TA_Appliance.cs | 2 + Models/ScpEntity/TS_BARCODE.cs | 6 +- Models/ScpEntity/V_TA_APPLIANCE.cs | 2 + Models/ScpEntity/V_TB_PO.cs | 2 + SCP/Views/BasicData/Appliance.aspx | 133 +++++++++--------- SCP/Views/BasicData/Appliance.aspx.cs | 24 +++- .../BasicData/Appliance.aspx.designer.cs | 18 +++ SCP/Views/BasicData/Appliance_DETAIL.aspx | 1 + SCP/Views/BasicData/Appliance_DETAIL.aspx.cs | 13 +- .../Appliance_DETAIL.aspx.designer.cs | 9 ++ SCP/Views/PlanData/SCP_PO.aspx | 2 +- SCP/Views/PlanData/SCP_PO.aspx.cs | 2 +- SCP/Views/富维本特勒/SCP_PO_EXTEND.aspx | 19 +-- .../富维本特勒/SCP_PO_EXTEND.aspx.cs | 22 +-- .../SCP_PO_EXTEND.aspx.designer.cs | 21 ++- SCP/Web.config | 2 +- .../Controller/OdbcApiQadController.cs | 4 +- 21 files changed, 193 insertions(+), 113 deletions(-) diff --git a/Controller/SCP_BARCODE_CONTROLLER.cs b/Controller/SCP_BARCODE_CONTROLLER.cs index 3829d0a..f4bfd9b 100644 --- a/Controller/SCP_BARCODE_CONTROLLER.cs +++ b/Controller/SCP_BARCODE_CONTROLLER.cs @@ -1005,8 +1005,8 @@ namespace CK.SCP.Controller Extend14 = _part1.Extend2, Extend15 = str6,//Ʒ Extend16 = _part1.Extend1, - ProjectId = p_entity.UpdateUser - + ProjectId = p_entity.UpdateUser, + OtherVendName = _Appliance?.OtherVendName }; if (_part == null) @@ -1197,7 +1197,9 @@ namespace CK.SCP.Controller Extend14 = _part1.Extend2, Extend15 = str6,//Ʒ Extend16 = _part1.Extend1, - ProjectId = p_entity.UpdateUser + ProjectId = p_entity.UpdateUser, + OtherVendName= _Appliance?.OtherVendName + }; diff --git a/Controller/SCP_PO_CONTROLLER.cs b/Controller/SCP_PO_CONTROLLER.cs index 639b2db..a342ed8 100644 --- a/Controller/SCP_PO_CONTROLLER.cs +++ b/Controller/SCP_PO_CONTROLLER.cs @@ -95,6 +95,10 @@ namespace CK.SCP.Controller { q = q.Where(p => p.BeginTime >= p_entity.BeginTime); } + if (p_entity.BeginTime_End != null) + { + q = q.Where(p => p.BeginTime <= p_entity.BeginTime_End); + } if (p_entity.EndTime != null) { q = q.Where(p => p.EndTime >= p_entity.EndTime); @@ -3109,6 +3113,7 @@ namespace CK.SCP.Controller _entity.Model = p.车型; _entity.ReceivingPort = p.收货口; _entity.VendID = p.供应商代码; + _entity.OtherVendName = p.供应商别名; db.TA_Appliance.Add(_entity); } @@ -3127,7 +3132,7 @@ namespace CK.SCP.Controller _partde.Texture = p.材质; _partde.ReceivingPort = p.收货口; - + _partde.OtherVendName = p.供应商别名; db.TA_Appliance.AddOrUpdate(_partde); } @@ -6913,6 +6918,7 @@ namespace CK.SCP.Controller if (site == "U32") { uni.PutTime = DateTime.Parse(p_PoDetail.EndTime.ToString()); //要求到货日期 + uni.Attn = p_dataRow["备注"].ToString(); } else { @@ -6936,7 +6942,7 @@ namespace CK.SCP.Controller uni.Currency = p_PoDetail.Extend3; uni.Receiver = "I";//订单类型 uni.SubSite = p_AskDetail.Extend1; - uni.Attn = p_dataRow["备注"].ToString(); + return uni; } private static List CreateManyTsuniapi(TB_PO p_Po, TB_ASK p_Ask, TB_PO_DETAIL p_PoDetail, TB_ASK_DETAIL p_AskDetail, DataRow p_dataRow, string site, ScpEntities db) diff --git a/Controller/SCP_TA_LANGUAGE_CONTROLLER.cs b/Controller/SCP_TA_LANGUAGE_CONTROLLER.cs index 56b4e65..366f3d1 100644 --- a/Controller/SCP_TA_LANGUAGE_CONTROLLER.cs +++ b/Controller/SCP_TA_LANGUAGE_CONTROLLER.cs @@ -418,7 +418,7 @@ namespace CK.SCP.Controller applianc.SufanLand = p_entitys.SufanLand; applianc.BoxType = p_entitys.BoxType; applianc.PostEngineering = p_entitys.PostEngineering; - + applianc.OtherVendName = p_entitys.OtherVendName; db.TA_Appliance.AddOrUpdate(applianc); } else @@ -432,7 +432,7 @@ namespace CK.SCP.Controller appliance.SufanLand = p_entitys.SufanLand; appliance.BoxType = p_entitys.BoxType; appliance.PostEngineering = p_entitys.PostEngineering; - + appliance.OtherVendName = p_entitys.OtherVendName; db.TA_Appliance.AddOrUpdate(appliance); } diff --git a/Models/ScpEntity/ExcelExportEnttity/SCP_VENDER_PART_EXPORT.cs b/Models/ScpEntity/ExcelExportEnttity/SCP_VENDER_PART_EXPORT.cs index 2d4174a..f79cefd 100644 --- a/Models/ScpEntity/ExcelExportEnttity/SCP_VENDER_PART_EXPORT.cs +++ b/Models/ScpEntity/ExcelExportEnttity/SCP_VENDER_PART_EXPORT.cs @@ -8,7 +8,7 @@ namespace CK.SCP.Models.ScpEntity.ExcelExportEnttity { public class SCP_VENDER_PART_EXPORT { - + public string 供应商别名 { get; set; } public string 供应商代码{ get; set; } public string 零件号 { get; set; } public string 供应商零件号 { get; set; } diff --git a/Models/ScpEntity/TA_Appliance.cs b/Models/ScpEntity/TA_Appliance.cs index 7aaf6b9..3dd2b42 100644 --- a/Models/ScpEntity/TA_Appliance.cs +++ b/Models/ScpEntity/TA_Appliance.cs @@ -23,6 +23,8 @@ namespace CK.SCP.Models.ScpEntity public string Texture { get; set; } public string ReceivingPort { get; set; } public string VendID { get; set; } + //供应商别名 + public string OtherVendName { get; set; } } } diff --git a/Models/ScpEntity/TS_BARCODE.cs b/Models/ScpEntity/TS_BARCODE.cs index caca2c7..20d634e 100644 --- a/Models/ScpEntity/TS_BARCODE.cs +++ b/Models/ScpEntity/TS_BARCODE.cs @@ -86,9 +86,9 @@ namespace CK.SCP.Models.ScpEntity public string Extend3 { get; set; } [DisplayName("Ӧ")] - public string VendName => ScpCache.GetVendName(VendId,Site); - - + public string VendName => string.IsNullOrEmpty(OtherVendName)? ScpCache.GetVendName(VendId,Site): OtherVendName; + [DisplayName("Ӧ̱")] + public string OtherVendName { get; set; } [DisplayName("")] diff --git a/Models/ScpEntity/V_TA_APPLIANCE.cs b/Models/ScpEntity/V_TA_APPLIANCE.cs index 68d79a2..95f7eb5 100644 --- a/Models/ScpEntity/V_TA_APPLIANCE.cs +++ b/Models/ScpEntity/V_TA_APPLIANCE.cs @@ -25,5 +25,7 @@ namespace CK.SCP.Models.ScpEntity public string VendID { get; set; } public string VendName { get; set; } + public string OtherVendName { get; set; } + } } diff --git a/Models/ScpEntity/V_TB_PO.cs b/Models/ScpEntity/V_TB_PO.cs index a60f82b..7913d5a 100644 --- a/Models/ScpEntity/V_TB_PO.cs +++ b/Models/ScpEntity/V_TB_PO.cs @@ -64,6 +64,8 @@ namespace CK.SCP.Models.ScpEntity public DateTime? EndTime_End { get; set; } + [NotMapped]/// + public DateTime? BeginTime_End { get; set; } } diff --git a/SCP/Views/BasicData/Appliance.aspx b/SCP/Views/BasicData/Appliance.aspx index af2c4cb..bf296ba 100644 --- a/SCP/Views/BasicData/Appliance.aspx +++ b/SCP/Views/BasicData/Appliance.aspx @@ -1,4 +1,5 @@ <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Appliance.aspx.cs" Inherits="SCP.Views.BasicData.Appliance" %> + @@ -9,78 +10,78 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - + + + + + + + + + + + + + + + + + + + + + + - AllowPaging="True" PageSize="50" OnPageIndexChange="Grid1_OnPageIndexChange" - ShowBorder="False" - AllowSorting="true" IsDatabasePaging="true" SortField="PartCode" EnableCheckBoxSelect="true"> - + + - + - - - - + + + + - - - - - - - <%-- + + + + + + <%-- @@ -88,7 +89,7 @@ WindowPosition="Center" IsModal="true" Title="Popup Window 1" Target="Parent" EnableIFrame="true" IFrameUrl="about:blank" Height="200px" Width="400px" OnClose="WindowUpload_Close" > --%> - + -