From af416be897efc6390db791e9a917441e89a10ddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Wed, 5 Aug 2020 13:27:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/SCP_DC_UNI_CONTROLLER.cs | 53 ++- Controller/UniApiController.cs | 14 +- Models/CK.SCP.Models.csproj | 3 - Models/ScpEntity/TB_ASK.cs | 5 + Models/ScpEntity/TB_ASK_DETAIL.cs | 4 + Models/ScpEntity/TB_ASN.cs | 5 + Models/ScpEntity/TB_ASN_DETAIL.cs | 5 + Models/ScpEntity/TB_PO.cs | 4 + Models/ScpEntity/TB_PO_DETAIL.cs | 5 +- Models/ScpEntity/TB_PO_PLAN_EXTEND.cs | 4 +- Models/ScpEntity/TB_RECEIVE.cs | 7 +- Models/ScpEntity/TB_RECEIVE_DETAIL.cs | 5 + Models/ScpEntity/TB_RECEIVE_DETAIL_QAD.cs | 5 + Models/ScpEntity/TB_RECEIVE_QAD.cs | 5 + Models/ScpEntity/TS_UNI_API.cs | 3 +- Models/ScpEntity/V_BillShip.cs | 93 ----- Models/ScpEntity/V_BillShipDetail.cs | 132 ------- Models/ScpEntity/V_FORECAST_REPORT.cs | 22 -- Models/ScpEntity/V_TB_ASN.cs | 4 + SCP/SCP.csproj | 152 -------- SCP/Views/ErpExtend/SCP_COMPARE.aspx | 107 ------ SCP/Views/ErpExtend/SCP_COMPARE.aspx.cs | 37 -- .../ErpExtend/SCP_COMPARE.aspx.designer.cs | 69 ---- SCP/Views/ErpExtend/SCP_INVOICE.aspx | 123 ------ SCP/Views/ErpExtend/SCP_INVOICE.aspx.cs | 191 ---------- .../ErpExtend/SCP_INVOICE.aspx.designer.cs | 231 ------------ .../ErpExtend/SCP_INVOICE_CHECKFAIL.aspx | 40 -- .../ErpExtend/SCP_INVOICE_CHECKFAIL.aspx.cs | 48 --- .../SCP_INVOICE_CHECKFAIL.aspx.designer.cs | 78 ---- SCP/Views/ErpExtend/SCP_INVOICE_CONFIRM.aspx | 128 ------- .../ErpExtend/SCP_INVOICE_CONFIRM.aspx.cs | 222 ----------- .../SCP_INVOICE_CONFIRM.aspx.designer.cs | 222 ----------- .../ErpExtend/SCP_INVOICE_CONFIRM_DETAIL.aspx | 138 ------- .../SCP_INVOICE_CONFIRM_DETAIL.aspx.cs | 312 ---------------- ...CP_INVOICE_CONFIRM_DETAIL.aspx.designer.cs | 321 ---------------- SCP/Views/ErpExtend/SCP_INVOICE_DELTAIL.aspx | 121 ------ .../ErpExtend/SCP_INVOICE_DELTAIL.aspx.cs | 280 -------------- .../SCP_INVOICE_DELTAIL.aspx.designer.cs | 294 --------------- SCP/Views/ErpExtend/SCP_INVOICE_RECVICE.aspx | 129 ------- .../ErpExtend/SCP_INVOICE_RECVICE.aspx.cs | 285 -------------- .../SCP_INVOICE_RECVICE.aspx.designer.cs | 159 -------- SCP/Views/ErpExtend/SCP_INVOICE_VIEW.aspx | 183 --------- SCP/Views/ErpExtend/SCP_INVOICE_VIEW.aspx.cs | 132 ------- .../SCP_INVOICE_VIEW.aspx.designer.cs | 276 -------------- .../ErpExtend/SCP_INVOICE_VIEW_DETAIL.aspx | 110 ------ .../ErpExtend/SCP_INVOICE_VIEW_DETAIL.aspx.cs | 232 ------------ .../SCP_INVOICE_VIEW_DETAIL.aspx.designer.cs | 222 ----------- SCP/Views/ErpExtend/SCP_RECEIVE.aspx | 250 ------------- SCP/Views/ErpExtend/SCP_RECEIVE.aspx.cs | 287 -------------- .../ErpExtend/SCP_RECEIVE.aspx.designer.cs | 231 ------------ SCP/Views/ErpExtend/SCP_RECEIVE_DETAIL.aspx | 103 ----- .../ErpExtend/SCP_RECEIVE_DETAIL.aspx.cs | 121 ------ .../SCP_RECEIVE_DETAIL.aspx.designer.cs | 177 --------- .../ErpExtend/SCP_RECEIVE_DETAIL_VIEW.aspx | 102 ----- .../ErpExtend/SCP_RECEIVE_DETAIL_VIEW.aspx.cs | 128 ------- .../SCP_RECEIVE_DETAIL_VIEW.aspx.designer.cs | 141 ------- SCP/Views/ErpExtend/SCP_RECEIVE_VIEW.aspx | 243 ------------ SCP/Views/ErpExtend/SCP_RECEIVE_VIEW.aspx.cs | 282 -------------- .../SCP_RECEIVE_VIEW.aspx.designer.cs | 213 ----------- SCP/Views/ErpExtend/SCP_REJECT.aspx | 136 ------- SCP/Views/ErpExtend/SCP_REJECT.aspx.cs | 198 ---------- .../ErpExtend/SCP_REJECT.aspx.designer.cs | 213 ----------- SCP/Views/ErpExtend/SCP_REJECT_DETAIL.aspx | 102 ----- SCP/Views/ErpExtend/SCP_REJECT_DETAIL.aspx.cs | 115 ------ .../SCP_REJECT_DETAIL.aspx.designer.cs | 195 ---------- .../WarehouseData/SCP_INVOICE_CONFIRM.aspx | 8 +- .../WarehouseData/SCP_INVOICE_CONFIRM.aspx.cs | 27 +- .../SCP_INVOICE_CONFIRM_DETAIL.aspx | 13 +- .../SCP_INVOICE_CONFIRM_DETAIL.aspx.cs | 6 +- ...CP_INVOICE_CONFIRM_DETAIL.aspx.designer.cs | 22 +- SCP/Views/WarehouseData/SCP_RECEIVE.aspx.cs | 76 ++-- .../WarehouseData/SCP_RECEIVE_DETAIL.aspx.cs | 2 +- .../北京安通林/SCP_INVOICE_CONFIRM.aspx | 128 ------- .../SCP_INVOICE_CONFIRM.aspx.cs | 223 ----------- .../SCP_INVOICE_CONFIRM.aspx.designer.cs | 222 ----------- .../SCP_INVOICE_CONFIRM_DETAIL.aspx | 178 --------- .../SCP_INVOICE_CONFIRM_DETAIL.aspx.cs | 320 ---------------- ...CP_INVOICE_CONFIRM_DETAIL.aspx.designer.cs | 321 ---------------- SCP/Views/北京安通林/SCP_RECEIVE.aspx | 160 -------- SCP/Views/北京安通林/SCP_RECEIVE.aspx.cs | 352 ------------------ .../SCP_RECEIVE.aspx.designer.cs | 240 ------------ .../北京安通林/SCP_RECEIVE_DETAIL.aspx | 103 ----- .../SCP_RECEIVE_DETAIL.aspx.cs | 256 ------------- .../SCP_RECEIVE_DETAIL.aspx.designer.cs | 204 ---------- 84 files changed, 183 insertions(+), 11135 deletions(-) delete mode 100644 Models/ScpEntity/V_BillShip.cs delete mode 100644 Models/ScpEntity/V_BillShipDetail.cs delete mode 100644 Models/ScpEntity/V_FORECAST_REPORT.cs delete mode 100644 SCP/Views/ErpExtend/SCP_COMPARE.aspx delete mode 100644 SCP/Views/ErpExtend/SCP_COMPARE.aspx.cs delete mode 100644 SCP/Views/ErpExtend/SCP_COMPARE.aspx.designer.cs delete mode 100644 SCP/Views/ErpExtend/SCP_INVOICE.aspx delete mode 100644 SCP/Views/ErpExtend/SCP_INVOICE.aspx.cs delete mode 100644 SCP/Views/ErpExtend/SCP_INVOICE.aspx.designer.cs delete mode 100644 SCP/Views/ErpExtend/SCP_INVOICE_CHECKFAIL.aspx delete mode 100644 SCP/Views/ErpExtend/SCP_INVOICE_CHECKFAIL.aspx.cs delete mode 100644 SCP/Views/ErpExtend/SCP_INVOICE_CHECKFAIL.aspx.designer.cs delete mode 100644 SCP/Views/ErpExtend/SCP_INVOICE_CONFIRM.aspx delete mode 100644 SCP/Views/ErpExtend/SCP_INVOICE_CONFIRM.aspx.cs delete mode 100644 SCP/Views/ErpExtend/SCP_INVOICE_CONFIRM.aspx.designer.cs delete mode 100644 SCP/Views/ErpExtend/SCP_INVOICE_CONFIRM_DETAIL.aspx delete mode 100644 SCP/Views/ErpExtend/SCP_INVOICE_CONFIRM_DETAIL.aspx.cs delete mode 100644 SCP/Views/ErpExtend/SCP_INVOICE_CONFIRM_DETAIL.aspx.designer.cs delete mode 100644 SCP/Views/ErpExtend/SCP_INVOICE_DELTAIL.aspx delete mode 100644 SCP/Views/ErpExtend/SCP_INVOICE_DELTAIL.aspx.cs delete mode 100644 SCP/Views/ErpExtend/SCP_INVOICE_DELTAIL.aspx.designer.cs delete mode 100644 SCP/Views/ErpExtend/SCP_INVOICE_RECVICE.aspx delete mode 100644 SCP/Views/ErpExtend/SCP_INVOICE_RECVICE.aspx.cs delete mode 100644 SCP/Views/ErpExtend/SCP_INVOICE_RECVICE.aspx.designer.cs delete mode 100644 SCP/Views/ErpExtend/SCP_INVOICE_VIEW.aspx delete mode 100644 SCP/Views/ErpExtend/SCP_INVOICE_VIEW.aspx.cs delete mode 100644 SCP/Views/ErpExtend/SCP_INVOICE_VIEW.aspx.designer.cs delete mode 100644 SCP/Views/ErpExtend/SCP_INVOICE_VIEW_DETAIL.aspx delete mode 100644 SCP/Views/ErpExtend/SCP_INVOICE_VIEW_DETAIL.aspx.cs delete mode 100644 SCP/Views/ErpExtend/SCP_INVOICE_VIEW_DETAIL.aspx.designer.cs delete mode 100644 SCP/Views/ErpExtend/SCP_RECEIVE.aspx delete mode 100644 SCP/Views/ErpExtend/SCP_RECEIVE.aspx.cs delete mode 100644 SCP/Views/ErpExtend/SCP_RECEIVE.aspx.designer.cs delete mode 100644 SCP/Views/ErpExtend/SCP_RECEIVE_DETAIL.aspx delete mode 100644 SCP/Views/ErpExtend/SCP_RECEIVE_DETAIL.aspx.cs delete mode 100644 SCP/Views/ErpExtend/SCP_RECEIVE_DETAIL.aspx.designer.cs delete mode 100644 SCP/Views/ErpExtend/SCP_RECEIVE_DETAIL_VIEW.aspx delete mode 100644 SCP/Views/ErpExtend/SCP_RECEIVE_DETAIL_VIEW.aspx.cs delete mode 100644 SCP/Views/ErpExtend/SCP_RECEIVE_DETAIL_VIEW.aspx.designer.cs delete mode 100644 SCP/Views/ErpExtend/SCP_RECEIVE_VIEW.aspx delete mode 100644 SCP/Views/ErpExtend/SCP_RECEIVE_VIEW.aspx.cs delete mode 100644 SCP/Views/ErpExtend/SCP_RECEIVE_VIEW.aspx.designer.cs delete mode 100644 SCP/Views/ErpExtend/SCP_REJECT.aspx delete mode 100644 SCP/Views/ErpExtend/SCP_REJECT.aspx.cs delete mode 100644 SCP/Views/ErpExtend/SCP_REJECT.aspx.designer.cs delete mode 100644 SCP/Views/ErpExtend/SCP_REJECT_DETAIL.aspx delete mode 100644 SCP/Views/ErpExtend/SCP_REJECT_DETAIL.aspx.cs delete mode 100644 SCP/Views/ErpExtend/SCP_REJECT_DETAIL.aspx.designer.cs delete mode 100644 SCP/Views/北京安通林/SCP_INVOICE_CONFIRM.aspx delete mode 100644 SCP/Views/北京安通林/SCP_INVOICE_CONFIRM.aspx.cs delete mode 100644 SCP/Views/北京安通林/SCP_INVOICE_CONFIRM.aspx.designer.cs delete mode 100644 SCP/Views/北京安通林/SCP_INVOICE_CONFIRM_DETAIL.aspx delete mode 100644 SCP/Views/北京安通林/SCP_INVOICE_CONFIRM_DETAIL.aspx.cs delete mode 100644 SCP/Views/北京安通林/SCP_INVOICE_CONFIRM_DETAIL.aspx.designer.cs delete mode 100644 SCP/Views/北京安通林/SCP_RECEIVE.aspx delete mode 100644 SCP/Views/北京安通林/SCP_RECEIVE.aspx.cs delete mode 100644 SCP/Views/北京安通林/SCP_RECEIVE.aspx.designer.cs delete mode 100644 SCP/Views/北京安通林/SCP_RECEIVE_DETAIL.aspx delete mode 100644 SCP/Views/北京安通林/SCP_RECEIVE_DETAIL.aspx.cs delete mode 100644 SCP/Views/北京安通林/SCP_RECEIVE_DETAIL.aspx.designer.cs diff --git a/Controller/SCP_DC_UNI_CONTROLLER.cs b/Controller/SCP_DC_UNI_CONTROLLER.cs index 1fe4852..8c9a182 100644 --- a/Controller/SCP_DC_UNI_CONTROLLER.cs +++ b/Controller/SCP_DC_UNI_CONTROLLER.cs @@ -780,11 +780,11 @@ namespace CK.SCP.Controller try { var _reciveList = db.TED_RECEIPT_MSTR.Where(p => p.TaskID == p_entity.TaskID).ToList(); - var _scpPoDetailList = new List(); + var _scpPoDetailList = new List(); foreach (var detail in _reciveList) { - var scpRcv = scpdb.TB_RECEIVE.SingleOrDefault(p => p.RecvBillNum != null && p.RecvBillNum == detail.ReceiveNbr && p.Site == detail.Domain && p.SubSite == detail.Site); - var scpRcvList = new List(); + var scpRcv = scpdb.TB_RECEIVE_QAD.SingleOrDefault(p => p.RecvBillNum != null && p.RecvBillNum == detail.ReceiveNbr && p.Site == detail.Domain && p.SubSite == detail.Site); + var scpRcvList = new List(); bool isRerviceOk = false; if (!string.IsNullOrEmpty(detail.Site) && !string.IsNullOrEmpty(detail.Domain)) { @@ -814,7 +814,7 @@ namespace CK.SCP.Controller { istate = (int)FormState.开放; } - scpRcv = new TB_RECEIVE + scpRcv = new TB_RECEIVE_QAD { RecvBillNum = detail.ReceiveNbr,//收货单号 State = istate, @@ -833,16 +833,16 @@ namespace CK.SCP.Controller scpRcv.VendId = detail.Supplier;//供货商名称 scpRcv.ShipTime = detail.ReceiptDate;//收货日期 scpRcv.SubSite = detail.Site; - scpdb.TB_RECEIVE.AddOrUpdate(scpRcvList.ToArray()); + scpdb.TB_RECEIVE_QAD.AddOrUpdate(scpRcvList.ToArray()); } - var scpRcveDetailList = new List(); + var scpRcveDetailList = new List(); var _reciveDetailList = db.TED_RECEIPT_DET.Where(p => p.TaskID == p_entity.TaskID).ToList(); foreach (var detail in _reciveDetailList) { var poLineNum = Convert.ToInt32(detail.Line); var scpRcvDetail = - scpdb.TB_RECEIVE_DETAIL.FirstOrDefault( + scpdb.TB_RECEIVE_DETAIL_QAD.FirstOrDefault( p => p.RecvBillNum == detail.ReceiveNbr && p.PoBillNum == detail.PurchaseOrder && p.PoLine == detail.Line && @@ -862,7 +862,7 @@ namespace CK.SCP.Controller //{ // istate = (int)FormState.开放; //} - scpRcvDetail = new TB_RECEIVE_DETAIL(); + scpRcvDetail = new TB_RECEIVE_DETAIL_QAD(); scpRcvDetail.RecvBillNum = detail.ReceiveNbr;//收货单号 scpRcvDetail.PoBillNum = detail.PurchaseOrder;//采购单 scpRcvDetail.PoLine = detail.Line;//订单行 @@ -881,24 +881,24 @@ namespace CK.SCP.Controller scpRcvDetail.BillType = 0; scpRcvDetail.SubSite = detail.Shipto; scpRcvDetail.Site = detail.Domain; - scpRcvDetail.Currency = detail.Currency; - scpRcvDetail.Currencyamount = detail.Currencyamount; - scpRcvDetail.ExchangeRate = detail.Exchangerate==null?"1":detail.Exchangerate.Value.ToString(); - scpRcvDetail.ExchangeRate1 = detail.Exchangerate2 == null ? "1" : detail.Exchangerate2.Value.ToString(); - scpRcvDetail.ExchangeRateType = detail.Exchangeratetype; - scpRcvDetail.WorkOrderID = detail.WorkOrderID; - scpRcvDetail.POSite = detail.Posite; - scpRcvDetail.POCost = detail.Purchasecost; - scpRcvDetail.POStandardCost = detail.Purchasestandardcost; - scpRcvDetail.ReceiptType = detail.receipttype; - scpRcvDetail.ReturnReasonCode = detail.Returnreason; - scpRcvDetail.Requestedby = detail.Requestby; - scpRcvDetail.TaxEnvironment = detail.Taxenvironment; - scpRcvDetail.TaxIn = detail.taxin; - scpRcvDetail.TaxUsage = detail.Taxusage; - scpRcvDetail.TaxClass = detail.Taxclass; - scpRcvDetail.PurchaseType = detail.Purchasetype; - scpRcvDetail.UMConversion = detail.Umconversion; + //scpRcvDetail.Currency = detail.Currency; + //scpRcvDetail.Currencyamount = detail.Currencyamount; + //scpRcvDetail.ExchangeRate = detail.Exchangerate==null?"1":detail.Exchangerate.Value.ToString(); + //scpRcvDetail.ExchangeRate1 = detail.Exchangerate2 == null ? "1" : detail.Exchangerate2.Value.ToString(); + //scpRcvDetail.ExchangeRateType = detail.Exchangeratetype; + //scpRcvDetail.WorkOrderID = detail.WorkOrderID; + //scpRcvDetail.POSite = detail.Posite; + //scpRcvDetail.POCost = detail.Purchasecost; + //scpRcvDetail.POStandardCost = detail.Purchasestandardcost; + //scpRcvDetail.ReceiptType = detail.receipttype; + //scpRcvDetail.ReturnReasonCode = detail.Returnreason; + //scpRcvDetail.Requestedby = detail.Requestby; + //scpRcvDetail.TaxEnvironment = detail.Taxenvironment; + //scpRcvDetail.TaxIn = detail.taxin; + //scpRcvDetail.TaxUsage = detail.Taxusage; + //scpRcvDetail.TaxClass = detail.Taxclass; + //scpRcvDetail.PurchaseType = detail.Purchasetype; + //scpRcvDetail.UMConversion = detail.Umconversion; scpRcveDetailList.Add(scpRcvDetail); } scpRcvDetail.Qty = detail.ReceiveQuantity; @@ -1158,7 +1158,6 @@ namespace CK.SCP.Controller _invMast.InvoiceAmountTC = (_vinvoice.TaxAmount == null ? 0 : _vinvoice.TaxAmount.Value) + _vinvoice.BlancePrice.Value; } #endregion - #region 发票明细 foreach (var detail in p_invoiceList) { diff --git a/Controller/UniApiController.cs b/Controller/UniApiController.cs index 39b06f2..1d2eecf 100644 --- a/Controller/UniApiController.cs +++ b/Controller/UniApiController.cs @@ -186,10 +186,12 @@ namespace CK.SCP.Controller apiData.Buyer = bill.Buyer; apiData.BuyerPhone = bill.BuyerPhone; apiData.Domain = bill.Site; - apiData.Site = !string.IsNullOrEmpty(bill.Remark)? bill.Remark:bill.Site; - - - + apiData.Site = bill.SubSite; + + Extend1 = Utils.JsonHelper.GetJson(bill), + Extend2 = Utils.JsonHelper.GetJson(detail) + + return apiData; } @@ -269,7 +271,9 @@ namespace CK.SCP.Controller TaxAmt = (decimal)(detail.Price * bill.Tax), Domain = bill.Site, Site = bill.Site, - Attn = Utils.JsonHelper.GetJson(bill) + Attn = Utils.JsonHelper.GetJson(bill), + Extend1 = Utils.JsonHelper.GetJson(bill), + Extend2 = Utils.JsonHelper.GetJson(detail) }; return apiData; } diff --git a/Models/CK.SCP.Models.csproj b/Models/CK.SCP.Models.csproj index a614d1d..35c9344 100644 --- a/Models/CK.SCP.Models.csproj +++ b/Models/CK.SCP.Models.csproj @@ -343,7 +343,6 @@ - @@ -401,8 +400,6 @@ - - diff --git a/Models/ScpEntity/TB_ASK.cs b/Models/ScpEntity/TB_ASK.cs index d184303..6e26293 100644 --- a/Models/ScpEntity/TB_ASK.cs +++ b/Models/ScpEntity/TB_ASK.cs @@ -37,5 +37,10 @@ namespace CK.SCP.Models.ScpEntity public string BuyerPhone { get; set; } [StringLength(50)] public string ReceivedPort { get; set; } + public string Extend1 { get; set; } + public string Extend2 { get; set; } + public string Extend3 { get; set; } + public string SubSite { get; set; } + } } diff --git a/Models/ScpEntity/TB_ASK_DETAIL.cs b/Models/ScpEntity/TB_ASK_DETAIL.cs index e6d08c6..ad9532c 100644 --- a/Models/ScpEntity/TB_ASK_DETAIL.cs +++ b/Models/ScpEntity/TB_ASK_DETAIL.cs @@ -48,6 +48,10 @@ namespace CK.SCP.Models.ScpEntity public decimal? ReduceQty { get; set; } + public string Extend1 { get; set; } + public string Extend2 { get; set; } + public string Extend3 { get; set; } + public string SubSite { get; set; } } } diff --git a/Models/ScpEntity/TB_ASN.cs b/Models/ScpEntity/TB_ASN.cs index 9bb04de..aa86f09 100644 --- a/Models/ScpEntity/TB_ASN.cs +++ b/Models/ScpEntity/TB_ASN.cs @@ -48,6 +48,11 @@ namespace CK.SCP.Models.ScpEntity public string PlateNumber { get; set; } [StringLength(50)] public string ReceivedPort { get; set; } + public string Extend1 { get; set; } + public string Extend2 { get; set; } + public string Extend3 { get; set; } + + public string SubSite { get; set; } diff --git a/Models/ScpEntity/TB_ASN_DETAIL.cs b/Models/ScpEntity/TB_ASN_DETAIL.cs index fcf7684..6e622d4 100644 --- a/Models/ScpEntity/TB_ASN_DETAIL.cs +++ b/Models/ScpEntity/TB_ASN_DETAIL.cs @@ -52,5 +52,10 @@ namespace CK.SCP.Models.ScpEntity public DateTime? EndTime { get; set; } [StringLength(50)] public string ReceivedPort { get; set; } + public string Extend1 { get; set; } + public string Extend2 { get; set; } + public string Extend3 { get; set; } + + public string SubSite { get; set; } } } diff --git a/Models/ScpEntity/TB_PO.cs b/Models/ScpEntity/TB_PO.cs index 3af8b16..ccca48b 100644 --- a/Models/ScpEntity/TB_PO.cs +++ b/Models/ScpEntity/TB_PO.cs @@ -51,6 +51,10 @@ namespace CK.SCP.Models.ScpEntity [NotMapped] public string ReceivedPort { get; set; } + public string Extend1 { get; set; } + public string Extend2 { get; set; } + public string Extend3 { get; set; } + public string SubSite { get; set; } } diff --git a/Models/ScpEntity/TB_PO_DETAIL.cs b/Models/ScpEntity/TB_PO_DETAIL.cs index 219904a..62f54b0 100644 --- a/Models/ScpEntity/TB_PO_DETAIL.cs +++ b/Models/ScpEntity/TB_PO_DETAIL.cs @@ -70,8 +70,11 @@ namespace CK.SCP.Models.ScpEntity public decimal UnConv { get; set; } [StringLength(50)] public string DockCode { get; set; } - + public string Extend1 { get; set; } + public string Extend2 { get; set; } + public string Extend3 { get; set; } + public string SubSite { get; set; } diff --git a/Models/ScpEntity/TB_PO_PLAN_EXTEND.cs b/Models/ScpEntity/TB_PO_PLAN_EXTEND.cs index c462322..b25a1f6 100644 --- a/Models/ScpEntity/TB_PO_PLAN_EXTEND.cs +++ b/Models/ScpEntity/TB_PO_PLAN_EXTEND.cs @@ -59,7 +59,7 @@ namespace CK.SCP.Models.ScpEntity public string Extend1 { get; set; } public string Extend2 { get; set; } public string Extend3 { get; set; } - - + + public string SubSite { get; set; } } } diff --git a/Models/ScpEntity/TB_RECEIVE.cs b/Models/ScpEntity/TB_RECEIVE.cs index cc8ea25..7f87efd 100644 --- a/Models/ScpEntity/TB_RECEIVE.cs +++ b/Models/ScpEntity/TB_RECEIVE.cs @@ -34,6 +34,11 @@ namespace CK.SCP.Models.ScpEntity [StringLength(50)] public string OperName { get; set; } public int BillType { get; set; } - + public string Extend1 { get; set; } + public string Extend2 { get; set; } + public string Extend3 { get; set; } + + public string SubSite { get; set; } + } } diff --git a/Models/ScpEntity/TB_RECEIVE_DETAIL.cs b/Models/ScpEntity/TB_RECEIVE_DETAIL.cs index db1239e..3937d45 100644 --- a/Models/ScpEntity/TB_RECEIVE_DETAIL.cs +++ b/Models/ScpEntity/TB_RECEIVE_DETAIL.cs @@ -38,6 +38,11 @@ namespace CK.SCP.Models.ScpEntity public string PoUnit { get; set; } [StringLength(50)] public string LocUnit { get; set; } + public string Extend1 { get; set; } + public string Extend2 { get; set; } + public string Extend3 { get; set; } + + public string SubSite { get; set; } } diff --git a/Models/ScpEntity/TB_RECEIVE_DETAIL_QAD.cs b/Models/ScpEntity/TB_RECEIVE_DETAIL_QAD.cs index 84825a8..b634a3d 100644 --- a/Models/ScpEntity/TB_RECEIVE_DETAIL_QAD.cs +++ b/Models/ScpEntity/TB_RECEIVE_DETAIL_QAD.cs @@ -66,5 +66,10 @@ namespace CK.SCP.Models.ScpEntity public decimal? CurAmt { get; set; } public string Tax { get; set; } + public string Extend1 { get; set; } + public string Extend2 { get; set; } + public string Extend3 { get; set; } + + public string SubSite { get; set; } } } diff --git a/Models/ScpEntity/TB_RECEIVE_QAD.cs b/Models/ScpEntity/TB_RECEIVE_QAD.cs index 2e002ca..75150d6 100644 --- a/Models/ScpEntity/TB_RECEIVE_QAD.cs +++ b/Models/ScpEntity/TB_RECEIVE_QAD.cs @@ -41,6 +41,11 @@ namespace CK.SCP.Models.ScpEntity public string Tax { get; set; } + public string Extend1 { get; set; } + public string Extend2 { get; set; } + public string Extend3 { get; set; } + + public string SubSite { get; set; } diff --git a/Models/ScpEntity/TS_UNI_API.cs b/Models/ScpEntity/TS_UNI_API.cs index 7d4a02e..b44766f 100644 --- a/Models/ScpEntity/TS_UNI_API.cs +++ b/Models/ScpEntity/TS_UNI_API.cs @@ -82,7 +82,8 @@ namespace CK.SCP.Models.ScpEntity public string Site { get; set; } public string Domain { get; set; } - + public string Extend1 { get; set; } + public string Extend2 { get; set; } public TS_UNI_API_HIS ToHis() { return new TS_UNI_API_HIS diff --git a/Models/ScpEntity/V_BillShip.cs b/Models/ScpEntity/V_BillShip.cs deleted file mode 100644 index 2a0db19..0000000 --- a/Models/ScpEntity/V_BillShip.cs +++ /dev/null @@ -1,93 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace CK.SCP.Models.ScpEntity -{ - public class V_BillShip - { - [DatabaseGenerated(DatabaseGeneratedOption.Identity)] - public int UID { get; set; } - - [Key] - [StringLength(50)] - public string Bill { get; set; } - - public DateTime BillTime { get; set; } - - [Required] - [StringLength(50)] - public string PoBillNum { get; set; } - - [Required] - [StringLength(50)] - public string VendId { get; set; } - - [Required] - [StringLength(50)] - public string OperName { get; set; } - - public DateTime ShipTime { get; set; } - - public int State { get; set; } - - [StringLength(50)] - public string Remark { get; set; } - - public DateTime? ReceiveTime { get; set; } - - [StringLength(50)] - public string ModType { get; set; } - - [Column(TypeName = "date")] - public DateTime? DueDate { get; set; } - - [StringLength(50)] - public string Contacter { get; set; } - - [StringLength(50)] - public string ShipToSite { get; set; } - - [StringLength(50)] - public string Buyer { get; set; } - - [StringLength(50)] - public string BuyerPhone { get; set; } - - - [Required] - [StringLength(50)] - public string VendName { get; set; } - - [Required] - [StringLength(2)] - public string VendAbbCode { get; set; } - - [StringLength(50)] - public string VendType { get; set; } - - [StringLength(50)] - public string Country { get; set; } - - [StringLength(50)] - public string City { get; set; } - - [StringLength(50)] - public string Currency { get; set; } - - [StringLength(200)] - public string Address { get; set; } - - [StringLength(50)] - public string ZipCode { get; set; } - - [StringLength(50)] - public string Phone { get; set; } - - [StringLength(50)] - public string Fax { get; set; } - - [StringLength(50)] - public string Email { get; set; } - } -} diff --git a/Models/ScpEntity/V_BillShipDetail.cs b/Models/ScpEntity/V_BillShipDetail.cs deleted file mode 100644 index 9c6b10b..0000000 --- a/Models/ScpEntity/V_BillShipDetail.cs +++ /dev/null @@ -1,132 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace CK.SCP.Models.ScpEntity -{ - public class V_BillShipDetail - { - [DatabaseGenerated(DatabaseGeneratedOption.Identity)] - public int UID { get; set; } - - [Key] - [StringLength(50)] - public string BillNum { get; set; } - - - [StringLength(50)] - public string PoBillNum { get; set; } - - - [DatabaseGenerated(DatabaseGeneratedOption.None)] - public int PoLineNum { get; set; } - - [StringLength(50)] - public string PartCode { get; set; } - - - [StringLength(50)] - public string Batch { get; set; } - - [Column(TypeName = "date")] - public DateTime ProduceDate { get; set; } - - [StringLength(50)] - public string VendBatch { get; set; } - - [Column(TypeName = "money")] - public decimal BillQty { get; set; } - - [StringLength(50)] - public string PoUnit { get; set; } - - [StringLength(50)] - public string LocUnit { get; set; } - - [Column(TypeName = "money")] - public decimal Price { get; set; } - - [StringLength(50)] - public string Currency { get; set; } - - [Column(TypeName = "money")] - public decimal PackQty { get; set; } - - public int State { get; set; } - - - - public int? BillType { get; set; } - - public DateTime? BillTime { get; set; } - - - - [Required] - [StringLength(50)] - public string AsnBillNum { get; set; } - - [Required] - [StringLength(50)] - public string VendId { get; set; } - - [Required] - [StringLength(50)] - public string OperName { get; set; } - - public DateTime? ShipTime { get; set; } - - public DateTime? ReceiveTime { get; set; } - - [StringLength(50)] - public string Remark { get; set; } - - - [StringLength(50)] - public string AsnBillNUm { get; set; } - - - [Column(TypeName = "money")] - public decimal? ReceivedQty { get; set; } - - [Required] - [StringLength(50)] - public string ErpPartCode { get; set; } - - [Required] - public string PartDesc1 { get; set; } - - [Required] - public string PartDesc2 { get; set; } - - [Required] - [StringLength(50)] - public string ProjectId { get; set; } - - [Required] - [StringLength(50)] - public string Unit { get; set; } - - [Required] - [StringLength(50)] - public string PartGroup { get; set; } - - - - [StringLength(100)] - public string Configuration { get; set; } - - public int? ValidityDays { get; set; } - - [StringLength(50)] - public string ReceivePort { get; set; } - - [StringLength(50)] - public string PalletSize { get; set; } - - //收货数量 - [Column(TypeName = "money")] - public decimal? Expr15 { get; set; } - - } -} diff --git a/Models/ScpEntity/V_FORECAST_REPORT.cs b/Models/ScpEntity/V_FORECAST_REPORT.cs deleted file mode 100644 index 48f387c..0000000 --- a/Models/ScpEntity/V_FORECAST_REPORT.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace CK.SCP.Models.ScpEntity -{ - public class V_FORECAST_REPORT - { - public string VendId { get; set; } //供应商编号 - public string PartCode { get; set; } //零件号 - public decimal AskQty { get; set; } //订单要货数量 - public int Month { get; set; } //月份 - public decimal MonthQty1 { get; set; } //N+1 - public decimal MonthQty2 { get; set; } //N+2 - public decimal MonthQty3 { get; set; } //N+3 - [NotMapped] - public string VendName => ScpCache.GetVendName(VendId);//供应商名称 - } -} diff --git a/Models/ScpEntity/V_TB_ASN.cs b/Models/ScpEntity/V_TB_ASN.cs index b655bed..684f9b6 100644 --- a/Models/ScpEntity/V_TB_ASN.cs +++ b/Models/ScpEntity/V_TB_ASN.cs @@ -63,6 +63,10 @@ namespace CK.SCP.Models.ScpEntity public string Site_Desc { get; set; } public string ReceivedPort { get; set; } + public string Extend1 { get; set; } + public string Extend2 { get; set; } + public string Extend3 { get; set; } + public string SubSite { get; set; } } } diff --git a/SCP/SCP.csproj b/SCP/SCP.csproj index 5829476..1fec8bc 100644 --- a/SCP/SCP.csproj +++ b/SCP/SCP.csproj @@ -2916,21 +2916,6 @@ - - - - - - - - - - - - - - - @@ -4543,10 +4528,6 @@ - - - - @@ -5149,111 +5130,6 @@ NotImply.aspx - - SCP_COMPARE.aspx - ASPXCodeBehind - - - SCP_COMPARE.aspx - - - SCP_INVOICE.aspx - ASPXCodeBehind - - - SCP_INVOICE.aspx - - - SCP_INVOICE_CHECKFAIL.aspx - ASPXCodeBehind - - - SCP_INVOICE_CHECKFAIL.aspx - - - SCP_INVOICE_CONFIRM.aspx - ASPXCodeBehind - - - SCP_INVOICE_CONFIRM.aspx - - - SCP_INVOICE_CONFIRM_DETAIL.aspx - ASPXCodeBehind - - - SCP_INVOICE_CONFIRM_DETAIL.aspx - - - SCP_INVOICE_DELTAIL.aspx - ASPXCodeBehind - - - SCP_INVOICE_DELTAIL.aspx - - - SCP_INVOICE_RECVICE.aspx - ASPXCodeBehind - - - SCP_INVOICE_RECVICE.aspx - - - SCP_INVOICE_VIEW.aspx - ASPXCodeBehind - - - SCP_INVOICE_VIEW.aspx - - - SCP_INVOICE_VIEW_DETAIL.aspx - ASPXCodeBehind - - - SCP_INVOICE_VIEW_DETAIL.aspx - - - SCP_RECEIVE.aspx - ASPXCodeBehind - - - SCP_RECEIVE.aspx - - - SCP_RECEIVE_DETAIL.aspx - ASPXCodeBehind - - - SCP_RECEIVE_DETAIL.aspx - - - SCP_RECEIVE_DETAIL_VIEW.aspx - ASPXCodeBehind - - - SCP_RECEIVE_DETAIL_VIEW.aspx - - - SCP_RECEIVE_VIEW.aspx - ASPXCodeBehind - - - SCP_RECEIVE_VIEW.aspx - - - SCP_REJECT.aspx - ASPXCodeBehind - - - SCP_REJECT.aspx - - - SCP_REJECT_DETAIL.aspx - ASPXCodeBehind - - - SCP_REJECT_DETAIL.aspx - ASN_STATE.aspx ASPXCodeBehind @@ -5889,34 +5765,6 @@ SCP_RECEIVE_DETAIL.aspx - - SCP_INVOICE_CONFIRM.aspx - ASPXCodeBehind - - - SCP_INVOICE_CONFIRM.aspx - - - SCP_INVOICE_CONFIRM_DETAIL.aspx - ASPXCodeBehind - - - SCP_INVOICE_CONFIRM_DETAIL.aspx - - - SCP_RECEIVE.aspx - ASPXCodeBehind - - - SCP_RECEIVE.aspx - - - SCP_RECEIVE_DETAIL.aspx - ASPXCodeBehind - - - SCP_RECEIVE_DETAIL.aspx - SCP_ASK.aspx ASPXCodeBehind diff --git a/SCP/Views/ErpExtend/SCP_COMPARE.aspx b/SCP/Views/ErpExtend/SCP_COMPARE.aspx deleted file mode 100644 index 108f5da..0000000 --- a/SCP/Views/ErpExtend/SCP_COMPARE.aspx +++ /dev/null @@ -1,107 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SCP_COMPARE.aspx.cs" Inherits="SCP.Views.ErpExtend.SCP_COMPARE" %> - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - diff --git a/SCP/Views/ErpExtend/SCP_COMPARE.aspx.cs b/SCP/Views/ErpExtend/SCP_COMPARE.aspx.cs deleted file mode 100644 index 7d80477..0000000 --- a/SCP/Views/ErpExtend/SCP_COMPARE.aspx.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace SCP.Views.ErpExtend -{ - public partial class SCP_COMPARE : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - - } - - protected void Grid_V_TB_PO_DETAIL_RowDataBound(object sender, FineUI.GridRowEventArgs e) - { - DataRowView row = e.DataItem as DataRowView; - if (row != null) - { - // row["PlanQty"] - - // row["ReceivedQty"] - - // row["RejectQty"] - int entranceYear = Convert.ToInt32(row["EntranceYear"]); - - if (entranceYear >= 2006) - { - highlightRows.Text += e.RowIndex.ToString() + ","; - } - } - } - } -} \ No newline at end of file diff --git a/SCP/Views/ErpExtend/SCP_COMPARE.aspx.designer.cs b/SCP/Views/ErpExtend/SCP_COMPARE.aspx.designer.cs deleted file mode 100644 index 3ced1f9..0000000 --- a/SCP/Views/ErpExtend/SCP_COMPARE.aspx.designer.cs +++ /dev/null @@ -1,69 +0,0 @@ -//------------------------------------------------------------------------------ -// <自动生成> -// 此代码由工具生成。 -// -// 对此文件的更改可能导致不正确的行为，如果 -// 重新生成代码，则所做更改将丢失。 -// -//------------------------------------------------------------------------------ - -namespace SCP.Views.ErpExtend { - - - public partial class SCP_COMPARE { - - /// - /// form1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - - /// - /// Grid_V_TB_PO_DETAIL 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUI.Grid Grid_V_TB_PO_DETAIL; - - /// - /// ToolbarSeparator1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUI.ToolbarSeparator ToolbarSeparator1; - - /// - /// ToolbarText1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUI.ToolbarText ToolbarText1; - - /// - /// ddlGridPageSize 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUI.DropDownList ddlGridPageSize; - - /// - /// highlightRows 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUI.HiddenField highlightRows; - } -} diff --git a/SCP/Views/ErpExtend/SCP_INVOICE.aspx b/SCP/Views/ErpExtend/SCP_INVOICE.aspx deleted file mode 100644 index 3c6ec9b..0000000 --- a/SCP/Views/ErpExtend/SCP_INVOICE.aspx +++ /dev/null @@ -1,123 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SCP_INVOICE.aspx.cs" Inherits="SCP.ErpExtend.SCP_INVOICE" %> - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%----%> - - - - - -