|
|
|
|
|
|
229
|
string datepath = DateTime.Now.ToString("yyyyMMddHHMMss");
|
229
|
string datepath = DateTime.Now.ToString("yyyyMMddHHMMss");
|
|
230
|
string aLastName = Path.GetExtension(_upFile.FileName);
|
230
|
string aLastName = Path.GetExtension(_upFile.FileName);
|
|
231
|
string oriname = Path.GetFileNameWithoutExtension(_upFile.FileName);
|
231
|
string oriname = Path.GetFileNameWithoutExtension(_upFile.FileName);
|
|
232
|
- if (aLastName != "xls" && aLastName != "xlsx")
|
|
|
|
|
|
232
|
+ if (aLastName != ".xls" && aLastName != ".xlsx")
|
|
233
|
{
|
233
|
{
|
|
234
|
return Error("文件类型错误,请选择Excel文件");
|
234
|
return Error("文件类型错误,请选择Excel文件");
|
|
235
|
}
|
235
|
}
|
|
|
|
|
|
|
264
|
#region 数据入库
|
264
|
#region 数据入库
|
|
265
|
headrow = headrow + 1;
|
265
|
headrow = headrow + 1;
|
|
266
|
|
266
|
|
|
267
|
- if (dr["物料编号"].ToString() != "" && valcode(dr["物料编号"].ToString()))
|
|
|
|
|
|
267
|
+ if (dr["物料编码"].ToString() != "" && valcode(dr["物料编码"].ToString()))
|
|
268
|
{
|
268
|
{
|
|
269
|
Model.T_Wo_MaterialManage dModel = new Model.T_Wo_MaterialManage();
|
269
|
Model.T_Wo_MaterialManage dModel = new Model.T_Wo_MaterialManage();
|
|
270
|
- dModel.F_MaterialCode = dr["物料编号"].ToString();//物料编号
|
|
|
|
|
|
270
|
+ dModel.F_MaterialCode = dr["物料编码"].ToString();//物料编号
|
|
271
|
dModel.F_MaterialName = dr["物料名称"].ToString();//物料名称
|
271
|
dModel.F_MaterialName = dr["物料名称"].ToString();//物料名称
|
|
272
|
dModel.F_Model = dr["型号"].ToString();//型号
|
272
|
dModel.F_Model = dr["型号"].ToString();//型号
|
|
273
|
dModel.F_Specs = dr["规格"].ToString();//规格
|
273
|
dModel.F_Specs = dr["规格"].ToString();//规格
|