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

1

This commit is contained in:
高飞 2025-08-05 10:51:12 +08:00
parent 00a98811a4
commit 3399396035
14 changed files with 219 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -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

3
DataBase/版本日志/HJGLDB_DS_2025-08-04_gf.sql Normal file
View File

@ -0,0 +1,3 @@
alter table Weld_StockIn add WarrantyNo nvarchar(50) null
alter table Weld_StockIn add IsCheckWarrantyNo bit null
GO

12
HJGL_DS/BLL/Common/SysManage/Sys_UserSettingsService.cs
View File

@ -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);
}
}
}
}

16
HJGL_DS/BLL/WeldMat/Stock/StockInService.cs
View File

@ -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();
}
}
/// <summary>
/// 更新附件
/// </summary>

21
HJGL_DS/FineUIPro.Web/ErrLog.txt
View File

@ -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

BIN
HJGL_DS/FineUIPro.Web/File/Excel/焊材入库导入模板.xlsx
View File

Binary file not shown.

9
HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockIn.aspx
View File

@ -62,7 +62,7 @@
HeaderText="规格" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="Warrantybook" DataField="Warrantybook" FieldType="String"
HeaderText="入库自编号" HeaderTextAlign="Center" TextAlign="Center" SortField="WeldCode">
HeaderText="入库自编号" HeaderTextAlign="Center" TextAlign="Center" SortField="Warrantybook">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="WeldTypeName" DataField="WeldTypeName" FieldType="String"
HeaderText="类型" HeaderTextAlign="Center" TextAlign="Center">
@ -76,6 +76,10 @@
<f:RenderField Width="80px" ColumnID="Weight" DataField="Weight" FieldType="Float"
HeaderText="重量" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="WarrantyNo" DataField="WarrantyNo" FieldType="String"
HeaderText="质保书自编号" HeaderTextAlign="Center" TextAlign="Center" SortField="WarrantyNo">
</f:RenderField>
<f:CheckBoxField Width="80px" RenderAsStaticField="true" TextAlign="Center" DataField="IsCheckWarrantyNo" HeaderText="是否确认" />
<f:RenderField Width="180px" ColumnID="UnitStoreName" DataField="UnitStoreName" FieldType="String"
HeaderText="单位仓库" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
@ -129,6 +133,9 @@
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
runat="server" Text="编辑" Icon="Pencil">
</f:MenuButton>
<f:MenuButton ID="btnMenuConfirm" OnClick="btnMenuConfirm_Click" EnablePostBack="true"
runat="server" Text="质保书自编号确认" Icon="Pencil">
</f:MenuButton>
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server" Text="删除" Icon="Delete">
</f:MenuButton>

46
HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockIn.aspx.cs
View File

@ -38,7 +38,7 @@ namespace FineUIPro.Web.WeldMat.Stock
/// </summary>
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<SqlParameter> listStr = new List<SqlParameter>();
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 质保书自编号确认按钮
/// <summary>
/// 质保书自编号确认按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
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 = "该入库材料已有领用，不能删除！";

9
HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockIn.aspx.designer.cs generated
View File

@ -192,6 +192,15 @@ namespace FineUIPro.Web.WeldMat.Stock {
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuEdit;
/// <summary>
/// btnMenuConfirm 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuConfirm;
/// <summary>
/// btnMenuDelete 控件。
/// </summary>

11
HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx
View File

@ -88,11 +88,22 @@
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtWarrantyNo" runat="server" Label="质保书自编号" LabelAlign="Right" Required="true" LabelWidth="120px"
ShowRedStar="true">
</f:TextBox>
<f:Label runat="server"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:LinkButton ID="UploadAttach" runat="server" Label="复验附件" Text="上传和查看" OnClick="btnAttachUrl_Click"
LabelAlign="Right">
</f:LinkButton>
<f:LinkButton ID="UploadAttach2" runat="server" Label="质保书附件" Text="上传和查看" OnClick="btnAttachUrl2_Click"
LabelAlign="Right">
</f:LinkButton>
</Items>
</f:FormRow>
</Rows>

27
HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx.cs
View File

@ -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)));
}
}
/// <summary>
/// 上传附件资源
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
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 查找焊材信息

18
HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx.designer.cs generated
View File

@ -201,6 +201,15 @@ namespace FineUIPro.Web.WeldMat.Stock {
/// </remarks>
protected global::FineUIPro.DatePicker txtReviewDate;
/// <summary>
/// txtWarrantyNo 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWarrantyNo;
/// <summary>
/// UploadAttach 控件。
/// </summary>
@ -210,6 +219,15 @@ namespace FineUIPro.Web.WeldMat.Stock {
/// </remarks>
protected global::FineUIPro.LinkButton UploadAttach;
/// <summary>
/// UploadAttach2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.LinkButton UploadAttach2;
/// <summary>
/// Toolbar2 控件。
/// </summary>

8
HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInImport.aspx.cs
View File

@ -281,6 +281,14 @@ namespace FineUIPro.Web.WeldMat.Stock
{
errorInfos += (i + 2) + "行, [生产时间] 不能为空</br>";
}
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) + "行, [质保书自编号] 不能为空</br>";
}
stockIn.StockInId = SQLHelper.GetNewID(typeof(Model.Weld_StockIn));
stockIn.Flag = "1";//入库

48
HJGL_DS/Model/Model.cs
View File

@ -110342,6 +110342,10 @@ namespace Model
private System.Nullable<System.DateTime> _MoveInDate;
private string _WarrantyNo;
private System.Nullable<bool> _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<System.DateTime> value);
partial void OnMoveInDateChanged();
partial void OnWarrantyNoChanging(string value);
partial void OnWarrantyNoChanged();
partial void OnIsCheckWarrantyNoChanging(System.Nullable<bool> 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<bool> 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;