列算法修改

DK.Client/ReportModule/R01/M01/F_RPT_010105.Designer.cs

@@ -517,9 +517,10 @@
 			this.mingroutingcount.DataPropertyName = "mingroutingcount";
 			dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
 			this.mingroutingcount.DefaultCellStyle = dataGridViewCellStyle5;
-			this.mingroutingcount.HeaderText = "期初注浆次数";
+			this.mingroutingcount.HeaderText = "期初累积注浆次数";
 			this.mingroutingcount.Name = "mingroutingcount";
 			this.mingroutingcount.ReadOnly = true;
+			this.mingroutingcount.Width = 120;
 			// 
 			// mingresidue
 			// 
@@ -542,9 +543,10 @@
 			this.maxGroutingCount.DataPropertyName = "maxGroutingCount";
 			dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
 			this.maxGroutingCount.DefaultCellStyle = dataGridViewCellStyle7;
-			this.maxGroutingCount.HeaderText = "期末注浆次数";
+			this.maxGroutingCount.HeaderText = "期末剩余注浆次数";
 			this.maxGroutingCount.Name = "maxGroutingCount";
 			this.maxGroutingCount.ReadOnly = true;
+			this.maxGroutingCount.Width = 120;
 			// 
 			// leftcount
 			// 

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -778,9 +778,13 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 													standardgroutingcount,
 													ENDUSEDDATE,
 													standardgroutingcount - mingroutingcount - sumgroutingcount leftcount,
-													CASE WHEN gmouldstatusname <> '正常' AND standardgroutingcount-sumgroutingcount+mingroutingcount > standardgroutingcount THEN 0 
-															 WHEN gmouldstatusname <> '正常' AND standardgroutingcount-sumgroutingcount+mingroutingcount < standardgroutingcount THEN standardgroutingcount-sumgroutingcount+mingroutingcount 
-													ELSE sumgroutingcount END financecount,
+													CASE WHEN gmouldstatusname = '变产' AND standardgroutingcount-(sumgroutingcount+mingroutingcount) > standardgroutingcount THEN 0 
+															 WHEN gmouldstatusname = '变产' AND standardgroutingcount-(sumgroutingcount+mingroutingcount) < standardgroutingcount THEN standardgroutingcount-sumgroutingcount+mingroutingcount 
+															 WHEN gmouldstatusname = '卸模' AND standardgroutingcount - mingroutingcount < 0 THEN 0
+															 WHEN gmouldstatusname = '卸模' AND standardgroutingcount - mingroutingcount > 0 THEN standardgroutingcount - mingroutingcount
+															 WHEN gmouldstatusname = '正常' AND standardgroutingcount - mingroutingcount > 0 AND standardgroutingcount - mingroutingcount - sumgroutingcount < 0 THEN standardgroutingcount - mingroutingcount
+															 WHEN gmouldstatusname = '正常' AND standardgroutingcount - mingroutingcount < 0 THEN 0
+															 ELSE sumgroutingcount END financecount,
 													standardgroutingcount - mingroutingcount mingresidue 
 												FROM
 													(