diff --git a/Controller/SCP_ASN_CONTROLLER.cs b/Controller/SCP_ASN_CONTROLLER.cs index a9b0bdd..bed1b84 100644 --- a/Controller/SCP_ASN_CONTROLLER.cs +++ b/Controller/SCP_ASN_CONTROLLER.cs @@ -863,6 +863,7 @@ namespace CK.SCP.Controller _detail.LineNO = p.PoLine.ToString(); _detail.Memo = p.Remark; _detail.Batch = p.Batch; + _detail.VendBatch = p.VendBatch; _detail.DockCode = p.DockCode; _detail.ProjectId = _lst.Where(itm => itm.PartCode == p.PartCode).FirstOrDefault().ProjectId; _lsDetail.Add(_detail); diff --git a/Models/ScpEntity/V_ASN_PRINT.cs b/Models/ScpEntity/V_ASN_PRINT.cs index 2d54c3f..a46ca33 100644 --- a/Models/ScpEntity/V_ASN_PRINT.cs +++ b/Models/ScpEntity/V_ASN_PRINT.cs @@ -40,7 +40,7 @@ namespace CK.SCP.Models.ScpEntity public string Memo { get; set; } public string DockCode { get; set; } public string Batch { get; set; } - + public string VendBatch { get; set; } public string ProjectId { get; set; } public string DockCode_Desc => ScpCache.PortList.Where(p => p.PORT_NO == DockCode).FirstOrDefault() == null ? "" : ScpCache.PortList.Where(p => p.PORT_NO == DockCode).FirstOrDefault().PORT_DESCRIPTION; diff --git a/SCP/Views/SupplierData/SCP_ASN_CREATE.aspx b/SCP/Views/SupplierData/SCP_ASN_CREATE.aspx index b1003cc..ce4b9a6 100644 --- a/SCP/Views/SupplierData/SCP_ASN_CREATE.aspx +++ b/SCP/Views/SupplierData/SCP_ASN_CREATE.aspx @@ -93,11 +93,17 @@ - + + + + + + + <%-- --%> - + + - - + diff --git a/SCP/Views/SupplierData/SCP_ASN_CREATE.aspx.cs b/SCP/Views/SupplierData/SCP_ASN_CREATE.aspx.cs index e84dc54..243e217 100644 --- a/SCP/Views/SupplierData/SCP_ASN_CREATE.aspx.cs +++ b/SCP/Views/SupplierData/SCP_ASN_CREATE.aspx.cs @@ -290,7 +290,7 @@ namespace SCP.SupplierData return; } DateTime dt = DateTime.Parse(_ProduceDate.ToString()); - _detail.Batch = _Batch1.ToString().Trim(); + _detail.Batch = GetBatch(dt); //_Batch1.ToString().Trim(); _detail.TempQty = number; _detail.PackQty = ConvertHelper.To(_PackQty); _detail.VendBatch = _VendBatch.ToString(); diff --git a/SCP/Views/SupplierData/SCP_ASN_CREATE.aspx.designer.cs b/SCP/Views/SupplierData/SCP_ASN_CREATE.aspx.designer.cs index 2e6b21b..fec7a89 100644 --- a/SCP/Views/SupplierData/SCP_ASN_CREATE.aspx.designer.cs +++ b/SCP/Views/SupplierData/SCP_ASN_CREATE.aspx.designer.cs @@ -266,6 +266,15 @@ namespace SCP.SupplierData /// protected global::FineUI.TextBox txtBatch1; + /// + /// TXT_VendBatch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUI.TextBox TXT_VendBatch; + /// /// NumberBox1 控件。 /// @@ -320,15 +329,6 @@ namespace SCP.SupplierData /// protected global::FineUI.NumberBox NumberBox4; - /// - /// TXT_VendBatch 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUI.TextBox TXT_VendBatch; - /// /// Window1 控件。 /// diff --git a/SCP/Views/SupplierData/SCP_INVOICE.aspx.cs b/SCP/Views/SupplierData/SCP_INVOICE.aspx.cs index 11c9eb9..6a423dc 100644 --- a/SCP/Views/SupplierData/SCP_INVOICE.aspx.cs +++ b/SCP/Views/SupplierData/SCP_INVOICE.aspx.cs @@ -46,13 +46,7 @@ namespace SCP.Views.SupplierData SearchInvoice(ret => { Grid_V_TB_INVOICE.RecordCount = ret.Count(); ret = SortAndPage(ret, Grid_V_TB_INVOICE); - var _ls=ret.ToList(); - // _ls.ForEach(p => { - // p.ContractPriceTax = (p.ContractPrice != null) ? decimal.Round((p.ContractPrice.Value * p.Tax.Value), 2) : 0; - // p.DiscountPriceTax = (p.DiscountPriceTax != null) ? decimal.Round((p.DiscountPriceTax.Value * p.Tax.Value), 2) : 0; - // p.RealTotal =( (p.Total!=null)?p.Total.Value:0) + ((p.ContractPrice!=null)?p.ContractPrice.Value:0) + p.ContractPriceTax.Value + ((p.DiscountPrice != null) ? p.DiscountPrice.Value : 0) + p.DiscountPriceTax.Value + ((p.BlancePrice!=null)?p.BlancePrice.Value:0); - // }); - Grid_V_TB_INVOICE.DataSource = _ls; + Grid_V_TB_INVOICE.DataSource = ret; Grid_V_TB_INVOICE.DataBind(); }); } diff --git a/SCP/Views/WarehouseData/SCP_INVOICE.aspx.cs b/SCP/Views/WarehouseData/SCP_INVOICE.aspx.cs index 7888fa8..e206bfe 100644 --- a/SCP/Views/WarehouseData/SCP_INVOICE.aspx.cs +++ b/SCP/Views/WarehouseData/SCP_INVOICE.aspx.cs @@ -53,15 +53,6 @@ namespace SCP.WarehouseData { Grid_V_TB_INVOICE.RecordCount = result.Count(); var list = SortAndPage(result, Grid_V_TB_INVOICE,"ASC"); - var _ls =list.ToList(); - //_ls.ForEach(p => { - // p.ContractPriceTax = (p.ContractPrice != null) ? decimal.Round((p.ContractPrice.Value * p.Tax.Value), 2) : 0; - - // p.DiscountPriceTax = (p.DiscountPriceTax != null) ? decimal.Round((p.DiscountPriceTax.Value * p.Tax.Value), 2) : 0; - // //p.RealTotal = p.Total + p.BlancePrice + p.ContractPrice; - - // p.RealTotal = ((p.Total != null) ? p.Total.Value : 0) + ((p.ContractPrice != null) ? p.ContractPrice.Value : 0) + p.ContractPriceTax.Value + ((p.DiscountPrice != null) ? p.DiscountPrice.Value : 0) + p.DiscountPriceTax.Value + ((p.BlancePrice != null) ? p.BlancePrice.Value : 0); - //}); Grid_V_TB_INVOICE.DataSource = list; Grid_V_TB_INVOICE.DataBind(); }); diff --git a/SCP/default.aspx b/SCP/default.aspx index abfd4d5..beef335 100644 --- a/SCP/default.aspx +++ b/SCP/default.aspx @@ -111,10 +111,10 @@ for (var i = 0; obj.options.length; i++) { - if ('CQBMPT' == obj.options[i].value) { + if ('JZ1' == obj.options[i].value) { obj.options[i].selected = true; _factory = document.getElementById(_factoryValue); - _factory.value = 'CQBMPT'; + _factory.value = 'JZ1'; } } }