DK.Client/PMModule/F_PM_2701.Designer.cs

@@ -36,6 +36,8 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
             this.gbSelect = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
+            this.cbWorkShop = new Dongke.IBOSS.PRD.Basics.BaseControls.DKListBoxComboBox();
+            this.lblWorkShop = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.c_CheckBox1 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_CheckBox();
             this.GroutingDateEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
             this.c_Label2 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
@@ -104,8 +106,6 @@
             this.ScrapProductID = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.AuditStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ScrapType = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.cbWorkShop = new Dongke.IBOSS.PRD.Basics.BaseControls.DKListBoxComboBox();
-            this.lblWorkShop = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.gbSelect.SuspendLayout();
             this.tsrOperate.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvScrapProduct)).BeginInit();
@@ -159,6 +159,39 @@
             this.gbSelect.Text = "查询条件 ▼";
             this.gbSelect.Enter += new System.EventHandler(this.gbSelect_Enter);
             // 
+            // cbWorkShop
+            // 
+            this.cbWorkShop.BackColor = System.Drawing.SystemColors.Window;
+            this.cbWorkShop.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.cbWorkShop.DataSource = null;
+            this.cbWorkShop.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cbWorkShop.FormattingEnabled = true;
+            // 
+            // 
+            // 
+            this.cbWorkShop.ListBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.cbWorkShop.ListBox.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cbWorkShop.ListBox.Location = new System.Drawing.Point(0, 0);
+            this.cbWorkShop.ListBox.Name = "";
+            this.cbWorkShop.ListBox.Size = new System.Drawing.Size(132, 136);
+            this.cbWorkShop.ListBox.TabIndex = 0;
+            this.cbWorkShop.Location = new System.Drawing.Point(896, 43);
+            this.cbWorkShop.Name = "cbWorkShop";
+            this.cbWorkShop.Size = new System.Drawing.Size(134, 20);
+            this.cbWorkShop.TabIndex = 109;
+            // 
+            // lblWorkShop
+            // 
+            this.lblWorkShop.AutoSize = true;
+            this.lblWorkShop.BackColor = System.Drawing.Color.Transparent;
+            this.lblWorkShop.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblWorkShop.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.lblWorkShop.Location = new System.Drawing.Point(840, 47);
+            this.lblWorkShop.Name = "lblWorkShop";
+            this.lblWorkShop.Size = new System.Drawing.Size(29, 12);
+            this.lblWorkShop.TabIndex = 108;
+            this.lblWorkShop.Text = "车间";
+            // 
             // c_CheckBox1
             // 
             this.c_CheckBox1.AutoSize = true;
@@ -718,7 +751,7 @@
             // 
             // COM
             // 
-            this.COM.DataPropertyName = "COM";
+            this.COM.DataPropertyName = "统计方式";
             this.COM.HeaderText = "统计方式";
             this.COM.Name = "COM";
             this.COM.ReadOnly = true;
@@ -1003,39 +1036,6 @@
             this.ScrapType.Visible = false;
             this.ScrapType.Width = 125;
             // 
-            // cbWorkShop
-            // 
-            this.cbWorkShop.BackColor = System.Drawing.SystemColors.Window;
-            this.cbWorkShop.BackgroundColor = System.Drawing.SystemColors.Window;
-            this.cbWorkShop.DataSource = null;
-            this.cbWorkShop.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cbWorkShop.FormattingEnabled = true;
-            // 
-            // 
-            // 
-            this.cbWorkShop.ListBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.cbWorkShop.ListBox.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cbWorkShop.ListBox.Location = new System.Drawing.Point(0, 0);
-            this.cbWorkShop.ListBox.Name = "";
-            this.cbWorkShop.ListBox.Size = new System.Drawing.Size(132, 136);
-            this.cbWorkShop.ListBox.TabIndex = 0;
-            this.cbWorkShop.Location = new System.Drawing.Point(896, 43);
-            this.cbWorkShop.Name = "cbWorkShop";
-            this.cbWorkShop.Size = new System.Drawing.Size(134, 20);
-            this.cbWorkShop.TabIndex = 109;
-            // 
-            // lblWorkShop
-            // 
-            this.lblWorkShop.AutoSize = true;
-            this.lblWorkShop.BackColor = System.Drawing.Color.Transparent;
-            this.lblWorkShop.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblWorkShop.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblWorkShop.Location = new System.Drawing.Point(840, 47);
-            this.lblWorkShop.Name = "lblWorkShop";
-            this.lblWorkShop.Size = new System.Drawing.Size(29, 12);
-            this.lblWorkShop.TabIndex = 108;
-            this.lblWorkShop.Text = "车间";
-            // 
             // F_PM_2701
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1098,6 +1098,8 @@
 		private Basics.BaseControls.C_DateTimePicker GroutingDateEnd;
 		private Basics.BaseControls.C_Label c_Label2;
 		private Basics.BaseControls.C_DateTimePicker GroutingDateStart;
+        private Basics.BaseControls.DKListBoxComboBox cbWorkShop;
+        private Basics.BaseControls.C_Label lblWorkShop;
         private System.Windows.Forms.DataGridViewTextBoxColumn GoodsID;
         private System.Windows.Forms.DataGridViewTextBoxColumn COM;
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineCode;
@@ -1129,7 +1131,5 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn ScrapProductID;
         private System.Windows.Forms.DataGridViewTextBoxColumn AuditStatus;
         private System.Windows.Forms.DataGridViewTextBoxColumn ScrapType;
-        private Basics.BaseControls.DKListBoxComboBox cbWorkShop;
-        private Basics.BaseControls.C_Label lblWorkShop;
     }
 }

DK.Service/PMModuleLogic/PMModuleLogic.cs

@@ -1847,15 +1847,6 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                 con.Open();
                 int procedureID = int.Parse(con.GetSqlResultToStr("select procedureID from TP_PM_INPRODUCTION where barcode='"+ barcode + "'",null));
                 
-                if (procedureID == 40 || procedureID == 6 || procedureID == 31 || procedureID == 16 || procedureID == 28 ||
-                        procedureID == 60 || procedureID == 61)
-                { 
-                    DataSet dss = new DataSet();
-                    DataTable dt = new DataTable();
-                    dss.Tables.Add(dt);
-                    return dss;
-
-                }
                 string sqlString = @"select 
                                     FlowProcedureID as 
                                     CompleteProcedureID,

DK.Service/PMModuleLogic/PMModuleLogicPartial.cs

@@ -1965,27 +1965,6 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 						dr[Constant.BarCodeResultTableColumns.out_barcode.ToString()] = sqlBarcode;
 						barcode = sqlBarcode;
 					}
-					if (procedureID ==40|| procedureID == 6 || procedureID == 31 || procedureID == 16 || procedureID == 28 ||
-						procedureID == 60 || procedureID == 61 ) {
-						string sql = @"SELECT 
-												TO_CHAR('	已检验	'||chr(10)||' 产品编码:'||GOODSCODE||chr(10)||' 产品名称:'||GOODSNAME||chr(10)||' 工序:'||PROCEDURENAME||chr(10)||
-												' 产品等级:'||TP_SYS_GOODSLEVELTYPE.GOODSLEVELTYPENAME) AS detailsMessage FROM TP_PM_PRODUCTIONDATA
-												LEFT JOIN TP_SYS_GOODSLEVELTYPE ON TP_SYS_GOODSLEVELTYPE.GOODSLEVELTYPEID=TP_PM_PRODUCTIONDATA.GOODSLEVELTYPEID
-												WHERE BARCODE= :BARCODE AND PROCEDUREID= :PROCEDUREID";
-						OracleParameter[] secondparas = new OracleParameter[]{
-						new OracleParameter("PROCEDUREID",OracleDbType.Int32,procedureID,ParameterDirection.Input),
-					    new OracleParameter("BARCODE",OracleDbType.NVarchar2,barcode,ParameterDirection.Input),
-						};
-						secondDt = oracleConn.GetSqlResultToDt(sql, secondparas);
-						if (secondDt != null && secondDt.Rows.Count > 0) {
-							dr[Constant.BarCodeResultTableColumns.out_errMsg.ToString()] = secondDt.Rows[0]["detailsMessage"];
-							dr[Constant.BarCodeResultTableColumns.out_missFlag.ToString()] = 0;
-							dtBarCode.Rows.Add(dr);
-							returnDs.Tables.Add(dtBarCode);
-							return returnDs;
-						}
-				
-					}
 					#endregion
 					OracleParameter[] paras = new OracleParameter[]{
 					new OracleParameter("in_procedureid",OracleDbType.Int32,procedureID,ParameterDirection.Input),

DK.Service/PMModuleService/PMModuleLogic.cs

@@ -5810,7 +5810,24 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
                 ServiceResultEntity result = new ServiceResultEntity();
                 con.Open();
 
-                string sqlString = @" with TB as  (SELECT sp.BarCode
+                string sqlString = @" SELECT
+                                                GROUPING_ID (STAFFNAME,Goodscode,车间) GID,
+                                                CASE when Groutinglinecode is null  AND GROUPING_ID (STAFFNAME,Goodscode,车间)=1 THEN '小计'
+                                                     WHEN Groutinglinecode is null  AND GROUPING_ID (STAFFNAME,Goodscode,车间)=5 THEN '合计'
+													 WHEN Groutinglinecode is null  AND GROUPING_ID (STAFFNAME,Goodscode,车间)=6 THEN TO_CHAR(车间)
+		                                             WHEN Groutinglinecode is null  AND GROUPING_ID (STAFFNAME,Goodscode,车间)=7 THEN '总计'
+		                                                 END AS 统计方式, TO_CHAR(Groutinglinecode) GroutingLineCode,ScrapProductID,车间,
+		                                        BARCODE,ResponUserCode,ResponUserName,STAFFNAME,
+		                                        SUM(CASE WHEN BARCODE IS NOT NULL THEN 1 ELSE 0 END) AS NUMS,
+                                                GoodsID,Goodscode,Goodsname,GroutingDailyID,Groutingdailydetailid,
+                                                GroutingDate,GroutingLineID,Groutinglinename,GMouldTypeID,
+                                                Groutingmouldcode,Mouldcode,Groutinguserid,Groutingusercode,Groutingnum,Scraptype,
+                                                ScrapTypeName,ResponType,ScrapDate,ScrapRreasonID,ScrapReason,UName,UCode,
+                                                AuditStatusName,createuser,ResponUserID,
+                                                BackOutFlag,BackOutTime,BackOutUserID,BackOutUserCode,BackOutUserName,
+                                                Remarks,AuditStatus,AuditDate,Auditopinion,Accountdate,OPTimeStamp
+                                            FROM(
+                                            SELECT sp.BarCode
                                                   ,sp.ScrapProductID
                                                   ,sp.GoodsID
                                                   ,sp.Goodscode
@@ -5820,6 +5837,8 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
                                                   ,sp.GroutingDate
                                                   ,sp.GroutingLineID
                                                   ,sp.Groutinglinecode
+												  ,CASE WHEN gl.HIGHPRESSUREFLAG=1 THEN '高压车间'
+													     ELSE TO_CHAR(SUBSTR(gl.GROUTINGLINECODE, 2, 1)||'车间')END 车间
                                                   ,sp.Groutinglinename
                                                   ,sp.GMouldTypeID
                                                   ,sp.Groutingmouldcode
@@ -5862,19 +5881,14 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
                                                   ,sp.OPTimeStamp
                                                   ,STAFF.STAFFNAME
                                               FROM TP_PM_GroutingScrapProduct sp
-                                             INNER JOIN TP_SYS_AuditStatus status
-                                                ON sp.AuditStatus = status.AuditStatusID
-                                              LEFT JOIN TP_MST_USER userInfo
-                                                ON sp.Auditor = userInfo.UserId
-                                              LEFT JOIN TP_MST_USER createuser
-                                                ON sp.createuserid = createuser.UserId
-                                              LEFT JOIN TP_MST_USER responUser
-                                                ON sp.ResponUserID = responUser.UserId
-                                              LEFT JOIN TP_MST_ScrapReason msr
-                                                ON sp.ScrapRreasonID = msr.ScrapReasonID
-                                              LEFT JOIN TP_MST_USER backOutUser
-                                                ON sp.BackOutUserID = backOutUser.UserId
-                                                INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.GROUTINGDAILYDETAILID = SP.GROUTINGDAILYDETAILID 
+                                             INNER JOIN TP_SYS_AuditStatus status ON sp.AuditStatus = status.AuditStatusID
+                                              LEFT JOIN TP_MST_USER userInfo ON sp.Auditor = userInfo.UserId
+                                              LEFT JOIN TP_MST_USER createuser ON sp.createuserid = createuser.UserId
+                                              LEFT JOIN TP_MST_USER responUser ON sp.ResponUserID = responUser.UserId 
+                                              LEFT JOIN TP_MST_ScrapReason msr ON sp.ScrapRreasonID = msr.ScrapReasonID
+                                              LEFT JOIN TP_MST_USER backOutUser ON sp.BackOutUserID = backOutUser.UserId
+                                              INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.GROUTINGDAILYDETAILID = SP.GROUTINGDAILYDETAILID
+											  LEFT JOIN TP_PC_GROUTINGLINE gl ON gl.GROUTINGLINECODE=gdd.GROUTINGLINECODE
                                                 LEFT JOIN (
                                                 SELECT
                                                 D.CLASSESSETTINGID,
@@ -5975,46 +5989,15 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
                     sqlString += " AND sp.GroutingDate <= :in_GroutingDateEnd";
                     paraList.Add(new OracleParameter(":in_GroutingDateEnd", OracleDbType.Date, Convert.ToDateTime(cre.Properties["GroutingDateEnd"]), ParameterDirection.Input));
                 }
-                sqlString += @" ) 
-																							 select  * from (SELECT GROUPING_ID (STAFFNAME,Goodscode) GID,
-                                                CASE when Groutinglinecode is null  AND GROUPING_ID (STAFFNAME,Goodscode)=0 THEN '小计'
-                                                     WHEN Groutinglinecode is null  AND GROUPING_ID (STAFFNAME,Goodscode)=2 THEN '合计'
-		                                                 WHEN Groutinglinecode is null  AND GROUPING_ID (STAFFNAME,Goodscode)=3 THEN '总计'
-		                                                 ELSE '' END AS com,Groutinglinecode,ScrapProductID,
-		                                                 BARCODE,ResponUserCode,ResponUserName,STAFFNAME,
-		                                                 SUM(CASE WHEN BARCODE IS NOT NULL THEN 1 ELSE 0 END) AS NUMS,
-                                                GoodsID,Goodscode,Goodsname,GroutingDailyID,Groutingdailydetailid,
-                                                GroutingDate,GroutingLineID,Groutinglinename,GMouldTypeID,
-                                                Groutingmouldcode,Mouldcode,Groutinguserid,Groutingusercode,Groutingnum,Scraptype,
-                                                ScrapTypeName,ResponType,ScrapDate,ScrapRreasonID,ScrapReason,UName,UCode,
-                                                AuditStatusName,createuser,ResponUserID,
-                                                BackOutFlag,BackOutTime,BackOutUserID,BackOutUserCode,BackOutUserName,
-                                                Remarks,AuditStatus,AuditDate,Auditopinion,Accountdate,OPTimeStamp
-                                            FROM( TB
-                                            ) GROUP BY GROUPING SETS ( (BARCODE,ScrapProductID,
+                sqlString += @" ) GROUP BY GROUPING SETS ( (BARCODE,ScrapProductID,
                                                 GoodsID,Goodscode,Goodsname,GroutingDailyID,Groutingdailydetailid,
                                                 GroutingDate,GroutingLineID,Groutinglinecode,Groutinglinename,GMouldTypeID,
                                                 Groutingmouldcode,Mouldcode,Groutinguserid,Groutingusercode,Groutingnum,Scraptype,
                                                 ScrapTypeName,ResponType,ScrapDate,ScrapRreasonID,ScrapReason,UName,UCode,
                                                 AuditStatusName,createuser,ResponUserName,ResponUserCode,ResponUserID,
                                                 BackOutFlag,BackOutTime,BackOutUserID,BackOutUserCode,BackOutUserName,
-                                                Remarks,AuditStatus,AuditDate,Auditopinion,Accountdate,OPTimeStamp,STAFFNAME),(Goodscode,Goodsname,Groutingusercode,STAFFNAME),(GOODSCODE,GOODSNAME),() )																								
-                                                ORDER BY DECODE(GROUPING_ID (Groutingusercode,Goodscode), 3, 1),GOODSCODE,BARCODE,STAFFNAME)
-																								union all 
-																							SELECT
-                                                null,
-                                               DECODE(substr(Groutinglinecode,2,1) , '-','高压', substr(Groutinglinecode,2,1))||'车间合计',null, null,
-		                                                 null,null,null,null,
-		                                                 SUM(CASE WHEN BARCODE IS NOT NULL THEN 1 ELSE 0 END) AS NUMS,
-                                                null,null,null,null,null,
-                                                null,null,null,null,
-                                                null,null,null,null,null,null,
-                                                null,null,null,null,null,null,null,
-                                                null,null,null,
-                                                null,null,null,null,null,
-                                                null,null,null,null,null,null
-																								
-																								from TB GROUP BY substr(Groutinglinecode,2,1)";
+                                                Remarks,AuditStatus,AuditDate,Auditopinion,Accountdate,OPTimeStamp,STAFFNAME),(Goodscode,Goodsname,Groutingusercode,STAFFNAME),(GOODSCODE,GOODSNAME),(车间),() )
+                                                ORDER BY DECODE(GROUPING_ID (STAFFNAME,Goodscode,车间), 7, 1),GOODSCODE,BARCODE,STAFFNAME,车间";
                 DataSet dsReturn = con.GetSqlResultToDs(sqlString, paraList.ToArray());
 
                 // 是否查责任员工 

DK.Service/SystemModuleLogic/SystemModuleLogic.cs

@@ -3527,9 +3527,14 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 			IDBConnection oracleConn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, DataManager.ConnectionString);
 			try
 			{
+				/*
 				string sqlString = @" Select DISTINCT LogoID,LogoCode,LogoName,concat(LogoName||'[',LogoCode||']') as LogoNameCode from TP_MST_GOODSLOGO
 											where valueflag ='1' 
 											AND GOODSCODE IN (SELECT GOODSCODE FROM TP_PM_GROUTINGDAILYDETAIL WHERE ACCOUNTID=:ACCOUNTID)";
+				*/
+				string sqlString = "Select LogoID,LogoCode,LogoName,LogoName||'['||LogoCode||']' as LogoNameCode "
+								 + "from tp_mst_logo where AccountID = :AccountID and valueflag ='1' order by isdefault desc, displayno";
+
 				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
 					new Oracle.ManagedDataAccess.Client.OracleParameter(":ACCOUNTID",sUserInfo.AccountID)