优化

Src/Configs.cs

@@ -17,6 +17,7 @@ namespace Kivii.Client
         public const string RouteSampleAssign = "/Restful/Kivii.Samples.Entities.Sample/Assign";
         public const string RouteSamplePackaging = "/Restful/Kivii.Samples.Entities.Sample/Packaging";
         public const string RouteSampleUnPackaging = "/Restful/Kivii.Samples.Entities.Sample/UnPackaging";
+        public const string RouteOrganizationQuery = "/Restful/Kivii.Organizations.Entities.Organization/Query";
 
     }
 }

Src/Entities/Sample.Entities.cs

@@ -232,6 +232,9 @@ namespace Kivii.Samples.Entities
         [Ignore]
         public Sample CurrentPackage { get; set; }
 
+        [Ignore]
+        public bool IsMatched { get; set; }
+
         #region 创建/更新人V1.0
         [ApiMember(Description = "创建人Kvid ")]
         [IgnoreUpdate]
@@ -473,4 +476,108 @@ namespace Kivii.Samples.Entities
         /// </summary>
         Inbound = 200
     }
+
+
+    public class Organization : EntityWithMetadata, IEntityInPrimaryDb,
+        IEntityIsTree, IEntityHasRole, IEntityIsConfig
+    {
+        #region 关联信息
+
+        [DefaultEmptyGuid]
+        [ApiMember(Description = "父级Id")]
+        public Guid ParentKvid { get; set; }
+
+        #endregion
+
+        #region 名称信息
+        /// <summary>
+        /// 公司简称
+        /// </summary>
+        [ApiMember(Description = "机构简称")]
+        [Default("")]
+        [StringLength(200)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 公司全称
+        /// </summary>
+        [ApiMember(Description = "机构全称", IsRequired = true)]
+        [Required]
+        [StringLength(200)]
+        [Unique]
+        public string FullName { get; set; }
+
+        /// <summary>
+        /// 助记码
+        /// </summary>
+        [StringLength(50)]
+        [Default("")]
+        [ApiMember(Description = "助 记 码")]
+        public string NameCode { get; set; }
+        #endregion
+
+        /// <summary>
+        /// 组织机构类型
+        /// </summary>
+        [StringLength(50)]
+        [IgnoreUpdate]
+        [Default("")]
+        [ApiMember(Description = "机构类型，分支机构，部门")]
+        public OrganizationType Type { get; set; }
+
+        /// <summary>
+        /// 内部编码，可以不填，一旦填写就要验证唯一性
+        /// </summary>
+        [StringLength(50)]
+        [Unique]
+        [Default("")]
+        [ApiMember(Description = "内部编码，可以不填，一旦填写就要验证唯一性")]
+        public string InternalCode { get; set; }
+
+        [Default("")]
+        [StringLength(50)]
+        [ApiMember(Description = "外部编码，其它系统导入的编码信息")]
+        public string RefId { get; set; }
+
+        /// <summary>
+        /// 部门电话
+        /// </summary>
+        [Default("")]
+        [ApiMember(Description = "联系电话")]
+        [StringLength(50)]
+        public string Telephone { get; set; }
+
+
+        /// <summary>
+        /// 公司地址
+        /// </summary>
+        [Default("")]
+        [StringLength(200)]
+        [ApiMember(Description = "机构地址")]
+        public string Address { get; set; }
+
+
+
+        /// <summary>
+        /// 排序号
+        /// </summary>
+        [Default(0)]
+        [ApiMember(Description = "排 序 号")]
+        public int SortId { get; set; }
+
+        //不使用，从系统层面已经分开各个组织机构了，一个域只能有一个组织机构
+        //[IgnoreUpdate]
+        //[CurrentOrganizationKvid]
+        //[ApiMember(Description = "根组织机构Id,根组织机构的Id和本属性值相同")]
+        //public Guid OrganizationKvid { get; set; }
+
+    }
+
+    public enum OrganizationType
+    {
+        Unsupported = 0,
+        Org,
+        Dept,
+        Virtual
+    }
 }

Src/FrmMain.Designer.cs

@@ -78,6 +78,7 @@
             this.btnClearCurrentPackage = new System.Windows.Forms.Button();
             this.lbSetPackage = new System.Windows.Forms.Label();
             this.tbSetCurrentPackage = new System.Windows.Forms.TextBox();
+            this.ckbAutoPackage = new System.Windows.Forms.CheckBox();
             this.plLeft.SuspendLayout();
             this.gbInfo.SuspendLayout();
             this.gbLogin.SuspendLayout();
@@ -98,7 +99,7 @@
             this.plLeft.Dock = System.Windows.Forms.DockStyle.Left;
             this.plLeft.Location = new System.Drawing.Point(0, 0);
             this.plLeft.Name = "plLeft";
-            this.plLeft.Size = new System.Drawing.Size(252, 667);
+            this.plLeft.Size = new System.Drawing.Size(252, 659);
             this.plLeft.TabIndex = 0;
             // 
             // gbInfo
@@ -107,7 +108,7 @@
             this.gbInfo.Dock = System.Windows.Forms.DockStyle.Fill;
             this.gbInfo.Location = new System.Drawing.Point(0, 447);
             this.gbInfo.Name = "gbInfo";
-            this.gbInfo.Size = new System.Drawing.Size(252, 220);
+            this.gbInfo.Size = new System.Drawing.Size(252, 212);
             this.gbInfo.TabIndex = 2;
             this.gbInfo.TabStop = false;
             this.gbInfo.Text = "信息";
@@ -117,7 +118,7 @@
             this.rtbMessage.Dock = System.Windows.Forms.DockStyle.Fill;
             this.rtbMessage.Location = new System.Drawing.Point(3, 17);
             this.rtbMessage.Name = "rtbMessage";
-            this.rtbMessage.Size = new System.Drawing.Size(246, 200);
+            this.rtbMessage.Size = new System.Drawing.Size(246, 192);
             this.rtbMessage.TabIndex = 0;
             this.rtbMessage.Text = "";
             // 
@@ -294,9 +295,9 @@
             this.plRight.Controls.Add(this.gbRfid);
             this.plRight.Controls.Add(this.gbRightToolBar);
             this.plRight.Dock = System.Windows.Forms.DockStyle.Right;
-            this.plRight.Location = new System.Drawing.Point(659, 0);
+            this.plRight.Location = new System.Drawing.Point(635, 0);
             this.plRight.Name = "plRight";
-            this.plRight.Size = new System.Drawing.Size(429, 667);
+            this.plRight.Size = new System.Drawing.Size(450, 659);
             this.plRight.TabIndex = 1;
             // 
             // gbRfid
@@ -305,7 +306,7 @@
             this.gbRfid.Dock = System.Windows.Forms.DockStyle.Fill;
             this.gbRfid.Location = new System.Drawing.Point(0, 125);
             this.gbRfid.Name = "gbRfid";
-            this.gbRfid.Size = new System.Drawing.Size(429, 542);
+            this.gbRfid.Size = new System.Drawing.Size(450, 534);
             this.gbRfid.TabIndex = 2;
             this.gbRfid.TabStop = false;
             this.gbRfid.Text = "Rfid扫描结果";
@@ -328,9 +329,10 @@
             this.dgvRfidSamples.Name = "dgvRfidSamples";
             this.dgvRfidSamples.ReadOnly = true;
             this.dgvRfidSamples.RowTemplate.Height = 23;
-            this.dgvRfidSamples.Size = new System.Drawing.Size(423, 522);
+            this.dgvRfidSamples.Size = new System.Drawing.Size(444, 514);
             this.dgvRfidSamples.TabIndex = 0;
             this.dgvRfidSamples.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dgvRfidSamples_RowPostPaint);
+            this.dgvRfidSamples.RowStateChanged += new System.Windows.Forms.DataGridViewRowStateChangedEventHandler(this.dgvRfidSamples_RowStateChanged);
             // 
             // dataGridViewTextBoxColumn1
             // 
@@ -394,6 +396,7 @@
             // 
             // gbRightToolBar
             // 
+            this.gbRightToolBar.Controls.Add(this.ckbAutoPackage);
             this.gbRightToolBar.Controls.Add(this.btnSampleAssign);
             this.gbRightToolBar.Controls.Add(this.lbTips);
             this.gbRightToolBar.Controls.Add(this.lbScanSample);
@@ -402,7 +405,7 @@
             this.gbRightToolBar.Dock = System.Windows.Forms.DockStyle.Top;
             this.gbRightToolBar.Location = new System.Drawing.Point(0, 0);
             this.gbRightToolBar.Name = "gbRightToolBar";
-            this.gbRightToolBar.Size = new System.Drawing.Size(429, 125);
+            this.gbRightToolBar.Size = new System.Drawing.Size(450, 125);
             this.gbRightToolBar.TabIndex = 1;
             this.gbRightToolBar.TabStop = false;
             this.gbRightToolBar.Text = "操作台";
@@ -413,7 +416,7 @@
             this.btnSampleAssign.Dock = System.Windows.Forms.DockStyle.Right;
             this.btnSampleAssign.Font = new System.Drawing.Font("宋体", 29F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))));
             this.btnSampleAssign.ForeColor = System.Drawing.Color.DarkBlue;
-            this.btnSampleAssign.Location = new System.Drawing.Point(313, 17);
+            this.btnSampleAssign.Location = new System.Drawing.Point(334, 17);
             this.btnSampleAssign.Name = "btnSampleAssign";
             this.btnSampleAssign.Size = new System.Drawing.Size(113, 105);
             this.btnSampleAssign.TabIndex = 84;
@@ -448,7 +451,7 @@
             this.tbScanSample.Font = new System.Drawing.Font("宋体", 18F);
             this.tbScanSample.Location = new System.Drawing.Point(7, 44);
             this.tbScanSample.Name = "tbScanSample";
-            this.tbScanSample.Size = new System.Drawing.Size(209, 35);
+            this.tbScanSample.Size = new System.Drawing.Size(224, 35);
             this.tbScanSample.TabIndex = 81;
             this.tbScanSample.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbScanSample_KeyDown);
             // 
@@ -459,7 +462,7 @@
             this.btnScanRfid.ForeColor = System.Drawing.Color.Chocolate;
             this.btnScanRfid.Location = new System.Drawing.Point(7, 82);
             this.btnScanRfid.Name = "btnScanRfid";
-            this.btnScanRfid.Size = new System.Drawing.Size(209, 40);
+            this.btnScanRfid.Size = new System.Drawing.Size(224, 40);
             this.btnScanRfid.TabIndex = 77;
             this.btnScanRfid.Text = "开始扫描";
             this.btnScanRfid.UseVisualStyleBackColor = false;
@@ -472,7 +475,7 @@
             this.plMain.Dock = System.Windows.Forms.DockStyle.Fill;
             this.plMain.Location = new System.Drawing.Point(252, 0);
             this.plMain.Name = "plMain";
-            this.plMain.Size = new System.Drawing.Size(407, 667);
+            this.plMain.Size = new System.Drawing.Size(383, 659);
             this.plMain.TabIndex = 2;
             // 
             // gbMain
@@ -481,7 +484,7 @@
             this.gbMain.Dock = System.Windows.Forms.DockStyle.Fill;
             this.gbMain.Location = new System.Drawing.Point(0, 125);
             this.gbMain.Name = "gbMain";
-            this.gbMain.Size = new System.Drawing.Size(407, 542);
+            this.gbMain.Size = new System.Drawing.Size(383, 534);
             this.gbMain.TabIndex = 1;
             this.gbMain.TabStop = false;
             this.gbMain.Text = "箱内样品";
@@ -504,9 +507,11 @@
             this.dgvSamples.Name = "dgvSamples";
             this.dgvSamples.ReadOnly = true;
             this.dgvSamples.RowTemplate.Height = 23;
-            this.dgvSamples.Size = new System.Drawing.Size(401, 522);
+            this.dgvSamples.Size = new System.Drawing.Size(377, 514);
             this.dgvSamples.TabIndex = 0;
+            this.dgvSamples.DataBindingComplete += new System.Windows.Forms.DataGridViewBindingCompleteEventHandler(this.dgvSamples_DataBindingComplete);
             this.dgvSamples.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dgvSamples_RowPostPaint);
+            this.dgvSamples.RowStateChanged += new System.Windows.Forms.DataGridViewRowStateChangedEventHandler(this.dgvSamples_RowStateChanged);
             // 
             // SampleBizId
             // 
@@ -577,7 +582,7 @@
             this.gbMainToolBar.Dock = System.Windows.Forms.DockStyle.Top;
             this.gbMainToolBar.Location = new System.Drawing.Point(0, 0);
             this.gbMainToolBar.Name = "gbMainToolBar";
-            this.gbMainToolBar.Size = new System.Drawing.Size(407, 125);
+            this.gbMainToolBar.Size = new System.Drawing.Size(383, 125);
             this.gbMainToolBar.TabIndex = 0;
             this.gbMainToolBar.TabStop = false;
             this.gbMainToolBar.Text = "操作台";
@@ -622,11 +627,21 @@
             this.tbSetCurrentPackage.TabIndex = 78;
             this.tbSetCurrentPackage.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbSetCurrentPackage_KeyDown);
             // 
+            // ckbAutoPackage
+            // 
+            this.ckbAutoPackage.AutoSize = true;
+            this.ckbAutoPackage.Location = new System.Drawing.Point(237, 103);
+            this.ckbAutoPackage.Name = "ckbAutoPackage";
+            this.ckbAutoPackage.Size = new System.Drawing.Size(72, 16);
+            this.ckbAutoPackage.TabIndex = 85;
+            this.ckbAutoPackage.Text = "自动入箱";
+            this.ckbAutoPackage.UseVisualStyleBackColor = true;
+            // 
             // FrmMain
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1088, 667);
+            this.ClientSize = new System.Drawing.Size(1085, 659);
             this.Controls.Add(this.plMain);
             this.Controls.Add(this.plRight);
             this.Controls.Add(this.plLeft);
@@ -703,6 +718,7 @@
         private System.Windows.Forms.ComboBox cbSetCurrentPackageOwner;
         private System.Windows.Forms.Label lbCurrentPackageStatus;
         private System.Windows.Forms.Button btnSampleAssign;
+        private System.Windows.Forms.CheckBox ckbAutoPackage;
     }
 }
 

Src/Requests/RestfulRequests.cs

@@ -19,7 +19,7 @@ namespace Kivii.Samples.Transforms
         public string Name { get; set; }
         public SampleType Type { get; set; }
 
-        //public Guid PackageKvid { get; set; }
+        public Guid? Kvid { get; set; }
     }
 
     [Route(Configs.RouteSampleQuery)]
@@ -60,4 +60,11 @@ namespace Kivii.Samples.Transforms
         public Guid Kvid { get; set; }//要流转样品信息
         public Location Location { get; set; }//地点位置信息,只需要InternalCode
     }
+
+    [Route(Configs.RouteOrganizationQuery)]
+    public class OrganizationQuery : IReturn<RestfulQueryResponse<Organization>>
+    {
+        public string InternalCodeContains { get; set; } = "ChildGroup";
+    }
+
 }