半检产品等级更新

DK.Basics/WFControls/11_Standard/06_CheckedListBox/CklCheckedListBox.cs

@@ -809,6 +809,29 @@ namespace Dongke.WinForm.Controls
             }
         }
 
+
+        /// <summary>
+        /// 设定指定值的项的复选状态
+        /// </summary>
+        /// <param name="value">若要将该项设置为选中，则为 true；否则为 false</param>
+        /// <param name="itemValues">要为其设置复选状态的项的值</param>
+        public virtual void SetItemCheckedByValueID(bool value, params string[] itemValues)
+        {
+            foreach (string itemValue in itemValues)
+            {
+                for (int i = 0; i < this.Items.Count; i++)
+                {
+                    object itemValueInner = this.GetItemValue(this.Items[i]);
+                    if ((itemValueInner == null && itemValue == null) ||
+                        (itemValue != null && itemValue == itemValueInner + ""))
+                    {
+                        this.SetItemChecked(value, i);
+                        break;
+                    }
+                }
+            }
+        }
+
         /// <summary>
         /// 设定指定索引处的项目选中或取消
         /// </summary>

DK.Client/PCModule/F_PC_0203.cs

@@ -230,6 +230,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
                 procedureEntity.IsSemireWork = Convert.ToInt32(dr1[0]["isSemireWork"].ToString());
                 //xuwei add 2019-11-20
                 procedureEntity.PrintType = Convert.ToInt32(dr1[0]["printType"].ToString());
+                //xuwei add 2019-12-11
+                procedureEntity.SemiGoodsLevel = dr1[0]["SemiGoodsLevel"].ToString();
 
                 procedureEntity.OrganizationID = Convert.ToInt32(dr1[0]["OrganizationID"].ToString());
                 procedureEntity.Remarks = dr1[0]["Remarks"].ToString();

DK.Client/PCModule/F_PC_0206.Designer.cs

@@ -55,10 +55,7 @@
         private Basics.BaseControls.C_ComboBox ddlPrintType;
         private Basics.BaseControls.C_Label c_Label6;
         private System.Windows.Forms.GroupBox groupBoxSemi;
-        private Basics.BaseControls.C_CheckBox cbSemiAccept;
-        private Basics.BaseControls.C_CheckBox cbSemiScrap;
-        private Basics.BaseControls.C_CheckBox cbSemiCheck;
-        private Basics.BaseControls.C_CheckBox cbSemiRework;
         private Basics.BaseControls.DKListBoxComboBox ddlProcessModelType;
+        private WinForm.Controls.CklCheckedListBox cklSemiGoodsLevel;
     }
 }

DK.Client/PCModule/F_PC_0206.cs

@@ -12,22 +12,16 @@ using System;
 using System.Collections;
 using System.ComponentModel;
 using System.Data;
-using System.Linq;
 using System.Windows.Forms;
 
+using Dongke.IBOSS.Basics.FlowSetting;
 using Dongke.IBOSS.PRD.Basics.BaseControls;
 using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Client.CommonModule;
 using Dongke.IBOSS.PRD.Client.Controls;
 using Dongke.IBOSS.PRD.Client.DataModels;
-using Dongke.IBOSS.PRD.WCF.Proxys;
-using Dongke.IBOSS.Basics.FlowSetting;
-using Dongke.IBOSS.PRD.WCF.Proxys.PCModuleService;
 using Dongke.IBOSS.PRD.WCF.DataModels;
-using Dongke.IBOSS.PRD.WCF.Services;
-using Dongke.IBOSS.PRD.Service.BarcodePrintService;
-using Dongke.IBOSS.PRD.Service.DataModels;
-using Dongke.IBOSS.PRD.WCF.Contracts;
+using Dongke.IBOSS.PRD.WCF.Proxys;
 
 namespace Dongke.IBOSS.PRD.Client.PCModule
 {
@@ -183,6 +177,12 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
                 this.txtBarCodePrintCopies.DataValue = this._procedureEntity.BarCodePrintCopies;
 
                 this.ddlPrintType.SelectedValue = this._procedureEntity.PrintType;
+                //xuwei add 2019-12-11
+                if (!string.IsNullOrEmpty(this._procedureEntity.SemiGoodsLevel))
+                {
+                    string[] ids = this._procedureEntity.SemiGoodsLevel.Split(',');
+                    cklSemiGoodsLevel.SetItemCheckedByValueID(true, ids);
+                }
             }
         }
 
@@ -210,26 +210,23 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle79 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle80 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle81 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle82 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle83 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle84 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle85 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle86 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle87 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle88 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle89 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle90 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle91 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_PC_0206));
             this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.ddlProcessModelType = new Dongke.IBOSS.PRD.Basics.BaseControls.DKListBoxComboBox();
             this.groupBoxSemi = new System.Windows.Forms.GroupBox();
-            this.cbSemiScrap = new Dongke.IBOSS.PRD.Basics.BaseControls.C_CheckBox();
-            this.cbSemiCheck = new Dongke.IBOSS.PRD.Basics.BaseControls.C_CheckBox();
-            this.cbSemiRework = new Dongke.IBOSS.PRD.Basics.BaseControls.C_CheckBox();
-            this.cbSemiAccept = new Dongke.IBOSS.PRD.Basics.BaseControls.C_CheckBox();
             this.ddlPrintType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ComboBox();
             this.c_Label6 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.txtBarCodePrintCopies = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DGV_Digital();
@@ -287,7 +284,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.JobsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.btnCancel = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
             this.btnSave = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
-            this.ddlProcessModelType = new Dongke.IBOSS.PRD.Basics.BaseControls.DKListBoxComboBox();
+            this.cklSemiGoodsLevel = new Dongke.WinForm.Controls.CklCheckedListBox();
             this.groupBox1.SuspendLayout();
             this.groupBoxSemi.SuspendLayout();
             this.groupBox4.SuspendLayout();
@@ -341,68 +338,46 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "基本属性";
             // 
+            // ddlProcessModelType
+            // 
+            this.ddlProcessModelType.BackColor = System.Drawing.Color.Yellow;
+            this.ddlProcessModelType.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.ddlProcessModelType.DataSource = null;
+            this.ddlProcessModelType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ddlProcessModelType.FormattingEnabled = true;
+            this.ddlProcessModelType.IsMustInput = true;
+            // 
+            // 
+            // 
+            this.ddlProcessModelType.ListBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ddlProcessModelType.ListBox.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ddlProcessModelType.ListBox.Location = new System.Drawing.Point(0, 0);
+            this.ddlProcessModelType.ListBox.Name = "";
+            this.ddlProcessModelType.ListBox.Size = new System.Drawing.Size(141, 136);
+            this.ddlProcessModelType.ListBox.TabIndex = 0;
+            this.ddlProcessModelType.ListBox.SelectedIndexChanged += new System.EventHandler(this.cobProcessModelType_SelectedIndexChanged);
+            this.ddlProcessModelType.Location = new System.Drawing.Point(544, 25);
+            this.ddlProcessModelType.Margin = new System.Windows.Forms.Padding(4);
+            this.ddlProcessModelType.Name = "ddlProcessModelType";
+            this.ddlProcessModelType.Size = new System.Drawing.Size(143, 23);
+            this.ddlProcessModelType.TabIndex = 25;
+            this.ddlProcessModelType.SelectedIndexChanged += new System.EventHandler(this.cobProcessModelType_SelectedIndexChanged);
+            // 
             // groupBoxSemi
             // 
             this.groupBoxSemi.BackColor = System.Drawing.Color.Transparent;
-            this.groupBoxSemi.Controls.Add(this.cbSemiScrap);
-            this.groupBoxSemi.Controls.Add(this.cbSemiCheck);
-            this.groupBoxSemi.Controls.Add(this.cbSemiRework);
-            this.groupBoxSemi.Controls.Add(this.cbSemiAccept);
+            this.groupBoxSemi.Controls.Add(this.cklSemiGoodsLevel);
             this.groupBoxSemi.Location = new System.Drawing.Point(472, 61);
             this.groupBoxSemi.Margin = new System.Windows.Forms.Padding(4);
             this.groupBoxSemi.Name = "groupBoxSemi";
             this.groupBoxSemi.Padding = new System.Windows.Forms.Padding(4);
-            this.groupBoxSemi.Size = new System.Drawing.Size(497, 68);
+            this.groupBoxSemi.Size = new System.Drawing.Size(220, 149);
             this.groupBoxSemi.TabIndex = 24;
             this.groupBoxSemi.TabStop = false;
             this.groupBoxSemi.Tag = "";
-            this.groupBoxSemi.Text = "半检登记";
+            this.groupBoxSemi.Text = "半检产品等级";
             this.groupBoxSemi.Visible = false;
             // 
-            // cbSemiScrap
-            // 
-            this.cbSemiScrap.AutoSize = true;
-            this.cbSemiScrap.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cbSemiScrap.Location = new System.Drawing.Point(231, 32);
-            this.cbSemiScrap.Name = "cbSemiScrap";
-            this.cbSemiScrap.Size = new System.Drawing.Size(59, 19);
-            this.cbSemiScrap.TabIndex = 1;
-            this.cbSemiScrap.Text = "废品";
-            this.cbSemiScrap.UseVisualStyleBackColor = true;
-            // 
-            // cbSemiCheck
-            // 
-            this.cbSemiCheck.AutoSize = true;
-            this.cbSemiCheck.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cbSemiCheck.Location = new System.Drawing.Point(158, 32);
-            this.cbSemiCheck.Name = "cbSemiCheck";
-            this.cbSemiCheck.Size = new System.Drawing.Size(59, 19);
-            this.cbSemiCheck.TabIndex = 1;
-            this.cbSemiCheck.Text = "复检";
-            this.cbSemiCheck.UseVisualStyleBackColor = true;
-            // 
-            // cbSemiRework
-            // 
-            this.cbSemiRework.AutoSize = true;
-            this.cbSemiRework.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cbSemiRework.Location = new System.Drawing.Point(85, 32);
-            this.cbSemiRework.Name = "cbSemiRework";
-            this.cbSemiRework.Size = new System.Drawing.Size(59, 19);
-            this.cbSemiRework.TabIndex = 1;
-            this.cbSemiRework.Text = "返工";
-            this.cbSemiRework.UseVisualStyleBackColor = true;
-            // 
-            // cbSemiAccept
-            // 
-            this.cbSemiAccept.AutoSize = true;
-            this.cbSemiAccept.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cbSemiAccept.Location = new System.Drawing.Point(12, 32);
-            this.cbSemiAccept.Name = "cbSemiAccept";
-            this.cbSemiAccept.Size = new System.Drawing.Size(59, 19);
-            this.cbSemiAccept.TabIndex = 0;
-            this.cbSemiAccept.Text = "良品";
-            this.cbSemiAccept.UseVisualStyleBackColor = true;
-            // 
             // ddlPrintType
             // 
             this.ddlPrintType.BackColor = System.Drawing.SystemColors.Window;
@@ -462,11 +437,11 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.groupBox4.BackColor = System.Drawing.Color.Transparent;
             this.groupBox4.Controls.Add(this.radioJobsPrice);
             this.groupBox4.Controls.Add(this.radioNotPrice);
-            this.groupBox4.Location = new System.Drawing.Point(472, 142);
+            this.groupBox4.Location = new System.Drawing.Point(703, 61);
             this.groupBox4.Margin = new System.Windows.Forms.Padding(4);
             this.groupBox4.Name = "groupBox4";
             this.groupBox4.Padding = new System.Windows.Forms.Padding(4);
-            this.groupBox4.Size = new System.Drawing.Size(220, 68);
+            this.groupBox4.Size = new System.Drawing.Size(266, 68);
             this.groupBox4.TabIndex = 9;
             this.groupBox4.TabStop = false;
             this.groupBox4.Tag = "";
@@ -841,8 +816,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             // dgvGoods
             // 
             this.dgvGoods.AllowUserToModifyRows = true;
-            dataGridViewCellStyle79.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvGoods.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle79;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvGoods.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
             this.dgvGoods.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
             this.dgvGoods.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
             this.dgvGoods.CellHeight = 23;
@@ -850,14 +825,14 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvGoods.ChildNodeColumnText = null;
             this.dgvGoods.ColumnDeep = 1;
             this.dgvGoods.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle80.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle80.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle80.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle80.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle80.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle80.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle80.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvGoods.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle80;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvGoods.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
             this.dgvGoods.ColumnHeadersHeight = 29;
             this.dgvGoods.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvGoods.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -868,14 +843,14 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.GoodsSpecification});
             this.dgvGoods.ColumnTreeView = null;
             this.dgvGoods.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)));
-            dataGridViewCellStyle81.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle81.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle81.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle81.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle81.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle81.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle81.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvGoods.DefaultCellStyle = dataGridViewCellStyle81;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvGoods.DefaultCellStyle = dataGridViewCellStyle3;
             this.dgvGoods.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvGoods.DynamicColumnName = "";
             this.dgvGoods.EnableHeadersVisualStyles = false;
@@ -898,8 +873,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvGoods.RefreshAtHscroll = false;
             this.dgvGoods.RowHeadersWidth = 50;
             this.dgvGoods.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle82.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvGoods.RowsDefaultCellStyle = dataGridViewCellStyle82;
+            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvGoods.RowsDefaultCellStyle = dataGridViewCellStyle4;
             this.dgvGoods.RowTemplate.Height = 21;
             this.dgvGoods.Size = new System.Drawing.Size(968, 310);
             this.dgvGoods.SortOrderColumnName = null;
@@ -972,8 +947,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             // dgvUser
             // 
             this.dgvUser.AllowUserToModifyRows = true;
-            dataGridViewCellStyle83.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle83;
+            dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5;
             this.dgvUser.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
             this.dgvUser.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
             this.dgvUser.CellHeight = 23;
@@ -981,14 +956,14 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvUser.ChildNodeColumnText = null;
             this.dgvUser.ColumnDeep = 1;
             this.dgvUser.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle84.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle84.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle84.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle84.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle84.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle84.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle84.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle84;
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+            dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle6.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6;
             this.dgvUser.ColumnHeadersHeight = 29;
             this.dgvUser.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvUser.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -1020,8 +995,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvUser.RefreshAtHscroll = false;
             this.dgvUser.RowHeadersWidth = 50;
             this.dgvUser.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle85.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvUser.RowsDefaultCellStyle = dataGridViewCellStyle85;
+            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvUser.RowsDefaultCellStyle = dataGridViewCellStyle7;
             this.dgvUser.RowTemplate.Height = 21;
             this.dgvUser.Size = new System.Drawing.Size(968, 310);
             this.dgvUser.SortOrderColumnName = null;
@@ -1086,8 +1061,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             // dgvDefect
             // 
             this.dgvDefect.AllowUserToModifyRows = true;
-            dataGridViewCellStyle86.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvDefect.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle86;
+            dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvDefect.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle8;
             this.dgvDefect.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
             this.dgvDefect.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
             this.dgvDefect.CellHeight = 23;
@@ -1095,14 +1070,14 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvDefect.ChildNodeColumnText = null;
             this.dgvDefect.ColumnDeep = 1;
             this.dgvDefect.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle87.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle87.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle87.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle87.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle87.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle87.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle87.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvDefect.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle87;
+            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+            dataGridViewCellStyle9.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle9.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvDefect.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9;
             this.dgvDefect.ColumnHeadersHeight = 29;
             this.dgvDefect.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvDefect.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -1134,8 +1109,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvDefect.RefreshAtHscroll = false;
             this.dgvDefect.RowHeadersWidth = 50;
             this.dgvDefect.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle88.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvDefect.RowsDefaultCellStyle = dataGridViewCellStyle88;
+            dataGridViewCellStyle10.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvDefect.RowsDefaultCellStyle = dataGridViewCellStyle10;
             this.dgvDefect.RowTemplate.Height = 21;
             this.dgvDefect.Size = new System.Drawing.Size(968, 310);
             this.dgvDefect.SortOrderColumnName = null;
@@ -1199,8 +1174,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             // dgvMissDefect
             // 
             this.dgvMissDefect.AllowUserToModifyRows = true;
-            dataGridViewCellStyle89.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvMissDefect.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle89;
+            dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvMissDefect.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11;
             this.dgvMissDefect.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
             this.dgvMissDefect.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
             this.dgvMissDefect.CellHeight = 23;
@@ -1208,14 +1183,14 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvMissDefect.ChildNodeColumnText = null;
             this.dgvMissDefect.ColumnDeep = 1;
             this.dgvMissDefect.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle90.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle90.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle90.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle90.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle90.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle90.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle90.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvMissDefect.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle90;
+            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+            dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle12.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvMissDefect.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12;
             this.dgvMissDefect.ColumnHeadersHeight = 29;
             this.dgvMissDefect.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvMissDefect.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -1249,8 +1224,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvMissDefect.RefreshAtHscroll = false;
             this.dgvMissDefect.RowHeadersWidth = 50;
             this.dgvMissDefect.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle91.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvMissDefect.RowsDefaultCellStyle = dataGridViewCellStyle91;
+            dataGridViewCellStyle13.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvMissDefect.RowsDefaultCellStyle = dataGridViewCellStyle13;
             this.dgvMissDefect.RowTemplate.Height = 21;
             this.dgvMissDefect.Size = new System.Drawing.Size(968, 310);
             this.dgvMissDefect.SortOrderColumnName = null;
@@ -1347,30 +1322,13 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.btnSave.UseVisualStyleBackColor = false;
             this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
             // 
-            // ddlProcessModelType
-            // 
-            this.ddlProcessModelType.BackColor = System.Drawing.Color.Yellow;
-            this.ddlProcessModelType.BackgroundColor = System.Drawing.SystemColors.Window;
-            this.ddlProcessModelType.DataSource = null;
-            this.ddlProcessModelType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ddlProcessModelType.FormattingEnabled = true;
-            this.ddlProcessModelType.IsMustInput = true;
-            // 
+            // cklSemiGoodsLevel
             // 
-            // 
-            this.ddlProcessModelType.ListBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.ddlProcessModelType.ListBox.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ddlProcessModelType.ListBox.Location = new System.Drawing.Point(0, 0);
-            this.ddlProcessModelType.ListBox.Name = "";
-            this.ddlProcessModelType.ListBox.Size = new System.Drawing.Size(141, 136);
-            this.ddlProcessModelType.ListBox.TabIndex = 0;
-            this.ddlProcessModelType.ListBox.SelectedIndexChanged += new System.EventHandler(this.cobProcessModelType_SelectedIndexChanged);
-            this.ddlProcessModelType.Location = new System.Drawing.Point(544, 25);
-            this.ddlProcessModelType.Margin = new System.Windows.Forms.Padding(4);
-            this.ddlProcessModelType.Name = "ddlProcessModelType";
-            this.ddlProcessModelType.Size = new System.Drawing.Size(143, 23);
-            this.ddlProcessModelType.TabIndex = 25;
-            this.ddlProcessModelType.SelectedIndexChanged += new System.EventHandler(this.cobProcessModelType_SelectedIndexChanged);
+            this.cklSemiGoodsLevel.FormattingEnabled = true;
+            this.cklSemiGoodsLevel.Location = new System.Drawing.Point(24, 26);
+            this.cklSemiGoodsLevel.Name = "cklSemiGoodsLevel";
+            this.cklSemiGoodsLevel.Size = new System.Drawing.Size(172, 104);
+            this.cklSemiGoodsLevel.TabIndex = 0;
             // 
             // F_PC_0206
             // 
@@ -1399,7 +1357,6 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
             this.groupBoxSemi.ResumeLayout(false);
-            this.groupBoxSemi.PerformLayout();
             this.groupBox4.ResumeLayout(false);
             this.groupBox4.PerformLayout();
             this.GetDataOgrp.ResumeLayout(false);
@@ -1735,6 +1692,15 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
                 //打印类型 xuwei add 2019-11-20
                 this._procedureEntity.PrintType = Convert.ToInt32(this.ddlPrintType.SelectedValue.ToString());
 
+                //半检产品等级 xuwei add 2019-12-11
+                //string cklStr = "";
+                //for(int i=0;i<cklSemiGoodsLevel.CheckedValues.Length;i++)
+                //{
+                //    if (i > 0) cklStr += ",";
+                //    cklStr += cklSemiGoodsLevel.CheckedValues[i].ToString();
+                //}
+                this._procedureEntity.SemiGoodsLevel = cklSemiGoodsLevel.CheckedValue;
+
                 #region 计件方式
                 this._procedureEntity.PieceType =
                     radioJobsPrice.Checked ? Constant.ProcedurePieceType.JobsPiece.GetHashCode() : Constant.ProcedurePieceType.NoPiece.GetHashCode();
@@ -1828,6 +1794,21 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
                 this.ddlPrintType.SelectedValue = this._procedureEntity.PrintType;
                 //加载 打印类型 xuwei end
 
+                //加载 半检产品等级 xuwei begin 2019-12-5
+                this.cklSemiGoodsLevel.DisplayMember = "GOODSLEVELNAME";
+                this.cklSemiGoodsLevel.ValueMember = "GOODSLEVELTYPEID";
+                cre.NameSpace = "ProcedureSemi";
+                cre.Name = "GetGoodsGradeDataSemi";
+                cre.Properties["procedureId"] = 0;
+                DataTable dtGoodsLevel = PMModuleProxyNew.Service.HandleRequest(cre).Data.Tables[0];
+                this.cklSemiGoodsLevel.DataSource = dtGoodsLevel;
+                if(!string.IsNullOrEmpty(this._procedureEntity.SemiGoodsLevel))
+                {
+                    string[] ids = this._procedureEntity.SemiGoodsLevel.Split(',');
+                    cklSemiGoodsLevel.SetItemCheckedByValueID(true, ids);
+                }
+                //加载 半检产品等级 xuwei end 
+
                 #endregion
 
                 #region 窗体赋值
@@ -2173,8 +2154,11 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
         private void cobProcessModelType_SelectedIndexChanged(object sender, EventArgs e)
         {
             //半检登记框组的显示隐藏
-            string temp = ddlProcessModelType.SelectedValue.ToString();
-            groupBoxSemi.Visible = ddlProcessModelType.SelectedValue.ToString() == "-3";
+            if(ddlProcessModelType.SelectedValue != null)
+            {
+                string temp = ddlProcessModelType.SelectedValue.ToString();
+                groupBoxSemi.Visible = ddlProcessModelType.SelectedValue.ToString() == "-3";
+            }
         }
     }
 }

DK.Client/PCModule/PCModule.csproj

@@ -277,10 +277,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DLL\Utilities.dll</HintPath>
     </Reference>
-    <Reference Include="WFControls, Version=1.0.0.23969, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DK.Basics\WFControls\bin\x86\Debug\WFControls.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\DK.Basics\BaseControls\BaseControls.csproj">
@@ -303,10 +299,18 @@
       <Project>{922d0f0f-01c2-4fa5-a4ad-00064232f455}</Project>
       <Name>Library</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\DK.Basics\WFControls\WFControls.csproj">
+      <Project>{34c3d971-de12-44ea-9943-581c24860a84}</Project>
+      <Name>WFControls</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\DK.Service\BarcodePrintService\BarcodePrintService.csproj">
       <Project>{31a876f7-cb0a-4ba7-a13c-69e864d10ea9}</Project>
       <Name>BarcodePrintService</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\DK.Service\PDAModuleLogic\PDAModuleLogic.csproj">
+      <Project>{75A1A28D-7076-4DC7-A1D4-703B884ECDEB}</Project>
+      <Name>PDAModuleLogic</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\DK.Service\Service.DataModels\Service.DataModels.csproj">
       <Project>{16C72702-C162-4CD3-9CCC-40B9D8491CCD}</Project>
       <Name>Service.DataModels</Name>
@@ -323,10 +327,6 @@
       <Project>{4c4bfbdc-125c-488a-8b35-5a0637478c66}</Project>
       <Name>WCF.DataModels</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\WCF.Service\WCF.Services\WCF.Services.csproj">
-      <Project>{20E7BF78-5301-4D5A-A7A0-FA24C0F32CDC}</Project>
-      <Name>WCF.Services</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Client.Controls\Client.Controls.csproj">
       <Project>{ae533029-79c3-4053-ba9c-ad5a0b4fbbf7}</Project>
       <Name>Client.Controls</Name>

DK.Client/PPModule/F_PP_0101.cs

@@ -7,15 +7,16 @@
  *      作者            日期                版本            修改内容
  *      徐伟          2019/08/27            1.00            新建
  *******************************************************************************/
+using System;
+using System.Reflection;
+using System.Windows.Forms;
+
 using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Client.CommonModule;
 using Dongke.IBOSS.PRD.Client.Controls;
 using Dongke.IBOSS.PRD.Client.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
 using Dongke.IBOSS.PRD.WCF.Proxys;
-using System;
-using System.Reflection;
-using System.Windows.Forms;
 
 namespace Dongke.IBOSS.PRD.Client.PPModule
 {

DK.Client/PPModule/F_PP_0102.cs

@@ -8,11 +8,8 @@
  *      徐伟          2019/08/27            1.00            新建
  *******************************************************************************/
 using System;
-using System.Collections.Generic;
-using System.Data;
 using System.Reflection;
 using System.Windows.Forms;
-using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Client.CommonModule;
 using Dongke.IBOSS.PRD.Client.Controls;
 using Dongke.IBOSS.PRD.Client.DataModels;

DK.Client/PPModule/F_PP_0103.cs

@@ -8,11 +8,8 @@
  *      徐伟          2019/09/05      1.00            新建
  *******************************************************************************/
 using System;
-using System.Collections.Generic;
-using System.Data;
 using System.Reflection;
 using System.Windows.Forms;
-using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Client.CommonModule;
 using Dongke.IBOSS.PRD.Client.Controls;
 using Dongke.IBOSS.PRD.Client.DataModels;

DK.Client/PPModule/F_PP_0110.cs

@@ -8,16 +8,11 @@
  *      徐伟          2019/08/27            1.00            新建
  *******************************************************************************/
 using System;
-using System.Collections.Generic;
-using System.Data;
 using System.Reflection;
 using System.Windows.Forms;
-using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Client.CommonModule;
 using Dongke.IBOSS.PRD.Client.Controls;
 using Dongke.IBOSS.PRD.Client.DataModels;
-using Dongke.IBOSS.PRD.WCF.DataModels;
-using Dongke.IBOSS.PRD.WCF.Proxys;
 
 namespace Dongke.IBOSS.PRD.Client.PPModule
 {

DK.Client/PPModule/F_PP_0111.cs

@@ -8,16 +8,11 @@
  *      徐伟          2019/08/27            1.00            新建
  *******************************************************************************/
 using System;
-using System.Collections.Generic;
-using System.Data;
 using System.Reflection;
 using System.Windows.Forms;
-using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Client.CommonModule;
 using Dongke.IBOSS.PRD.Client.Controls;
 using Dongke.IBOSS.PRD.Client.DataModels;
-using Dongke.IBOSS.PRD.WCF.DataModels;
-using Dongke.IBOSS.PRD.WCF.Proxys;
 
 namespace Dongke.IBOSS.PRD.Client.PPModule
 {

DK.Client/PPModule/F_PP_0121.cs

@@ -8,16 +8,13 @@
  *      徐伟          2019/08/27            1.00            新建
  *******************************************************************************/
 using System;
-using System.Collections.Generic;
-using System.Data;
 using System.Reflection;
 using System.Windows.Forms;
+
 using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Client.CommonModule;
 using Dongke.IBOSS.PRD.Client.Controls;
 using Dongke.IBOSS.PRD.Client.DataModels;
-using Dongke.IBOSS.PRD.WCF.DataModels;
-using Dongke.IBOSS.PRD.WCF.Proxys;
 
 namespace Dongke.IBOSS.PRD.Client.PPModule
 {

DK.Client/PPModule/F_PP_0201.cs

@@ -7,15 +7,16 @@
  *      作者            日期                版本            修改内容
  *      徐伟          2019/08/27            1.00            新建
  *******************************************************************************/
+using System;
+using System.Reflection;
+using System.Windows.Forms;
+
 using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Client.CommonModule;
 using Dongke.IBOSS.PRD.Client.Controls;
 using Dongke.IBOSS.PRD.Client.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
 using Dongke.IBOSS.PRD.WCF.Proxys;
-using System;
-using System.Reflection;
-using System.Windows.Forms;
 
 namespace Dongke.IBOSS.PRD.Client.PPModule
 {

DK.Client/PPModule/F_PP_0202.cs

@@ -8,11 +8,8 @@
  *      徐伟          2019/08/27            1.00            新建
  *******************************************************************************/
 using System;
-using System.Collections.Generic;
-using System.Data;
 using System.Reflection;
 using System.Windows.Forms;
-using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Client.CommonModule;
 using Dongke.IBOSS.PRD.Client.Controls;
 using Dongke.IBOSS.PRD.Client.DataModels;

DK.Client/PPModule/F_PP_0203.cs

@@ -8,11 +8,8 @@
  *      徐伟          2019/09/05      1.00            新建
  *******************************************************************************/
 using System;
-using System.Collections.Generic;
-using System.Data;
 using System.Reflection;
 using System.Windows.Forms;
-using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Client.CommonModule;
 using Dongke.IBOSS.PRD.Client.Controls;
 using Dongke.IBOSS.PRD.Client.DataModels;

DK.Client/PPModule/F_PP_0301.cs

@@ -7,15 +7,16 @@
  *      作者            日期                版本            修改内容
  *      徐伟          2019/08/27            1.00            新建
  *******************************************************************************/
+using System;
+using System.Reflection;
+using System.Windows.Forms;
+
 using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Client.CommonModule;
 using Dongke.IBOSS.PRD.Client.Controls;
 using Dongke.IBOSS.PRD.Client.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
 using Dongke.IBOSS.PRD.WCF.Proxys;
-using System;
-using System.Reflection;
-using System.Windows.Forms;
 
 namespace Dongke.IBOSS.PRD.Client.PPModule
 {

DK.Client/PPModule/F_PP_0302.cs

@@ -8,11 +8,8 @@
  *      徐伟          2019/08/27            1.00            新建
  *******************************************************************************/
 using System;
-using System.Collections.Generic;
-using System.Data;
 using System.Reflection;
 using System.Windows.Forms;
-using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Client.CommonModule;
 using Dongke.IBOSS.PRD.Client.Controls;
 using Dongke.IBOSS.PRD.Client.DataModels;

DK.Client/PPModule/F_PP_0303.cs

@@ -8,11 +8,8 @@
  *      徐伟          2019/09/05      1.00            新建
  *******************************************************************************/
 using System;
-using System.Collections.Generic;
-using System.Data;
 using System.Reflection;
 using System.Windows.Forms;
-using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Client.CommonModule;
 using Dongke.IBOSS.PRD.Client.Controls;
 using Dongke.IBOSS.PRD.Client.DataModels;

DK.Client/PPModule/PPModule.csproj

@@ -191,38 +191,14 @@
       <Project>{61710211-9b80-45c1-b338-fdf984c9ae43}</Project>
       <Name>BaseResources</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\DK.Basics\DataAccess\DataAccess.csproj">
-      <Project>{d0492c0b-7b65-4d8f-8ea5-bc0570e19050}</Project>
-      <Name>DataAccess</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\DK.Basics\DockPanel\DockPanel.csproj">
       <Project>{e32f051d-7c28-42ec-ab5b-cfe18290aa45}</Project>
       <Name>DockPanel</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\DK.Basics\FlowSettingTest\FlowSettingTest.csproj">
-      <Project>{137279fd-ffe9-4fe3-8d42-c19a2cb5a7c1}</Project>
-      <Name>FlowSettingTest</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\DK.Basics\FlowSetting\FlowSetting.csproj">
-      <Project>{898f439b-72ea-43e2-8213-c8d173ee9b0b}</Project>
-      <Name>FlowSetting</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\DK.Basics\WFControls\WFControls.csproj">
       <Project>{34c3d971-de12-44ea-9943-581c24860a84}</Project>
       <Name>WFControls</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\DK.Service\CMNModuleService\CMNModuleService.csproj">
-      <Project>{86518b86-66a1-45d3-86cc-f6d6cf0efa35}</Project>
-      <Name>CMNModuleService</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\DK.Service\CommonModuleLogic\CommonModuleLogic.csproj">
-      <Project>{f675544b-7bec-4fcf-b01a-fc322c6311fc}</Project>
-      <Name>CommonModuleLogic</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\DK.Service\DKIBOSSPRDLogic\DKIBOSSPRDLogic.csproj">
-      <Project>{5d0fe449-2391-4b60-ace9-b0435cb18f23}</Project>
-      <Name>DKIBOSSPRDLogic</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\WCF.Client\WCF.Proxys\WCF.Proxys.csproj">
       <Project>{d5ac665b-a113-4ddd-808c-7563202dc293}</Project>
       <Name>WCF.Proxys</Name>
@@ -235,22 +211,6 @@
       <Project>{4c4bfbdc-125c-488a-8b35-5a0637478c66}</Project>
       <Name>WCF.DataModels</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\WCF.Service\WCF.Hosting\WCF.Hosting.csproj">
-      <Project>{00673f55-dc62-4759-8fca-9108a338b4d0}</Project>
-      <Name>WCF.Hosting</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\WCF.Service\WCF.Services\WCF.Services.csproj">
-      <Project>{20e7bf78-5301-4d5a-a7a0-fa24c0f32cdc}</Project>
-      <Name>WCF.Services</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\WCF.Service\WCF.WebHosting\WCF.WebHosting.csproj">
-      <Project>{518ada48-93b2-4433-9e0d-7124812658fc}</Project>
-      <Name>WCF.WebHosting</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\WCF.Service\WCF.WindowsService\WCF.WindowsService.csproj">
-      <Project>{90c58c37-b4c9-4045-8388-89b548cdc697}</Project>
-      <Name>WCF.WindowsService</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Client.Controls\Client.Controls.csproj">
       <Project>{ae533029-79c3-4053-ba9c-ad5a0b4fbbf7}</Project>
       <Name>Client.Controls</Name>
@@ -260,7 +220,7 @@
       <Name>Client.DataModels</Name>
     </ProjectReference>
     <ProjectReference Include="..\CommonModule\CommonModule.csproj">
-      <Project>{fec6e3a7-c649-4300-b7dc-fe4e111b79f6}</Project>
+      <Project>{FEC6E3A7-C649-4300-B7DC-FE4E111B79F6}</Project>
       <Name>CommonModule</Name>
     </ProjectReference>
   </ItemGroup>

DK.Service/PCModuleLogic/PCModuleLogicDAL.cs

@@ -1148,6 +1148,41 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                         }
                         else
                         {
+
+                            #region 更新工序半检信息 xuwei add 2019-12-11
+                            if (!string.IsNullOrEmpty(procedure.SemiGoodsLevel))
+                            {
+                                string[] ids = procedure.SemiGoodsLevel.Split(',');
+                                string sqlStr = @"
+                                    BEGIN
+
+                                    DELETE 
+                                        TP_PC_PROCEDUREGOODSLEVEL
+                                    WHERE 
+                                        PRODUCTIONLINEID = :PRODUCTIONLINEID
+                                        AND PROCEDUREID = :PROCEDUREID;
+                                ";
+                                for (int i = 0; i < ids.Length; i++)
+                                {
+                                    sqlStr += $@"
+                                        INSERT INTO TP_PC_PROCEDUREGOODSLEVEL 
+                                            ( PRODUCTIONLINEID,  PROCEDUREID,  GOODSLEVELTYPEID)
+                                        VALUES
+	                                        (:PRODUCTIONLINEID, :PROCEDUREID, {ids[i]});
+                                    ";
+                                }
+                                sqlStr += "END;";
+                                oracleTrConn.ExecuteNonQuery(
+                                    sqlStr,
+                                    new OracleParameter[]
+                                    {
+                                        new OracleParameter(":PRODUCTIONLINEID",productionLine.ProductionLineID),
+                                        new OracleParameter(":PROCEDUREID",procedure.ProcedureID)
+                                    }
+                                );
+                            }
+                            #endregion
+
                             #region 编辑
                             sqlText = "UPDATE TP_PC_Procedure SET "
                                                                                 + " ProcedureName=:procedureName,"
@@ -1515,6 +1550,41 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                 #endregion
 
                 string sqlText = "";
+
+                #region 更新工序半检信息 xuwei add 2019-12-11
+                if (!string.IsNullOrEmpty(procedure.SemiGoodsLevel))
+                {
+                    string[] ids = procedure.SemiGoodsLevel.Split(',');
+                    string sqlStr = @"
+                                    BEGIN
+
+                                    DELETE 
+                                        TP_PC_PROCEDUREGOODSLEVEL
+                                    WHERE 
+                                        PRODUCTIONLINEID = :PRODUCTIONLINEID
+                                        AND PROCEDUREID = :PROCEDUREID;
+                                ";
+                    for (int i = 0; i < ids.Length; i++)
+                    {
+                        sqlStr += $@"
+                                        INSERT INTO TP_PC_PROCEDUREGOODSLEVEL 
+                                            ( PRODUCTIONLINEID,  PROCEDUREID,  GOODSLEVELTYPEID)
+                                        VALUES
+	                                        (:PRODUCTIONLINEID, :PROCEDUREID, {ids[i]});
+                                    ";
+                    }
+                    sqlStr += "END;";
+                    oracleTrConn.ExecuteNonQuery(
+                        sqlStr,
+                        new OracleParameter[]
+                        {
+                                        new OracleParameter(":PRODUCTIONLINEID",procedure.ProductionLineID),
+                                        new OracleParameter(":PROCEDUREID",procedure.ProcedureID)
+                        }
+                    );
+                }
+                #endregion
+
                 #region 更新工序信息
                 sqlText = "UPDATE TP_PC_Procedure SET "
                     + " ProcedureName=:procedureName,"

DK.Service/PDAModuleLogic/PDAModuleLogicSemi.cs

@@ -34,68 +34,84 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
     /// </summary>
     public partial class PDAModuleLogic
     {
-        //public static ServiceResultEntity SemiGetGroutingLineInfo(string groutingLineCode, string groutingDay, SUserInfo sUser)
-        //{
-        //    ServiceResultEntity sre = new ServiceResultEntity();
-        //    sre.Data = new DataSet();
-        //    sre.Status = Constant.ServiceResultStatus.Success;
-        //    IDBTransaction conn = ClsDbFactory.CreateDBTransaction(DataBaseType.ORACLE, DataManager.ConnectionString);
-        //    string sqlStr = "";
-        //    try
-        //    {
-        //        conn.Connect();
-        //        //成型线注浆查询
-        //        if (sre.Status == Constant.ServiceResultStatus.Success)
-        //        {
-        //            sqlStr = $@"
-        //                SELECT
-	       //                 l.GROUTINGLINECODE ,-- AS 成型线号,
-	       //                 l.LASTGROUTINGDATE ,-- AS 已注浆日期,
-	       //                 l.LASTGROUTINGBATCHNO ,-- AS 已注浆批次,
-	       //                 u.USERCODE ,-- AS 成型工号,
-	       //                 m.USERCODE AS MONITORUSERCODE,-- AS 成型班长,
-	       //                 l.MOULDQUANTITY, -- AS 模具数量, 
-	       //                 t.CANMANYTIMES -- AS 允许多次注浆
-        //                FROM
-	       //                 TP_PC_GROUTINGLINE l
-	       //                 LEFT JOIN TP_MST_USER u ON l.USERID = u.USERID
-	       //                 LEFT JOIN TP_MST_USER m ON l.USERID = m.USERID
-	       //                 LEFT JOIN TP_MST_GMOULDTYPE t ON l.GMOULDTYPEID = t.GMOULDTYPEID 
-        //                WHERE
-	       //                 l.VALUEFLAG = '1' --有效标识
-        //                    AND l.ACCOUNTID = {sUser.AccountID}
-	       //                 AND l.GMOULDSTATUS = 1 --成型线正常状态
-	       //                 AND t.CANMANYTIMES = '1' --允许多次注浆
-	       //                 AND EXISTS ( SELECT 1 FROM TP_PC_GROUTINGLINEDETAIL d WHERE l.GROUTINGLINEID = d.GROUTINGLINEID AND d.VALUEFLAG = '1' AND d.GMOULDSTATUS = 1 ) --有正常状态的模具
-	       //                 --AND EXISTS ( SELECT p.PURVIEWID FROM TP_MST_USERPURVIEW p WHERE p.PURVIEWTYPE = '6' AND ( p.PURVIEWID = - 1 OR p.PURVIEWID = l.GROUTINGLINEID ) AND u.USERCODE = '{sUser.UserCode}' ) --有操作权限
-        //                    AND l.GROUTINGLINECODE = '{groutingLineCode}'
-        //                ";
-        //            DataTable groutingLine = conn.GetSqlResultToDt(sqlStr);
-        //            groutingLine.TableName = "GroutingLine";
-        //            sre.Data.Tables.Add(groutingLine);
-        //            if (groutingLine.Rows.Count == 0)
-        //            {
-        //                sre.Status = Constant.ServiceResultStatus.NoSearchResults;
-        //                sre.Message = "没有查询结果！";
-        //            }
-        //            else
-        //            {
-        //                sre.Status = Constant.ServiceResultStatus.Success;
-        //                sre.Message = "操作成功！";
-        //            }
-        //        }
-        //    }
-        //    catch (Exception ex)
-        //    {
-        //        throw ex;
-        //    }
-        //    finally
-        //    {
-        //        conn.Disconnect();
-        //    }
-        //    //返回数据
-        //    return sre;
-        //}
-
+        /// <summary>
+        /// 获取半检等级 xuwei add 2019-12-5
+        /// </summary>
+        /// <param name="procedureId"></param>
+        /// <param name="sUser"></param>
+        /// <returns></returns>
+        public static ServiceResultEntity GetGoodsGradeDataSemi(int procedureId , SUserInfo sUser)
+        {
+            ServiceResultEntity sre = new ServiceResultEntity();
+            sre.Data = new DataSet();
+            sre.Status = Constant.ServiceResultStatus.Success;
+            IDBTransaction conn = ClsDbFactory.CreateDBTransaction(DataBaseType.ORACLE, DataManager.ConnectionString);
+            string sqlStr = "";
+            try
+            {
+                conn.Connect();
+                //读取工序定义的半检产品等级
+                if (sre.Status == Constant.ServiceResultStatus.Success)
+                {
+                    //获取全部分级
+                    if (procedureId == 0)
+                    {
+                        sqlStr = $@"
+                        SELECT
+                         t.GOODSLEVELTYPEID,
+                         l.GOODSLEVELNAME 
+                        FROM
+                         TP_MST_GOODSLEVEL l
+                         LEFT JOIN TP_SYS_GOODSLEVELTYPE t ON l.GOODSLEVELTYPEID = t.GOODSLEVELTYPEID 
+                        WHERE
+                         t.ISSEMIFINISHEDEX = '1' 
+                         AND t.GOODSLEVELTYPEID NOT IN ( 13, 14 ) 
+                        ORDER BY
+                         l.SFEDISPLAYNO
+                        ";
+                    }
+                    //获取工序定义的分级
+                    if (procedureId > 0)
+                    {
+                        sqlStr = $@"
+                            SELECT
+                             t.GOODSLEVELTYPEID,
+                             l.GOODSLEVELNAME 
+                            FROM
+                              TP_PC_PROCEDUREGOODSLEVEL p
+                             LEFT JOIN TP_SYS_GOODSLEVELTYPE t ON p.GOODSLEVELTYPEID = t.GOODSLEVELTYPEID 
+                             LEFT JOIN TP_MST_GOODSLEVEL l ON l.GOODSLEVELTYPEID = t.GOODSLEVELTYPEID
+                            WHERE
+                             p.PROCEDUREID = {procedureId}
+                            ORDER BY
+                             l.SFEDISPLAYNO
+                            ";
+                    }
+                    DataTable groutingLine = conn.GetSqlResultToDt(sqlStr);
+                    groutingLine.TableName = "GoodsLevel";
+                    sre.Data.Tables.Add(groutingLine);
+                    if (groutingLine.Rows.Count == 0)
+                    {
+                        sre.Status = Constant.ServiceResultStatus.NoSearchResults;
+                        sre.Message = "没有查询结果！";
+                    }
+                    else
+                    {
+                        sre.Status = Constant.ServiceResultStatus.Success;
+                        sre.Message = "操作成功！";
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            finally
+            {
+                conn.Disconnect();
+            }
+            //返回数据
+            return sre;
+        }
     }
 }

IBOSS.PRD.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.902
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29519.181
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WCF.Service", "WCF.Service", "{30200D07-8FA7-4A96-A0A3-BE8A4906CA50}"
 EndProject

WCF.Service/WCF.Contracts/IPDAModule.cs

@@ -387,12 +387,13 @@ namespace Dongke.IBOSS.PRD.WCF.Contracts
         /// <returns></returns>
         /// <remarks>
         /// 陈冰              2014.10.04              新建
+        /// xuwei 2019-12-4 添加参数 type 默认为2 为成检 为1时 半检
         /// </remarks>
         [OperationContract]
         [WebInvoke(BodyStyle = WebMessageBodyStyle.WrappedRequest
             , ResponseFormat = WebMessageFormat.Json
             , RequestFormat = WebMessageFormat.Json)]
-        ActionResult GetGoodsGradeData(string accountCode, string userCode, string userPassword, string sessionKey);
+        ActionResult GetGoodsGradeData(string accountCode, string userCode, string userPassword, string sessionKey,int type);
 
         /// <summary>
         /// 获得产品分级

WCF.Service/WCF.Contracts/IPDAModuleSemi.cs

@@ -29,11 +29,10 @@ namespace Dongke.IBOSS.PRD.WCF.Contracts
     //Namespace = "Dongke.IBOSS.PRD.WCF.Contracts")]
     public partial interface IPDAModule
     {
-        //[OperationContract]
-        //[WebInvoke(BodyStyle = WebMessageBodyStyle.WrappedRequest
-        //    , ResponseFormat = WebMessageFormat.Json
-        //    , RequestFormat = WebMessageFormat.Json)]
-        //ActionResult SemiGetGroutingLineUserCode(string accountCode, string userCode, string userPassword, string sessionKey, string groutingLineCode);
-
+        [OperationContract]
+        [WebInvoke(BodyStyle = WebMessageBodyStyle.WrappedRequest
+            , ResponseFormat = WebMessageFormat.Json
+            , RequestFormat = WebMessageFormat.Json)]
+        ActionResult GetGoodsGradeDataSemi(string accountCode, string userCode, string userPassword, string sessionKey, int procedureId);
     }
 }

WCF.Service/WCF.DataModels/PCModule/ProcedureEntity.cs

@@ -76,6 +76,9 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
         /// </summary>
         private int printType = 0;
 
+        //xuwei add 2019-12-5
+        private string semiGoodsLevel;
+
         /// <summary>
         /// 所属部门
         /// </summary>
@@ -342,6 +345,17 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
             set { printType = value; }
         }
 
+        //xuwei add 2019-12-5
+        /// <summary>
+        /// 产检等级ID
+        /// </summary>
+        [DataMember]
+        public string SemiGoodsLevel
+        {
+            get { return semiGoodsLevel; }
+            set { semiGoodsLevel = value; }
+        }
+
         /// <summary>
         /// 所属部门
         /// </summary>

WCF.Service/WCF.Services/PDAModuleService.cs

@@ -1325,8 +1325,9 @@ namespace Dongke.IBOSS.PRD.WCF.Services
 		/// <returns></returns>
 		/// <remarks>
 		/// 陈冰              2014.10.08              新建
+        /// xuwei 2019-12-4 添加参数type 默认为2成检 为1时 半检
 		/// </remarks>
-		public ActionResult GetGoodsGradeData(string accountCode, string userCode, string userPassword, string sessionKey)
+		public ActionResult GetGoodsGradeData(string accountCode, string userCode, string userPassword, string sessionKey, int type = 2)
 		{
 			ActionResult actionResult = new ActionResult();
 			try
@@ -1340,9 +1341,12 @@ namespace Dongke.IBOSS.PRD.WCF.Services
 					return actionResult;
 				}
 
-				#region 构造产品分级的数据源
-				//DataTable dtGrade = CreateDataSource.GetGoodsGradeTable();
-				DataSet dsGrade = SystemModuleLogic.GetGoodsLevel(2, sUserInfo);
+                #region 构造产品分级的数据源
+                //DataTable dtGrade = CreateDataSource.GetGoodsGradeTable();
+                //xuwei modify 2019-12-04 支持半检 没传参数 type=0 
+                //DataSet dsGrade = SystemModuleLogic.GetGoodsLevel(2 , sUserInfo);
+                DataSet dsGrade = SystemModuleLogic.GetGoodsLevel(type == 0 ? 2 : type, sUserInfo);
+
 				if (dsGrade != null && dsGrade.Tables.Count > Constant.INT_IS_ZERO)
 				{
 					actionResult.Result = JsonHelper.ToJson(dsGrade.Tables[0]);
@@ -10698,6 +10702,7 @@ namespace Dongke.IBOSS.PRD.WCF.Services
 			}
 			return actionResult;
 		}
-        #endregion
-    }
+
+		#endregion
+	}
 }

WCF.Service/WCF.Services/PDAModuleServiceSemi.cs

@@ -8,49 +8,23 @@
  *      徐伟            2019/12/02          1.00            新建
  *******************************************************************************/
 
-using System;
-using System.Reflection;
-using System.Collections.Generic;
-using System.Data;
-using System.IO;
-using System.ServiceModel;
-using System.ServiceModel.Activation;
-using Dongke.IBOSS.PRD.Basics.BaseResources;
-using Dongke.IBOSS.PRD.Basics.DataAccess;
-using Dongke.IBOSS.PRD.Basics.Library;
-using Dongke.IBOSS.PRD.Service.BarcodePrintService;
-using Dongke.IBOSS.PRD.Service.CommonModuleLogic;
-using Dongke.IBOSS.PRD.Service.DataModels;
-using Dongke.IBOSS.PRD.Service.DKIBOSSPRDLogic;
-using Dongke.IBOSS.PRD.Service.HRModuleLogic;
-using Dongke.IBOSS.PRD.Service.PCModuleLogic;
-using Dongke.IBOSS.PRD.Service.PDAModuleLogic;
-using Dongke.IBOSS.PRD.Service.PMModuleLogic;
-using Dongke.IBOSS.PRD.Service.PublicModuleService;
-using Dongke.IBOSS.PRD.Service.ReportModuleLogic;
-using Dongke.IBOSS.PRD.Service.SmartDeviceService;
-using Dongke.IBOSS.PRD.Service.SystemModuleLogic;
 using Dongke.IBOSS.PRD.WCF.Contracts;
 using Dongke.IBOSS.PRD.WCF.DataModels;
-using Dongke.IBOSS.PRD.WCF.DataModels.ConfigModule;
-using Dongke.IBOSS.PRD.WCF.DataModels.HRModule;
-using Dongke.IBOSS.PRD.WCF.DataModels.PCModule;
-using Dongke.IBOSS.PRD.WCF.DataModels.PMModule;
+using Dongke.IBOSS.PRD.Service.PDAModuleLogic;
 
 namespace Dongke.IBOSS.PRD.WCF.Services
 {
-	public partial class PDAModuleService : IPDAModule
+    public partial class PDAModuleService : IPDAModule
 	{
-        //public ActionResult SemiGetGroutingLineUserCode(string accountCode, string userCode, string userPassword, string sessionKey, string groutingLineCode)
-        //{
-        //    return CallActionResult("PDAModuleLogic.PDAModuleLogic.GetGroutingLineUserCode",
-        //        accountCode,
-        //        userCode,
-        //        userPassword,
-        //        sessionKey,
-        //        groutingLineCode
-        //        );
-        //}
-
+        public ActionResult GetGoodsGradeDataSemi(string accountCode, string userCode, string userPassword, string sessionKey, int procedureId)
+        {
+            return CallActionResult("PDAModuleLogic.PDAModuleLogic.GetGoodsGradeDataSemi",
+                accountCode,
+                userCode,
+                userPassword,
+                sessionKey,
+                procedureId
+                );
+        }
     }
 }

WCF.Service/WCF.Services/PMModuleServiceNew.cs

@@ -13,7 +13,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.ServiceModel;
 using System.ServiceModel.Activation;
-
+using Dongke.IBOSS.PRD.Service.PDAModuleLogic;
 using Dongke.IBOSS.PRD.Service.PMModuleService;
 using Dongke.IBOSS.PRD.WCF.Contracts;
 using Dongke.IBOSS.PRD.WCF.DataModels;
@@ -507,6 +507,17 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                 }
                 #endregion
 
+                #region 工序半检 xuwei add 2019-12-11
+                if(cre.NameSpace == "ProcedureSemi")
+                {
+                    if(cre.Name == "GetGoodsGradeDataSemi")
+                    {
+                        return ServiceInvoker.Invoke(this, () => PDAModuleLogic.GetGoodsGradeDataSemi(Convert.ToInt32(cre.Properties["procedureId"]), this.SUserInfo));
+                    }
+                    return null;
+                }
+                #endregion
+
                 return null;
             }
             catch (Exception ex)
@@ -515,5 +526,7 @@ namespace Dongke.IBOSS.PRD.WCF.Services
             }
 		}
 		#endregion
+
+
 	}
 }