载具状态，质量等级增加成型工号，产品报损

DK.Client/PMModule/F_PM_1102.cs

@@ -128,20 +128,23 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 				dr["AuditStatusID"] = 0;
 				dr["AuditStatusValue"] = "待审核";
 				dtAuditStatus.Rows.Add(dr);
-				if (this._isScrap)
-				{
-					dr = dtAuditStatus.NewRow();
-					dr["AuditStatusID"] = 1;
-					dr["AuditStatusValue"] = "损坯通过";
-					dtAuditStatus.Rows.Add(dr);
-					dr = dtAuditStatus.NewRow();
-					dr["AuditStatusID"] = 2;
-					dr["AuditStatusValue"] = "损坯驳回";
-					dtAuditStatus.Rows.Add(dr);
-				}
+				//if (this._isScrap)
+				//{
+					
+				//}
+				dr = dtAuditStatus.NewRow();
+				dr["AuditStatusID"] = 1;
+				dr["AuditStatusValue"] = "损坯通过";
+				dtAuditStatus.Rows.Add(dr);
+				dr = dtAuditStatus.NewRow();
+				dr["AuditStatusID"] = 2;
+				dr["AuditStatusValue"] = "损坯驳回";
+				dtAuditStatus.Rows.Add(dr); 
+
 				this.cmbAuditStatus.DisplayMember = "AuditStatusValue";
 				this.cmbAuditStatus.ValueMember = "AuditStatusID";
 				this.cmbAuditStatus.DataSource = dtAuditStatus;
+				this.cmbAuditStatus.SelectedValue = 1;
 				if (this._formType == Constant.FormMode.Edit)
 				{
 					BindEntity();

DK.Client/PMModule/F_PM_1201.Designer.cs

@@ -47,6 +47,10 @@
             this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
             this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
             this.gbxCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
+            this.txtGroutingUserCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+            this.c_Label5 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.cobworkshop = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ComboBox();
+            this.c_Label4 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.lblOrganization = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.scbOrganization = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbOrganization();
             this.lblGoodsType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
@@ -117,8 +121,6 @@
             this.DefectStaffNames = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.JobsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.DefectRemarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.cobworkshop = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ComboBox();
-            this.c_Label4 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.tsrOperate.SuspendLayout();
             this.gbxCondition.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -206,6 +208,8 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.gbxCondition.BackColor = System.Drawing.Color.Transparent;
             this.gbxCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("gbxCondition.BackgroundImage")));
+            this.gbxCondition.Controls.Add(this.txtGroutingUserCode);
+            this.gbxCondition.Controls.Add(this.c_Label5);
             this.gbxCondition.Controls.Add(this.cobworkshop);
             this.gbxCondition.Controls.Add(this.c_Label4);
             this.gbxCondition.Controls.Add(this.lblOrganization);
@@ -243,6 +247,59 @@
             this.gbxCondition.TabStop = false;
             this.gbxCondition.Text = "查询条件 ▼";
             // 
+            // txtGroutingUserCode
+            // 
+            this.txtGroutingUserCode.BackColor = System.Drawing.SystemColors.Window;
+            this.txtGroutingUserCode.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtGroutingUserCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+            this.txtGroutingUserCode.ErrorMessage = "";
+            this.txtGroutingUserCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtGroutingUserCode.Location = new System.Drawing.Point(918, 77);
+            this.txtGroutingUserCode.MaxLength = 500;
+            this.txtGroutingUserCode.Name = "txtGroutingUserCode";
+            this.txtGroutingUserCode.Size = new System.Drawing.Size(127, 21);
+            this.txtGroutingUserCode.TabIndex = 64;
+            // 
+            // c_Label5
+            // 
+            this.c_Label5.AutoSize = true;
+            this.c_Label5.BackColor = System.Drawing.Color.Transparent;
+            this.c_Label5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.c_Label5.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.c_Label5.Location = new System.Drawing.Point(859, 80);
+            this.c_Label5.Name = "c_Label5";
+            this.c_Label5.Size = new System.Drawing.Size(53, 12);
+            this.c_Label5.TabIndex = 65;
+            this.c_Label5.Text = "成型工号";
+            // 
+            // cobworkshop
+            // 
+            this.cobworkshop.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.cobworkshop.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cobworkshop.FormattingEnabled = true;
+            this.cobworkshop.Items.AddRange(new object[] {
+            "A",
+            "B",
+            "C",
+            "高压",
+            "干补"});
+            this.cobworkshop.Location = new System.Drawing.Point(706, 78);
+            this.cobworkshop.Name = "cobworkshop";
+            this.cobworkshop.Size = new System.Drawing.Size(134, 20);
+            this.cobworkshop.TabIndex = 62;
+            // 
+            // c_Label4
+            // 
+            this.c_Label4.AutoSize = true;
+            this.c_Label4.BackColor = System.Drawing.Color.Transparent;
+            this.c_Label4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.c_Label4.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.c_Label4.Location = new System.Drawing.Point(661, 81);
+            this.c_Label4.Name = "c_Label4";
+            this.c_Label4.Size = new System.Drawing.Size(29, 12);
+            this.c_Label4.TabIndex = 63;
+            this.c_Label4.Text = "车间";
+            // 
             // lblOrganization
             // 
             this.lblOrganization.AutoSize = true;
@@ -1048,34 +1105,6 @@
             this.DefectRemarks.Resizable = System.Windows.Forms.DataGridViewTriState.True;
             this.DefectRemarks.Width = 200;
             // 
-            // cobworkshop
-            // 
-            this.cobworkshop.BackgroundColor = System.Drawing.SystemColors.Window;
-            this.cobworkshop.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cobworkshop.FormattingEnabled = true;
-            this.cobworkshop.Items.AddRange(new object[] {
-            "A",
-            "B",
-            "C",
-            "高压",
-            "干补"});
-            this.cobworkshop.Location = new System.Drawing.Point(706, 78);
-            this.cobworkshop.Name = "cobworkshop";
-            this.cobworkshop.Size = new System.Drawing.Size(134, 20);
-            this.cobworkshop.TabIndex = 62;
-            // 
-            // c_Label4
-            // 
-            this.c_Label4.AutoSize = true;
-            this.c_Label4.BackColor = System.Drawing.Color.Transparent;
-            this.c_Label4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.c_Label4.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.c_Label4.Location = new System.Drawing.Point(661, 81);
-            this.c_Label4.Name = "c_Label4";
-            this.c_Label4.Size = new System.Drawing.Size(29, 12);
-            this.c_Label4.TabIndex = 63;
-            this.c_Label4.Text = "车间";
-            // 
             // F_PM_1201
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1184,5 +1213,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn KilnCarPosition;
         private Basics.BaseControls.C_ComboBox cobworkshop;
         private Basics.BaseControls.C_Label c_Label4;
+        private Basics.BaseControls.C_TextBox txtGroutingUserCode;
+        private Basics.BaseControls.C_Label c_Label5;
     }
 }

DK.Client/PMModule/F_PM_1201.cs

@@ -471,6 +471,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 				result.KilnCode = this.cobKilnName.SelectedValue.ToString();
 			}
 			result.KilnCarCode = this.txtKilnCarName.Text.Trim();
+			result.GroutingUserCode = this.txtGroutingUserCode.Text.Trim();
 			if (this.cobKilnCarPosition.SelectedValue != null
 					&& !Constant.CBO_SELECT_ALL_VALUE.ToString().Equals(this.cobKilnCarPosition.SelectedValue.ToString()))
 			{

DK.Client/SystemModule/F_MST_1601.resx

@@ -254,6 +254,9 @@
   <metadata name="dataGridViewTextBoxColumn22.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="STATUS.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="dataGridViewTextBoxColumn23.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DK.Service/PublicModuleService/PublicModuleLogic.cs

@@ -432,8 +432,8 @@ namespace Dongke.IBOSS.PRD.Service.PublicModuleService
                             + " TP_MST_RptProcedure.Rptprocedurename,"
                             + " TP_MST_RptProcedure.Rptproceduretype,"
                             + " decode(TP_MST_RptProcedure.Rptproceduretype,'A0001','出窑统计','质量统计') RptproceduretypeName,"
-                            + " (select wm_concat(s.procedureid) sprocedureid from tp_mst_rptsprocedure s where s.rptprocedureid = TP_MST_RptProcedure.Rptprocedureid) sprocedureid,"
-                            + " (select wm_concat(t.procedureid) tprocedureid from tp_mst_rpttprocedure t where t.rptprocedureid = TP_MST_RptProcedure.Rptprocedureid) tprocedureid,"
+                            + " (select listagg(s.procedureid) sprocedureid from tp_mst_rptsprocedure s where s.rptprocedureid = TP_MST_RptProcedure.Rptprocedureid) sprocedureid,"
+                            + " (select listagg(t.procedureid) tprocedureid from tp_mst_rpttprocedure t where t.rptprocedureid = TP_MST_RptProcedure.Rptprocedureid) tprocedureid,"
                             + " TP_MST_RptProcedure.Optimestamp "
                             + " from TP_MST_RptProcedure "
                             + " where TP_MST_RptProcedure.ValueFlag=1 "

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -9199,8 +9199,8 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                             + " TP_MST_RptProcedure.Rptprocedurename,"
                             + " TP_MST_RptProcedure.Rptproceduretype,"
                             + " decode(TP_MST_RptProcedure.Rptproceduretype,'A0001','出窑统计','质量统计') RptproceduretypeName,"
-                            + " (select wm_concat(s.procedureid) sprocedureid from tp_mst_rptsprocedure s where s.rptprocedureid = TP_MST_RptProcedure.Rptprocedureid) sprocedureid,"
-                            + " (select wm_concat(t.procedureid) tprocedureid from tp_mst_rpttprocedure t where t.rptprocedureid = TP_MST_RptProcedure.Rptprocedureid) tprocedureid,"
+                            + " (select listagg(s.procedureid) sprocedureid from tp_mst_rptsprocedure s where s.rptprocedureid = TP_MST_RptProcedure.Rptprocedureid) sprocedureid,"
+                            + " (select listagg(t.procedureid) tprocedureid from tp_mst_rpttprocedure t where t.rptprocedureid = TP_MST_RptProcedure.Rptprocedureid) tprocedureid,"
                             + " TP_MST_RptProcedure.Optimestamp "
                             + " from TP_MST_RptProcedure "
                             + " where TP_MST_RptProcedure.ValueFlag=1 "

DK.Service/SystemModuleLogic/SystemModuleLogicPartial.cs

@@ -2148,6 +2148,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 												GOODSCODE,
 												GOODSNAME,
 												ENTRUCKINGCODE,
+												STATUS,
 												SUM(NUMBERS) AS NUMBERS,
 												CREATETIME,
 												VALUEFLAG
@@ -2165,6 +2166,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 												gd.GOODSNAME,
 												ord.BARCODE,
 												ord.ENTRUCKINGCODE,
+												CASE WHEN pe.STATUS = 1 THEN '已使用' ELSE '未使用' END AS STATUS,
 												ord.NUMBERS,
 												ord.CREATETIME,
 												 row_number() over(partition by ord.ENTRUCKINGCODE order by ord.CREATETIME desc) rn  ,
@@ -2174,6 +2176,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 												inner JOIN TP_PC_CUSTOMERINFORMATION cus on cus.CUSTOMERCODE=ord.CUSTOMERCODE
 												inner JOIN TP_PC_LAYOUTINFORMATION lay on lay.LAYOUTCODE=ord.LAYOUTCODE
 												LEFT JOIN TP_MST_GOODS gd on gd.GOODSCODE=ord.GOODSCODE
+												LEFT JOIN  TP_PM_ENTRUCKING pe  on pe.entruckingcode = ord.entruckingcode
 												WHERE 1=1  ";
 				if (!string.IsNullOrEmpty(cre.Properties["ORDERCODE"].ToString()))
 				{
@@ -2235,6 +2238,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 												GOODSCODE,
 GOODSNAME,
 												ENTRUCKINGCODE,
+												STATUS,
 												CREATETIME,
 												VALUEFLAG
 												), (CUSTOMERCODE, CUSTOMERNAME, LAYOUTCODE, LAYOUTNAME, GOODSCODE, GOODSNAME), (CUSTOMERCODE, CUSTOMERNAME), ())";

WCF.Service/WCF.Hosting/Config.ini

@@ -17,10 +17,10 @@ Description=
 #DBUser=hgiboss
 #DBPassword=etLHPkLTOLw=
 
-DBIP=192.168.0.101
+DBIP=192.168.0.102
 DBPort=1521
-SID=dkmes
-DBUser=dkmes
+SID=test
+DBUser=test
 DBPassword=etLHPkLTOLw=
 
 [DBSettingReport]