SCP
/
SCPFWBTL
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

采购订单-要货看板与供应商菜单-要货看板，新增四个字段对应的新增与查询。

master
TML 4 years ago
parent
be83c676fb
commit
ecde265b07
27 changed files with 859 additions and 309 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      Controller/SCP_ASK_CONTROLLER.cs
  2. 17
      Controller/SCP_ASN_CONTROLLER.cs
  3. 58
      Controller/SCP_PO_CONTROLLER.cs
  4. 2
      SCP/SCP.csproj
  5. 6
      SCP/Views/PlanData/SCP_ASK.aspx
  6. 4
      SCP/Views/PlanData/SCP_ASK.aspx.cs
  7. 42
      SCP/Views/PlanData/SCP_ASK.aspx.designer.cs
  8. 14
      SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx
  9. 6
      SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.designer.cs
  10. 5
      SCP/Views/PlanData/SCP_PO.aspx
  11. 4
      SCP/Views/PlanData/SCP_PO.aspx.cs
  12. 42
      SCP/Views/PlanData/SCP_PO.aspx.designer.cs
  13. 43
      SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx
  14. 34
      SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx.cs
  15. 78
      SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx.designer.cs
  16. 4
      SCP/Views/PlanData/SCP_PO_EXTEND.aspx
  17. 4
      SCP/Views/PlanData/SCP_PO_EXTEND.aspx.cs
  18. 42
      SCP/Views/PlanData/SCP_PO_EXTEND.aspx.designer.cs
  19. 4
      SCP/Views/SupplierData/SCP_ASK.aspx
  20. 4
      SCP/Views/SupplierData/SCP_ASK.aspx.cs
  21. 42
      SCP/Views/SupplierData/SCP_ASK.aspx.designer.cs
  22. 4
      SCP/Views/SupplierData/SCP_ASN.aspx
  23. 4
      SCP/Views/SupplierData/SCP_ASN.aspx.cs
  24. 42
      SCP/Views/SupplierData/SCP_ASN.aspx.designer.cs
  25. 17
      SCP/Views/SupplierData/SCP_ASN_CREATE.aspx
  26. 26
      SCP/Views/SupplierData/SCP_ASN_CREATE.aspx.cs
  27. 42
      SCP/Views/SupplierData/SCP_ASN_CREATE.aspx.designer.cs

16
Controller/SCP_ASK_CONTROLLER.cs
View File

@ -90,6 +90,22 @@ namespace CK.SCP.Controller
{
q = q.Where(p => p_entity.UserInVendIds.Contains(p.VendId));
}
if (!string.IsNullOrEmpty(p_entity.SubSite))
{
q = q.Where(p => p.SubSite.Contains(p_entity.SubSite));
}
if (!string.IsNullOrEmpty(p_entity.Extend1))
{
q = q.Where(p => p.Extend1.Contains(p_entity.Extend1));
}
if (!string.IsNullOrEmpty(p_entity.Extend2))
{
q = q.Where(p => p.Extend2.Contains(p_entity.Extend2));
}
if (!string.IsNullOrEmpty(p_entity.Extend3))
{
q = q.Where(p => p.Extend3.Contains(p_entity.Extend3));
}
_ret.State = ReturnStatus.Succeed;
_ret.Result = q;
p_action(_ret);

17
Controller/SCP_ASN_CONTROLLER.cs
View File

@ -156,6 +156,22 @@ namespace CK.SCP.Controller
{
q = q.Where(p => p_entity.UserInVendIds.Contains(p.VendId));
}
if (!string.IsNullOrEmpty(p_entity.SubSite))
{
q = q.Where(p => p.SubSite == p_entity.SubSite);
}
if (!string.IsNullOrEmpty(p_entity.Extend1))
{
q = q.Where(p => p.Extend1 == p_entity.Extend1);
}
if (!string.IsNullOrEmpty(p_entity.Extend2))
{
q = q.Where(p => p.Extend2 == p_entity.Extend2);
}
if (!string.IsNullOrEmpty(p_entity.Extend3))
{
q = q.Where(p => p.Extend3 == p_entity.Extend3);
}
_ret.State = ReturnStatus.Succeed;
_ret.Result = q;
p_action(_ret);
@ -178,7 +194,6 @@ namespace CK.SCP.Controller
}
catch (OptimisticConcurrencyException ex)//并发冲突异常
{
_ret.State = ReturnStatus.Failed;
_ret.ErrorList.Add(ex);
LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_ASN_CONTROLLER), "Get_V_TB_ASN_List", ex.ToString());

58
Controller/SCP_PO_CONTROLLER.cs
View File

@ -104,6 +104,23 @@ namespace CK.SCP.Controller
q = q.Where(p => p_entity.UserInVendIds.Contains(p.VendId));
}
if (!string.IsNullOrEmpty(p_entity.SubSite))
{
q = q.Where(p => p.SubSite.Contains(p_entity.SubSite));
}
if (!string.IsNullOrEmpty(p_entity.Extend1))
{
q = q.Where(p => p.Extend1.Contains(p_entity.Extend1));
}
if (!string.IsNullOrEmpty(p_entity.Extend2))
{
q = q.Where(p => p.Extend2.Contains(p_entity.Extend2));
}
if (!string.IsNullOrEmpty(p_entity.Extend3))
{
q = q.Where(p => p.Extend3.Contains(p_entity.Extend3));
}
//if (!string.IsNullOrEmpty(p_entity.PartCode))
//{
// var _po = db.TB_PO_DETAIL.Where(p => p.PartCode == p_entity.PartCode && p.IsDeleted== false);
@ -227,6 +244,7 @@ namespace CK.SCP.Controller
if (_detail.PoBillNum == itm.PoBillNum && _detail.PoLine == itm.PoLine && _detail.PartCode == itm.PartCode)
{
_detail.ReceivedQty = itm.ReceiveSum;
}
});
@ -2104,6 +2122,10 @@ namespace CK.SCP.Controller
_t.ReceivedPort = p_order.ReceivedPort;
_t.Remark = p_order.Remark;
_t.State = (int)AskState.New;
_t.SubSite = p_order.SubSite;
_t.Extend1 = p_order.Extend1;
_t.Extend2 = p_order.Extend2;
_t.Extend3 = p_order.Extend3;
_t.GUID = Guid.NewGuid();
_t.ModType = (int)p_order.ModType;
@ -2142,6 +2164,10 @@ namespace CK.SCP.Controller
_tDetail.Price = itm.Price;
_tDetail.GUID = Guid.NewGuid();
_tDetail.Currency = itm.Currency;
_tDetail.SubSite = itm.SubSite;
_tDetail.Extend1 = itm.Extend1;
_tDetail.Extend2 = itm.Extend2;
_tDetail.Extend3 = itm.Extend3;
db.TB_ASK_DETAIL.Add(_tDetail);
var _order_detail = db.TB_PO_DETAIL.Where(p => p.UID == itm.UID).FirstOrDefault();
_order_detail.TempQty = itm.TempQty;
@ -2281,6 +2307,38 @@ namespace CK.SCP.Controller
{
q = q.Where(p => p_entity.UserInAddress.Contains(p.Site));
}
if (!string.IsNullOrEmpty(p_entity.SubSite))
{
q = q.Where(p => p.SubSite == p_entity.SubSite);
}
if (!string.IsNullOrEmpty(p_entity.Extend1))
{
q = q.Where(p => p.Extend1 == p_entity.Extend1);
}
if (!string.IsNullOrEmpty(p_entity.Extend2))
{
q = q.Where(p => p.Extend1 == p_entity.Extend2);
}
if (!string.IsNullOrEmpty(p_entity.Extend3))
{
q = q.Where(p => p.Extend1 == p_entity.Extend3);
}
if (!string.IsNullOrEmpty(p_entity.SubSite))
{
q = q.Where(p => p.SubSite.Contains(p_entity.SubSite));
}
if (!string.IsNullOrEmpty(p_entity.Extend1))
{
q = q.Where(p => p.Extend1.Contains(p_entity.Extend1));
}
if (!string.IsNullOrEmpty(p_entity.Extend2))
{
q = q.Where(p => p.Extend2.Contains(p_entity.Extend2));
}
if (!string.IsNullOrEmpty(p_entity.Extend3))
{
q = q.Where(p => p.Extend3.Contains(p_entity.Extend3));
}
_ret.State = ReturnStatus.Succeed;
_ret.Result = q;
p_action(_ret);

2
SCP/SCP.csproj
View File

@ -6281,7 +6281,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>62030</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:6789/</IISUrl>
<IISUrl>http://localhost:5678</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>

6
SCP/Views/PlanData/SCP_ASK.aspx
View File

@ -67,7 +67,11 @@
<f:FormRow runat="server">
<Items>
<f:TextBox runat = "server" Label = "订单编号" EmptyText = "" ID = "TXT_BillNo" />
<f:TextBox runat = "server" Label = "看板编号" EmptyText = "" ID = "TXT_AskBill" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_SubSite" Hidden="true" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend1" Hidden="true" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend2" Hidden="true" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend3" Hidden="true" />
<f:TextBox runat = "server" Label = "看板编号" EmptyText = "" ID = "TXT_AskBill" Hidden="true" />
<f:DropDownList ID="ddl_Vender" runat="server" Label="供应商" EnableEdit="true" ></f:DropDownList>
<f:TextBox runat = "server" Label = "送货地点" EmptyText = "" ID = "TXT_Site_Desc" />
</Items>

4
SCP/Views/PlanData/SCP_ASK.aspx.cs
View File

@ -85,6 +85,10 @@ namespace SCP.PlanData
_entity.State_DESC = TXT_Site_Desc.Text;
_entity.AskBillNum = TXT_AskBill.Text;
_entity.ErpBillNum = TXT_ProjectId.Text;
_entity.SubSite = TXT_SubSite.Text;
_entity.Extend1 = TXT_Extend1.Text;
_entity.Extend2 = TXT_Extend2.Text;
_entity.Extend3 = TXT_Extend3.Text;
if (DP_StartDate.SelectedDate != null)
{
_entity.BeginTime = DP_StartDate.SelectedDate;

42
SCP/Views/PlanData/SCP_ASK.aspx.designer.cs
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace SCP.PlanData {
namespace SCP.PlanData
{
public partial class SCP_ASK {
public partial class SCP_ASK
{
/// <summary>
/// form1 控件。
@ -201,6 +203,42 @@ namespace SCP.PlanData {
/// </remarks>
protected global::FineUI.TextBox TXT_BillNo;
/// <summary>
/// TXT_SubSite 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TXT_SubSite;
/// <summary>
/// TXT_Extend1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TXT_Extend1;
/// <summary>
/// TXT_Extend2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TXT_Extend2;
/// <summary>
/// TXT_Extend3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TXT_Extend3;
/// <summary>
/// TXT_AskBill 控件。
/// </summary>

14
SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx
View File

@ -39,6 +39,7 @@
<f:DatePicker runat="server" Label="至" ID="TextBillTime2"></f:DatePicker>
<f:DatePicker runat="server" Label="计划到货日期" ID="dp_EndTimeStart"></f:DatePicker>
<f:DatePicker runat="server" Label="至" ID="dp_EndTimeEnd"></f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="33% 33% 33%" ID="FormRow_2" runat="server">
@ -51,6 +52,14 @@
</f:TextBox>
<f:TextBox runat="server" Label="零件名称" ID="TextPartName">
</f:TextBox>
<%-- <f:TextBox runat="server" Label="子网站" ID="SubSite">
</f:TextBox>
<f:TextBox runat="server" Label="子网站" ID="Extend1">
</f:TextBox>
<f:TextBox runat="server" Label="子网站" ID="Extend2">
</f:TextBox>
<f:TextBox runat="server" Label="子网站" ID="Extend3">
</f:TextBox> --%>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="25% 25% 25% 25%" ID="FormRow_3" runat="server">
@ -113,6 +122,11 @@
<f:BoundField Width = "100px" DataField = "ShipTime" DataFormatString = "{0:yyyy-MM-dd}" HeaderText = "最后发货日期" />
<f:BoundField Width = "100px" DataField = "ValidityDays" HeaderText = "距到货日期（天）" />
<%-- <f:BoundField Width = "100px" DataField = "SubSite" HeaderText = "子网站" />
<f:BoundField Width = "100px" DataField = "Extend1" HeaderText = "子网站" />
<f:BoundField Width = "100px" DataField = "Extend2" HeaderText = "子网站" />
<f:BoundField Width = "100px" DataField = "Extend3" HeaderText = "子网站" />
--%>
</Columns>
</f:Grid>
</Items>

6
SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.designer.cs
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace SCP.PlanData {
namespace SCP.PlanData
{
public partial class SCP_INCOMPLETE_ASK {
public partial class SCP_INCOMPLETE_ASK
{
/// <summary>
/// form1 控件。

5
SCP/Views/PlanData/SCP_PO.aspx
View File

@ -63,6 +63,10 @@
<f:FormRow runat="server" ColumnWidths="25% 25% 25% 25%">
<Items>
<f:TextBox runat = "server" Label = "订单编号" EmptyText = "" ID = "TXT_BillNo" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_SubSite" Hidden="true"/>
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend1" Hidden="true" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend2" Hidden="true"/>
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend3" Hidden="true" />
<f:DropDownList ID="ddl_Vender" runat="server" Label="供应商" EnableEdit="true" ></f:DropDownList>
<f:TextBox runat = "server" Label = "项目编码" EmptyText = "" ID = "TXT_ProjectId" />
</Items>
@ -86,6 +90,7 @@
<f:FormRow runat="server" ColumnWidths="33% 33% 33%">
<Items>
<f:TextBox runat="server" Required ="true" Label="零件编号" EmptyText="查询请填写零件编号" ID="TXT_PartCode" />
<%-- <f:DropDownList runat="server" ID="DropDownList1" Label="零件状态">
<f:ListItem Text="-" Value=""/>
<f:ListItem Text="开发" Value="0" />

4
SCP/Views/PlanData/SCP_PO.aspx.cs
View File

@ -79,6 +79,10 @@ namespace SCP.PlanData
_entity.UserInAddress = CurrentUser.FactoryList;
_entity.UserInVendIds = CurrentUser.VenderList;
_entity.PartCode = TXT_PartCode.Text;
_entity.SubSite = TXT_SubSite.Text;
_entity.Extend1 = TXT_Extend1.Text;
_entity.Extend2 = TXT_Extend2.Text;
_entity.Extend3 = TXT_Extend3.Text;
SCP_PO_CONTROLLER.Get_V_TB_PO_List(_entity, (_ret) => {
if (_ret.State == ReturnStatus.Succeed)
{

42
SCP/Views/PlanData/SCP_PO.aspx.designer.cs
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace SCP.PlanData {
namespace SCP.PlanData
{
public partial class SCP_PO {
public partial class SCP_PO
{
/// <summary>
/// form1 控件。
@ -147,6 +149,42 @@ namespace SCP.PlanData {
/// </remarks>
protected global::FineUI.TextBox TXT_BillNo;
/// <summary>
/// TXT_SubSite 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TXT_SubSite;
/// <summary>
/// TXT_Extend1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TXT_Extend1;
/// <summary>
/// TXT_Extend2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TXT_Extend2;
/// <summary>
/// TXT_Extend3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TXT_Extend3;
/// <summary>
/// ddl_Vender 控件。
/// </summary>

43
SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx
View File

@ -41,6 +41,14 @@
<f:TextBox runat = "server" Label = "供应商编号" EmptyText = "" ID = "TXT_VendId" />
</Items>
</f:FormRow>
<f:FormRow runat="server" ColumnWidths="25% 25% 25% 25%">
<Items>
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_SubSite" Hidden="true" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend1" Hidden="true" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend2" Hidden="true" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend3" Hidden="true" />
</Items>
</f:FormRow>
<f:FormRow runat="server" ColumnWidths="33% 33% 33%">
<Items>
@ -85,7 +93,7 @@
<f:HiddenField ID="HF_GRID_INDEX" runat="server"></f:HiddenField>
<f:Grid ID = "Grid_V_TB_PO_DETAIL" EnableCollapse = "true" ShowBorder = "true" EnableMultiSelect="true" ShowHeader = "true" runat ="server" EnableCheckBoxSelect = "true"
DataKeyNames = "UID,PoBillNum,PoLine,PartCode,PlanQty,ShippedQty,ReceivedQty,RejectQty,BeginTime,EndTime,PoUnit,LocUnit,Price,Currency,PackQty,UnConv,DockCode,State,Remark,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,PartDesc1,CurrencyDesc,ErpBillNum,ModType,Contacter,Site,Buyer,BuyerPhone,VendName,PartDesc2,TempQty,PublishQty,ReceivedPort"
DataKeyNames = "UID,PoBillNum,PoLine,PartCode,PlanQty,ShippedQty,ReceivedQty,RejectQty,BeginTime,EndTime,PoUnit,LocUnit,Price,Currency,PackQty,UnConv,DockCode,State,Remark,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,PartDesc1,CurrencyDesc,ErpBillNum,ModType,Contacter,Site,Buyer,BuyerPhone,VendName,PartDesc2,TempQty,PublishQty,ReceivedPort,SubSite,Extend1,Extend2,Extend3"
SortField="PoLine"
AllowPaging="True"
AllowCellEditing="true" ClicksToEdit="2"
@ -147,6 +155,39 @@
</f:DatePicker>
</Editor>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="SubSite" DataField="SubSite" FieldType="String"
HeaderText="子网站" Hidden="true">
<Editor>
<f:NumberBox ID="NumberBox2" runat="server" MinValue="0"
MaxValue="99999999" DecimalPrecision="3" >
</f:NumberBox>
</Editor>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="Extend1" DataField="Extend1" FieldType="String"
HeaderText="子网站" Hidden="true">
<Editor>
<f:NumberBox ID="NumberBox3" runat="server" MinValue="0"
MaxValue="99999999" DecimalPrecision="3" >
</f:NumberBox>
</Editor>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="Extend2" DataField="Extend2" FieldType="String"
HeaderText="子网站" Hidden="true" >
<Editor>
<f:NumberBox ID="NumberBox4" runat="server" MinValue="0"
MaxValue="99999999" DecimalPrecision="3" >
</f:NumberBox>
</Editor>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="Extend3" DataField="Extend3" FieldType="String"
HeaderText="子网站" Hidden="true">
<Editor>
<f:NumberBox ID="NumberBox5" runat="server" MinValue="0"
MaxValue="99999999" DecimalPrecision="3" >
</f:NumberBox>
</Editor>
</f:RenderField>
<f:BoundField Width = "50px" DataField = "PoUnit" DataFormatString = "{0}" Hidden="true" HeaderText = "单位" />

34
SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx.cs
View File

@ -47,7 +47,6 @@ namespace SCP.PlanData
p_action(_ret.Result);
}
});
}
public void GetV_TB_POData()
@ -74,6 +73,11 @@ namespace SCP.PlanData
this.TXT_State_DESC.Text = _result.State_DESC;
this.TXT_VendName.Text = _result.VendName;
this.txtRemark.Text = _result.Remark;
this.TXT_SubSite.Text = _result.SubSite;
this.TXT_Extend1.Text = _result.Extend1;
this.TXT_Extend2.Text = _result.Extend2;
this.TXT_Extend3.Text = _result.Extend3;
}
});
}
@ -152,12 +156,17 @@ namespace SCP.PlanData
protected void btnRelease_Click(object sender, EventArgs e)
{
var qadOrder = Session["order"] as V_TB_PO;
qadOrder.SubSite = TXT_SubSite.Text;
qadOrder.Extend1 = TXT_Extend1.Text;
qadOrder.Extend2 = TXT_Extend2.Text;
qadOrder.Extend3 = TXT_Extend3.Text;
//qadOrder.ReceivedPort = DDL_PORT.SelectedValue;
if (DP_BeginTime.SelectedDate == null )
{
Alert.Show("要货日期没有填写!");
return;
}
qadOrder.BeginTime = DP_BeginTime.SelectedDate;
List<string> _lineList = new List<string>();
if (!string.IsNullOrEmpty(CurrentUser.Name))
@ -208,6 +217,7 @@ namespace SCP.PlanData
_entity.PartDesc2 = rowDataKeys[34] as string;
_entity.TempQty = ConvertHelper.To<Decimal>(rowDataKeys[35]);
_entity.BeginTime = DP_BeginTime.SelectedDate;
if (qadOrder.ModType == (int)BillModType.Non_Contract)
{
_entity.PublishQty = ConvertHelper.To<Decimal>(rowDataKeys[36]);
@ -220,9 +230,29 @@ namespace SCP.PlanData
{
var modifyValue = modifiedDict[i];
if (modifyValue.Keys.Contains("PublishQty"))
if (modifyValue.Keys.Contains("SubSite"))
{
_entity.SubSite = modifyValue["SubSite"].ToString();
}
if (modifyValue.Keys.Contains("Extend1"))
{
_entity.Extend1 = modifyValue["Extend1"].ToString();
}
if (modifyValue.Keys.Contains("Extend2"))
{
_entity.Extend2 = modifyValue["Extend2"].ToString();
}
if (modifyValue.Keys.Contains("Extend3"))
{
_entity.Extend3 = modifyValue["Extend3"].ToString();
}
if (modifyValue.Keys.Contains("PublishQty"))
{
var _publishQty = modifyValue["PublishQty"];
decimal _out = 0;
bool _result = decimal.TryParse(_publishQty.ToString(), out _out);

78
SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx.designer.cs
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace SCP.PlanData {
namespace SCP.PlanData
{
public partial class SCP_PO_CREATE_ASK {
public partial class SCP_PO_CREATE_ASK
{
/// <summary>
/// form1 控件。
@ -102,6 +104,42 @@ namespace SCP.PlanData {
/// </remarks>
protected global::FineUI.TextBox TXT_VendId;
/// <summary>
/// TXT_SubSite 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TXT_SubSite;
/// <summary>
/// TXT_Extend1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TXT_Extend1;
/// <summary>
/// TXT_Extend2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TXT_Extend2;
/// <summary>
/// TXT_Extend3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TXT_Extend3;
/// <summary>
/// DP_BeginTime 控件。
/// </summary>
@ -237,6 +275,42 @@ namespace SCP.PlanData {
/// </remarks>
protected global::FineUI.DatePicker DatePicker1;
/// <summary>
/// NumberBox2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.NumberBox NumberBox2;
/// <summary>
/// NumberBox3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.NumberBox NumberBox3;
/// <summary>
/// NumberBox4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.NumberBox NumberBox4;
/// <summary>
/// NumberBox5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.NumberBox NumberBox5;
/// <summary>
/// NumberBox1 控件。
/// </summary>

4
SCP/Views/PlanData/SCP_PO_EXTEND.aspx
View File

@ -73,6 +73,10 @@
<f:FormRow runat="server" ColumnWidths="25% 25% 25% 25%">
<Items>
<f:TextBox runat = "server" Label = "订单编号" EmptyText = "" ID = "TXT_BillNo" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TxT_SubSite" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TxT_Extend1" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TxT_Extend2" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TxT_Extend3" />
<f:TextBox runat = "server" Label = "供应商编码" EmptyText = "" ID = "TXT_Vendid" />
<f:TextBox runat = "server" Label = "供应商名称" EmptyText = "" ID = "TXT_VendName" />
<f:TextBox runat = "server" Label = "项目编码" EmptyText = "" ID = "TXT_ProjectId" />

4
SCP/Views/PlanData/SCP_PO_EXTEND.aspx.cs
View File

@ -73,6 +73,10 @@ namespace SCP.PlanData
}
_entity.ErpBillNum = TXT_ProjectId.Text;
_entity.SubSite = TxT_SubSite.Text;
_entity.Extend1 = TxT_Extend1.Text;
_entity.Extend2 = TxT_Extend2.Text;
_entity.Extend3 = TxT_Extend3.Text;
_entity.IsDeleted = false;
_entity.UserInAddress = CurrentUser.FactoryList;

42
SCP/Views/PlanData/SCP_PO_EXTEND.aspx.designer.cs
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace SCP.PlanData {
namespace SCP.PlanData
{
public partial class SCP_PO_EXTEND {
public partial class SCP_PO_EXTEND
{
/// <summary>
/// form1 控件。
@ -129,6 +131,42 @@ namespace SCP.PlanData {
/// </remarks>
protected global::FineUI.TextBox TXT_BillNo;
/// <summary>
/// TxT_SubSite 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TxT_SubSite;
/// <summary>
/// TxT_Extend1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TxT_Extend1;
/// <summary>
/// TxT_Extend2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TxT_Extend2;
/// <summary>
/// TxT_Extend3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TxT_Extend3;
/// <summary>
/// TXT_Vendid 控件。
/// </summary>

4
SCP/Views/SupplierData/SCP_ASK.aspx
View File

@ -57,6 +57,10 @@
<f:FormRow runat="server" ID="FormRow_1">
<Items>
<f:TextBox runat = "server" Label = "订单编号" EmptyText = "" ID = "TXT_BillNo" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_SubSite" Hidden="true" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend1" Hidden="true" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend2" Hidden="true" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend3" Hidden="true" />
<f:TextBox runat = "server" Label = "看板编号" EmptyText = "" ID = "TXT_AskBillNo" />
<f:TextBox runat = "server" Label = "供应商编码" EmptyText = "" ID = "TXT_VendId" />
<f:TextBox runat = "server" Label = "送货地点" EmptyText = "" ID = "TXT_Site_Desc" />

4
SCP/Views/SupplierData/SCP_ASK.aspx.cs
View File

@ -90,6 +90,10 @@ namespace SCP.Views.SupplierData
_entity.State_DESC = TXT_Site_Desc.Text;
_entity.AskBillNum = TXT_AskBillNo.Text;
_entity.ErpBillNum = TXT_ProjectId.Text;
_entity.SubSite = TXT_SubSite.Text;
_entity.Extend1 = TXT_Extend1.Text;
_entity.Extend2 = TXT_Extend2.Text;
_entity.Extend3 = TXT_Extend3.Text;
if (DP_StartDate.SelectedDate != null)
{
_entity.BeginTime = DP_StartDate.SelectedDate;

42
SCP/Views/SupplierData/SCP_ASK.aspx.designer.cs
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace SCP.Views.SupplierData {
namespace SCP.Views.SupplierData
{
public partial class SCP_ASK {
public partial class SCP_ASK
{
/// <summary>
/// form1 控件。
@ -156,6 +158,42 @@ namespace SCP.Views.SupplierData {
/// </remarks>
protected global::FineUI.TextBox TXT_BillNo;
/// <summary>
/// TXT_SubSite 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TXT_SubSite;
/// <summary>
/// TXT_Extend1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TXT_Extend1;
/// <summary>
/// TXT_Extend2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TXT_Extend2;
/// <summary>
/// TXT_Extend3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TXT_Extend3;
/// <summary>
/// TXT_AskBillNo 控件。
/// </summary>

4
SCP/Views/SupplierData/SCP_ASN.aspx
View File

@ -61,6 +61,10 @@
<f:TextBox ID="TXT_VenderName" runat="server" Label="供应商"/>
<f:TextBox ID="TXT_ASK" runat="server" Label="看板编号" />
<f:TextBox ID="txtPO" runat="server" Label="订单编号" />
<f:TextBox ID="TXT_SubSite" runat="server" Label="子网站" Hidden="true" />
<f:TextBox ID="TXT_Extend1" runat="server" Label="子网站" Hidden="true" />
<f:TextBox ID="TXT_Extend2" runat="server" Label="子网站" Hidden="true" />
<f:TextBox ID="TXT_Extend3" runat="server" Label="子网站" Hidden="true" />
</Items>
</f:FormRow>
<f:FormRow runat="server" ID="FormRow_3" Hidden="true">

4
SCP/Views/SupplierData/SCP_ASN.aspx.cs
View File

@ -68,6 +68,10 @@ namespace SCP.SupplierData
_entity.AskBillNum = TXT_ASK.Text;
_entity.UserInVendIds = CurrentUser.VenderList;
_entity.UserInAddress = CurrentUser.FactoryList;
_entity.SubSite = TXT_SubSite.Text;
_entity.Extend1 = TXT_Extend1.Text;
_entity.Extend2 = TXT_Extend2.Text;
_entity.Extend3 = TXT_Extend3.Text;
SCP_ASN_CONTROLLER.Get_V_TB_ASN_List(_entity, (_ret) => {
if (_ret.State == ReturnStatus.Succeed)
{

42
SCP/Views/SupplierData/SCP_ASN.aspx.designer.cs
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace SCP.SupplierData {
namespace SCP.SupplierData
{
public partial class SCP_ASN {
public partial class SCP_ASN
{
/// <summary>
/// form1 控件。
@ -183,6 +185,42 @@ namespace SCP.SupplierData {
/// </remarks>
protected global::FineUI.TextBox txtPO;
/// <summary>
/// TXT_SubSite 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TXT_SubSite;
/// <summary>
/// TXT_Extend1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TXT_Extend1;
/// <summary>
/// TXT_Extend2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TXT_Extend2;
/// <summary>
/// TXT_Extend3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TXT_Extend3;
/// <summary>
/// FormRow_3 控件。
/// </summary>

17
SCP/Views/SupplierData/SCP_ASN_CREATE.aspx
View File

@ -20,7 +20,6 @@
<%-- <f:Button ID="btnAll" runat="server" EnablePostBack="True" OnClick="btnAll_Click" Text="默认为要货数量" Icon="CssAdd" OnClientClick="if(!confirm('是否?'))return false;">
</f:Button>--%>
<%--<f:Button ID="btnSet" runat="server" EnablePostBack="True" OnClick="btnSet_Click" Text="默认发货批次为生产批次,生产时间为录入时间" Icon="CssAdd">
</f:Button>--%>
<f:ToolbarFill runat="server" />
@ -40,6 +39,14 @@
<f:TextBox runat = "server" Label = "供应商" Enabled="false" EmptyText = "" ID = "TXT_VendName" />
<f:TextBox runat = "server" Enabled="false" Label = "发往地点" EmptyText = "" ID = "TXT_Site" />
</Items>
</f:FormRow>
<f:FormRow runat="server" ColumnWidths="25% 25% 25% 25%">
<Items>
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_SubSite" Hidden="true" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend1" Hidden="true"/>
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend2" Hidden="true" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend3" Hidden="true" />
</Items>
</f:FormRow>
<f:FormRow runat="server" ColumnWidths="25% 25% 25% 25%" ID="FormRow_2">
<Items>
@ -62,7 +69,7 @@
</Items>
</f:Form>
<f:Grid runat="server" ID="Grid_V_TB_ASK_DETAIL"
DataKeyNames ="UID,PoBillNum,PoLine,PartCode,ShippedQty,ReceivedQty,BeginTime,EndTime,PoUnit,LocUnit,Price,Currency,PackQty,UnConv,DockCode,State,Remark,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,PartDesc1,CurrencyDesc,Site,VendName,PartDesc2,AskBillNum,AskQty,TempQty,ReceivedPort,ProduceDate,ReduceQty,ValidityDays,Batch"
DataKeyNames ="UID,PoBillNum,PoLine,PartCode,ShippedQty,ReceivedQty,BeginTime,EndTime,PoUnit,LocUnit,Price,Currency,PackQty,UnConv,DockCode,State,Remark,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,PartDesc1,CurrencyDesc,Site,VendName,PartDesc2,AskBillNum,AskQty,TempQty,ReceivedPort,ProduceDate,ReduceQty,ValidityDays,Batch,SubSite,Extend1,Extend2,Extend3"
IsDatabasePaging="True" AllowPaging="True" OnPageIndexChange="Grid_V_TB_ASK_DETAIL_PageIndexChange" OnRowDataBound="Grid_V_TB_ASK_DETAIL_RowDataBound"
EnableRowSelectEvent="True" PageSize="500" AutoScroll="True" SortField="PoLine" SortDirection="DESC" AllowCellEditing="true" ClicksToEdit="1" >
<PageItems>
@ -157,6 +164,10 @@
<f:BoundField SortField="PoUnit" DataField="PoUnit" HeaderText="单位" ColumnID="PoUnit" Width="40px" />
<f:BoundField SortField="CanQty" DataField="CanQty" HeaderText="可发数量" ColumnID="CanQty" Width="70px" DataFormatString = "{0:F}"/>
<f:BoundField SortField="EndTime" DataField="EndTime" HeaderText="到货截至日期" ColumnID="EndTime" Width="100px" />
<f:BoundField SortField="SubSite" DataField="SubSite" HeaderText="子网站" ColumnID="SubSite" Width="100px" Hidden="true"/>
<f:BoundField SortField="Extend1" DataField="Extend1" HeaderText="子网站" ColumnID="Extend1" Width="100px" Hidden="true" />
<f:BoundField SortField="Extend2" DataField="Extend2" HeaderText="子网站" ColumnID="Extend2" Width="100px" Hidden="true"/>
<f:BoundField SortField="Extend3" DataField="Extend3" HeaderText="子网站" ColumnID="Extend3" Width="100px" Hidden="true"/>
<f:BoundField SortField="AskQty" DataField="AskQty" HeaderText="要货数量" ColumnID="AskQty" Width="70px" Hidden="true" DataFormatString = "{0:F}"/>
<f:BoundField SortField="ReduceQty" Hidden="true" DataField="ReduceQty" HeaderText="减产数量" ColumnID="ReduceQty" Width="70px" DataFormatString = "{0:F}"/>
<f:BoundField SortField="ShipQty" DataField="ShippedQty" HeaderText="发货数量" ColumnID="ShippedQty" Width="70px" Hidden="true" />
@ -166,8 +177,6 @@
<f:BoundField SortField="UpdateInfo" DataField="UpdateInfo" HeaderText="备注" Hidden="true" />
<f:BoundField SortField="ReceivedPort" DataField="ReceivedPort" HeaderText="收货口" ColumnID="ReceivedPort" Hidden="true" />
</Columns>
<Listeners>
<f:Listener Event="afteredit" Handler="f_onAfterEdit" />

26
SCP/Views/SupplierData/SCP_ASN_CREATE.aspx.cs
View File

@ -81,6 +81,10 @@ namespace SCP.SupplierData
this.TXT_State_Desc.Text = _result.State_DESC;
this.TXT_VendName.Text = _result.VendName;
this.TXT_Remark.Text = _result.Remark;
this.TXT_SubSite.Text = _result.SubSite;
this.TXT_Extend1.Text = _result.Extend1;
this.TXT_Extend2.Text = _result.Extend2;
this.TXT_Extend3.Text = _result.Extend3;
DP_ShipTime.SelectedDate = DateTime.Now;
DDL_PORT.DataSource = ScpCache.PortList.Where(p => CurrentUser.FactoryList.Contains(p.FACTORY_ID));
DDL_PORT.DataBind();
@ -97,7 +101,6 @@ namespace SCP.SupplierData
{
SearchV_TB_ASK_DETAILData((ret) => {
Grid_V_TB_ASK_DETAIL.RecordCount = ret.Count();
var list = SortAndPage<V_TB_ASK_DETAIL>(ret, Grid_V_TB_ASK_DETAIL);
@ -232,6 +235,7 @@ namespace SCP.SupplierData
_entity.ReduceQty = ConvertHelper.To<decimal>(rowDataKeys[33]);
_entity.ValidityDays = ConvertHelper.To<int>(rowDataKeys[34]);
_entity.Batch = ConvertHelper.To<string>(rowDataKeys[35]);
_entity.ProduceDate = DateTime.Now;
if (Convert.ToDecimal(_entity.AskQty) == 0)
{
@ -245,7 +249,26 @@ namespace SCP.SupplierData
var _Batch1 = modifyValue.Keys.Contains("Batch") ? modifyValue["Batch"] : _entity.Batch;
var _VendBatch = modifyValue.Keys.Contains("VendBatch") ? modifyValue["VendBatch"].ToString() : _entity.Batch;
var _ProduceDate = modifyValue.Keys.Contains("ProduceDate") ? modifyValue["ProduceDate"].ToString() : _entity.ProduceDate.ToString();
if (modifyValue.Keys.Contains("SubSite"))
{
_entity.SubSite = modifyValue["SubSite"].ToString();
}
if (modifyValue.Keys.Contains("Extend1"))
{
_entity.Extend1 = modifyValue["Extend1"].ToString();
}
if (modifyValue.Keys.Contains("Extend2"))
{
_entity.Extend2 = modifyValue["Extend2"].ToString();
}
if (modifyValue.Keys.Contains("Extend3"))
{
_entity.Extend3 = modifyValue["Extend3"].ToString();
}
if (string.IsNullOrEmpty(_VendBatch) || string.IsNullOrEmpty(_ProduceDate))
{
@ -369,7 +392,6 @@ namespace SCP.SupplierData
{
p.VendBatch = p.Batch;
});
}
}

42
SCP/Views/SupplierData/SCP_ASN_CREATE.aspx.designer.cs
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace SCP.SupplierData {
namespace SCP.SupplierData
{
public partial class SCP_ASN_CREATE {
public partial class SCP_ASN_CREATE
{
/// <summary>
/// form1 控件。
@ -111,6 +113,42 @@ namespace SCP.SupplierData {
/// </remarks>
protected global::FineUI.TextBox TXT_Site;
/// <summary>
/// TXT_SubSite 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TXT_SubSite;
/// <summary>
/// TXT_Extend1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TXT_Extend1;
/// <summary>
/// TXT_Extend2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TXT_Extend2;
/// <summary>
/// TXT_Extend3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TXT_Extend3;
/// <summary>
/// FormRow_2 控件。
/// </summary>

Write Preview
Loading…
Cancel
Save