From 9a32e11a1c1411388ffd124c7362999ebd7e9176 Mon Sep 17 00:00:00 2001 From: qian Date: Mon, 24 Feb 2025 13:36:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E8=A1=A5=E5=8F=8A=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/SCP_ASK_CONTROLLER.cs | 10 +- Controller/SCP_ASN_CONTROLLER.cs | 27 +- Controller/SCP_CONTRACT_CONTROLLER.cs | 144 ++-- Controller/SCP_INVOICE_CONTROLLER.cs | 695 +++++++++++++++--- Controller/SCP_PO_CONTROLLER.cs | 30 +- Models/CK.SCP.Models.csproj | 3 + Models/ScpEntities.cs | 2 + .../SCP_CHECKPARTANDVENDER_EXPORT.cs | 15 + Models/ScpEntity/TA_CHECKPARTANDVEND.cs | 18 + Models/ScpEntity/V_TA_CheckPartsAndVend.cs | 21 + SCP/SCP.csproj | 16 + .../BasicData/SCP_CheckPartsAndVend.aspx | 82 +++ .../BasicData/SCP_CheckPartsAndVend.aspx.cs | 177 +++++ .../SCP_CheckPartsAndVend.aspx.designer.cs | 215 ++++++ .../BasicData/SCP_CheckPartsAndVend_EDIT.aspx | 38 + .../SCP_CheckPartsAndVend_EDIT.aspx.cs | 74 ++ ...CP_CheckPartsAndVend_EDIT.aspx.designer.cs | 89 +++ SCP/Views/PlanData/SCP_ASK.aspx | 2 +- SCP/Views/PlanData/SCP_ASK.aspx.cs | 2 +- .../富维冲压件/SCP_MAXPO_INCOMPLETE.aspx | 90 +-- .../SCP_MAXPO_INCOMPLETE.aspx.cs | 4 +- .../SCP_MAXPO_INCOMPLETE_DETAIL.aspx | 9 +- .../富维冲压件/SCP_PO_MAX_DETAIL.aspx | 2 +- .../富维冲压件/SCP_PO_MAX_DETAIL.aspx.cs | 6 +- .../Controller/OdbcApiQadController.cs | 3 +- .../Controller/OdbcApiWmsController.cs | 5 +- 26 files changed, 1515 insertions(+), 264 deletions(-) create mode 100644 Models/ScpEntity/ExcelExportEnttity/SCP_CHECKPARTANDVENDER_EXPORT.cs create mode 100644 Models/ScpEntity/TA_CHECKPARTANDVEND.cs create mode 100644 Models/ScpEntity/V_TA_CheckPartsAndVend.cs create mode 100644 SCP/Views/BasicData/SCP_CheckPartsAndVend.aspx create mode 100644 SCP/Views/BasicData/SCP_CheckPartsAndVend.aspx.cs create mode 100644 SCP/Views/BasicData/SCP_CheckPartsAndVend.aspx.designer.cs create mode 100644 SCP/Views/BasicData/SCP_CheckPartsAndVend_EDIT.aspx create mode 100644 SCP/Views/BasicData/SCP_CheckPartsAndVend_EDIT.aspx.cs create mode 100644 SCP/Views/BasicData/SCP_CheckPartsAndVend_EDIT.aspx.designer.cs diff --git a/Controller/SCP_ASK_CONTROLLER.cs b/Controller/SCP_ASK_CONTROLLER.cs index 1ae2866..5f2f952 100644 --- a/Controller/SCP_ASK_CONTROLLER.cs +++ b/Controller/SCP_ASK_CONTROLLER.cs @@ -1918,11 +1918,13 @@ namespace CK.SCP.Controller { _tDetail.VendBatch = itm.VendBatch; } - - if (_t.PoBillNum.Substring(0, 5) == "CYD03" && _t.Site == "W21") + if (_t.PoBillNum.Length>=5) { - var podetail = db.TB_PO_DETAIL.FirstOrDefault(t => t.PoBillNum == _t.PoBillNum && t.PartCode == itm.PartCode && t.PoLine == itm.PoLine); - _tDetail.VendBatch = podetail.SubSite + "," + podetail.Extend3 + "," + itm.VendBatch + "#"; + if (_t.PoBillNum.Substring(0, 5) == "CYD03" && _t.Site == "W21") + { + var podetail = db.TB_PO_DETAIL.FirstOrDefault(t => t.PoBillNum == _t.PoBillNum && t.PartCode == itm.PartCode && t.PoLine == itm.PoLine); + _tDetail.VendBatch = podetail.SubSite + "," + podetail.Extend3 + "," + itm.VendBatch + "#"; + } } _tDetail.UpdateUser = itm.VendBatch; _tDetail.PackQty = itm.PackQty == 0 ? 1 : itm.PackQty; diff --git a/Controller/SCP_ASN_CONTROLLER.cs b/Controller/SCP_ASN_CONTROLLER.cs index 391508e..6f7c5a9 100644 --- a/Controller/SCP_ASN_CONTROLLER.cs +++ b/Controller/SCP_ASN_CONTROLLER.cs @@ -3036,25 +3036,25 @@ namespace CK.SCP.Controller { p_entitys.ForEach(p => { - var _maxpolist = db.TB_MAXPO_DETAIL.Where(t => t.PartCode == p.PartCode && t.VendId == p.Extend1&&t.AsnQty>0 && !t.IsDeleted).ToList().OrderBy(t=>t.ContractMonth); + var _maxpolist = db.TB_MAXPO_DETAIL.Where(t => t.PartCode == p.PartCode && t.VendId == p.Extend1&&t.SurplusQty>0 && !t.IsDeleted).ToList().OrderBy(t=>t.ContractMonth); decimal sum = 0; if (_maxpolist.Count() > 0) { - sum = _maxpolist.Sum(t => t.AsnQty); + sum = _maxpolist.Sum(t => t.SurplusQty); } decimal Qtyy = p.Qty; if(sum< Qtyy) { - _ret.MessageList.Add(string.Format("确认发货失败,零件号{0}大订单剩余数量不足,请联系业务人员维护", p.PartCode)); + _ret.MessageList.Add(string.Format("确认发货失败,零件号{0}大订单剩余数量不足,剩余{1},请联系业务人员维护", p.PartCode,sum)); } else { foreach (var _maxpo in _maxpolist) { - if (_maxpo.AsnQty > Qtyy) + if (_maxpo.SurplusQty > Qtyy) { - _maxpo.AsnQty = _maxpo.AsnQty - Qtyy; + TB_MAXPO_CONSUME consumne = new TB_MAXPO_CONSUME(); consumne.PoBillNum = _maxpo.PoBillNum; consumne.BillNum = p.AsnBillNum; @@ -3064,11 +3064,9 @@ namespace CK.SCP.Controller consumne.ShipTime = _maxpo.CreateTime; consumlist.Add(consumne); - db.TB_MAXPO_DETAIL.AddOrUpdate(_maxpo); - break; } - else if (_maxpo.AsnQty == Qtyy) + else if (_maxpo.SurplusQty == Qtyy) { TB_MAXPO_CONSUME consumne = new TB_MAXPO_CONSUME(); consumne.PoBillNum = _maxpo.PoBillNum; @@ -3077,27 +3075,22 @@ namespace CK.SCP.Controller consumne.VendId = _maxpo.VendId; consumne.PartCode = _maxpo.PartCode; consumne.ShipTime = _maxpo.CreateTime; - consumlist.Add(consumne); - _maxpo.AsnQty = 0; - - db.TB_MAXPO_DETAIL.AddOrUpdate(_maxpo); + consumlist.Add(consumne); break; } - else if (_maxpo.AsnQty < Qtyy) + else if (_maxpo.SurplusQty < Qtyy) { TB_MAXPO_CONSUME consumne = new TB_MAXPO_CONSUME(); consumne.PoBillNum = _maxpo.PoBillNum; consumne.BillNum = p.AsnBillNum; - consumne.PoQty = _maxpo.AsnQty; + consumne.PoQty = _maxpo.SurplusQty; consumne.VendId = _maxpo.VendId; consumne.PartCode = _maxpo.PartCode; consumne.ShipTime = _maxpo.CreateTime; - Qtyy = Qtyy - _maxpo.AsnQty; + Qtyy = Qtyy - _maxpo.SurplusQty; consumlist.Add(consumne); - _maxpo.AsnQty = 0; - db.TB_MAXPO_DETAIL.AddOrUpdate(_maxpo); } } diff --git a/Controller/SCP_CONTRACT_CONTROLLER.cs b/Controller/SCP_CONTRACT_CONTROLLER.cs index 415fe4c..eae01d2 100644 --- a/Controller/SCP_CONTRACT_CONTROLLER.cs +++ b/Controller/SCP_CONTRACT_CONTROLLER.cs @@ -18,8 +18,8 @@ namespace CK.SCP.Controller public class SCP_CONTRACT_CONTROLLER - { - public static void Get_TB_CONTRACT_List(TB_CONTRACT p_entity, Action>> p_action) + { + public static void Get_TB_CONTRACT_List(TB_CONTRACT p_entity, Action>> p_action) { ResultObject> _ret = new ResultObject>(); try @@ -63,11 +63,11 @@ namespace CK.SCP.Controller { q = q.Where(p => p.BillNo.Contains(p_entity.BillNo)); } - + _ret.State = ReturnStatus.Succeed; _ret.Result = q; p_action(_ret); - + } } catch (System.Data.Entity.Validation.DbEntityValidationException dbEx)//捕获实体验证异常 @@ -87,7 +87,7 @@ namespace CK.SCP.Controller } catch (OptimisticConcurrencyException ex)//并发冲突异常 { - + _ret.State = ReturnStatus.Failed; _ret.ErrorList.Add(ex); LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_CONTRACT_CONTROLLER), "Get_TB_CONTRACT_List", ex.ToString()); @@ -95,7 +95,7 @@ namespace CK.SCP.Controller } catch (ScpException ex) { - + _ret.State = ReturnStatus.Failed; _ret.ErrorList.Add(ex); @@ -103,7 +103,7 @@ namespace CK.SCP.Controller if (ex.InnerException != null && ex.InnerException.GetType() == typeof(UpdateException)) { var inner = (UpdateException)ex.InnerException; - + throw new ScpException(ResultCode.Exception, "0000", ex.ToString()); } else @@ -118,7 +118,7 @@ namespace CK.SCP.Controller LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_CONTRACT_CONTROLLER), "Get_TB_CONTRACT_List", e.Message); throw e; } - + } public static ResultObject> Get_TB_CONTRACT_DETAIL_List(TB_CONTRACT_DETAIL p_entity) { @@ -164,10 +164,10 @@ namespace CK.SCP.Controller { q = q.Where(p => p.UpdateInfo.Contains(p_entity.UpdateInfo)); } - + q = q.Where(p => p.IsDeleted == p_entity.IsDeleted); - - + + _ret.State = ReturnStatus.Succeed; _ret.Result = q.ToList(); } @@ -191,7 +191,7 @@ namespace CK.SCP.Controller } catch (OptimisticConcurrencyException ex)//并发冲突异常 { - + _ret.State = ReturnStatus.Failed; _ret.ErrorList.Add(ex); LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_CONTRACT_CONTROLLER), "Get_TB_CONTRACT_DETAIL_List", ex.ToString()); @@ -199,7 +199,7 @@ namespace CK.SCP.Controller } catch (ScpException ex) { - + _ret.State = ReturnStatus.Failed; _ret.ErrorList.Add(ex); @@ -209,7 +209,7 @@ namespace CK.SCP.Controller { var inner = (UpdateException)ex.InnerException; - + throw new ScpException(ResultCode.Exception, "0000", ex.ToString()); } else @@ -230,13 +230,13 @@ namespace CK.SCP.Controller public static List NOTIFY_COMPARE_PRICE(List p_priceList, List p_polist) { List msgList = new List(); - var ret= from po in p_polist - join price in p_priceList on po.PartCode equals price.PartCode - select new { VAL1 = po, VAL2 = price }; - var list = ret.Where(p=> p.VAL1.BeginTime>=p.VAL2.BeginTime && p.VAL1.BeginTime<=p.VAL2.EndTime && p.VAL1.PlanQty>=p.VAL2.QtyBegin && p.VAL1.PlanQty < p.VAL2.QtyEnd && (p.VAL1.Price> p.VAL2.Price || p.VAL1.Price==0)); - foreach(var itm in list) + var ret = from po in p_polist + join price in p_priceList on po.PartCode equals price.PartCode + select new { VAL1 = po, VAL2 = price }; + var list = ret.Where(p => p.VAL1.BeginTime >= p.VAL2.BeginTime && p.VAL1.BeginTime <= p.VAL2.EndTime && p.VAL1.PlanQty >= p.VAL2.QtyBegin && p.VAL1.PlanQty < p.VAL2.QtyEnd && (p.VAL1.Price > p.VAL2.Price || p.VAL1.Price == 0)); + foreach (var itm in list) { - msgList.Add(string.Format("物料编码{0}价格{1}与合同价格{2}不一致",itm.VAL1.PartCode, itm.VAL1.Price, itm.VAL2.Price)); + msgList.Add(string.Format("物料编码{0}价格{1}与合同价格{2}不一致", itm.VAL1.PartCode, itm.VAL1.Price, itm.VAL2.Price)); } return msgList; @@ -250,7 +250,7 @@ namespace CK.SCP.Controller // { // using (ScpEntities db = EntitiesFactory.CreateScpInstance()) // { - + // } // } @@ -264,14 +264,14 @@ namespace CK.SCP.Controller { if (p_list.Count > 0) { - var ret= Get_TB_CONTRACT_DETAIL_PRICE_List(new TB_CONTRACT_DETAIL_PRICE() { VendId = p_list[0].VendId }); + var ret = Get_TB_CONTRACT_DETAIL_PRICE_List(new TB_CONTRACT_DETAIL_PRICE() { VendId = p_list[0].VendId }); if (ret.State == ReturnStatus.Succeed) { var p_priceList = ret.Result; List msgList = new List(); var ls = from po in p_list - join price in p_priceList on po.PartCode equals price.PartCode - select new { VAL1 = po, VAL2 = price }; + join price in p_priceList on po.PartCode equals price.PartCode + select new { VAL1 = po, VAL2 = price }; var list = ls.Where(p => p.VAL1.BeginTime >= p.VAL2.BeginTime && p.VAL1.BeginTime <= p.VAL2.EndTime && p.VAL1.Qty >= p.VAL2.QtyBegin && p.VAL1.Qty < p.VAL2.QtyEnd); p_list.ForEach(p => { @@ -365,23 +365,23 @@ namespace CK.SCP.Controller { if (p_list.Count > 0) - { - - p_list.ForEach(p => + { + + p_list.ForEach(p => + { + using (ScpEntities db = EntitiesFactory.CreateScpInstance()) { - using (ScpEntities db = EntitiesFactory.CreateScpInstance()) + if (!string.IsNullOrEmpty(p.SubSite)) { - if (!string.IsNullOrEmpty(p.SubSite)) + var part = db.TA_PART.FirstOrDefault(t => t.PartCode == p.SubSite); + if (part != null) { - var part = db.TA_PART.FirstOrDefault(t => t.PartCode == p.SubSite); - if (part != null) - { - p.Subpartspec = part.PartDesc2; - } + p.Subpartspec = part.PartDesc2; } - } - }); - + } + } + }); + } return p_list; } @@ -396,26 +396,26 @@ namespace CK.SCP.Controller using (ScpEntities db = EntitiesFactory.CreateScpInstance()) { List _ls = new List(); - var _No = db.TB_MAXPO_CONSUME.Where(t => t.PartCode == p.PartCode&&t.BillNum==p.PoBillNum).ToList(); + var _No = db.TB_MAXPO_CONSUME.Where(t => t.PartCode == p.PartCode && t.BillNum == p.PoBillNum).ToList(); var _Month = db.V_TB_MAXPO_CONSUME.Where(t => t.PartCode == p.PartCode && t.BillNum == p.PoBillNum).ToList(); - - foreach(var Mo in _Month) + + foreach (var Mo in _Month) { if (!_ls.Contains(Mo.ContractMonth)) { _ls.Add(Mo.ContractMonth); - } + } } - string ContactNo = string.Join(";",_ls); + string ContactNo = string.Join(";", _ls); p.ContractMonth = ContactNo; - foreach (var pa in _No) - { - ContactNo = ContactNo + pa.PoBillNum + ";"; - } - p.ContractNo = ContactNo.Substring(0, ContactNo.Length - 1).Trim(); - } - - + foreach (var pa in _No) + { + ContactNo = ContactNo + pa.PoBillNum + ";"; + } + p.ContractNo = ContactNo.Substring(0, ContactNo.Length - 1).Trim(); + } + + }); } @@ -481,7 +481,7 @@ namespace CK.SCP.Controller } - public static ResultObject> Get_TB_CONTRACT_DETAIL_PRICE_List(TB_CONTRACT_DETAIL_PRICE p_entity,int p_qty=0) + public static ResultObject> Get_TB_CONTRACT_DETAIL_PRICE_List(TB_CONTRACT_DETAIL_PRICE p_entity, int p_qty = 0) { ResultObject> _ret = new ResultObject>(); try @@ -489,7 +489,7 @@ namespace CK.SCP.Controller using (ScpEntities db = EntitiesFactory.CreateScpInstance()) { - + IQueryable q = db.TB_CONTRACT_DETAIL_PRICE; if (p_entity.UID != 0) { @@ -523,10 +523,10 @@ namespace CK.SCP.Controller { q = q.Where(p => p.VendId.Contains(p_entity.VendId)); } - + q = q.Where(p => p.IsDeleted == p_entity.IsDeleted); - - + + _ret.State = ReturnStatus.Succeed; _ret.Result = q.ToList(); } @@ -550,7 +550,7 @@ namespace CK.SCP.Controller } catch (OptimisticConcurrencyException ex)//并发冲突异常 { - + _ret.State = ReturnStatus.Failed; _ret.ErrorList.Add(ex); LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_CONTRACT_CONTROLLER), "Get_TB_CONTRACT_DETAIL_PRICE_List", ex.ToString()); @@ -558,7 +558,7 @@ namespace CK.SCP.Controller } catch (ScpException ex) { - + _ret.State = ReturnStatus.Failed; _ret.ErrorList.Add(ex); @@ -568,7 +568,7 @@ namespace CK.SCP.Controller { var inner = (UpdateException)ex.InnerException; - + throw new ScpException(ResultCode.Exception, "0000", ex.ToString()); } else @@ -595,11 +595,11 @@ namespace CK.SCP.Controller if (string.IsNullOrEmpty(itm.合同编号)) { - _buffer.AppendFormat(string.Format("导入错误合同编号未填写！")); + _buffer.AppendFormat(string.Format("导入错误合同编号未填写！")); } if (string.IsNullOrEmpty(itm.供应商代码) || string.IsNullOrEmpty(itm.供应商名称)) { - _buffer.AppendFormat(string.Format("导入错误供应商编号或供应商名称未填写！")); + _buffer.AppendFormat(string.Format("导入错误供应商编号或供应商名称未填写！")); } if (string.IsNullOrEmpty(itm.供应商物料号) || string.IsNullOrEmpty(itm.物料描述)) { @@ -685,7 +685,7 @@ namespace CK.SCP.Controller } if (_buffer.Length > 0) { - LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_CONTRACT_CONTROLLER), "IMPORT_CONTRACT_CHECK",_buffer.ToString()); + LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_CONTRACT_CONTROLLER), "IMPORT_CONTRACT_CHECK", _buffer.ToString()); return _buffer.ToString(); } return string.Empty; @@ -694,7 +694,7 @@ namespace CK.SCP.Controller { ResultObject _ret = new ResultObject(); int line = 1; - + foreach (var itm in p_contract_list) { if (!string.IsNullOrEmpty(IMPORT_CONTRACT_CHECK(itm))) @@ -711,15 +711,15 @@ namespace CK.SCP.Controller { var _contract = p_contract_list.FirstOrDefault(); #region 删除老合同 - var contract=db.TB_CONTRACT.Where(p => p.VendId == _contract.供应商代码 && p.ContractNo == _contract.合同编号); + var contract = db.TB_CONTRACT.Where(p => p.VendId == _contract.供应商代码 && p.ContractNo == _contract.合同编号); if (contract.Count() > 0) { var c = contract.FirstOrDefault(); if (!string.IsNullOrEmpty(c.BillNo)) { - var detailPrice = db.TB_CONTRACT_DETAIL_PRICE.Where(p => p.BillNo ==c.BillNo); + var detailPrice = db.TB_CONTRACT_DETAIL_PRICE.Where(p => p.BillNo == c.BillNo); db.TB_CONTRACT_DETAIL_PRICE.RemoveRange(detailPrice); - var detail=db.TB_CONTRACT_DETAIL.Where(p => p.BillNo ==c.BillNo); + var detail = db.TB_CONTRACT_DETAIL.Where(p => p.BillNo == c.BillNo); db.TB_CONTRACT_DETAIL.RemoveRange(detail); db.TB_CONTRACT.Remove(c); } @@ -732,11 +732,11 @@ namespace CK.SCP.Controller _tbContract.CreateUser = p_creator; _tbContract.ContractNo = _contract.合同编号; _tbContract.IsDeleted = false; - + db.TB_CONTRACT.Add(_tbContract); - var list = p_contract_list.Distinct(new SCP_CONTRACT_EXCEL_COMPARE()).ToList(); + var list = p_contract_list.Distinct(new SCP_CONTRACT_EXCEL_COMPARE()).ToList(); foreach (var itm in list) { var _tbContract_detail = new TB_CONTRACT_DETAIL(); @@ -760,7 +760,7 @@ namespace CK.SCP.Controller _detail_price.EndTime = ConvertHelper.To(itm.结束日期); _detail_price.ContractNo = _tbContract.ContractNo; _detail_price.QtyBegin = int.Parse(itm.最小起订量1); - _detail_price.QtyEnd = !string.IsNullOrEmpty(itm.最小起订量2)? int.Parse(itm.最小起订量2):999999999; + _detail_price.QtyEnd = !string.IsNullOrEmpty(itm.最小起订量2) ? int.Parse(itm.最小起订量2) : 999999999; _detail_price.BillNo = _tbContract.BillNo; _detail_price.IsDeleted = false; _detail_price.PartCode = itm.供应商物料号; @@ -843,7 +843,7 @@ namespace CK.SCP.Controller { _ret.State = ReturnStatus.Failed; _ret.Result = false; - + } } @@ -867,7 +867,7 @@ namespace CK.SCP.Controller } catch (OptimisticConcurrencyException ex)//并发冲突异常 { - + _ret.State = ReturnStatus.Failed; _ret.Result = false; _ret.ErrorList.Add(ex); @@ -876,7 +876,7 @@ namespace CK.SCP.Controller } catch (ScpException ex) { - + _ret.State = ReturnStatus.Failed; _ret.Result = false; @@ -887,7 +887,7 @@ namespace CK.SCP.Controller { var inner = (UpdateException)ex.InnerException; - + throw new ScpException(ResultCode.Exception, "0000", ex.ToString()); } else diff --git a/Controller/SCP_INVOICE_CONTROLLER.cs b/Controller/SCP_INVOICE_CONTROLLER.cs index 059a4e1..923c074 100644 --- a/Controller/SCP_INVOICE_CONTROLLER.cs +++ b/Controller/SCP_INVOICE_CONTROLLER.cs @@ -12,6 +12,7 @@ using CK.SCP.Models.ScpEntity; using CK.SCP.Models.ScpEntity.ExcelImportEntity; using CK.SCP.Utils; using System.Data.Entity.Core; +using CK.SCP.Models.ScpEntity.ExcelExportEnttity; namespace CK.SCP.Controller { @@ -38,7 +39,7 @@ namespace CK.SCP.Controller { q = q.Where(p => p.InvcBillNum.Contains(p_entity.InvcBillNum)); } - + if (!string.IsNullOrEmpty(p_entity.VendName)) { q = q.Where(p => p.VendName.Contains(p_entity.VendName)); @@ -167,7 +168,7 @@ namespace CK.SCP.Controller } - public static List Get_V_TB_INVOICE_BY_TIME(string p_begin,string p_end,string p_po,string p_asn) + public static List Get_V_TB_INVOICE_BY_TIME(string p_begin, string p_end, string p_po, string p_asn) { List _list = new List(); using (ScpEntities db = EntitiesFactory.CreateScpInstance()) @@ -190,9 +191,9 @@ namespace CK.SCP.Controller } if (!string.IsNullOrEmpty(p_asn)) { - _builder.AppendFormat(" and A.AsnBillNum='{0}' \r\n",p_asn); + _builder.AppendFormat(" and A.AsnBillNum='{0}' \r\n", p_asn); } - _list =db.Database.SqlQuery(_builder.ToString()).ToList(); + _list = db.Database.SqlQuery(_builder.ToString()).ToList(); } return _list; @@ -212,17 +213,17 @@ namespace CK.SCP.Controller } if (!string.IsNullOrEmpty(p_entity.InvcBillNum)) { - q = q.Where(p => p.InvcBillNum==p_entity.InvcBillNum); + q = q.Where(p => p.InvcBillNum == p_entity.InvcBillNum); } if (!string.IsNullOrEmpty(p_entity.VendId)) { - q = q.Where(p => p.VendId==p_entity.VendId); + q = q.Where(p => p.VendId == p_entity.VendId); } if (!string.IsNullOrEmpty(p_entity.VendName)) { q = q.Where(p => p.VendName.Contains(p_entity.VendName)); } - + if (!string.IsNullOrEmpty(p_entity.InvoiceNum)) { q = q.Where(p => p.InvoiceNum.Contains(p_entity.InvoiceNum)); @@ -270,9 +271,9 @@ namespace CK.SCP.Controller } if (!string.IsNullOrEmpty(p_entity.AskCreateUser)) { - q = q.Where(p => p.AskCreateUser==p_entity.AskCreateUser); + q = q.Where(p => p.AskCreateUser == p_entity.AskCreateUser); } - if (p_entity.InvoiceList!=null && p_entity.InvoiceList.Count>0) + if (p_entity.InvoiceList != null && p_entity.InvoiceList.Count > 0) { q = q.Where(p => p_entity.InvoiceList.Contains(p.InvcBillNum)); } @@ -302,7 +303,7 @@ namespace CK.SCP.Controller } catch (OptimisticConcurrencyException ex)//并发冲突异常 { - + _ret.State = ReturnStatus.Failed; _ret.ErrorList.Add(ex); LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_INVOICE_CONTROLLER), "Get_V_TB_INVOICE_List", ex.ToString()); @@ -310,7 +311,7 @@ namespace CK.SCP.Controller } catch (ScpException ex) { - + _ret.State = ReturnStatus.Failed; _ret.ErrorList.Add(ex); @@ -320,7 +321,7 @@ namespace CK.SCP.Controller { var inner = (UpdateException)ex.InnerException; - + throw new ScpException(ResultCode.Exception, "0000", ex.ToString()); } else @@ -610,7 +611,7 @@ namespace CK.SCP.Controller using (ScpEntities db = EntitiesFactory.CreateScpInstance()) { IQueryable q = db.TA_Receiving_Information; - + if (!string.IsNullOrEmpty(p_entity.Shift)) { q = q.Where(p => p.Shift == p_entity.Shift); @@ -964,7 +965,7 @@ namespace CK.SCP.Controller } if (!string.IsNullOrEmpty(p_entity.InvcBillNum)) { - q = q.Where(p => p.InvcBillNum==(p_entity.InvcBillNum)); + q = q.Where(p => p.InvcBillNum == (p_entity.InvcBillNum)); } if (!string.IsNullOrEmpty(p_entity.PoBillNum)) { @@ -1050,7 +1051,7 @@ namespace CK.SCP.Controller { q = q.Where(p => p.CreateUser.Contains(p_entity.CreateUser)); } - // q = q.Where(p => p.IsRed == p_entity.IsRed); + // q = q.Where(p => p.IsRed == p_entity.IsRed); _ret.State = ReturnStatus.Succeed; _ret.Result = q; @@ -1076,7 +1077,7 @@ namespace CK.SCP.Controller } catch (OptimisticConcurrencyException ex)//并发冲突异常 { - + _ret.State = ReturnStatus.Failed; _ret.ErrorList.Add(ex); LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_INVOICE_CONTROLLER), "Get_V_TB_INVOICE_DETAIL_List", ex.ToString()); @@ -1084,7 +1085,7 @@ namespace CK.SCP.Controller } catch (ScpException ex) { - + _ret.State = ReturnStatus.Failed; _ret.ErrorList.Add(ex); @@ -1094,7 +1095,7 @@ namespace CK.SCP.Controller { var inner = (UpdateException)ex.InnerException; - + throw new ScpException(ResultCode.Exception, "0000", ex.ToString()); } else @@ -1273,15 +1274,15 @@ namespace CK.SCP.Controller } - public static ResultObject CREATE_TB_INVOICE(V_TB_INVOICE p_entity,List p_list) + public static ResultObject CREATE_TB_INVOICE(V_TB_INVOICE p_entity, List p_list) { ResultObject _ret = new ResultObject(); try { using (ScpEntities db = EntitiesFactory.CreateScpInstance()) { - var _tax=db.TA_VENDER.Where(p => p.VendId == p_entity.VendId).Select(p => p.Tax).FirstOrDefault(); - var _ls=p_list.Where(p => p.BillType_DESC == "索赔单").ToList(); + var _tax = db.TA_VENDER.Where(p => p.VendId == p_entity.VendId).Select(p => p.Tax).FirstOrDefault(); + var _ls = p_list.Where(p => p.BillType_DESC == "索赔单").ToList(); TB_INVOICE invoice = new TB_INVOICE(); invoice.InvcBillNum = SCP_BILLCODE_CONTROLLER.MakeInvoiceCode(); invoice.VendId = p_entity.VendId; @@ -1301,7 +1302,7 @@ namespace CK.SCP.Controller if (_ls.Count > 0) { - invoice.ContractPrice =0- _ls.Sum(p=>p.Price); + invoice.ContractPrice = 0 - _ls.Sum(p => p.Price); } else { @@ -1309,13 +1310,14 @@ namespace CK.SCP.Controller } invoice.BlancePrice = p_entity.BlancePrice; db.TB_INVOICE.AddOrUpdate(invoice); - - p_list.ForEach(p => { + + p_list.ForEach(p => + { TB_INVOICE_DETAIL invocieDetail = new TB_INVOICE_DETAIL(); invocieDetail.Site = invoice.Site; invocieDetail.SubSite = invoice.SubSite; - invocieDetail.InvcBillNum= invoice.InvcBillNum; + invocieDetail.InvcBillNum = invoice.InvcBillNum; invocieDetail.AsnBillNum = p.AsnBillNum; invocieDetail.PoBillNum = p.PoBillNum; invocieDetail.PoLineNum = p.PoLine; @@ -1357,7 +1359,7 @@ namespace CK.SCP.Controller #endregion if (db.SaveChanges() != -1) - { + { _ret.State = ReturnStatus.Succeed; _ret.Result = true; } @@ -1386,7 +1388,7 @@ namespace CK.SCP.Controller } catch (OptimisticConcurrencyException ex)//并发冲突异常 { - + _ret.State = ReturnStatus.Failed; _ret.Result = false; _ret.ErrorList.Add(ex); @@ -1395,7 +1397,7 @@ namespace CK.SCP.Controller } catch (ScpException ex) { - + _ret.State = ReturnStatus.Failed; _ret.Result = false; @@ -1406,7 +1408,7 @@ namespace CK.SCP.Controller { var inner = (UpdateException)ex.InnerException; - + throw new ScpException(ResultCode.Exception, "0000", ex.ToString()); } else @@ -1441,7 +1443,7 @@ namespace CK.SCP.Controller { using (ScpEntities db = EntitiesFactory.CreateScpInstance()) { - decimal _total = 0; + decimal _total = 0; TB_INVOICE invoice = new TB_INVOICE(); invoice.InvcBillNum = SCP_BILLCODE_CONTROLLER.MakeInvoiceCode(); invoice.VendId = p_entity.VendId; @@ -1458,7 +1460,8 @@ namespace CK.SCP.Controller invoice.Tax = p_entity.Tax; invoice.IsRed = false; db.TB_INVOICE.AddOrUpdate(invoice); - p_list.ForEach(p => { + p_list.ForEach(p => + { TB_INVOICE_DETAIL invocieDetail = new TB_INVOICE_DETAIL(); invocieDetail.InvcBillNum = invoice.InvcBillNum; @@ -1480,13 +1483,13 @@ namespace CK.SCP.Controller invocieDetail.IsDeleted = false; invocieDetail.State = (int)InvoiceState.New; invocieDetail.GUID = Guid.NewGuid(); - invocieDetail.Remark =""; + invocieDetail.Remark = ""; invocieDetail.IsRed = false; invocieDetail.BlancePrice = p.BlancePrice;//模具分摊价格 invocieDetail.DiscountPrice = p.DiscountPrice;//供应商价格 db.TB_INVOICE_DETAIL.AddOrUpdate(invocieDetail); - var _moldsharing = db.TA_MoldSharing.SingleOrDefault(t =>t.IsDeleted==false&& t.VendId == p.VendId.ToUpper() && t.PartCode == p.PartCode.ToUpper()&&t.Qty!=t.Count); - if(_moldsharing!=null ) + var _moldsharing = db.TA_MoldSharing.SingleOrDefault(t => t.IsDeleted == false && t.VendId == p.VendId.ToUpper() && t.PartCode == p.PartCode.ToUpper() && t.Qty != t.Count); + if (_moldsharing != null) { var _num = _moldsharing.Count + p.Qty; if (_moldsharing.Qty < _num) @@ -1536,7 +1539,7 @@ namespace CK.SCP.Controller _ret.State = ReturnStatus.Failed; _ret.Result = false; } - } + } } } catch (System.Data.Entity.Validation.DbEntityValidationException dbEx)//捕获实体验证异常 @@ -1600,7 +1603,7 @@ namespace CK.SCP.Controller var _entity = db.TB_INVOICE.Where(p => p.InvcBillNum == p_billno).FirstOrDefault(); if (p_state == InvoiceState.Apply) { - + #region 采购员代办任务新 TB_PENING_ITEMS _item = new TB_PENING_ITEMS(); _item.ROLE_NAME = "采购人员"; @@ -1691,7 +1694,7 @@ namespace CK.SCP.Controller if (p_state == InvoiceState.FinanceReceive) { - var _ary=db.TB_PENING_ITEMS.Where(itm => itm.INVOICE_NO == _entity.InvcBillNum).ToArray(); + var _ary = db.TB_PENING_ITEMS.Where(itm => itm.INVOICE_NO == _entity.InvcBillNum).ToArray(); db.TB_PENING_ITEMS.RemoveRange(_ary); #region 财务审核通过任务新 @@ -1727,12 +1730,13 @@ namespace CK.SCP.Controller //_item.ITEM_ADDRESS = _entity.Site; _item.GUID = Guid.NewGuid(); db.TB_PENING_ITEMS.Add(_item); - #endregion + #endregion } var _list = db.TB_INVOICE_DETAIL.Where(p => p.InvcBillNum == p_billno).ToList(); - _list.ForEach(p => { + _list.ForEach(p => + { p.State = (int)p_state; }); @@ -1745,14 +1749,15 @@ namespace CK.SCP.Controller _entity.IsDeleted = true; _list = db.TB_INVOICE_DETAIL.Where(p => p.InvcBillNum == p_billno).ToList(); - _list.ForEach(p => { + _list.ForEach(p => + { p.State = (int)p_state; p.IsDeleted = true; }); } db.TB_INVOICE_DETAIL.AddOrUpdate(p => p.UID, _list.ToArray()); - db.TB_INVOICE.AddOrUpdate(p => p.UID,_entity); + db.TB_INVOICE.AddOrUpdate(p => p.UID, _entity); if (string.IsNullOrEmpty(_ret.Message)) { @@ -1791,7 +1796,7 @@ namespace CK.SCP.Controller } catch (OptimisticConcurrencyException ex)//并发冲突异常 { - + _ret.State = ReturnStatus.Failed; _ret.Result = false; _ret.ErrorList.Add(ex); @@ -1800,7 +1805,7 @@ namespace CK.SCP.Controller } catch (ScpException ex) { - + _ret.State = ReturnStatus.Failed; _ret.Result = false; @@ -1811,7 +1816,7 @@ namespace CK.SCP.Controller { var inner = (UpdateException)ex.InnerException; - + throw new ScpException(ResultCode.Exception, "0000", ex.ToString()); } else @@ -1830,7 +1835,7 @@ namespace CK.SCP.Controller return _ret; } - public static ResultObject SAVE_TB_INVOICE_STATE(V_TB_INVOICE invoice, InvoiceState p_state,string p_username="", string p_flag = "") + public static ResultObject SAVE_TB_INVOICE_STATE(V_TB_INVOICE invoice, InvoiceState p_state, string p_username = "", string p_flag = "") { ResultObject _ret = new ResultObject(); try @@ -1994,7 +1999,8 @@ namespace CK.SCP.Controller } var _list = db.TB_INVOICE_DETAIL.Where(p => p.InvcBillNum == invoice.InvcBillNum).ToList(); - _list.ForEach(p => { + _list.ForEach(p => + { p.State = (int)p_state; }); @@ -2007,16 +2013,17 @@ namespace CK.SCP.Controller _entity.IsDeleted = true; _list = db.TB_INVOICE_DETAIL.Where(p => p.InvcBillNum == invoice.InvcBillNum).ToList(); - _list.ForEach(p => { + _list.ForEach(p => + { p.State = (int)p_state; p.IsDeleted = true; if (!string.IsNullOrEmpty(p_flag))//修改分摊数量 { - var _moldsharing = db.TA_MoldSharing.SingleOrDefault(t =>t.IsDeleted==false&& t.VendId == invoice.VendId.ToUpper() && t.PartCode == p.PartCode.ToUpper()); - var _ms_detail = db.TA_MoldSharing_Invoice.SingleOrDefault(t =>t.InvcGUID==p.GUID); - if (_moldsharing != null&& _ms_detail!=null) - { - db.TA_MoldSharing_Invoice.Remove(_ms_detail); + var _moldsharing = db.TA_MoldSharing.SingleOrDefault(t => t.IsDeleted == false && t.VendId == invoice.VendId.ToUpper() && t.PartCode == p.PartCode.ToUpper()); + var _ms_detail = db.TA_MoldSharing_Invoice.SingleOrDefault(t => t.InvcGUID == p.GUID); + if (_moldsharing != null && _ms_detail != null) + { + db.TA_MoldSharing_Invoice.Remove(_ms_detail); var _num = _moldsharing.Count - p.Qty; _moldsharing.Count = _num; db.TA_MoldSharing.AddOrUpdate(_moldsharing); @@ -2065,7 +2072,7 @@ namespace CK.SCP.Controller } catch (OptimisticConcurrencyException ex)//并发冲突异常 { - + _ret.State = ReturnStatus.Failed; _ret.Result = false; _ret.ErrorList.Add(ex); @@ -2074,7 +2081,7 @@ namespace CK.SCP.Controller } catch (ScpException ex) { - + _ret.State = ReturnStatus.Failed; _ret.Result = false; @@ -2085,7 +2092,7 @@ namespace CK.SCP.Controller { var inner = (UpdateException)ex.InnerException; - + throw new ScpException(ResultCode.Exception, "0000", ex.ToString()); } else @@ -2147,7 +2154,7 @@ namespace CK.SCP.Controller } catch (OptimisticConcurrencyException ex)//并发冲突异常 { - + _ret.State = ReturnStatus.Failed; _ret.Result = false; _ret.ErrorList.Add(ex); @@ -2156,7 +2163,7 @@ namespace CK.SCP.Controller } catch (ScpException ex) { - + _ret.State = ReturnStatus.Failed; _ret.Result = false; @@ -2167,7 +2174,7 @@ namespace CK.SCP.Controller { var inner = (UpdateException)ex.InnerException; - + throw new ScpException(ResultCode.Exception, "0000", ex.ToString()); } else @@ -2185,7 +2192,7 @@ namespace CK.SCP.Controller return _ret; } - public static ResultObject SAVE_TB_INVOICE_APPLY(V_TB_INVOICE p_invoice, List p_list,string p_flag="") + public static ResultObject SAVE_TB_INVOICE_APPLY(V_TB_INVOICE p_invoice, List p_list, string p_flag = "") { ResultObject _ret = new ResultObject(); List _list = new List(); @@ -2193,7 +2200,7 @@ namespace CK.SCP.Controller { using (ScpEntities db = EntitiesFactory.CreateScpInstance()) { - var _bill=db.TB_INVOICE.Where(itm => itm.InvcBillNum == p_invoice.InvcBillNum).FirstOrDefault(); + var _bill = db.TB_INVOICE.Where(itm => itm.InvcBillNum == p_invoice.InvcBillNum).FirstOrDefault(); _bill.InvoiceNum = p_invoice.InvoiceNum; _bill.ExpressNum = p_invoice.ExpressNum; _bill.ContractPrice = p_invoice.ContractPrice; @@ -2210,10 +2217,11 @@ namespace CK.SCP.Controller _bill.UpdateTime = p_invoice.UpdateTime; } db.TB_INVOICE.AddOrUpdate(p => p.InvcBillNum, _bill); - p_list.ForEach(p => { - var _detail=db.TB_INVOICE_DETAIL.Where(itm => itm.UID == p.UID).FirstOrDefault(); + p_list.ForEach(p => + { + var _detail = db.TB_INVOICE_DETAIL.Where(itm => itm.UID == p.UID).FirstOrDefault(); var _qty = _detail.Qty - p.Qty; - _detail.State =(int)p.State; + _detail.State = (int)p.State; _detail.Qty = p.Qty; _detail.Price = p.Price; _detail.ContractPrice = p.ContractPrice; @@ -2223,15 +2231,15 @@ namespace CK.SCP.Controller if (_detail.Qty == 0) { _detail.State = (int)InvoiceState.Reject; - _detail.IsDeleted = true; + _detail.IsDeleted = true; } _detail.Remark = p.Remark; - db.TB_INVOICE_DETAIL.AddOrUpdate(itm=>itm.UID,_detail); - if(!string.IsNullOrEmpty(p_flag))//修改发票数量对分摊数修改 + db.TB_INVOICE_DETAIL.AddOrUpdate(itm => itm.UID, _detail); + if (!string.IsNullOrEmpty(p_flag))//修改发票数量对分摊数修改 { - var _ms = db.TA_MoldSharing.SingleOrDefault(t =>t.IsDeleted==false&& t.PartCode == _detail.PartCode && t.VendId == _bill.VendId); - var _ms_detail= db.TA_MoldSharing_Invoice.SingleOrDefault(t =>t.InvcGUID== _detail.GUID); - if (_ms != null&& _ms_detail!=null) + var _ms = db.TA_MoldSharing.SingleOrDefault(t => t.IsDeleted == false && t.PartCode == _detail.PartCode && t.VendId == _bill.VendId); + var _ms_detail = db.TA_MoldSharing_Invoice.SingleOrDefault(t => t.InvcGUID == _detail.GUID); + if (_ms != null && _ms_detail != null) { _ms.Count = _ms.Count - _qty; if (_ms.Count > _ms.Qty) @@ -2272,15 +2280,15 @@ namespace CK.SCP.Controller } else { - if (db.SaveChanges() != -1) - { - _ret.State = ReturnStatus.Succeed; - _ret.Result = true; - } - else - { - _ret.State = ReturnStatus.Failed; - _ret.Result = false; + if (db.SaveChanges() != -1) + { + _ret.State = ReturnStatus.Succeed; + _ret.Result = true; + } + else + { + _ret.State = ReturnStatus.Failed; + _ret.Result = false; } } } @@ -2305,7 +2313,7 @@ namespace CK.SCP.Controller } catch (OptimisticConcurrencyException ex)//并发冲突异常 { - + _ret.State = ReturnStatus.Failed; _ret.Result = false; _ret.ErrorList.Add(ex); @@ -2314,7 +2322,7 @@ namespace CK.SCP.Controller } catch (ScpException ex) { - + _ret.State = ReturnStatus.Failed; _ret.Result = false; @@ -2325,7 +2333,7 @@ namespace CK.SCP.Controller { var inner = (UpdateException)ex.InnerException; - + throw new ScpException(ResultCode.Exception, "0000", ex.ToString()); } else @@ -2351,7 +2359,7 @@ namespace CK.SCP.Controller { using (ScpEntities db = EntitiesFactory.CreateScpInstance()) { - var _bill = db.TB_INVOICE.Where(itm => itm.InvcBillNum == p_invoice.InvcBillNum && itm.IsRed==true).FirstOrDefault(); + var _bill = db.TB_INVOICE.Where(itm => itm.InvcBillNum == p_invoice.InvcBillNum && itm.IsRed == true).FirstOrDefault(); _bill.InvoiceNum = p_invoice.InvoiceNum; _bill.ExpressNum = p_invoice.ExpressNum; _bill.ContractPrice = p_invoice.ContractPrice; @@ -2361,7 +2369,8 @@ namespace CK.SCP.Controller _bill.Remark = p_invoice.Remark; _bill.State = (int)p_invoice.State; db.TB_INVOICE.AddOrUpdate(p => p.UID, _bill); - p_list.ForEach(p => { + p_list.ForEach(p => + { var _detail = db.TB_INVOICE_DETAIL.Where(itm => itm.UID == p.UID).FirstOrDefault(); _detail.State = (int)p.State; _detail.Qty = p.Qty; @@ -2457,8 +2466,8 @@ namespace CK.SCP.Controller { using (ScpEntities db = EntitiesFactory.CreateScpInstance()) { - - TB_INVOICE _bill = db.TB_INVOICE.Where(itm => itm.InvcBillNum == p_invoice.InvcBillNum && itm.IsDeleted==false).FirstOrDefault(); + + TB_INVOICE _bill = db.TB_INVOICE.Where(itm => itm.InvcBillNum == p_invoice.InvcBillNum && itm.IsDeleted == false).FirstOrDefault(); if (_bill != null) @@ -2542,7 +2551,7 @@ namespace CK.SCP.Controller _detail.BlancePrice = p.BlancePrice; _detail.DiscountPrice = p.DiscountPrice; _detail.DiscountRemark = p.DiscountRemark; - _detail.IsRed =true; + _detail.IsRed = true; db.TB_INVOICE_DETAIL.Add(_detail); }); @@ -2668,7 +2677,7 @@ namespace CK.SCP.Controller } catch (OptimisticConcurrencyException ex)//并发冲突异常 { - + _ret.State = ReturnStatus.Failed; _ret.Result = false; _ret.ErrorList.Add(ex); @@ -2677,7 +2686,7 @@ namespace CK.SCP.Controller } catch (ScpException ex) { - + _ret.State = ReturnStatus.Failed; _ret.Result = false; @@ -2688,7 +2697,7 @@ namespace CK.SCP.Controller { var inner = (UpdateException)ex.InnerException; - + throw new ScpException(ResultCode.Exception, "0000", ex.ToString()); } else @@ -2705,7 +2714,7 @@ namespace CK.SCP.Controller } return _ret; } - public static ResultObject CaiWu_Return_Reason(string p_InvcBillNum,string p_Memo) + public static ResultObject CaiWu_Return_Reason(string p_InvcBillNum, string p_Memo) { ResultObject _ret = new ResultObject(); try @@ -2786,7 +2795,7 @@ namespace CK.SCP.Controller } catch (OptimisticConcurrencyException ex)//并发冲突异常 { - + _ret.State = ReturnStatus.Failed; _ret.Result = false; _ret.ErrorList.Add(ex); @@ -2795,7 +2804,7 @@ namespace CK.SCP.Controller } catch (ScpException ex) { - + _ret.State = ReturnStatus.Failed; _ret.Result = false; @@ -2806,7 +2815,7 @@ namespace CK.SCP.Controller { var inner = (UpdateException)ex.InnerException; - + throw new ScpException(ResultCode.Exception, "0000", ex.ToString()); } else @@ -2908,7 +2917,7 @@ namespace CK.SCP.Controller return _ret; } - public static ResultObject UpdateMemoByInvcBillNum(string p_InvcBillNum, string p_Memo, decimal p_blan, string p_inv,DateTime p_time) + public static ResultObject UpdateMemoByInvcBillNum(string p_InvcBillNum, string p_Memo, decimal p_blan, string p_inv, DateTime p_time) { ResultObject _ret = new ResultObject(); try @@ -3155,8 +3164,8 @@ namespace CK.SCP.Controller { db.Database.ExecuteSqlCommand(string.Format("delete FROM TS_UNI_API where InterfaceType = 'invoice' and billnum = '{0}'", p_InvcBillNum)); } - //财务审核通过，把所有代办信息设为已办状态 - if (p_state == InvoiceState.FinanceReceive) + //财务审核通过，把所有代办信息设为已办状态 + if (p_state == InvoiceState.FinanceReceive) { List items = db.TB_PENING_ITEMS.Where(p => p.ITEM_NO == p_InvcBillNum).ToList(); @@ -3167,18 +3176,18 @@ namespace CK.SCP.Controller List _ls = db.V_TB_INVOICE_DETAIL.Where(p => p.InvcBillNum == p_InvcBillNum).ToList(); - V_TB_INVOICE _bill= db.V_TB_INVOICE.Where(p => p.InvcBillNum == p_InvcBillNum).FirstOrDefault(); + V_TB_INVOICE _bill = db.V_TB_INVOICE.Where(p => p.InvcBillNum == p_InvcBillNum).FirstOrDefault(); foreach (V_TB_INVOICE_DETAIL itm in _ls) { - - TS_UNI_API _api = UniApiController.CreateBy(_bill,itm ,UniApiType.Invoice); + + TS_UNI_API _api = UniApiController.CreateBy(_bill, itm, UniApiType.Invoice); _api.State = 1; db.TS_UNI_API.AddOrUpdate(_api); itm.State = (int)p_state; } } - + //财务取消收票，把所有代办信息设为等待状态 //if (p_state == InvoiceState.Mail) //{ @@ -3231,7 +3240,7 @@ namespace CK.SCP.Controller } catch (OptimisticConcurrencyException ex)//并发冲突异常 { - + _ret.State = ReturnStatus.Failed; _ret.Result = false; _ret.ErrorList.Add(ex); @@ -3240,7 +3249,7 @@ namespace CK.SCP.Controller } catch (ScpException ex) { - + _ret.State = ReturnStatus.Failed; _ret.Result = false; @@ -3251,7 +3260,7 @@ namespace CK.SCP.Controller { var inner = (UpdateException)ex.InnerException; - + throw new ScpException(ResultCode.Exception, "0000", ex.ToString()); } else @@ -3279,7 +3288,7 @@ namespace CK.SCP.Controller var _invoice = db.TB_INVOICE.Where(p => p.InvcBillNum == p_entity.InvcBillNum).FirstOrDefault(); var _invoicedetail = db.TB_INVOICE_DETAIL.Where(p => p.InvcBillNum == p_entity.InvcBillNum).FirstOrDefault(); - if(_invoice !=null) + if (_invoice != null) { if (_invoicedetail != null) { @@ -3407,5 +3416,483 @@ namespace CK.SCP.Controller } return _ret; } + + /// + /// 物料与供应商对应关系表 + /// + /// + /// + public static void Get_V_TA_CheckPartsAndVend(V_TA_CheckPartsAndVend p_entity, Action>> p_action) + { + ResultObject> _ret = new ResultObject>(); + try + { + using (ScpEntities db = EntitiesFactory.CreateScpInstance()) + { + IQueryable q = db.V_TA_CheckPartsAndVend; + if (!string.IsNullOrEmpty(p_entity.PartCode)) + { + q = q.Where(p => p.PartCode == p_entity.PartCode); + } + if (!string.IsNullOrEmpty(p_entity.VendID)) + { + q = q.Where(p => p.VendID == p_entity.VendID); + } + _ret.State = ReturnStatus.Succeed; + _ret.Result = q; + p_action(_ret); + } + } + catch (System.Data.Entity.Validation.DbEntityValidationException dbEx)//捕获实体验证异常 + { + var sb = new StringBuilder(); + + foreach (var error in dbEx.EntityValidationErrors.ToList()) + { + + error.ValidationErrors.ToList().ForEach(i => + { + sb.AppendFormat("表：{0}，字段：{1}，信息：{2}\r\n", error.Entry.Entity.GetType().Name, i.PropertyName, i.ErrorMessage); + }); + } + _ret.State = ReturnStatus.Failed; + _ret.ErrorList.Add(dbEx); + LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_INVOICE_CONTROLLER), "Get_V_TA_CheckPartsAndVend", sb.ToString()); + throw new ScpException(ResultCode.DbEntityValidationException, sb.ToString(), "字段验证失败" + sb.ToString()); + } + catch (OptimisticConcurrencyException ex)//并发冲突异常 + { + + _ret.State = ReturnStatus.Failed; + _ret.ErrorList.Add(ex); + LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_INVOICE_CONTROLLER), "Get_V_TA_CheckPartsAndVend", ex.ToString()); + throw new ScpException(ResultCode.Exception, "9999", ex.ToString()); + } + catch (ScpException ex) + { + + + _ret.State = ReturnStatus.Failed; + _ret.ErrorList.Add(ex); + LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_INVOICE_CONTROLLER), "Get_V_TA_CheckPartsAndVend", ex.ToString()); + + if (ex.InnerException != null && ex.InnerException.GetType() == typeof(UpdateException)) + { + var inner = (UpdateException)ex.InnerException; + + + throw new ScpException(ResultCode.Exception, "0000", ex.ToString()); + } + else + { + if (ex.InnerException != null) throw ex.InnerException; + } + } + catch (Exception e) + { + _ret.State = ReturnStatus.Failed; + _ret.ErrorList.Add(e); + LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_INVOICE_CONTROLLER), "Get_V_TA_CheckPartsAndVend", e.Message); + throw e; + } + } + + /// + /// 导入检查 + /// + /// + /// + /// + /// + private static List CheckExcelMode_VenderPart(ScpEntities db, SCP_CHECKPARTANDVENDER_EXPORT p_excel, string site) + { + List ErrorList = new List(); + if (!string.IsNullOrEmpty(p_excel.零件号)) + { + int count = db.TA_PART.Count(p => p.PartCode == p_excel.零件号.Trim()); + if (count == 0) + { + ErrorList.Add(string.Format("零件编号【{0}】不存在!", p_excel.零件号)); + } + + } + if (!string.IsNullOrEmpty(p_excel.供应商)) + { + int count1 = db.TA_VENDER.Count(p => p.VendId == p_excel.供应商.Trim()); + if (count1 == 0) + { + ErrorList.Add(string.Format("供应商【{0}】不存在!", p_excel.供应商)); + } + } + else if (string.IsNullOrEmpty(p_excel.零件号) || string.IsNullOrEmpty(p_excel.供应商)) + { + ErrorList.Add(string.Format("零件号码【{0}】有填写为空！", p_excel.零件号)); + } + return ErrorList; + } + /// + /// 导入零件供应商对应关系表 + /// + /// + /// + /// + /// + public static ResultObject EXCEL_VENDER_PART(List p_order_list, string site, string p_creator) + { + ResultObject _ret = new ResultObject(); + try + { + using (ScpEntities db = EntitiesFactory.CreateScpInstance()) + { + int number = 1; + List lineError = new List(); + List ErrorList = new List(); + var _lst = p_order_list; + _lst.ForEach(p => + { + var _count = _lst.Count(itm => itm.零件号 == p.零件号 && itm.供应商 == p.供应商); + if (_count > 1) + { + lineError.Add(string.Format("零件号码有重", p.零件号)); + ErrorList = lineError; + } + }); + _lst.ForEach(p => + { + var _ls = CheckExcelMode_VenderPart(db, p, site); + if (_ls.Count > 0) + { + lineError.Add(number.ToString()); + ErrorList.Add(string.Join("
", _ls.ToArray())); + } + number++; + }); + if (lineError.Count > 0) + { + _ret.State = ReturnStatus.Failed; + _ret.MessageList.AddRange(ErrorList); + _ret.Result = false; + } + else + { + _lst.ForEach(p => + { + + var _partdes = db.TA_CHECKPARTANDVEND.Count(t => t.PartCode == p.零件号.Trim() && t.VendID == p.供应商.Trim()); + if (_partdes == 0) + { + TA_CHECKPARTANDVEND _entity = new TA_CHECKPARTANDVEND(); + _entity.PartCode = p.零件号.Trim(); + _entity.VendID = p.供应商.Trim(); + _entity.Model = p.车型.Trim(); + db.TA_CHECKPARTANDVEND.Add(_entity); + + } + else + { + var _partde = db.TA_CHECKPARTANDVEND.SingleOrDefault(t => t.PartCode == p.零件号.Trim() && t.VendID == p.供应商.Trim()); + + _partde.PartCode = p.零件号.Trim(); + _partde.VendID = p.供应商.Trim(); + _partde.Model = p.车型.Trim(); + db.TA_CHECKPARTANDVEND.AddOrUpdate(_partde); + } + + + }); + if (_ret.MessageList.Count == 0) + { + int state = db.SaveChanges(); + if (state != -1) + { + _ret.State = ReturnStatus.Succeed; + _ret.Result = true; + } + else + { + _ret.State = ReturnStatus.Failed; + _ret.Result = false; + } + } + else + { + _ret.State = ReturnStatus.Failed; + _ret.Result = false; + } + } + } + + } + catch (System.Data.Entity.Validation.DbEntityValidationException dbEx)//捕获实体验证异常 + { + var sb = new StringBuilder(); + + foreach (var error in dbEx.EntityValidationErrors.ToList()) + { + + error.ValidationErrors.ToList().ForEach(i => + { + sb.AppendFormat("表：{0}，字段：{1}，信息：{2}\r\n", error.Entry.Entity.GetType().Name, i.PropertyName, i.ErrorMessage); + }); + } + _ret.State = ReturnStatus.Failed; + _ret.Result = false; + _ret.ErrorList.Add(dbEx); + LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_INVOICE_CONTROLLER), "EXCEL_VENDER_PART", sb.ToString()); + throw new ScpException(ResultCode.DbEntityValidationException, sb.ToString(), "字段验证失败" + sb.ToString()); + } + catch (OptimisticConcurrencyException ex)//并发冲突异常 + { + + _ret.State = ReturnStatus.Failed; + _ret.Result = false; + _ret.ErrorList.Add(ex); + LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_INVOICE_CONTROLLER), "EXCEL_VENDER_PART", ex.ToString()); + throw new ScpException(ResultCode.Exception, "9999", ex.ToString()); + } + catch (ScpException ex) + { + + + _ret.State = ReturnStatus.Failed; + _ret.Result = false; + _ret.ErrorList.Add(ex); + LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_INVOICE_CONTROLLER), "EXCEL_VENDER_PART", ex.ToString()); + + if (ex.InnerException != null && ex.InnerException.GetType() == typeof(UpdateException)) + { + var inner = (UpdateException)ex.InnerException; + + + throw new ScpException(ResultCode.Exception, "0000", ex.ToString()); + } + else + { + if (ex.InnerException != null) throw ex.InnerException; + } + } + catch (Exception e) + { + _ret.State = ReturnStatus.Failed; + LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_INVOICE_CONTROLLER), "EXCEL_VENDER_PART", e.Message); + _ret.Result = false; + _ret.ErrorList.Add(e); + } + return _ret; + } + + /// + /// 删除 + /// + /// + /// + /// + public static ResultObject Del_VENDER_PART(string partcode, string vendid) + { + ResultObject _ret = new ResultObject(); + try + { + using (ScpEntities db = EntitiesFactory.CreateScpInstance()) + { + + + var _entity = db.TA_CHECKPARTANDVEND.FirstOrDefault(p => p.VendID == vendid && p.PartCode == partcode); + if (_entity != null) + { + db.TA_CHECKPARTANDVEND.Remove(_entity); + if (db.SaveChanges() != -1) + { + _ret.State = ReturnStatus.Succeed; + _ret.Result = true; + } + else + { + _ret.State = ReturnStatus.Failed; + _ret.Result = false; + } + } + else + { + _ret.State = ReturnStatus.Failed; + _ret.Message = "请刷新后重新选择数据再进行删除！"; + _ret.Result = false; + } + + + } + } + catch (System.Data.Entity.Validation.DbEntityValidationException dbEx)//捕获实体验证异常 + { + var sb = new StringBuilder(); + + foreach (var error in dbEx.EntityValidationErrors.ToList()) + { + + error.ValidationErrors.ToList().ForEach(i => + { + sb.AppendFormat("表：{0}，字段：{1}，信息：{2}\r\n", error.Entry.Entity.GetType().Name, i.PropertyName, i.ErrorMessage); + }); + } + _ret.State = ReturnStatus.Failed; + _ret.Result = false; + _ret.ErrorList.Add(dbEx); + LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_INFO_CONTROLLER), "Del_VENDER_PART", sb.ToString()); + throw new ScpException(ResultCode.DbEntityValidationException, sb.ToString(), "字段验证失败" + sb.ToString()); + } + catch (OptimisticConcurrencyException ex)//并发冲突异常 + { + + _ret.State = ReturnStatus.Failed; + _ret.Result = false; + _ret.ErrorList.Add(ex); + LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_INFO_CONTROLLER), "Del_VENDER_PART", ex.ToString()); + throw new ScpException(ResultCode.Exception, "9999", ex.ToString()); + } + catch (ScpException ex) + { + + + _ret.State = ReturnStatus.Failed; + _ret.Result = false; + _ret.ErrorList.Add(ex); + LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_INFO_CONTROLLER), "Del_VENDER_PART", ex.ToString()); + + if (ex.InnerException != null && ex.InnerException.GetType() == typeof(UpdateException)) + { + var inner = (UpdateException)ex.InnerException; + + + throw new ScpException(ResultCode.Exception, "0000", ex.ToString()); + } + else + { + if (ex.InnerException != null) throw ex.InnerException; + } + } + catch (Exception e) + { + _ret.State = ReturnStatus.Failed; + _ret.Result = false; + _ret.ErrorList.Add(e); + LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_INFO_CONTROLLER), "Del_VENDER_PART", e.Message); + throw e; + } + return _ret; + } + + /// + /// 保存零件供应商对应关系表 + /// + /// + /// + public static ResultObject Save_TA_CHECKPARTANDVEND(TA_CHECKPARTANDVEND p_entitys) + { + ResultObject _ret = new ResultObject(); + int pcount = 0; + int vcount = 0; + try + { + using (ScpEntities db = EntitiesFactory.CreateScpInstance()) + { + var appliance = db.TA_CHECKPARTANDVEND.FirstOrDefault(p => p.PartCode == p_entitys.PartCode && p.VendID == p_entitys.VendID); + pcount = db.TA_PART.Count(q => q.PartCode == p_entitys.PartCode); + if (pcount == 0) + { + _ret.State = ReturnStatus.Failed; + _ret.Message = "未找到零件号：" + p_entitys.PartCode; + _ret.Result = false; + return _ret; + } + vcount = db.TA_VENDER.Count(q => q.VendId == p_entitys.VendID); + if (vcount == 0) + { + _ret.State = ReturnStatus.Failed; + _ret.Message = "未找到供应商：" + p_entitys.VendID; + _ret.Result = false; + return _ret; + } + if (appliance == null) + { + TA_CHECKPARTANDVEND applianc = new TA_CHECKPARTANDVEND(); + applianc.PartCode = p_entitys.PartCode; + applianc.VendID = p_entitys.VendID; + applianc.Model = p_entitys.Model; + db.TA_CHECKPARTANDVEND.AddOrUpdate(applianc); + } + else + { + appliance.Model = p_entitys.Model; + db.TA_CHECKPARTANDVEND.AddOrUpdate(appliance); + } + if (db.SaveChanges() != -1) + { + _ret.State = ReturnStatus.Succeed; + _ret.Result = true; + } + else + { + _ret.State = ReturnStatus.Failed; + _ret.Result = false; + } + } + } + catch (System.Data.Entity.Validation.DbEntityValidationException dbEx)//捕获实体验证异常 + { + var sb = new StringBuilder(); + + foreach (var error in dbEx.EntityValidationErrors.ToList()) + { + + error.ValidationErrors.ToList().ForEach(i => + { + sb.AppendFormat("表：{0}，字段：{1}，信息：{2}\r\n", error.Entry.Entity.GetType().Name, i.PropertyName, i.ErrorMessage); + }); + } + _ret.State = ReturnStatus.Failed; + _ret.Result = false; + _ret.ErrorList.Add(dbEx); + LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_INVOICE_CONTROLLER), "Save_TA_LANGUAGE", sb.ToString()); + throw new ScpException(ResultCode.DbEntityValidationException, sb.ToString(), "字段验证失败" + sb.ToString()); + } + catch (OptimisticConcurrencyException ex)//并发冲突异常 + { + + _ret.State = ReturnStatus.Failed; + _ret.Result = false; + _ret.ErrorList.Add(ex); + LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_INVOICE_CONTROLLER), "Save_TA_LANGUAGE", ex.ToString()); + throw new ScpException(ResultCode.Exception, "9999", ex.ToString()); + } + catch (ScpException ex) + { + + + _ret.State = ReturnStatus.Failed; + _ret.Result = false; + _ret.ErrorList.Add(ex); + LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_INVOICE_CONTROLLER), "Save_TA_LANGUAGE", ex.ToString()); + + if (ex.InnerException != null && ex.InnerException.GetType() == typeof(UpdateException)) + { + var inner = (UpdateException)ex.InnerException; + + + throw new ScpException(ResultCode.Exception, "0000", ex.ToString()); + } + else + { + if (ex.InnerException != null) throw ex.InnerException; + } + } + catch (Exception e) + { + _ret.State = ReturnStatus.Failed; + LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_INVOICE_CONTROLLER), "Save_TA_LANGUAGE", e.Message); + _ret.Result = false; + _ret.ErrorList.Add(e); + throw e; + } + return _ret; + } } } diff --git a/Controller/SCP_PO_CONTROLLER.cs b/Controller/SCP_PO_CONTROLLER.cs index 4db9173..11ff625 100644 --- a/Controller/SCP_PO_CONTROLLER.cs +++ b/Controller/SCP_PO_CONTROLLER.cs @@ -1872,6 +1872,14 @@ namespace CK.SCP.Controller ErrorList.Add(string.Format("普通采购订单不涉及组件物料号,请到委外采购订单菜单导入")); } var _part = db.TA_PART.SingleOrDefault(p => p.PartCode == p_excel.物料号码); + if ((!string.IsNullOrEmpty(p_excel.供应商编号))&& (_part.PartGroup == "WT" || _part.PartGroup == "YC")) + { + int checkCount = db.TA_CHECKPARTANDVEND.Count(q => q.PartCode == p_excel.物料号码 && q.VendID == p_excel.供应商编号); + if (checkCount == 0) + { + ErrorList.Add(string.Format("物料号码{0}与供应商{1}在现货原料与供应商对照关系表内没有对应的基础信息!", p_excel.物料号码, p_excel.供应商编号)); + } + } if (_part.PartCode.ToString() != p_excel.物料号码.ToString()) { ErrorList.Add(string.Format("物料号码{0}填写不正确请注意大小写!", p_excel.物料号码)); @@ -5092,9 +5100,9 @@ namespace CK.SCP.Controller { if (_maxpo.SurplusQty > _PlanQTY) { - _maxpo.SurplusQty = _maxpo.SurplusQty - _PlanQTY; + //_maxpo.SurplusQty = _maxpo.SurplusQty - _PlanQTY; - db.TB_MAXPO_DETAIL.AddOrUpdate(_maxpo); + //db.TB_MAXPO_DETAIL.AddOrUpdate(_maxpo); TB_MAXPO_CONSUME CONSUME = new TB_MAXPO_CONSUME(); CONSUME.PoBillNum = _maxpo.PoBillNum; CONSUME.BillNum = _ls.PoBillNum; @@ -5107,8 +5115,8 @@ namespace CK.SCP.Controller } else if (_maxpo.SurplusQty == _PlanQTY) { - _maxpo.SurplusQty = 0; - db.TB_MAXPO_DETAIL.AddOrUpdate(_maxpo); + //_maxpo.SurplusQty = 0; + //db.TB_MAXPO_DETAIL.AddOrUpdate(_maxpo); TB_MAXPO_CONSUME CONSUME = new TB_MAXPO_CONSUME(); CONSUME.PoBillNum = _maxpo.PoBillNum; CONSUME.BillNum = _ls.PoBillNum; @@ -5130,8 +5138,8 @@ namespace CK.SCP.Controller CONSUME.ShipTime = DateTime.Now; consum.Add(CONSUME); _PlanQTY = _PlanQTY - _maxpo.SurplusQty; - _maxpo.SurplusQty = 0; - db.TB_MAXPO_DETAIL.AddOrUpdate(_maxpo); + //_maxpo.SurplusQty = 0; + //db.TB_MAXPO_DETAIL.AddOrUpdate(_maxpo); } @@ -9468,10 +9476,10 @@ namespace CK.SCP.Controller { _ret.MessageList.Add("零件号" + _entity.PartCode + "单次削减量不能大于剩余订货量（千克）"); } - if (((_entity.OrderQtydNow + itm.ReductionQty) * 1000) < _entity.OrderQtykg - _entity.AsnQty) - { - _ret.MessageList.Add("零件号" + _entity.PartCode + "剩余可消耗订货量不足"); - } + //if (((_entity.OrderQtydNow + itm.ReductionQty) * 1000) < _entity.OrderQtykg - _entity.AsnQty) + //{ + // _ret.MessageList.Add("零件号" + _entity.PartCode + "剩余可消耗订货量不足"); + //} if ((_entity.OrderQtydNow + itm.ReductionQty) < 0) { _ret.MessageList.Add("削减失败，零件号" + _entity.PartCode + "本次填写的削减量过大，将会使得订货量小于0!"); @@ -9507,7 +9515,7 @@ namespace CK.SCP.Controller } _entity.OrderQtykg = (_entity.OrderQtydNow + itm.ReductionQty).Value * 1000; - _entity.AsnQty = (itm.ReductionQty * 1000 + _entity.AsnQty).Value; + //_entity.AsnQty = (itm.ReductionQty * 1000 + _entity.AsnQty).Value; _entity.SurplusQty = (itm.ReductionQty * 1000 + _entity.SurplusQty).Value; // 修改数据 TS_UNI_API maxuni = new TS_UNI_API(); diff --git a/Models/CK.SCP.Models.csproj b/Models/CK.SCP.Models.csproj index 500890b..223173f 100644 --- a/Models/CK.SCP.Models.csproj +++ b/Models/CK.SCP.Models.csproj @@ -351,10 +351,12 @@ + + @@ -362,6 +364,7 @@ + diff --git a/Models/ScpEntities.cs b/Models/ScpEntities.cs index 1ea58f4..b583e81 100644 --- a/Models/ScpEntities.cs +++ b/Models/ScpEntities.cs @@ -44,6 +44,8 @@ namespace CK.SCP.Models public virtual DbSet TB_PALLETS_BTL { get; set; } public virtual DbSet TA_Receiving_Information { get; set; } public virtual DbSet V_TA_APPLIANCE { get; set; } + public virtual DbSet V_TA_CheckPartsAndVend { get; set; } + public virtual DbSet TA_CHECKPARTANDVEND { get; set; } public virtual DbSet TA_SubPart { get; set; } public virtual DbSet TB_MAXPO { get; set; } public virtual DbSet TB_MAXPO_DETAIL { get; set; } diff --git a/Models/ScpEntity/ExcelExportEnttity/SCP_CHECKPARTANDVENDER_EXPORT.cs b/Models/ScpEntity/ExcelExportEnttity/SCP_CHECKPARTANDVENDER_EXPORT.cs new file mode 100644 index 0000000..a4c1129 --- /dev/null +++ b/Models/ScpEntity/ExcelExportEnttity/SCP_CHECKPARTANDVENDER_EXPORT.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CK.SCP.Models.ScpEntity.ExcelExportEnttity +{ + public class SCP_CHECKPARTANDVENDER_EXPORT + { + public string 供应商 { get; set; } + public string 车型 { get; set; } + public string 零件号 { get; set; } + } +} diff --git a/Models/ScpEntity/TA_CHECKPARTANDVEND.cs b/Models/ScpEntity/TA_CHECKPARTANDVEND.cs new file mode 100644 index 0000000..a633821 --- /dev/null +++ b/Models/ScpEntity/TA_CHECKPARTANDVEND.cs @@ -0,0 +1,18 @@ +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + +namespace CK.SCP.Models.ScpEntity +{ + + public partial class TA_CHECKPARTANDVEND + { + + [Key] + public long UID { get; set; } + public string PartCode { get; set; } + + public string Model { get; set; } + public string VendID { get; set; } + + } +} diff --git a/Models/ScpEntity/V_TA_CheckPartsAndVend.cs b/Models/ScpEntity/V_TA_CheckPartsAndVend.cs new file mode 100644 index 0000000..0bb3d30 --- /dev/null +++ b/Models/ScpEntity/V_TA_CheckPartsAndVend.cs @@ -0,0 +1,21 @@ +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + +namespace CK.SCP.Models.ScpEntity +{ + + public partial class V_TA_CheckPartsAndVend + { + + [Key] + public long UID { get; set; } + public string PartCode { get; set; } + public string Model { get; set; } + public string PartDesc1 { get; set; } + public string PartDesc2 { get; set; } + public string PartDesc { get; set; } + public string VendID { get; set; } + public string VendName { get; set; } + + } +} diff --git a/SCP/SCP.csproj b/SCP/SCP.csproj index d7302d3..a84ca13 100644 --- a/SCP/SCP.csproj +++ b/SCP/SCP.csproj @@ -263,6 +263,8 @@ + + @@ -5013,6 +5015,20 @@ MakeVerifyCode.ashx + + SCP_CheckPartsAndVend_EDIT.aspx + ASPXCodeBehind + + + SCP_CheckPartsAndVend_EDIT.aspx + + + SCP_CheckPartsAndVend.aspx + ASPXCodeBehind + + + SCP_CheckPartsAndVend.aspx + Appliance.aspx ASPXCodeBehind diff --git a/SCP/Views/BasicData/SCP_CheckPartsAndVend.aspx b/SCP/Views/BasicData/SCP_CheckPartsAndVend.aspx new file mode 100644 index 0000000..d4eb738 --- /dev/null +++ b/SCP/Views/BasicData/SCP_CheckPartsAndVend.aspx @@ -0,0 +1,82 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SCP_CheckPartsAndVend.aspx.cs" Inherits="SCP.Views.BasicData.SCP_CheckPartsAndVend" %> + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +