Browse Source

发货单修改

master
lvzb 4 years ago
parent
commit
1f5f20301b
  1. 1
      Controller/SCP_ASN_CONTROLLER.cs
  2. 2
      Models/ScpEntity/V_ASN_PRINT.cs
  3. 16
      SCP/Views/SupplierData/SCP_ASN_CREATE.aspx
  4. 2
      SCP/Views/SupplierData/SCP_ASN_CREATE.aspx.cs
  5. 18
      SCP/Views/SupplierData/SCP_ASN_CREATE.aspx.designer.cs
  6. 8
      SCP/Views/SupplierData/SCP_INVOICE.aspx.cs
  7. 9
      SCP/Views/WarehouseData/SCP_INVOICE.aspx.cs
  8. 4
      SCP/default.aspx

1
Controller/SCP_ASN_CONTROLLER.cs

@ -863,6 +863,7 @@ namespace CK.SCP.Controller
_detail.LineNO = p.PoLine.ToString(); _detail.LineNO = p.PoLine.ToString();
_detail.Memo = p.Remark; _detail.Memo = p.Remark;
_detail.Batch = p.Batch; _detail.Batch = p.Batch;
_detail.VendBatch = p.VendBatch;
_detail.DockCode = p.DockCode; _detail.DockCode = p.DockCode;
_detail.ProjectId = _lst.Where(itm => itm.PartCode == p.PartCode).FirstOrDefault().ProjectId; _detail.ProjectId = _lst.Where(itm => itm.PartCode == p.PartCode).FirstOrDefault().ProjectId;
_lsDetail.Add(_detail); _lsDetail.Add(_detail);

2
Models/ScpEntity/V_ASN_PRINT.cs

@ -40,7 +40,7 @@ namespace CK.SCP.Models.ScpEntity
public string Memo { get; set; } public string Memo { get; set; }
public string DockCode { get; set; } public string DockCode { get; set; }
public string Batch { get; set; } public string Batch { get; set; }
public string VendBatch { get; set; }
public string ProjectId { 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; 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;

16
SCP/Views/SupplierData/SCP_ASN_CREATE.aspx

@ -93,11 +93,17 @@
</f:NumberBox> </f:NumberBox>
</Editor> </Editor>
</f:RenderField> </f:RenderField>
<f:RenderField Width="100px" ColumnID="Batch" DataField="Batch" FieldType="String" HeaderText="发货批次"> <f:RenderField Width="100px" ColumnID="Batch" DataField="Batch" FieldType="String" HeaderText="发货批次" Hidden ="true">
<Editor> <Editor>
<f:TextBox ID="txtBatch1" Text="" runat="server" Regex="\d{6}" ></f:TextBox> <f:TextBox ID="txtBatch1" Text="" runat="server" Regex="\d{6}" ></f:TextBox>
</Editor> </Editor>
</f:RenderField> </f:RenderField>
<f:RenderField Width="150px" ColumnID="VendBatch" HeaderText="供应商批次">
<Editor>
<f:TextBox ID="TXT_VendBatch" runat="server" MaxLength="12" Regex="^[A-Za-z0-9]+$" >
</f:TextBox>
</Editor>
</f:RenderField>
<%--<f:BoundField SortField="Batch1" DataField="Batch" HeaderText="发货批次" ColumnID="Batch1" Width="100px" /> --%> <%--<f:BoundField SortField="Batch1" DataField="Batch" HeaderText="发货批次" ColumnID="Batch1" Width="100px" /> --%>
<f:RenderField Width="100px" ColumnID="TempQty" FieldType="Float" DataField="TempQty" <f:RenderField Width="100px" ColumnID="TempQty" FieldType="Float" DataField="TempQty"
@ -137,6 +143,7 @@
</f:TextBox> </f:TextBox>
</Editor> </Editor>
</f:RenderField> </f:RenderField>
<f:RenderField Width="100px" ColumnID="Qty3" FieldType="Float" Hidden="true" <f:RenderField Width="100px" ColumnID="Qty3" FieldType="Float" Hidden="true"
HeaderText="发货数量"> HeaderText="发货数量">
<Editor> <Editor>
@ -146,13 +153,6 @@
</Editor> </Editor>
</f:RenderField> </f:RenderField>
<f:RenderField Width="150px" ColumnID="VendBatch" Hidden="true"
HeaderText="供应商批次(YYMMDD)">
<Editor>
<f:TextBox ID="TXT_VendBatch" runat="server" >
</f:TextBox>
</Editor>
</f:RenderField>
<f:BoundField SortField="PoUnit" DataField="PoUnit" HeaderText="单位" ColumnID="PoUnit" Width="40px" /> <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="CanQty" DataField="CanQty" HeaderText="可发数量" ColumnID="CanQty" Width="70px" DataFormatString = "{0:F}"/>

2
SCP/Views/SupplierData/SCP_ASN_CREATE.aspx.cs

@ -290,7 +290,7 @@ namespace SCP.SupplierData
return; return;
} }
DateTime dt = DateTime.Parse(_ProduceDate.ToString()); DateTime dt = DateTime.Parse(_ProduceDate.ToString());
_detail.Batch = _Batch1.ToString().Trim(); _detail.Batch = GetBatch(dt); //_Batch1.ToString().Trim();
_detail.TempQty = number; _detail.TempQty = number;
_detail.PackQty = ConvertHelper.To<decimal>(_PackQty); _detail.PackQty = ConvertHelper.To<decimal>(_PackQty);
_detail.VendBatch = _VendBatch.ToString(); _detail.VendBatch = _VendBatch.ToString();

18
SCP/Views/SupplierData/SCP_ASN_CREATE.aspx.designer.cs

@ -266,6 +266,15 @@ namespace SCP.SupplierData
/// </remarks> /// </remarks>
protected global::FineUI.TextBox txtBatch1; protected global::FineUI.TextBox txtBatch1;
/// <summary>
/// TXT_VendBatch 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TXT_VendBatch;
/// <summary> /// <summary>
/// NumberBox1 控件。 /// NumberBox1 控件。
/// </summary> /// </summary>
@ -320,15 +329,6 @@ namespace SCP.SupplierData
/// </remarks> /// </remarks>
protected global::FineUI.NumberBox NumberBox4; protected global::FineUI.NumberBox NumberBox4;
/// <summary>
/// TXT_VendBatch 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TXT_VendBatch;
/// <summary> /// <summary>
/// Window1 控件。 /// Window1 控件。
/// </summary> /// </summary>

8
SCP/Views/SupplierData/SCP_INVOICE.aspx.cs

@ -46,13 +46,7 @@ namespace SCP.Views.SupplierData
SearchInvoice(ret => { SearchInvoice(ret => {
Grid_V_TB_INVOICE.RecordCount = ret.Count(); Grid_V_TB_INVOICE.RecordCount = ret.Count();
ret = SortAndPage(ret, Grid_V_TB_INVOICE); ret = SortAndPage(ret, Grid_V_TB_INVOICE);
var _ls=ret.ToList(); Grid_V_TB_INVOICE.DataSource = ret;
// _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.DataBind(); Grid_V_TB_INVOICE.DataBind();
}); });
} }

9
SCP/Views/WarehouseData/SCP_INVOICE.aspx.cs

@ -53,15 +53,6 @@ namespace SCP.WarehouseData
{ {
Grid_V_TB_INVOICE.RecordCount = result.Count(); Grid_V_TB_INVOICE.RecordCount = result.Count();
var list = SortAndPage<V_TB_INVOICE>(result, Grid_V_TB_INVOICE,"ASC"); var list = SortAndPage<V_TB_INVOICE>(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.DataSource = list;
Grid_V_TB_INVOICE.DataBind(); Grid_V_TB_INVOICE.DataBind();
}); });

4
SCP/default.aspx

@ -111,10 +111,10 @@
for (var i = 0; obj.options.length; i++) 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; obj.options[i].selected = true;
_factory = document.getElementById(_factoryValue); _factory = document.getElementById(_factoryValue);
_factory.value = 'CQBMPT'; _factory.value = 'JZ1';
} }
} }
} }

Loading…
Cancel
Save