diff --git a/APP/QMAPP.Web/App_Data/MainPower.xml b/APP/QMAPP.Web/App_Data/MainPower.xml
index 5ff8ee0..6fae65e 100644
--- a/APP/QMAPP.Web/App_Data/MainPower.xml
+++ b/APP/QMAPP.Web/App_Data/MainPower.xml
@@ -278,6 +278,11 @@
+
+
+
+
+
diff --git a/APP/QMAPP.Web/App_Data/Menu.xml b/APP/QMAPP.Web/App_Data/Menu.xml
index dca7b2c..d2795e0 100644
--- a/APP/QMAPP.Web/App_Data/Menu.xml
+++ b/APP/QMAPP.Web/App_Data/Menu.xml
@@ -453,7 +453,8 @@
+
-
+ -->
-
+
diff --git a/APPMD/QMAPP.MD.Web/Web.config b/APPMD/QMAPP.MD.Web/Web.config
index 24b8e5c..dfba128 100644
--- a/APPMD/QMAPP.MD.Web/Web.config
+++ b/APPMD/QMAPP.MD.Web/Web.config
@@ -31,16 +31,17 @@
-
+
+
-
-
+
+
+ -->
diff --git a/APPMESReport/QMAPP.MESReport.DAL/LineQTY/LineDWQTYCountDAL.cs b/APPMESReport/QMAPP.MESReport.DAL/LineQTY/LineDWQTYCountDAL.cs
index d8e4c2c..fca2410 100644
--- a/APPMESReport/QMAPP.MESReport.DAL/LineQTY/LineDWQTYCountDAL.cs
+++ b/APPMESReport/QMAPP.MESReport.DAL/LineQTY/LineDWQTYCountDAL.cs
@@ -109,6 +109,7 @@ namespace QMAPP.MESReport.DAL.LineQTY
,tsa.[EQUIPMENT_CODE]
,tsa.[WORKCELL_CODE]
,tsa.[MATRIAL_CODE] AS [MATERIAL_CODE]
+ ,ma.MATERIAL_NAME
,tsa.[SHIFT_CODE]
,CONVERT(VARCHAR(10),tsa.[STATIS_DATE],120) as STATIS_DATE
,tsa.[QTY]
@@ -126,7 +127,9 @@ namespace QMAPP.MESReport.DAL.LineQTY
sqlBuilder.AppendLine("on tmw.WORKCELL_CODE =tsa.WORKCELL_CODE ");
sqlBuilder.AppendLine("inner join T_MD_PROCESS_ROUTE_WORKCELL_SEQ tmprw ");
sqlBuilder.AppendLine("on tmprw.WORKCELL_CODE =tsa.WORKCELL_CODE ");
-
+ sqlBuilder.AppendLine("inner join T_MD_MATERIAL ma ");
+ sqlBuilder.AppendLine("on ma.MATERIAL_CODE =tsa.MATRIAL_CODE ");
+
if (string.IsNullOrEmpty(condition.START_DATE) == false)
{
whereBuilder.Append(" AND STATIS_DATE >= @START_DATE ");
@@ -189,14 +192,14 @@ namespace QMAPP.MESReport.DAL.LineQTY
try
{
//构成查询语句
- sqlBuilder.Append("select * from T_SA_WORKCELLQTYCOUNT");
+ sqlBuilder.Append("select tsa.*,ma.MATERIAL_NAME from T_SA_WORKCELLQTYCOUNT as tsa inner join T_MD_MATERIAL ma on ma.MATERIAL_CODE = tsa.MATRIAL_CODE ");
if (whereBuilder.Length > 0)
{
sqlBuilder.Append(whereBuilder.ToString());
}
- sqlBuilder.Append(" ORDER BY STATIS_DATE DESC ");
+ sqlBuilder.Append(" ORDER BY tsa.STATIS_DATE DESC ");
using (IDataSession session = AppDataFactory.CreateMainSession())
{
diff --git a/APPMESReport/QMAPP.MESReport.Entity/LINEQTY/LineDayQTYCount.cs b/APPMESReport/QMAPP.MESReport.Entity/LINEQTY/LineDayQTYCount.cs
index 83f90b5..fd4b9cd 100644
--- a/APPMESReport/QMAPP.MESReport.Entity/LINEQTY/LineDayQTYCount.cs
+++ b/APPMESReport/QMAPP.MESReport.Entity/LINEQTY/LineDayQTYCount.cs
@@ -58,5 +58,7 @@ namespace QMAPP.MESReport.Entity.LineQTY
public string WORKCENTER_NAME { get; set; }
+ public string MATERIAL_NAME { get; set; }
+
}
}
diff --git a/APPMESReport/QMAPP.MESReport.Web/Models/LineQTY/LineDWQTYModel.cs b/APPMESReport/QMAPP.MESReport.Web/Models/LineQTY/LineDWQTYModel.cs
index b783cbf..85a7d68 100644
--- a/APPMESReport/QMAPP.MESReport.Web/Models/LineQTY/LineDWQTYModel.cs
+++ b/APPMESReport/QMAPP.MESReport.Web/Models/LineQTY/LineDWQTYModel.cs
@@ -121,9 +121,18 @@ namespace QMAPP.MESReport.Web.Models.LineQTY
[Description("物料号")]
[HTMLInput(UpdateRead = false, required = false, MaxLength = 50, Width = 120)]
[InputType(inputType.text)]
- [DGColumn(frozenColumns = false, Sortable = true, Width = 150, DataAlign = DataAlign.center)]
+ [DGColumn(frozenColumns = false, Sortable = true, Width = 200, DataAlign = DataAlign.center)]
public string MATERIAL_CODE { get; set; }
+ ///
+ ///物料名称
+ ///
+ [Description("物料名称")]
+ [HTMLInput(UpdateRead = false, required = false, MaxLength = 50, Width = 120)]
+ [InputType(inputType.text)]
+ [DGColumn(frozenColumns = false, Sortable = true, Width = 250, DataAlign = DataAlign.center)]
+ public string MATERIAL_NAME { get; set; }
+
///
///工序合格数
///
diff --git a/APPMESReport/QMAPP.MESReport.Web/QMAPP.MESReport.Web.csproj b/APPMESReport/QMAPP.MESReport.Web/QMAPP.MESReport.Web.csproj
index a7febb8..dc7f0fb 100644
--- a/APPMESReport/QMAPP.MESReport.Web/QMAPP.MESReport.Web.csproj
+++ b/APPMESReport/QMAPP.MESReport.Web/QMAPP.MESReport.Web.csproj
@@ -25,6 +25,12 @@
SAK
SAK
SAK
+
+
+
+
+
+
true
@@ -46,6 +52,9 @@
AllRules.ruleset
+
+ ..\..\DLL\EmitMapper.dll
+
False
..\..\DLL\log4net.dll
@@ -540,6 +549,7 @@
PreserveNewest
+
diff --git a/APPMESReport/QMAPP.MESReport.Web/Temp/ec10e4ca-e6a1-4ce0-a5a2-dceeb4fd79a7.xls b/APPMESReport/QMAPP.MESReport.Web/Temp/ec10e4ca-e6a1-4ce0-a5a2-dceeb4fd79a7.xls
new file mode 100644
index 0000000..411274c
Binary files /dev/null and b/APPMESReport/QMAPP.MESReport.Web/Temp/ec10e4ca-e6a1-4ce0-a5a2-dceeb4fd79a7.xls differ
diff --git a/APPQ5/QMAPP.FJC.BLL/Operation/MainOperationBLL.cs b/APPQ5/QMAPP.FJC.BLL/Operation/MainOperationBLL.cs
index c82ee58..05e9d28 100644
--- a/APPQ5/QMAPP.FJC.BLL/Operation/MainOperationBLL.cs
+++ b/APPQ5/QMAPP.FJC.BLL/Operation/MainOperationBLL.cs
@@ -2825,6 +2825,7 @@ namespace QMAPP.FJC.BLL.Operation
proCodeInfo = new PrintCodeDAL().GetPrintCodeInfo(proCodeInfo);
if (proCodeInfo != null)
{
+ var sssss = proCodeInfo.UPDATETIME.ToShortDateString();
if (proCodeInfo.UPDATETIME.ToShortDateString() != DateTime.Now.ToShortDateString())
{
proCodeInfo.SERIAL_NUM = 0;
diff --git a/APPQ5/QMAPP.FJC.Entity/Operation/SignInfo.cs b/APPQ5/QMAPP.FJC.Entity/Operation/SignInfo.cs
index 564af08..12a8ce9 100644
--- a/APPQ5/QMAPP.FJC.Entity/Operation/SignInfo.cs
+++ b/APPQ5/QMAPP.FJC.Entity/Operation/SignInfo.cs
@@ -56,9 +56,9 @@ namespace QMAPP.FJC.Entity.Operation
public string EndTime { get; set; }
///
- ///停工、复工时间
+ ///停工时间
///
- [DBColumn(ColumnName = "SIGNDATE", DataType = DbType.DateTime2)]
+ [DBColumn(ColumnName = "SIGNDATEBEGIN", DataType = DbType.DateTime2)]
public string SIGNDATE { get; set; }
}
}
diff --git a/APPQ5/QMAPP.FJC.Web/App_Data/Power.xml b/APPQ5/QMAPP.FJC.Web/App_Data/Power.xml
index 2a6e5d7..e7b85a9 100644
--- a/APPQ5/QMAPP.FJC.Web/App_Data/Power.xml
+++ b/APPQ5/QMAPP.FJC.Web/App_Data/Power.xml
@@ -279,6 +279,11 @@
+
+
+
+
+
diff --git a/APPQ5/QMAPP.FJC.Web/Web.config b/APPQ5/QMAPP.FJC.Web/Web.config
index 6d0a56a..691353a 100644
--- a/APPQ5/QMAPP.FJC.Web/Web.config
+++ b/APPQ5/QMAPP.FJC.Web/Web.config
@@ -36,12 +36,12 @@
-
+
+-->
-
+