456

DK.Client/PMModule/F_PM_0101.Designer.cs

@@ -81,6 +81,7 @@
             this.lblGroutingLineCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.txtGroutingBatchNo = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TXT_Digital();
             this.dgvGroutingDaily = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+            this.chkTestMouldFlag = new Dongke.IBOSS.PRD.Basics.BaseControls.C_StatusCheckBox();
             this.GroutingDailyDetailID = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GroutingDailyID = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GroutingLineID = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -109,6 +110,7 @@
             this.CreateTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Createuser = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.TestMouldFlag = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.tsrOperate.SuspendLayout();
             this.gbxCondition.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvGroutingDaily)).BeginInit();
@@ -133,7 +135,7 @@
             this.tsrOperate.Name = "tsrOperate";
             this.tsrOperate.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
             this.tsrOperate.ShowItemToolTips = false;
-            this.tsrOperate.Size = new System.Drawing.Size(978, 35);
+            this.tsrOperate.Size = new System.Drawing.Size(1000, 35);
             this.tsrOperate.TabIndex = 0;
             // 
             // tsbtnAdd
@@ -225,6 +227,7 @@
             | 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.chkTestMouldFlag);
             this.gbxCondition.Controls.Add(this.chkDeliverTime);
             this.gbxCondition.Controls.Add(this.btnSearch);
             this.gbxCondition.Controls.Add(this.cboGroutingLineType);
@@ -263,7 +266,7 @@
             this.gbxCondition.Location = new System.Drawing.Point(0, 38);
             this.gbxCondition.Name = "gbxCondition";
             this.gbxCondition.OriginalHeight = -1;
-            this.gbxCondition.Size = new System.Drawing.Size(966, 124);
+            this.gbxCondition.Size = new System.Drawing.Size(988, 124);
             this.gbxCondition.TabIndex = 0;
             this.gbxCondition.TabStop = false;
             this.gbxCondition.Text = "查询条件 ▼";
@@ -287,7 +290,7 @@
             this.btnSearch.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSearch.BackgroundImage")));
             this.btnSearch.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnSearch.ForeColor = System.Drawing.Color.White;
-            this.btnSearch.Location = new System.Drawing.Point(784, 89);
+            this.btnSearch.Location = new System.Drawing.Point(806, 89);
             this.btnSearch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btnSearch.Name = "btnSearch";
             this.btnSearch.Size = new System.Drawing.Size(85, 30);
@@ -371,7 +374,7 @@
             this.btnClearCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnClearCondition.BackgroundImage")));
             this.btnClearCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnClearCondition.ForeColor = System.Drawing.Color.White;
-            this.btnClearCondition.Location = new System.Drawing.Point(875, 89);
+            this.btnClearCondition.Location = new System.Drawing.Point(897, 89);
             this.btnClearCondition.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btnClearCondition.Name = "btnClearCondition";
             this.btnClearCondition.Size = new System.Drawing.Size(85, 30);
@@ -431,7 +434,7 @@
             this.txtRemarks.Multiline = true;
             this.txtRemarks.Name = "txtRemarks";
             this.txtRemarks.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.txtRemarks.Size = new System.Drawing.Size(165, 69);
+            this.txtRemarks.Size = new System.Drawing.Size(165, 43);
             this.txtRemarks.TabIndex = 9;
             // 
             // lblRemarks
@@ -753,7 +756,8 @@
             this.DeliverTime,
             this.CreateTime,
             this.Createuser,
-            this.Remarks});
+            this.Remarks,
+            this.TestMouldFlag});
             this.dgvGroutingDaily.ColumnTreeView = null;
             this.dgvGroutingDaily.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
             dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
@@ -790,7 +794,7 @@
             this.dgvGroutingDaily.RowsDefaultCellStyle = dataGridViewCellStyle9;
             this.dgvGroutingDaily.RowTemplate.Height = 21;
             this.dgvGroutingDaily.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvGroutingDaily.Size = new System.Drawing.Size(966, 394);
+            this.dgvGroutingDaily.Size = new System.Drawing.Size(988, 394);
             this.dgvGroutingDaily.SortOrderColumnName = null;
             this.dgvGroutingDaily.TabIndex = 2;
             this.dgvGroutingDaily.Tag = true;
@@ -799,6 +803,20 @@
             this.dgvGroutingDaily.VirtualMode = true;
             this.dgvGroutingDaily.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvGroutingDaily_CellDoubleClick);
             // 
+            // chkTestMouldFlag
+            // 
+            this.chkTestMouldFlag.BackColor = System.Drawing.SystemColors.Control;
+            this.chkTestMouldFlag.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("chkTestMouldFlag.BackgroundImage")));
+            this.chkTestMouldFlag.FalseText = "否";
+            this.chkTestMouldFlag.Location = new System.Drawing.Point(713, 73);
+            this.chkTestMouldFlag.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
+            this.chkTestMouldFlag.Name = "chkTestMouldFlag";
+            this.chkTestMouldFlag.Size = new System.Drawing.Size(130, 16);
+            this.chkTestMouldFlag.TabIndex = 45;
+            this.chkTestMouldFlag.Title = "试验标识";
+            this.chkTestMouldFlag.TitleAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.chkTestMouldFlag.TrueText = "是";
+            // 
             // GroutingDailyDetailID
             // 
             this.GroutingDailyDetailID.DataPropertyName = "GroutingDailyDetailID";
@@ -1022,11 +1040,21 @@
             this.Remarks.Name = "Remarks";
             this.Remarks.ReadOnly = true;
             // 
+            // TestMouldFlag
+            // 
+            this.TestMouldFlag.DataPropertyName = "TestMouldFlag";
+            this.TestMouldFlag.FalseValue = "0";
+            this.TestMouldFlag.HeaderText = "试验标识";
+            this.TestMouldFlag.IndeterminateValue = "0";
+            this.TestMouldFlag.Name = "TestMouldFlag";
+            this.TestMouldFlag.ReadOnly = true;
+            this.TestMouldFlag.TrueValue = "1";
+            // 
             // F_PM_0101
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(978, 562);
+            this.ClientSize = new System.Drawing.Size(1000, 562);
             this.Controls.Add(this.dgvGroutingDaily);
             this.Controls.Add(this.gbxCondition);
             this.Controls.Add(this.tsrOperate);
@@ -1088,6 +1116,7 @@
         private Basics.BaseControls.C_CheckBox chkDeliverTime;
         private System.Windows.Forms.ToolStripButton tsbtnUnLast;
 		private System.Windows.Forms.ToolStripButton tsbtnReStartGroutingLine;
+        private Basics.BaseControls.C_StatusCheckBox chkTestMouldFlag;
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDailyDetailID;
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDailyID;
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineID;
@@ -1116,5 +1145,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn CreateTime;
         private System.Windows.Forms.DataGridViewTextBoxColumn Createuser;
         private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn TestMouldFlag;
     }
 }

DK.Client/PMModule/F_PM_0101.cs

@@ -84,6 +84,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
                     this.cboGroutingLineType.DataSource = sre.Data.Tables[0];
                 }
                 this.cboGroutingLineType.SelectedValue = null;
+                this.chkTestMouldFlag.AllItemCheck();
             }
             catch (Exception ex)
             {
@@ -114,6 +115,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
             this.txtGroutingBatchNo.Clear();
             this.chkDeliverTime.Checked = false;
             this.chkDeliverFlag.ClearItemCheck();
+            this.chkTestMouldFlag.AllItemCheck();
         }
 
         /// <summary>
@@ -404,6 +406,11 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
                     se.DeliverTimeBegin = this.dtpDeliverTimeBegin.Value;
                     se.DeliverTimeEnd = this.dtpDeliverTimeEnd.Value;
                 }
+                object[] testMouldFlags = this.chkTestMouldFlag.SelectedValues;
+                if (testMouldFlags.Length == 1)
+                {
+                    se.TestMouldFlag = testMouldFlags[0].ToString();
+                }
 
                 // 调用服务器端获取数据集
                 ServiceResultEntity sre = DoAsync<ServiceResultEntity>(() =>

DK.Client/PMModule/F_PM_0101.resx

@@ -178,6 +178,63 @@
         TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
 </value>
   </data>
+  <data name="chkTestMouldFlag.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+        TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
+</value>
+  </data>
   <data name="btnSearch.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -506,6 +563,9 @@
   <metadata name="Remarks.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="TestMouldFlag.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>36</value>
   </metadata>

DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -22778,7 +22778,7 @@ updateuserid=:updateuserid where barcode=:barcode";
                 //"                      ,'' zscs\n" +
                 //"                      ,case when g.goods_line_type = 1 or gl.highpressureflag = '1' then 'G' else 'L' end zscs\n" +
                 "                      ,bar.testmouldflag" +
-                "                      ,decode(bar.testmouldflag,'0', g.goods_line_code, g.goods_line_code || 'S') as zscs\n" +
+                "                      ,decode(bar.testmouldflag,'0', g.goods_line_code, decode(g.goods_line_code,'G','A','M','A','L','B',g.goods_line_code)) as zscs\n" +
                 "                      ,CASE\n" +
                 "                           WHEN o.orderid IS NULL\n" +
                 "                                OR o.orderno LIKE 'HEGII%' THEN\n" +
@@ -22816,7 +22816,7 @@ updateuserid=:updateuserid where barcode=:barcode";
                 "                 ,t.sapcode\n" +
                 "                 ,t.usercode\n" +
                 "                 ,t.ordercode\n" +
-                "                 ,t.orderitem,t.zscs) tt\n" +
+                "                 ,t.orderitem,t.testmouldflag,t.zscs) tt\n" +
                 " WHERE tt.outputnum <> 0\n" +
                 "    OR tt.recoverynum <> 0\n" +
                 " ORDER BY tt.goodscode\n" +

DK.Service/PMModuleService/PMModuleLogic.cs

@@ -249,6 +249,12 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
                         sql.Append(" AND GDD.DeliverFlag = :DeliverFlag");
                         parameters.Add(new OracleParameter(":DeliverFlag", OracleDbType.Char, se.DeliverFlag, ParameterDirection.Input));
                     }
+                    // 试验标识
+                    if (!string.IsNullOrEmpty(se.TestMouldFlag))
+                    {
+                        sql.Append(" AND GDD.TestMouldFlag = :TestMouldFlag");
+                        parameters.Add(new OracleParameter(":TestMouldFlag", OracleDbType.Char, se.TestMouldFlag, ParameterDirection.Input));
+                    }
                 }
 
                 sql.Append(" ORDER BY GDD.GroutingDate, GDD.GroutingLineCode, GDD.GroutingDailyID, GDD.GroutingMouldCode");
@@ -337,6 +343,8 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
                 "       U.UserName AS Createuser," +
                 // 试验线
                 "       GDD.TestFlag," +
+                // 试验模具
+                "       GDD.TestMouldFlag," +
                 // 试验线
                 "       CASE WHEN GDD.TestFlag = 1 THEN '试验线' WHEN GDD.TestFlag = 0 THEN '普通线' end TestFlagName" +
                 // 注浆日报

WCF.Service/WCF.DataModels/SearchEntity/PM/FPM0101_SE.cs

@@ -198,5 +198,15 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
             get;
             set;
         }
+
+        /// <summary>
+        /// 试验标识
+        /// </summary>
+        [DataMember]
+        public string TestMouldFlag
+        {
+            get;
+            set;
+        }
     }
 }