From 3399396035163812d566fff344fdda3d18952905 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Tue, 5 Aug 2025 10:51:12 +0800
Subject: [PATCH] 1
---
.gitignore | 1 +
DataBase/版本日志/HJGLDB_DS_2025-08-04_gf.sql | 3 ++
.../SysManage/Sys_UserSettingsService.cs | 12 ++++-
HJGL_DS/BLL/WeldMat/Stock/StockInService.cs | 16 ++++++
HJGL_DS/FineUIPro.Web/ErrLog.txt | 21 ++++++++
.../File/Excel/焊材入库导入模板.xlsx | Bin 9307 -> 10066 bytes
.../FineUIPro.Web/WeldMat/Stock/StockIn.aspx | 9 +++-
.../WeldMat/Stock/StockIn.aspx.cs | 46 ++++++++++++++---
.../WeldMat/Stock/StockIn.aspx.designer.cs | 9 ++++
.../WeldMat/Stock/StockInEdit.aspx | 11 ++++
.../WeldMat/Stock/StockInEdit.aspx.cs | 27 +++++++++-
.../Stock/StockInEdit.aspx.designer.cs | 18 +++++++
.../WeldMat/Stock/StockInImport.aspx.cs | 8 +++
HJGL_DS/Model/Model.cs | 48 ++++++++++++++++++
14 files changed, 219 insertions(+), 10 deletions(-)
create mode 100644 DataBase/版本日志/HJGLDB_DS_2025-08-04_gf.sql
diff --git a/.gitignore b/.gitignore
index 273be0d..583bdb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@ bin-release/
/HJGL_DSPackFile/版本日志
/HJGL_DS/FineUIPro.Web/FileUpload/FaceRecognition
/HJGL_DS/WebAPI/.vs
+/HJGL_DS/FineUIPro.Web/FileUpload/WeldMat/StockIn
diff --git a/DataBase/版本日志/HJGLDB_DS_2025-08-04_gf.sql b/DataBase/版本日志/HJGLDB_DS_2025-08-04_gf.sql
new file mode 100644
index 0000000..10d1adf
--- /dev/null
+++ b/DataBase/版本日志/HJGLDB_DS_2025-08-04_gf.sql
@@ -0,0 +1,3 @@
+alter table Weld_StockIn add WarrantyNo nvarchar(50) null
+alter table Weld_StockIn add IsCheckWarrantyNo bit null
+GO
\ No newline at end of file
diff --git a/HJGL_DS/BLL/Common/SysManage/Sys_UserSettingsService.cs b/HJGL_DS/BLL/Common/SysManage/Sys_UserSettingsService.cs
index 31a9522..4c224f9 100644
--- a/HJGL_DS/BLL/Common/SysManage/Sys_UserSettingsService.cs
+++ b/HJGL_DS/BLL/Common/SysManage/Sys_UserSettingsService.cs
@@ -247,7 +247,11 @@ namespace BLL
pUser.UserId = item.UserId;
pUser.ProjectId = projectid;
pUser.RoleId = bUser.FirstOrDefault(x => x.UserId == item.UserId).RoleId;
- AddProject_UserList.Add(pUser);
+ var us = Funs.DB.Project_User.FirstOrDefault(x => x.UserId == item.UserId && x.ProjectId == projectid);
+ if (us == null)
+ {
+ AddProject_UserList.Add(pUser);
+ }
//增加单位
uItem m = new uItem();
@@ -273,7 +277,11 @@ namespace BLL
{
pUnit.UnitType = bresult.UnitType;
}
- AddProject_Unit.Add(pUnit);
+ var un= bUnit.FirstOrDefault(x => x.ProjectId == projectid && x.UnitId == item.UnitId);
+ if (un == null)
+ {
+ AddProject_Unit.Add(pUnit);
+ }
}
}
}
diff --git a/HJGL_DS/BLL/WeldMat/Stock/StockInService.cs b/HJGL_DS/BLL/WeldMat/Stock/StockInService.cs
index 53b86c6..d367dd3 100644
--- a/HJGL_DS/BLL/WeldMat/Stock/StockInService.cs
+++ b/HJGL_DS/BLL/WeldMat/Stock/StockInService.cs
@@ -48,6 +48,7 @@ namespace BLL
newStockIn.Flag = stockIn.Flag;
newStockIn.UsingAmount = stockIn.UsingAmount;
newStockIn.Number = stockIn.Number;
+ newStockIn.WarrantyNo = stockIn.WarrantyNo;
db.Weld_StockIn.InsertOnSubmit(newStockIn);
db.SubmitChanges();
@@ -80,6 +81,8 @@ namespace BLL
newStockIn.HeartNo = stockIn.HeartNo;
newStockIn.SupplierId = stockIn.SupplierId;
newStockIn.UnitStoreId = stockIn.UnitStoreId;
+ newStockIn.WarrantyNo = stockIn.WarrantyNo;
+
db.SubmitChanges();
}
}
@@ -98,6 +101,8 @@ namespace BLL
newStockIn.HeartNo = stockIn.HeartNo;
newStockIn.SupplierId = stockIn.SupplierId;
newStockIn.UnitStoreId = stockIn.UnitStoreId;
+ newStockIn.WarrantyNo = stockIn.WarrantyNo;
+
db.SubmitChanges();
}
}
@@ -133,6 +138,17 @@ namespace BLL
}
}
+ public static void UpdateStockInIsCheckWarrantyNo(Model.Weld_StockIn stockIn)
+ {
+ Model.SGGLDB db = Funs.DB;
+ Model.Weld_StockIn newStockIn = db.Weld_StockIn.FirstOrDefault(e => e.StockInId == stockIn.StockInId);
+ if (newStockIn != null)
+ {
+ newStockIn.IsCheckWarrantyNo = stockIn.IsCheckWarrantyNo;
+ db.SubmitChanges();
+ }
+ }
+
///
/// 更新附件
///
diff --git a/HJGL_DS/FineUIPro.Web/ErrLog.txt b/HJGL_DS/FineUIPro.Web/ErrLog.txt
index ef4fcd8..708af39 100644
--- a/HJGL_DS/FineUIPro.Web/ErrLog.txt
+++ b/HJGL_DS/FineUIPro.Web/ErrLog.txt
@@ -94,3 +94,24 @@ IP地址:::1
出错时间:07/28/2025 11:13:06
+
+错误信息开始=====>
+错误类型:HttpCompileException
+错误信息:d:\工作\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\WeldMat\Stock\StockIn.aspx(132): error CS1061: “ASP.weldmat_stock_stockin_aspx”不包含“btnMenuConfirm_Click”的定义，并且找不到可接受类型为“ASP.weldmat_stock_stockin_aspx”的第一个参数的扩展方法“btnMenuConfirm_Click”(是否缺少 using 指令或程序集引用?)
+错误堆栈:
+ 在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath)
+ 在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+ 在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+ 在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
+ 在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
+ 在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
+ 在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
+ 在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+ 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+ 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:08/04/2025 15:24:06
+出错文件:http://localhost:64304/WeldMat/Stock/StockIn.aspx
+IP地址:::1
+
+出错时间:08/04/2025 15:24:06
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Excel/焊材入库导入模板.xlsx b/HJGL_DS/FineUIPro.Web/File/Excel/焊材入库导入模板.xlsx
index ef31c603ea4a45c8afbb0bb8c964c4bd81cca759..1384ea2772329312d582e3e8a0f1ea567cbe0a0b 100644
GIT binary patch
delta 7307
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 c5+qC$G4pxqNR6buS
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
X@Sa~D?>`JQs9-EF=uoI>|6cts-5TjV
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockIn.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockIn.aspx
index d47d6b9..1f68beb 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockIn.aspx
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockIn.aspx
@@ -62,7 +62,7 @@
HeaderText="规格" HeaderTextAlign="Center" TextAlign="Center">
+ HeaderText="入库自编号" HeaderTextAlign="Center" TextAlign="Center" SortField="Warrantybook">
@@ -76,6 +76,10 @@
+
+
+
@@ -129,6 +133,9 @@
+
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockIn.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockIn.aspx.cs
index cd5f98f..5930e84 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockIn.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockIn.aspx.cs
@@ -38,7 +38,7 @@ namespace FineUIPro.Web.WeldMat.Stock
///
private void BindGrid()
{
- string strSql = @"SELECT StockIn.StockInId,StockIn.WeldId,StockIn.Amount,StockIn.Weight,Users.UserName AS Materialman,StockIn.InStockDate,
+ string strSql = @"SELECT StockIn.StockInId,StockIn.WeldId,StockIn.Amount,StockIn.Weight,Users.UserName AS Materialman,StockIn.InStockDate,StockIn.WarrantyNo,StockIn.IsCheckWarrantyNo,
ReviewDate,Weld.WeldCode,Weld.WeldName,Weld.WeldSpec,StockIn.Warrantybook, StockIn.HeartNo,
WeldType.WeldTypeName, WeldType.WeldUnit,StockIn.UnitStoreId,(unit.UnitName+'('+store.UnitStoreName+')') AS UnitStoreName,
(CASE WHEN (StockIn.AttachUrl!='' AND StockIn.AttachUrl IS NOT NULL) THEN '是' ELSE '否' END) IsUploadAttach
@@ -50,7 +50,7 @@ namespace FineUIPro.Web.WeldMat.Stock
LEFT JOIN dbo.Base_Unit unit ON unit.UnitId=store.UnitId
WHERE StockIn.Flag='1' ";
List listStr = new List();
-
+
if (!string.IsNullOrEmpty(this.txtWeldName.Text.Trim()))
{
strSql += " AND Weld.WeldName LIKE @WeldName";
@@ -61,7 +61,7 @@ namespace FineUIPro.Web.WeldMat.Stock
strSql += " AND Weld.WeldTypeId = @WeldTypeId";
listStr.Add(new SqlParameter("@WeldTypeId", drpWeldType.SelectedValue));
}
- if (this.drpUnitStoreId.SelectedValue!=BLL.Const._Null)
+ if (this.drpUnitStoreId.SelectedValue != BLL.Const._Null)
{
strSql += " AND StockIn.UnitStoreId = @unitStoreId";
listStr.Add(new SqlParameter("@unitStoreId", drpUnitStoreId.SelectedValue));
@@ -237,7 +237,7 @@ namespace FineUIPro.Web.WeldMat.Stock
var s = BLL.UnitStoreService.GetUnitStoreById(q.UnitStoreId);
//if (s != null && s.UnitId == CurrUser.UnitId)
//{
- PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("StockInEdit.aspx?StockInId={0}", id, "编辑 - ")));
+ PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("StockInEdit.aspx?StockInId={0}", id, "编辑 - ")));
//}
//else
//{
@@ -245,7 +245,41 @@ namespace FineUIPro.Web.WeldMat.Stock
// return;
//}
}
-
+
+ }
+ }
+ else
+ {
+ Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
+ return;
+ }
+ }
+ #endregion
+
+ #region 质保书自编号确认按钮
+ ///
+ /// 质保书自编号确认按钮
+ ///
+ ///
+ ///
+ protected void btnMenuConfirm_Click(object sender, EventArgs e)
+ {
+ if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.CLGL_StockInMenuId, BLL.Const.BtnModify))
+ {
+ if (Grid1.SelectedRowIndexArray.Length == 0)
+ {
+ Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+ return;
+ }
+
+ string id = Grid1.SelectedRowID;
+ if (!string.IsNullOrEmpty(id))
+ {
+ var q = BLL.StockInService.GetStockInById(id);
+ q.IsCheckWarrantyNo = true;
+ BLL.StockInService.UpdateStockInIsCheckWarrantyNo(q);
+ this.BindGrid();
+ ShowNotify("质保书自编号确认成功!", MessageBoxIcon.Success);
}
}
else
@@ -309,7 +343,7 @@ namespace FineUIPro.Web.WeldMat.Stock
private bool judgementDelete(string rowID)
{
string content = string.Empty;
- var q = from x in Funs.DB.Weld_UsingMat where x.StockInId==rowID select x;
+ var q = from x in Funs.DB.Weld_UsingMat where x.StockInId == rowID select x;
if (q.Count() > 0)
{
content = "该入库材料已有领用，不能删除！";
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockIn.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockIn.aspx.designer.cs
index c186e0f..7f3da53 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockIn.aspx.designer.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockIn.aspx.designer.cs
@@ -192,6 +192,15 @@ namespace FineUIPro.Web.WeldMat.Stock {
///
protected global::FineUIPro.MenuButton btnMenuEdit;
+ ///
+ /// btnMenuConfirm 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.MenuButton btnMenuConfirm;
+
///
/// btnMenuDelete 控件。
///
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx
index 9af5bc1..56c5361 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx
@@ -88,11 +88,22 @@
+
+
+
+
+
+
+
+
+
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx.cs
index eecdfdf..e927895 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx.cs
@@ -134,6 +134,7 @@ namespace FineUIPro.Web.WeldMat.Stock
this.txtRecycleAmount.Text = stockIn.RecycleAmount.Value.ToString("0.####");
}
}
+ this.txtWarrantyNo.Text = stockIn.WarrantyNo;
}
}
}
@@ -192,7 +193,7 @@ namespace FineUIPro.Web.WeldMat.Stock
stockIn.Warrantybook = this.txtWarrantybook.Text.Trim();
//stockIn.Number = txtNumber.Text.Trim();
stockIn.HeartNo = txtHeartNo.Text.Trim();
-
+ stockIn.WarrantyNo = txtWarrantyNo.Text.Trim();
if (this.drpUnitStore.SelectedValue != BLL.Const._Null)
{
stockIn.UnitStoreId = this.drpUnitStore.SelectedValue;
@@ -267,6 +268,30 @@ namespace FineUIPro.Web.WeldMat.Stock
PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/WeldMat/StockIn&menuId={1}&edit={2}", this.StockInId, Const.CLGL_StockInMenuId, edit)));
}
}
+
+ ///
+ /// 上传附件资源
+ ///
+ ///
+ ///
+ protected void btnAttachUrl2_Click(object sender, EventArgs e)
+ {
+ string edit = "0"; // 表示能打开附件上传窗口，但不能上传附件
+ if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.CLGL_StockInMenuId, BLL.Const.BtnSave))
+ {
+ if (string.IsNullOrEmpty(this.StockInId))
+ {
+ if (this.hdWeldId.Text == string.Empty)
+ {
+ Alert.ShowInTop("请选择焊材牌号！", MessageBoxIcon.Warning);
+ return;
+ }
+ SaveData();
+ }
+ edit = "1";
+ PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/WeldMat/StockIn&menuId={1}&edit={2}", this.StockInId + "W", Const.CLGL_StockInMenuId, edit)));
+ }
+ }
#endregion
#region 查找焊材信息
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx.designer.cs
index cb05c14..7694809 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx.designer.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx.designer.cs
@@ -201,6 +201,15 @@ namespace FineUIPro.Web.WeldMat.Stock {
///
protected global::FineUIPro.DatePicker txtReviewDate;
+ ///
+ /// txtWarrantyNo 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtWarrantyNo;
+
///
/// UploadAttach 控件。
///
@@ -210,6 +219,15 @@ namespace FineUIPro.Web.WeldMat.Stock {
///
protected global::FineUIPro.LinkButton UploadAttach;
+ ///
+ /// UploadAttach2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.LinkButton UploadAttach2;
+
///
/// Toolbar2 控件。
///
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInImport.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInImport.aspx.cs
index 7da4766..f6f24cd 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInImport.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInImport.aspx.cs
@@ -281,6 +281,14 @@ namespace FineUIPro.Web.WeldMat.Stock
{
errorInfos += (i + 2) + "行, [生产时间] 不能为空";
}
+ if (ds.Tables[0].Rows[i]["质保书自编号"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["质保书自编号"].ToString()))
+ {
+ stockIn.WarrantyNo = ds.Tables[0].Rows[i]["质保书自编号"].ToString();
+ }
+ else
+ {
+ errorInfos += (i + 2) + "行, [质保书自编号] 不能为空";
+ }
stockIn.StockInId = SQLHelper.GetNewID(typeof(Model.Weld_StockIn));
stockIn.Flag = "1";//入库
diff --git a/HJGL_DS/Model/Model.cs b/HJGL_DS/Model/Model.cs
index 6390973..c688674 100644
--- a/HJGL_DS/Model/Model.cs
+++ b/HJGL_DS/Model/Model.cs
@@ -110342,6 +110342,10 @@ namespace Model
private System.Nullable _MoveInDate;
+ private string _WarrantyNo;
+
+ private System.Nullable _IsCheckWarrantyNo;
+
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -110392,6 +110396,10 @@ namespace Model
partial void OnMoveInManIdChanged();
partial void OnMoveInDateChanging(System.Nullable value);
partial void OnMoveInDateChanged();
+ partial void OnWarrantyNoChanging(string value);
+ partial void OnWarrantyNoChanged();
+ partial void OnIsCheckWarrantyNoChanging(System.Nullable value);
+ partial void OnIsCheckWarrantyNoChanged();
#endregion
public Weld_StockIn()
@@ -110859,6 +110867,46 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WarrantyNo", DbType="NVarChar(50)")]
+ public string WarrantyNo
+ {
+ get
+ {
+ return this._WarrantyNo;
+ }
+ set
+ {
+ if ((this._WarrantyNo != value))
+ {
+ this.OnWarrantyNoChanging(value);
+ this.SendPropertyChanging();
+ this._WarrantyNo = value;
+ this.SendPropertyChanged("WarrantyNo");
+ this.OnWarrantyNoChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsCheckWarrantyNo", DbType="Bit")]
+ public System.Nullable IsCheckWarrantyNo
+ {
+ get
+ {
+ return this._IsCheckWarrantyNo;
+ }
+ set
+ {
+ if ((this._IsCheckWarrantyNo != value))
+ {
+ this.OnIsCheckWarrantyNoChanging(value);
+ this.SendPropertyChanging();
+ this._IsCheckWarrantyNo = value;
+ this.SendPropertyChanged("IsCheckWarrantyNo");
+ this.OnIsCheckWarrantyNoChanged();
+ }
+ }
+ }
+
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;