From d1d6353e0a31cb08355d69eb5f512c8b25bbf910 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Thu, 9 Jan 2025 16:04:08 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=A7=BB=E4=BA=A4=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=EF=BC=8C=E5=B0=BE=E9=A1=B9=E7=AE=A1=E7=90=86=E5=AF=BC=E5=87=BA?=
=?UTF-8?q?=E6=94=AF=E6=8C=81=E4=B8=8D=E5=B8=A6=E5=9B=BE=E7=89=87=E5=AF=BC?=
=?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx | 8 ++++++--
SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs | 8 ++++++--
.../Transfer/PunchlistFrom.aspx.designer.cs | 13 +++++++++++--
3 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
index fc6e24b4..c66ad357 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
@@ -74,11 +74,15 @@
-
-
+
+
+
+
+
+
<%--
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
index 97e84cf7..d40e559b 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
@@ -457,8 +457,12 @@ namespace FineUIPro.Web.Transfer
NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0);
- var pcList = Funs.DB.AttachFile.Where(p => p.MenuId == BLL.Const.PunchlistFromMenuId && p.AttachUrl != null && p.AttachUrl != "").ToList();
-
+ //var pcList = Funs.DB.AttachFile.Where(p => p.MenuId == BLL.Const.PunchlistFromMenuId && p.AttachUrl != null && p.AttachUrl != "").ToList();
+ var pcList = new List();
+ if (rbOutType.SelectedValue == "1")
+ {//导出带图片
+ pcList = Funs.DB.AttachFile.Where(p => p.MenuId == BLL.Const.PunchlistFromMenuId && p.AttachUrl != null && p.AttachUrl != "").ToList();
+ }
int i = 2;
foreach (DataRow tbRow in tb.Rows)
{
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
index a4598406..66400c38 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
@@ -195,13 +195,13 @@ namespace FineUIPro.Web.Transfer
protected global::FineUIPro.DropDownList ddlMatI;
///
- /// btnImport 控件。
+ /// rbOutType 控件。
///
///
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::FineUIPro.Button btnImport;
+ protected global::FineUIPro.RadioButtonList rbOutType;
///
/// btnOut 控件。
@@ -212,6 +212,15 @@ namespace FineUIPro.Web.Transfer
///
protected global::FineUIPro.Button btnOut;
+ ///
+ /// btnImport 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnImport;
+
///
/// lbPhotoesImageUrl 控件。
///
From 766b96b2ec0e4357126846329e0768f57e960467 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Thu, 9 Jan 2025 16:29:50 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=A7=BB=E4=BA=A4=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=EF=BC=8C=E7=AE=A1=E9=81=93=E5=AF=BC=E5=85=A5=E8=A1=A5=E5=85=85?=
=?UTF-8?q?=E6=80=BB=E8=BE=BE=E5=9B=A0=E6=95=B0=E3=80=81=E8=BE=BE=E5=9B=A0?=
=?UTF-8?q?=E6=95=B0=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Transfer/PipingDataIn.aspx.cs | 25 +++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs
index fd63a60a..feb1e395 100644
--- a/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs
@@ -169,6 +169,31 @@ namespace FineUIPro.Web.Transfer
{
result += (i + 3).ToString() + "," + "Test Package No" + "," + "不能为空！" + "|";
}
+ string obj1 = pds.Rows[i][5].ToString();
+ string obj2 = pds.Rows[i][6].ToString();
+ string obj3 = pds.Rows[i][7].ToString();
+ if (!string.IsNullOrEmpty(obj1))
+ {
+ try
+ {
+ Decimal date = Convert.ToDecimal(obj1.Trim());
+ }
+ catch (Exception)
+ {
+ result += (i + 3).ToString() + "," + "总达因数" + "," + "请填写数值！" + "|";
+ }
+ }
+ if (!string.IsNullOrEmpty(obj2))
+ {
+ try
+ {
+ Decimal date = Convert.ToDecimal(obj2.Trim());
+ }
+ catch (Exception)
+ {
+ result += (i + 3).ToString() + "," + "完成达因数" + "," + "请填写数值！" + "|";
+ }
+ }
}
if (!string.IsNullOrEmpty(result))
From 330402c752529797c1e6770cca59a0e62470ee2c Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Tue, 14 Jan 2025 09:40:45 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E7=9D=A3=E6=9F=A5=E4=BA=BA=E5=91=98?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SGGL/BLL/SysManage/UserService.cs | 2 +
SGGL/BLL/WebService/CNCECHSSEWebService.cs | 32 ++
SGGL/FineUIPro.Web/SysManage/UserList.aspx | 29 +-
SGGL/FineUIPro.Web/SysManage/UserList.aspx.cs | 20 +
.../SysManage/UserList.aspx.designer.cs | 59 ++-
.../FineUIPro.Web/SysManage/UserListEdit.aspx | 57 +--
.../SysManage/UserListEdit.aspx.cs | 3 +
.../SysManage/UserListEdit.aspx.designer.cs | 67 +--
.../APIItem/InspectionBrigadeUserItem.cs | 91 ++++
SGGL/Model/Model.cs | 414 +++---------------
SGGL/Model/Model.csproj | 1 +
11 files changed, 320 insertions(+), 455 deletions(-)
create mode 100644 SGGL/Model/APIItem/InspectionBrigadeUserItem.cs
diff --git a/SGGL/BLL/SysManage/UserService.cs b/SGGL/BLL/SysManage/UserService.cs
index 685784b1..02318197 100644
--- a/SGGL/BLL/SysManage/UserService.cs
+++ b/SGGL/BLL/SysManage/UserService.cs
@@ -238,6 +238,7 @@ namespace BLL
ViceCNProfessionalId = user.ViceCNProfessionalId,
WorkNo = user.WorkNo,
HomePageType = user.HomePageType,
+ IsInspectionBrigade = user.IsInspectionBrigade
};
db.Sys_User.InsertOnSubmit(newUser);
db.SubmitChanges();
@@ -319,6 +320,7 @@ namespace BLL
newUser.ViceCNProfessionalId = user.ViceCNProfessionalId;
newUser.WorkNo = user.WorkNo;
newUser.HomePageType = user.HomePageType;
+ newUser.IsInspectionBrigade = user.IsInspectionBrigade;
Funs.DB.SubmitChanges();
}
}
diff --git a/SGGL/BLL/WebService/CNCECHSSEWebService.cs b/SGGL/BLL/WebService/CNCECHSSEWebService.cs
index c90d4d8b..f17852f2 100644
--- a/SGGL/BLL/WebService/CNCECHSSEWebService.cs
+++ b/SGGL/BLL/WebService/CNCECHSSEWebService.cs
@@ -3604,6 +3604,38 @@
return responeData.code;
}
#endregion
+
+ #region 督查人员推送
+
+ public static int PushInspectionBrigadeUser()
+ {
+
+ string baseurl = "/api/InspectionBrigade/SaveInspectionBrigadeUser";
+ var CollCropCode = BLL.CommonService.GetIsThisUnit()?.CollCropCode;
+ var userList = from x in Funs.DB.Sys_User
+ where x.IsInspectionBrigade == true
+ select new Model.InspectionBrigadeUserItem()
+ {
+
+ UserId = x.UserId,
+ UserName = x.UserName,
+ Sex = x.Sex,
+ Account = x.Account,
+ Password = x.Password,
+ IdentityCard = x.IdentityCard,
+ Telephone = x.Telephone,
+ CollCropCode = CollCropCode
+
+ };
+
+ var resultJsonReport = JsonConvert.SerializeObject(userList.ToList());
+ resultJsonReport = "{\"InspectionBrigadeUserItems\":" + resultJsonReport.Replace("}{", ",") + "}";
+ var responeData = BLL.ServerService.PushCNCEC(resultJsonReport, baseurl);
+ return responeData.code;
+ }
+
+
+ #endregion
}
diff --git a/SGGL/FineUIPro.Web/SysManage/UserList.aspx b/SGGL/FineUIPro.Web/SysManage/UserList.aspx
index 76bc48bf..9faf7a56 100644
--- a/SGGL/FineUIPro.Web/SysManage/UserList.aspx
+++ b/SGGL/FineUIPro.Web/SysManage/UserList.aspx
@@ -26,27 +26,30 @@
OnRowDoubleClick="Grid1_RowDoubleClick" Width="980px" EnableTextSelection="True">
-
+
-
+
-
+ EnableEdit="true" Width="190px" LabelWidth="50px">
+
-
+
-
-
+
+
+
@@ -57,15 +60,15 @@
FieldType="String" HeaderText="姓名" HeaderTextAlign="Center" TextAlign="Left">
+ FieldType="String" HeaderText="单位" HeaderTextAlign="Center" TextAlign="Left">
+ FieldType="String" HeaderText="部门" HeaderTextAlign="Center" TextAlign="Left">
- <%--
--%>
- <%--
--%>
@@ -95,7 +98,7 @@
+ OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
@@ -108,7 +111,7 @@
-
+