diff --git a/Controller/SCP_INVOICE_CONTROLLER.cs b/Controller/SCP_INVOICE_CONTROLLER.cs index 190c381..70ff070 100644 --- a/Controller/SCP_INVOICE_CONTROLLER.cs +++ b/Controller/SCP_INVOICE_CONTROLLER.cs @@ -1097,6 +1097,7 @@ namespace CK.SCP.Controller { ResultObject _ret = new ResultObject(); List _list = new List(); + List _listpartcode = new List();//超过分摊零件集合 try { using (ScpEntities db = EntitiesFactory.CreateScpInstance()) @@ -1151,8 +1152,12 @@ namespace CK.SCP.Controller var _num = _moldsharing.Count + p.Qty; if (_moldsharing.Qty < _num) { - string _str ="供应商"+ _moldsharing .VendId+ "零件名称"+ _moldsharing.PartCode+"超过分摊数量"+ (_num- _moldsharing.Qty).ToString(); - _list.Add(_str); + string _str = "供应商" + _moldsharing.VendId + "零件名称" + _moldsharing.PartCode + "超过分摊数量，分摊数量剩余" + (_moldsharing.Qty - _moldsharing.Count).ToString(); + if (!_listpartcode.Contains(_moldsharing.PartCode)) + { + _listpartcode.Add(_moldsharing.PartCode); + _list.Add(_str); + } } else { diff --git a/SCP/SCP.csproj b/SCP/SCP.csproj index 03451e8..a3a9b2b 100644 --- a/SCP/SCP.csproj +++ b/SCP/SCP.csproj @@ -2933,6 +2933,9 @@ + + + @@ -5264,6 +5267,27 @@ SCP_UNI_API.aspx + + SCP_QUALITY_CREATE.aspx + ASPXCodeBehind + + + SCP_QUALITY_CREATE.aspx + + + SCP_QUALITY_MANAGER.aspx + ASPXCodeBehind + + + SCP_QUALITY_MANAGER.aspx + + + SCP_SQE.aspx + ASPXCodeBehind + + + SCP_SQE.aspx + SCP_ARRIVE_REPORT.aspx ASPXCodeBehind diff --git a/SCP/Views/PlanData/SCP_ASK.aspx b/SCP/Views/PlanData/SCP_ASK.aspx index 7e803a5..ed93d31 100644 --- a/SCP/Views/PlanData/SCP_ASK.aspx +++ b/SCP/Views/PlanData/SCP_ASK.aspx @@ -114,7 +114,7 @@ - + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SCP/Views/Quality/SCP_QUALITY_CREATE.aspx.cs b/SCP/Views/Quality/SCP_QUALITY_CREATE.aspx.cs new file mode 100644 index 0000000..8b219df --- /dev/null +++ b/SCP/Views/Quality/SCP_QUALITY_CREATE.aspx.cs @@ -0,0 +1,109 @@ +using CK.SCP.Controller; +using CK.SCP.Models.ScpEntity; +using CK.SCP.Utils; +using FineUI; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace SCP.Views.Quality +{ + public partial class SCP_QUALITY_CREATE : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + BindDetail(); + } + } + public void SearchV_TB_ASN_DETAILData(Action> p_action) + { + V_TB_ASN_DETAIL _entity = new V_TB_ASN_DETAIL(); + //_entity.AskBillNum = ""; + _entity.AsnBillNum = !string.IsNullOrEmpty(TXT_AsnBillNum.Text) ? TXT_AsnBillNum.Text : "9999999"; + SCP_ASN_CONTROLLER.Get_V_TB_ASN_DETAIL_List(_entity, (_ret) => { + if (_ret.State == ReturnStatus.Succeed) + { + p_action(_ret.Result); + } + }); + } + /// + /// 绑定明细 + /// + public void BindDetail() + { + SearchV_TB_ASN_DETAILData((ret) => { + Grid_V_TB_ASN_DETAIL.RecordCount = ret.Count(); + var list = SortAndPage(ret, Grid_V_TB_ASN_DETAIL); + var ls = list.ToList(); + Grid_V_TB_ASN_DETAIL.DataSource = ls; + Grid_V_TB_ASN_DETAIL.DataBind(); + }); + } + + protected void Grid_V_TB_ASN_DETAIL_PageIndexChange(object sender, FineUI.GridPageEventArgs e) + { + BindDetail(); + } + + protected void ddlGridPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + BindDetail(); + } + + protected void btnRelease_Click(object sender, EventArgs e) + { + List _list = new List(); + Dictionary> modifiedDict = Grid_V_TB_ASN_DETAIL.GetModifiedDict(); + for (int i = 0, count = Grid_V_TB_ASN_DETAIL.Rows.Count; i < count; i++) + { + V_TB_ASN_DETAIL _entity = new V_TB_ASN_DETAIL(); + object[] rowDataKeys = Grid_V_TB_ASN_DETAIL.DataKeys[i]; + _entity.UID = ConvertHelper.To(rowDataKeys[0]); + _entity.PoBillNum = rowDataKeys[1] as string; + _entity.PoLine = ConvertHelper.To(rowDataKeys[2]); + _entity.PartCode = rowDataKeys[3] as string; + _entity.AsnBillNum = rowDataKeys[4] as string; + _entity.Batch = rowDataKeys[5] as string; + _entity.VendId = rowDataKeys[6] as string; + + if (modifiedDict.Keys.Contains(i)) + { + var modifyValue = modifiedDict[i]; + var _FailQty = modifyValue.Keys.Contains("Failqty") ? modifyValue["Failqty"] : 0; + var _FailReason = modifyValue.Keys.Contains("FailReason") ? modifyValue["FailReason"] : string.Empty; + _entity.FailQty = ConvertHelper.To(_FailQty); + _entity.FailReason = _FailReason.ToString(); + _list.Add(_entity); + + } + + + } + var ret = SCP_QUALITY_CONTROLLER.Save_ASN_TO_QUALITY(_list, CurrentUser.ChineseName); + if (ret.Result == true) + { + Alert.Show("添加不合格品信息成功!"); + } + //var ret = SCP_ASK_CONTROLLER.Save_ASK_TO_ASN(_model, _askDetaillist, TXT_PlateNumber.Text, CurrentUser.ChineseName, CurrentUser.CellPhone); + //if (ret.State == ReturnStatus.Succeed) + //{ + // Alert.Show("生成发货单成功!"); + // GetV_TB_POData(); + // BindDetail(); + //} + } + + protected void btnQuery_Click(object sender, EventArgs e) + { + BindDetail(); + } + + + } +} \ No newline at end of file diff --git a/SCP/Views/Quality/SCP_QUALITY_CREATE.aspx.designer.cs b/SCP/Views/Quality/SCP_QUALITY_CREATE.aspx.designer.cs new file mode 100644 index 0000000..2a4d1ab --- /dev/null +++ b/SCP/Views/Quality/SCP_QUALITY_CREATE.aspx.designer.cs @@ -0,0 +1,107 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace SCP.Views.Quality +{ + + + public partial class SCP_QUALITY_CREATE + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUI.Panel Panel1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUI.Toolbar Toolbar2; + + /// + /// btnRelease 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUI.Button btnRelease; + + /// + /// TXT_AsnBillNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUI.TextBox TXT_AsnBillNum; + + /// + /// btnQuery 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUI.Button btnQuery; + + /// + /// Grid_V_TB_ASN_DETAIL 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUI.Grid Grid_V_TB_ASN_DETAIL; + + /// + /// NB_PublishNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUI.NumberBox NB_PublishNum; + + /// + /// fail 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUI.DropDownList fail; + + /// + /// highlightRows 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUI.HiddenField highlightRows; + } +} diff --git a/SCP/Views/Quality/SCP_QUALITY_MANAGER.aspx b/SCP/Views/Quality/SCP_QUALITY_MANAGER.aspx new file mode 100644 index 0000000..d056fc9 --- /dev/null +++ b/SCP/Views/Quality/SCP_QUALITY_MANAGER.aspx @@ -0,0 +1,107 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SCP_QUALITY_MANAGER.aspx.cs" Inherits="SCP.Views.Quality.SCP_QUALITY_MANAGER" %> + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +