Merge branch 'master' of https://e.coding.net/ccwin-in/JBLEAR-STD/jbLear-STD

# Conflicts:
#	Stone.WinForm/Stone.WinBiz/BasicData/F_Location.cs

.gitignore

@@ -264,3 +264,27 @@ __pycache__/
 /OpenAuth.WebApi/temp-keys
 /OpenAuthPro_3_1/Client/dist.rar
 
+/Data/Bak/2022-03-16/BMW.SY88.DELINS.2022021715242817.B1715243
+/Data/Bak/2022-03-16/BMW.SY88.DELINS.2022021814354328.B1814363
+/Data/Bak/2022-03-16/BMW.SY88.DELINS.2022021914293926.B1914293
+/Data/Bak/2022-03-16/BMW.SY88.DELINS.2022022014003635.B2014003
+/Data/Bak/2022-03-16/BMW.SY88.DELINS.2022022114543274.B2114543
+/Data/Bak/2022-03-16/BMW.SY88.DELINS.2022022214020358.B2214023
+/Data/Bak/2022-03-17/BMW.SY88.DELINS.2022030114542935.C0114543
+/Data/Bak/2022-03-17/BMW.SY88.DELINS.2022030215370477.C0215375
+/Data/Error/BMW.SY88.DELINS.2022030114542935.C0114543
+/Data/Error/BMW.SY88.DELINS.2022030215370477.C0215375
+/Data/测试报文/BMW.SY88.DELINS.2022021715242817.B1715243
+/Data/测试报文/BMW.SY88.DELINS.2022021814354328.B1814363
+/Data/测试报文/BMW.SY88.DELINS.2022021914293926.B1914293
+/Data/测试报文/BMW.SY88.DELINS.2022022014003635.B2014003
+/Data/测试报文/BMW.SY88.DELINS.2022022114543274.B2114543
+/Data/测试报文/BMW.SY88.DELINS.2022022214020358.B2214023
+BMW.SY88.DELINS.2022021715242817.B1715243
+BMW.SY88.DELINS.2022021814354328.B1814363
+BMW.SY88.DELINS.2022021914293926.B1914293
+BMW.SY88.DELINS.2022022014003635.B2014003
+BMW.SY88.DELINS.2022022114543274.B2114543
+BMW.SY88.DELINS.2022022214020358.B2214023
+BMW.SY88.DELINS.2022030114542935.C0114543
+BMW.SY88.DELINS.2022030215370477.C0215375

Stone.WinForm/Stone.WinBiz/BasicData/F_Location.cs

@@ -27,7 +27,6 @@ namespace Stone.WinBiz.BasicData
             dgv.Columns["Address2"].HeaderText = "地址2";
             dgv.Columns["Address3"].HeaderText = "地址3";
             dgv.Columns["State"].HeaderText = "状态";
-
         }
 
     }

Stone.WinForm/Stone.WinBiz/BasicData/F_Product.cs

@@ -35,6 +35,7 @@ namespace Stone.WinBiz.BasicData
             dgv.Columns["BarCode"].HeaderText = "条码号";
             dgv.Columns["IsStandard"].HeaderText = "是否STD件";
             dgv.Columns["PackNumer"].HeaderText = "装箱数量";
+            dgv.Columns["State"].HeaderText = "启用";
           
 
         }
@@ -73,6 +74,7 @@ namespace Stone.WinBiz.BasicData
                 drInput["BarCode"] = drData["条码号"].ToString();
                 drInput["PackNumer"] = drData["装箱数量"].ToString();
                 drInput["IsStandard"] = drData["是否STD件"].ToString();
+                drInput["State"] = drData["启用"].ToString();
 
                 if (drInput["Code"].ToString().Trim() == "")
                     throw new Exception("代码不能为空!");

Stone.WinForm/Stone.WinBiz/JISAdmin/F_EDI_JIS5000Sequence.cs

@@ -146,6 +146,7 @@ namespace Stone.WinBiz.JISAdmin
         {
 
             Entity_t_JIS_Lab t_JIS_Lab = new Entity_t_JIS_Lab();
+            Entity_t_Product t_Product = new Entity_t_Product();
 
             LocalDBService db = new LocalDBService();
 
@@ -190,7 +191,7 @@ namespace Stone.WinBiz.JISAdmin
 
                 }
             }
-
+            var strPartMsg = "";
 
             foreach (string line_text in sp_text)
             {
@@ -225,6 +226,18 @@ namespace Stone.WinBiz.JISAdmin
                 {
                     partNumber = sp_line[1].Split(':')[0];
                     orderNumber = sp_line[3];
+
+                    //校验零件号是否失效
+                    var strsql = "";
+                    strsql = "select top 1 * from t_Product where Code = '" + partNumber + "' order by id desc";
+                    var dsProd = db.Exec_DataSet(strsql);
+                    if (dsProd.Tables[0].Rows.Count > 0)
+                    {
+                        var strState = dsProd.Tables[0].Rows[0]["State"].ToString();
+                        if (strState == "0" || string.IsNullOrEmpty(strState))
+                            strPartMsg += "零件号 " + partNumber + " 已失效！" + Environment.NewLine;
+                    }
+
                 }
 
 
@@ -233,6 +246,17 @@ namespace Stone.WinBiz.JISAdmin
                 {
                     LocationCode = sp_line[1].Split(':')[0];
                     location = sp_line[3];
+
+                    //校验卸货点是否失效
+                    var strsql = "";
+                    strsql = "select top 1 * from t_Location where Code = '" + LocationCode + "' order by id desc";
+                    var dsLoc = db.Exec_DataSet(strsql);
+                    if (dsLoc.Tables[0].Rows.Count > 0)
+                    {
+                        var strState = dsLoc.Tables[0].Rows[0]["State"].ToString();
+                        if (strState == "0" || string.IsNullOrEmpty(strState))
+                            strPartMsg += "卸货点 " + partNumber + " 已失效！" + Environment.NewLine;
+                    }
                 }
 
                 if(sp_line[0] == "DST")
@@ -302,12 +326,7 @@ namespace Stone.WinBiz.JISAdmin
                         db.Exec_NonQuery(sqls.ToString());
                         sqls = new StringBuilder();
                     }
-
-
                 }
-
-
-
             }
 
             if (sqls.ToString() != "")
@@ -316,8 +335,10 @@ namespace Stone.WinBiz.JISAdmin
                 sqls = new StringBuilder();
             }
 
-
-
+            if (strPartMsg != "")
+            {
+                F_Mail.Send(strPartMsg);
+            }
         }
 
 

Stone.WinForm/Stone.WinForm/Stone.WinForm.csproj

@@ -214,7 +214,9 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <WCFMetadata Include="Connected Services\" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Stone.WinForm/Stone.WinModule/BasicData/frmLocationDetail.Designer.cs

@@ -37,92 +37,129 @@
             this.colorDialog1 = new System.Windows.Forms.ColorDialog();
             this.txtAddress3 = new System.Windows.Forms.TextBox();
             this.label4 = new System.Windows.Forms.Label();
+            this.label5 = new System.Windows.Forms.Label();
+            this.cbState = new System.Windows.Forms.CheckBox();
             this.SuspendLayout();
             // 
             // btnAddNewLine
             // 
-            this.btnAddNewLine.Location = new System.Drawing.Point(41, 191);
+            this.btnAddNewLine.Location = new System.Drawing.Point(62, 293);
+            this.btnAddNewLine.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             // 
             // btnClose
             // 
-            this.btnClose.Location = new System.Drawing.Point(254, 191);
+            this.btnClose.Location = new System.Drawing.Point(381, 293);
+            this.btnClose.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             // 
             // btnOK
             // 
-            this.btnOK.Location = new System.Drawing.Point(167, 191);
+            this.btnOK.Location = new System.Drawing.Point(250, 293);
+            this.btnOK.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             // 
             // txtAddress2
             // 
-            this.txtAddress2.Location = new System.Drawing.Point(113, 108);
+            this.txtAddress2.Location = new System.Drawing.Point(170, 162);
+            this.txtAddress2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtAddress2.MaxLength = 200;
             this.txtAddress2.Name = "txtAddress2";
-            this.txtAddress2.Size = new System.Drawing.Size(222, 21);
+            this.txtAddress2.Size = new System.Drawing.Size(331, 28);
             this.txtAddress2.TabIndex = 2;
             // 
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(57, 110);
+            this.label3.Location = new System.Drawing.Point(86, 165);
+            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(47, 12);
+            this.label3.Size = new System.Drawing.Size(71, 18);
             this.label3.TabIndex = 111;
             this.label3.Text = "地址2：";
             // 
             // txtAddress1
             // 
-            this.txtAddress1.Location = new System.Drawing.Point(113, 74);
+            this.txtAddress1.Location = new System.Drawing.Point(170, 111);
+            this.txtAddress1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtAddress1.MaxLength = 100;
             this.txtAddress1.Name = "txtAddress1";
-            this.txtAddress1.Size = new System.Drawing.Size(222, 21);
+            this.txtAddress1.Size = new System.Drawing.Size(331, 28);
             this.txtAddress1.TabIndex = 1;
             // 
             // txtCode
             // 
-            this.txtCode.Location = new System.Drawing.Point(113, 40);
+            this.txtCode.Location = new System.Drawing.Point(170, 60);
+            this.txtCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtCode.MaxLength = 10;
             this.txtCode.Name = "txtCode";
-            this.txtCode.Size = new System.Drawing.Size(222, 21);
+            this.txtCode.Size = new System.Drawing.Size(331, 28);
             this.txtCode.TabIndex = 0;
             // 
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(57, 77);
+            this.label2.Location = new System.Drawing.Point(86, 116);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(47, 12);
+            this.label2.Size = new System.Drawing.Size(71, 18);
             this.label2.TabIndex = 109;
             this.label2.Text = "地址1：";
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(63, 44);
+            this.label1.Location = new System.Drawing.Point(94, 66);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(41, 12);
+            this.label1.Size = new System.Drawing.Size(62, 18);
             this.label1.TabIndex = 108;
             this.label1.Text = "代码：";
             // 
             // txtAddress3
             // 
-            this.txtAddress3.Location = new System.Drawing.Point(113, 142);
+            this.txtAddress3.Location = new System.Drawing.Point(170, 213);
+            this.txtAddress3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtAddress3.MaxLength = 200;
             this.txtAddress3.Name = "txtAddress3";
-            this.txtAddress3.Size = new System.Drawing.Size(222, 21);
+            this.txtAddress3.Size = new System.Drawing.Size(331, 28);
             this.txtAddress3.TabIndex = 3;
             // 
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(57, 143);
+            this.label4.Location = new System.Drawing.Point(86, 214);
+            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(47, 12);
+            this.label4.Size = new System.Drawing.Size(71, 18);
             this.label4.TabIndex = 113;
             this.label4.Text = "地址3：";
             // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(88, 256);
+            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(62, 18);
+            this.label5.TabIndex = 115;
+            this.label5.Text = "状态：";
+            // 
+            // cbState
+            // 
+            this.cbState.AutoSize = true;
+            this.cbState.Checked = true;
+            this.cbState.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.cbState.Location = new System.Drawing.Point(170, 255);
+            this.cbState.Name = "cbState";
+            this.cbState.Size = new System.Drawing.Size(70, 22);
+            this.cbState.TabIndex = 116;
+            this.cbState.Text = "启用";
+            this.cbState.UseVisualStyleBackColor = true;
+            // 
             // frmLocationDetail
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.ClientSize = new System.Drawing.Size(381, 277);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.ClientSize = new System.Drawing.Size(572, 416);
+            this.Controls.Add(this.cbState);
+            this.Controls.Add(this.label5);
             this.Controls.Add(this.txtAddress3);
             this.Controls.Add(this.label4);
             this.Controls.Add(this.txtAddress2);
@@ -131,6 +168,7 @@
             this.Controls.Add(this.txtCode);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.label1);
+            this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.Name = "frmLocationDetail";
             this.Load += new System.EventHandler(this.frmColorDetail_Load);
             this.Controls.SetChildIndex(this.btnOK, 0);
@@ -144,6 +182,8 @@
             this.Controls.SetChildIndex(this.txtAddress2, 0);
             this.Controls.SetChildIndex(this.label4, 0);
             this.Controls.SetChildIndex(this.txtAddress3, 0);
+            this.Controls.SetChildIndex(this.label5, 0);
+            this.Controls.SetChildIndex(this.cbState, 0);
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -160,5 +200,7 @@
         private System.Windows.Forms.ColorDialog colorDialog1;
         private System.Windows.Forms.TextBox txtAddress3;
         private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.CheckBox cbState;
     }
 }

Stone.WinForm/Stone.WinModule/BasicData/frmLocationDetail.cs

@@ -33,6 +33,16 @@ namespace Stone.WinModule.BasicData
             drData["Address1"] = MyStrings.GetString(this.txtAddress1.Text.Trim());
             drData["Address2"] = MyStrings.GetString(this.txtAddress2.Text.Trim());
             drData["Address3"] = MyStrings.GetString(this.txtAddress3.Text.Trim());
+            if (cbState.Checked)
+            {
+                drData["State"] = "1";
+            }
+            else
+            {
+                drData["State"] = "0";
+            }
+
+           
 
             return true;
         }
@@ -46,6 +56,16 @@ namespace Stone.WinModule.BasicData
                 this.txtAddress1.Text = drData["Address1"].ToString();
                 this.txtAddress2.Text = drData["Address2"].ToString();
                 this.txtAddress3.Text = drData["Address3"].ToString();
+
+                var strState = drData["State"].ToString();
+                if (strState == "1")
+                {
+                    cbState.Checked = true;
+                }
+                else
+                {
+                    cbState.Checked = false;
+                }
             }
 
             return false;
@@ -58,6 +78,7 @@ namespace Stone.WinModule.BasicData
             this.txtAddress1.Text = "";
             this.txtAddress2.Text = "";
             this.txtAddress3.Text = "";
+            cbState.Checked = true;
 
             this.txtCode.Focus();
         }

Stone.WinForm/Stone.WinModule/BasicData/frmProductDetail.Designer.cs

@@ -46,172 +46,207 @@
             this.txtIsStandard = new System.Windows.Forms.CheckBox();
             this.txtPackNumer = new System.Windows.Forms.TextBox();
             this.label5 = new System.Windows.Forms.Label();
+            this.cbState = new System.Windows.Forms.CheckBox();
             this.SuspendLayout();
             // 
             // btnAddNewLine
             // 
-            this.btnAddNewLine.Location = new System.Drawing.Point(184, 331);
+            this.btnAddNewLine.Location = new System.Drawing.Point(276, 496);
+            this.btnAddNewLine.Margin = new System.Windows.Forms.Padding(6);
+            this.btnAddNewLine.Click += new System.EventHandler(this.btnAddNewLine_Click);
             // 
             // btnClose
             // 
-            this.btnClose.Location = new System.Drawing.Point(411, 331);
+            this.btnClose.Location = new System.Drawing.Point(616, 496);
+            this.btnClose.Margin = new System.Windows.Forms.Padding(6);
             // 
             // btnOK
             // 
-            this.btnOK.Location = new System.Drawing.Point(324, 331);
+            this.btnOK.Location = new System.Drawing.Point(486, 496);
+            this.btnOK.Margin = new System.Windows.Forms.Padding(6);
+            this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
             // 
             // txtDeploy
             // 
-            this.txtDeploy.Location = new System.Drawing.Point(107, 184);
+            this.txtDeploy.Location = new System.Drawing.Point(160, 276);
+            this.txtDeploy.Margin = new System.Windows.Forms.Padding(4);
             this.txtDeploy.MaxLength = 50;
             this.txtDeploy.Name = "txtDeploy";
-            this.txtDeploy.Size = new System.Drawing.Size(385, 21);
+            this.txtDeploy.Size = new System.Drawing.Size(576, 28);
             this.txtDeploy.TabIndex = 5;
             // 
             // label21
             // 
             this.label21.AutoSize = true;
-            this.label21.Location = new System.Drawing.Point(63, 188);
+            this.label21.Location = new System.Drawing.Point(94, 282);
+            this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label21.Name = "label21";
-            this.label21.Size = new System.Drawing.Size(41, 12);
+            this.label21.Size = new System.Drawing.Size(62, 18);
             this.label21.TabIndex = 186;
             this.label21.Text = "配置：";
             // 
             // txtCarModelCode
             // 
-            this.txtCarModelCode.Location = new System.Drawing.Point(107, 126);
+            this.txtCarModelCode.Location = new System.Drawing.Point(160, 189);
+            this.txtCarModelCode.Margin = new System.Windows.Forms.Padding(6);
             this.txtCarModelCode.Name = "txtCarModelCode";
             this.txtCarModelCode.ReadOnly = false;
-            this.txtCarModelCode.Size = new System.Drawing.Size(385, 21);
+            this.txtCarModelCode.Size = new System.Drawing.Size(578, 28);
             this.txtCarModelCode.TabIndex = 3;
             this.txtCarModelCode.OnSelectClick += new System.EventHandler(this.txtCarModelCode_OnSelectClick);
             // 
             // label6
             // 
             this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(63, 159);
+            this.label6.Location = new System.Drawing.Point(94, 238);
+            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(41, 12);
+            this.label6.Size = new System.Drawing.Size(62, 18);
             this.label6.TabIndex = 185;
             this.label6.Text = "颜色：";
             // 
             // txtColorCode
             // 
-            this.txtColorCode.Location = new System.Drawing.Point(107, 155);
+            this.txtColorCode.Location = new System.Drawing.Point(160, 232);
+            this.txtColorCode.Margin = new System.Windows.Forms.Padding(6);
             this.txtColorCode.Name = "txtColorCode";
             this.txtColorCode.ReadOnly = false;
-            this.txtColorCode.Size = new System.Drawing.Size(385, 21);
+            this.txtColorCode.Size = new System.Drawing.Size(578, 28);
             this.txtColorCode.TabIndex = 4;
             this.txtColorCode.OnSelectClick += new System.EventHandler(this.txtColorCode_OnSelectClick);
             // 
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(63, 130);
+            this.label4.Location = new System.Drawing.Point(94, 195);
+            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(41, 12);
+            this.label4.Size = new System.Drawing.Size(62, 18);
             this.label4.TabIndex = 183;
             this.label4.Text = "车型：";
             // 
             // txtModel
             // 
-            this.txtModel.Location = new System.Drawing.Point(107, 97);
+            this.txtModel.Location = new System.Drawing.Point(160, 146);
+            this.txtModel.Margin = new System.Windows.Forms.Padding(4);
             this.txtModel.MaxLength = 50;
             this.txtModel.Name = "txtModel";
-            this.txtModel.Size = new System.Drawing.Size(385, 21);
+            this.txtModel.Size = new System.Drawing.Size(576, 28);
             this.txtModel.TabIndex = 2;
             // 
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(39, 101);
+            this.label3.Location = new System.Drawing.Point(58, 152);
+            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(65, 12);
+            this.label3.Size = new System.Drawing.Size(98, 18);
             this.label3.TabIndex = 182;
             this.label3.Text = "规格型号：";
             // 
             // txtName
             // 
-            this.txtName.Location = new System.Drawing.Point(107, 68);
+            this.txtName.Location = new System.Drawing.Point(160, 102);
+            this.txtName.Margin = new System.Windows.Forms.Padding(4);
             this.txtName.MaxLength = 100;
             this.txtName.Name = "txtName";
-            this.txtName.Size = new System.Drawing.Size(385, 21);
+            this.txtName.Size = new System.Drawing.Size(576, 28);
             this.txtName.TabIndex = 1;
             // 
             // txtCode
             // 
-            this.txtCode.Location = new System.Drawing.Point(107, 39);
+            this.txtCode.Location = new System.Drawing.Point(160, 58);
+            this.txtCode.Margin = new System.Windows.Forms.Padding(4);
             this.txtCode.MaxLength = 20;
             this.txtCode.Name = "txtCode";
-            this.txtCode.Size = new System.Drawing.Size(385, 21);
+            this.txtCode.Size = new System.Drawing.Size(576, 28);
             this.txtCode.TabIndex = 0;
             // 
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(39, 72);
+            this.label2.Location = new System.Drawing.Point(58, 108);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(65, 12);
+            this.label2.Size = new System.Drawing.Size(98, 18);
             this.label2.TabIndex = 181;
             this.label2.Text = "存货名称：";
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(39, 43);
+            this.label1.Location = new System.Drawing.Point(58, 64);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(65, 12);
+            this.label1.Size = new System.Drawing.Size(98, 18);
             this.label1.TabIndex = 180;
             this.label1.Text = "存货代码：";
             // 
             // txtBarCode
             // 
-            this.txtBarCode.Location = new System.Drawing.Point(107, 213);
+            this.txtBarCode.Location = new System.Drawing.Point(160, 320);
+            this.txtBarCode.Margin = new System.Windows.Forms.Padding(4);
             this.txtBarCode.MaxLength = 50;
             this.txtBarCode.Name = "txtBarCode";
-            this.txtBarCode.Size = new System.Drawing.Size(385, 21);
+            this.txtBarCode.Size = new System.Drawing.Size(576, 28);
             this.txtBarCode.TabIndex = 6;
             // 
             // label31
             // 
             this.label31.AutoSize = true;
-            this.label31.Location = new System.Drawing.Point(51, 217);
+            this.label31.Location = new System.Drawing.Point(76, 326);
+            this.label31.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label31.Name = "label31";
-            this.label31.Size = new System.Drawing.Size(53, 12);
+            this.label31.Size = new System.Drawing.Size(80, 18);
             this.label31.TabIndex = 204;
             this.label31.Text = "条码号：";
             // 
             // txtIsStandard
             // 
             this.txtIsStandard.AutoSize = true;
-            this.txtIsStandard.Location = new System.Drawing.Point(411, 245);
+            this.txtIsStandard.Location = new System.Drawing.Point(466, 365);
+            this.txtIsStandard.Margin = new System.Windows.Forms.Padding(4);
             this.txtIsStandard.Name = "txtIsStandard";
-            this.txtIsStandard.Size = new System.Drawing.Size(78, 16);
+            this.txtIsStandard.Size = new System.Drawing.Size(115, 22);
             this.txtIsStandard.TabIndex = 14;
             this.txtIsStandard.Text = "是否STD件";
             this.txtIsStandard.UseVisualStyleBackColor = true;
             // 
             // txtPackNumer
             // 
-            this.txtPackNumer.Location = new System.Drawing.Point(107, 242);
+            this.txtPackNumer.Location = new System.Drawing.Point(160, 363);
+            this.txtPackNumer.Margin = new System.Windows.Forms.Padding(4);
             this.txtPackNumer.MaxLength = 5;
             this.txtPackNumer.Name = "txtPackNumer";
-            this.txtPackNumer.Size = new System.Drawing.Size(276, 21);
+            this.txtPackNumer.Size = new System.Drawing.Size(269, 28);
             this.txtPackNumer.TabIndex = 13;
             // 
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(39, 246);
+            this.label5.Location = new System.Drawing.Point(58, 369);
+            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(65, 12);
+            this.label5.Size = new System.Drawing.Size(98, 18);
             this.label5.TabIndex = 216;
             this.label5.Text = "装箱数量：";
             // 
+            // cbState
+            // 
+            this.cbState.AutoSize = true;
+            this.cbState.Location = new System.Drawing.Point(599, 365);
+            this.cbState.Margin = new System.Windows.Forms.Padding(4);
+            this.cbState.Name = "cbState";
+            this.cbState.Size = new System.Drawing.Size(70, 22);
+            this.cbState.TabIndex = 217;
+            this.cbState.Text = "启用";
+            this.cbState.UseVisualStyleBackColor = true;
+            // 
             // frmProductDetail
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.ClientSize = new System.Drawing.Size(534, 413);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.ClientSize = new System.Drawing.Size(801, 620);
+            this.Controls.Add(this.cbState);
             this.Controls.Add(this.txtPackNumer);
             this.Controls.Add(this.label5);
             this.Controls.Add(this.txtIsStandard);
@@ -229,6 +264,7 @@
             this.Controls.Add(this.txtCode);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.label1);
+            this.Margin = new System.Windows.Forms.Padding(6);
             this.Name = "frmProductDetail";
             this.Load += new System.EventHandler(this.frmColorDetail_Load);
             this.Controls.SetChildIndex(this.btnOK, 0);
@@ -251,6 +287,7 @@
             this.Controls.SetChildIndex(this.txtIsStandard, 0);
             this.Controls.SetChildIndex(this.label5, 0);
             this.Controls.SetChildIndex(this.txtPackNumer, 0);
+            this.Controls.SetChildIndex(this.cbState, 0);
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -276,5 +313,6 @@
         private System.Windows.Forms.CheckBox txtIsStandard;
         private System.Windows.Forms.TextBox txtPackNumer;
         private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.CheckBox cbState;
     }
 }

Stone.WinForm/Stone.WinModule/BasicData/frmProductDetail.cs

@@ -50,6 +50,7 @@ namespace Stone.WinModule.BasicData
             drData["BarCode"] = MyStrings.GetString(this.txtBarCode.Text.Trim());
             drData["IsStandard"] = this.txtIsStandard.Checked ? true : false;
             drData["PackNumer"] = MyStrings.GetString(this.txtPackNumer.Text.Trim());
+            drData["State"] = this.cbState.Checked ? true : false;
 
             return true;
         }
@@ -67,6 +68,7 @@ namespace Stone.WinModule.BasicData
                 this.txtBarCode.Text = drData["BarCode"].ToString();
                 this.txtIsStandard.Checked = Convert.ToBoolean(drData["IsStandard"]);
                 this.txtPackNumer.Text = drData["PackNumer"].ToString();
+                this.cbState.Checked = Convert.ToBoolean(drData["State"]);
             }
 
             return false;
@@ -77,6 +79,8 @@ namespace Stone.WinModule.BasicData
             base.Clear();
             this.txtCode.Focus();
             this.txtCode.SelectAll();
+            cbState.Checked = true;
+            txtIsStandard.Checked = true;
         }
 
    
@@ -123,9 +127,14 @@ namespace Stone.WinModule.BasicData
             }
         }
 
-  
+        private void btnOK_Click(object sender, EventArgs e)
+        {
 
-        
+        }
 
+        private void btnAddNewLine_Click(object sender, EventArgs e)
+        {
+
+        }
     }
 }

Stone.WinForm/Stone.WinModule/JISData/frmJISLABReport.cs

@@ -151,15 +151,18 @@ namespace Stone.WinModule.JISData
         {
 
             #region 总数量获取
+
             string sql = @"
                     select 
                        partNumber,
                        Description,
+                       max(releaseId) as releaseId,
                        startDate,
+                       endDate,
                        SUM(quantity) as quantity
                     from v_JIS_Lab
                     where quantity <>0 and [startDate]>='{0}' and [startDate]<='{1}'
-                    group by partNumber, Description, startDate
+                    group by partNumber, Description, startDate,endDate
                     order by startDate, partNumber
                 ";
             object[] obj = new object[2];
@@ -177,7 +180,9 @@ namespace Stone.WinModule.JISData
 
             this.dgrdView.Columns["PartNumber"].HeaderText = "零件号";
             this.dgrdView.Columns["Description"].HeaderText = "零件描述";
-            this.dgrdView.Columns["startDate"].HeaderText = "需求日期";
+            this.dgrdView.Columns["releaseId"].HeaderText = "版本号";
+            this.dgrdView.Columns["startDate"].HeaderText = "需求开始日期";
+            this.dgrdView.Columns["endDate"].HeaderText = "需求结束日期";
             this.dgrdView.Columns["quantity"].HeaderText = "需求数量";