From 9c5e59a5dc2f88ff570636338afbd8382b6c31f4 Mon Sep 17 00:00:00 2001 From: TML <1448969505@qq.com> Date: Sat, 10 Oct 2020 15:34:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Models/ScpEntity/TA_VENDER.cs | 1 + Models/ScpEntity/TB_PRICE.cs | 2 ++ SCP/default.aspx | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Models/ScpEntity/TA_VENDER.cs b/Models/ScpEntity/TA_VENDER.cs index 6091c8e..7d56d1e 100644 --- a/Models/ScpEntity/TA_VENDER.cs +++ b/Models/ScpEntity/TA_VENDER.cs @@ -65,6 +65,7 @@ namespace CK.SCP.Models.ScpEntity public string Site { get; set; } public int? ReceiveTimeScope { set; get; } + public decimal? Quota { set; get; } [NotMapped] public string FactoryName => ScpCache.GetFactoryNameByCode(Site); } diff --git a/Models/ScpEntity/TB_PRICE.cs b/Models/ScpEntity/TB_PRICE.cs index 479178b..17c1534 100644 --- a/Models/ScpEntity/TB_PRICE.cs +++ b/Models/ScpEntity/TB_PRICE.cs @@ -27,5 +27,7 @@ namespace CK.SCP.Models.ScpEntity public string Extend1 { get; set; } public string Extend2 { get; set; } public string Extend3 { get; set; } + public int State { get; set; } + public decimal? VendAmt { get; set; } } } diff --git a/SCP/default.aspx b/SCP/default.aspx index a8354e6..0072930 100644 --- a/SCP/default.aspx +++ b/SCP/default.aspx @@ -111,10 +111,10 @@ for (var i = 0; obj.options.length; i++) { - if ('0210' == obj.options[i].value) { + if ('CNS' == obj.options[i].value) { obj.options[i].selected = true; _factory = document.getElementById(_factoryValue); - _factory.value = '0210'; + _factory.value = 'CNS'; } } From 4989c53b5df0b47d71d5c0b0dee941a144e1c291 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Mon, 12 Oct 2020 11:19:56 +0800 Subject: [PATCH 2/2] =?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_TS_BARCODE_CONTROLLER.cs | 2 -- Models/UniApiEntity/xxscm_inv_det.cs | 6 ++++++ UniApiGroup/Controller/OdbcApiScpController.cs | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Controller/SCP_TS_BARCODE_CONTROLLER.cs b/Controller/SCP_TS_BARCODE_CONTROLLER.cs index b5b14b8..3875031 100644 --- a/Controller/SCP_TS_BARCODE_CONTROLLER.cs +++ b/Controller/SCP_TS_BARCODE_CONTROLLER.cs @@ -107,7 +107,6 @@ namespace CK.SCP.Controller { q = q.Where(p => p.PartName.Contains(p_entity.PartName)); } - _ret.State = ReturnStatus.Succeed; _ret.Result = q; p_action(_ret); @@ -175,7 +174,6 @@ namespace CK.SCP.Controller { q = q.Where(p => p.PartCode.Contains(p_entity.PartCode)); } - if (!string.IsNullOrEmpty(p_entity.Batch)) { q = q.Where(p => p.Batch.Contains(p_entity.Batch)); diff --git a/Models/UniApiEntity/xxscm_inv_det.cs b/Models/UniApiEntity/xxscm_inv_det.cs index e5416ca..7c00350 100644 --- a/Models/UniApiEntity/xxscm_inv_det.cs +++ b/Models/UniApiEntity/xxscm_inv_det.cs @@ -99,6 +99,12 @@ namespace CK.SCP.Models.UniApiEntity public decimal xxscm_inv_tottaxvar { get; set; } public decimal xxscm_inv_totdiscount { get; set; } + + + public decimal xxscm_inv_totclaim { get; set; } + + + public string xxscm_inv_project { get; set; } public decimal xxscm_inv_extend1 { get; set; } diff --git a/UniApiGroup/Controller/OdbcApiScpController.cs b/UniApiGroup/Controller/OdbcApiScpController.cs index 97b7e0f..44a5315 100644 --- a/UniApiGroup/Controller/OdbcApiScpController.cs +++ b/UniApiGroup/Controller/OdbcApiScpController.cs @@ -326,9 +326,10 @@ namespace CK.SCP.GrupUniApi.Controller qadData.xxscm_inv_date = _invoice.UpdateTime == null ? _invoice.CreateTime.Value.AddDays(1) : _invoice.UpdateTime.Value; qadData.xxscm_inv_totamt = _invoice.Amount.Value; qadData.xxscm_inv_tottax = _invoice.Total.Value; - qadData.xxscm_inv_totdiscount = _invoice.ContractPrice == null ? 0 : _invoice.ContractPrice.Value; + qadData.xxscm_inv_totdiscount = _invoice.DiscountPrice == null ? 0 : _invoice.DiscountPrice.Value; qadData.xxscm_inv_tottaxvar = _invoice.BlancePrice == null ? 0 : _invoice.BlancePrice.Value; - qadData.xxscm_inv_extend1 = _invoice.Extend1 == null ? 0 : _invoice.Extend1.Value; + qadData.xxscm_inv_totclaim= _invoice.ContractPrice == null ? 0 : _invoice.ContractPrice.Value; + qadData.xxscm_inv_extend1 = _invoice.Extend1 == null ? 0 : q_invoice.Extend1.Value; qadData.xxscm_inv_extend2 = _invoice.Extend2 == null ? 0 : _invoice.Extend2.Value; qadDataList.Add(qadData); p.State = (int)BillState.Finish;