gaofei
/
HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
高飞 2025-07-15 17:33:21 +08:00
parent 3ca4e2349b
commit 79a2c9260e
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
HJGL_DS/FineUIPro.Web/File/Excel/领料计划导入模板.xlsx
View File

Binary file not shown.

21
HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanImport.aspx.cs
View File

@ -341,7 +341,25 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
} }
else else
{ {
errorInfos += (i + 2) + "行, [数量] 不能为空</br>"; errorInfos += (i + 2) + "行, [数量 ] 不能为空</br>";
}
if (ds.Tables[0].Rows[i]["预约日期"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["预约日期"].ToString()))
{
string strTime = ds.Tables[0].Rows[i]["预约日期"].ToString();
try
{
DateTime d = Convert.ToDateTime(strTime);
usingPlan.OrderDate = d;
}
catch (Exception ex)
{
errorInfos += (i + 2) + "行, [预约日期] 录入不正确</br>";
}
}
else
{
errorInfos += (i + 2) + "行, [预约日期] 不能为空</br>";
} }
if (ds.Tables[0].Rows[i]["时间段"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["时间段"].ToString())) if (ds.Tables[0].Rows[i]["时间段"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["时间段"].ToString()))
@ -407,7 +425,6 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
usingPlan.UsingPlanId = SQLHelper.GetNewID(typeof(Model.Weld_UsingPlan)); usingPlan.UsingPlanId = SQLHelper.GetNewID(typeof(Model.Weld_UsingPlan));
usingPlan.InPutDate = DateTime.Now; usingPlan.InPutDate = DateTime.Now;
usingPlan.OrderDate = DateTime.Now.Date;
usingPlan.InPutMan = CurrUser.UserId; usingPlan.InPutMan = CurrUser.UserId;
usingPlan.IsCancel = false; usingPlan.IsCancel = false;
usingPlan.IsSubmit = true; usingPlan.IsSubmit = true;

2
HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/ShowStockIn.aspx
View File

@ -14,7 +14,7 @@
<Items> <Items>
<f:Grid ID="Grid1" Title="焊材库存信息" ShowHeader="false" EnableCollapse="true" PageSize="15" <f:Grid ID="Grid1" Title="焊材库存信息" ShowHeader="false" EnableCollapse="true" PageSize="15"
ShowBorder="true" runat="server" EnableColumnLines="true" ShowBorder="true" runat="server" EnableColumnLines="true"
SortField="WeldCode" SortDirection="ASC" DataKeyNames="StockInId" SortField="Warrantybook" SortDirection="ASC" DataKeyNames="StockInId"
DataIDField="StockInId" EnableCheckBoxSelect="true" KeepCurrentSelection="true" DataIDField="StockInId" EnableCheckBoxSelect="true" KeepCurrentSelection="true"
EnableMultiSelect="true" AllowCellEditing="true" CheckBoxSelectOnly="true" > EnableMultiSelect="true" AllowCellEditing="true" CheckBoxSelectOnly="true" >
<Toolbars> <Toolbars>