钜弘MES项目修改提交

UAS_MES_JH/App.config

@@ -72,13 +72,8 @@
   <applicationSettings>
     <UAS_MES_NEW.Properties.Settings>
       <setting name="MES" serializeAs="String">
-        <value>Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=joyhong.tpddns.cn)(PORT=1522)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</value>
+        <value>Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.1.5)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</value>
       </setting>
     </UAS_MES_NEW.Properties.Settings>
-    <UAS_MES.Properties.Settings>
-      <setting name="MES" serializeAs="String">
-        <value>Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=UAS_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=218.17.158.219)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</value>
-      </setting>
-    </UAS_MES.Properties.Settings>
   </applicationSettings>
 </configuration>

UAS_MES_JH/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -262,7 +262,8 @@ namespace UAS_MES_NEW.Make
                                 {
                                     OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
                                 }
-                                if (US_SKU.Text != "")
+                                string skureset = dh.GetConfig("skureset", "sys").ToString();
+                                if (US_SKU.Text != ""&& skureset =="1")
                                 {
                                     dh.ExecuteSql("update makeserial set ms_sku = '" + US_SKU.Text + "' where ms_sncode = '" + sncode.Text + "' and ms_makecode = '" + ma_code.Text + "'", "update");
                                 }

UAS_MES_JH/FunctionCode/Make/Make_ColorBoxWeigh.Designer.cs

@@ -827,6 +827,7 @@
             this.setmin.Str1 = null;
             this.setmin.Str2 = null;
             this.setmin.TabIndex = 211;
+            this.setmin.Visible = false;
             // 
             // label2
             // 
@@ -836,6 +837,7 @@
             this.label2.Size = new System.Drawing.Size(11, 12);
             this.label2.TabIndex = 212;
             this.label2.Text = "-";
+            this.label2.Visible = false;
             // 
             // setmax
             // 
@@ -850,6 +852,7 @@
             this.setmax.Str1 = null;
             this.setmax.Str2 = null;
             this.setmax.TabIndex = 213;
+            this.setmax.Visible = false;
             // 
             // normalButton2
             // 
@@ -867,6 +870,7 @@
             this.normalButton2.TabIndex = 214;
             this.normalButton2.Text = "重量范围更新";
             this.normalButton2.UseVisualStyleBackColor = false;
+            this.normalButton2.Visible = false;
             this.normalButton2.Click += new System.EventHandler(this.normalButton2_Click);
             // 
             // Make_ColorBoxWeigh

UAS_MES_JH/FunctionCode/Make/Make_RePrintLabel.Designer.cs

@@ -92,9 +92,8 @@
             this.fuselagel.Name = "fuselagel";
             this.fuselagel.Size = new System.Drawing.Size(108, 25);
             this.fuselagel.TabIndex = 3;
-            this.fuselagel.Text = "机身标打印";
+            this.fuselagel.Text = "栈板标打印";
             this.fuselagel.UseVisualStyleBackColor = true;
-            this.fuselagel.Visible = false;
             this.fuselagel.CheckedChanged += new System.EventHandler(this.radioButton_CheckedChange);
             // 
             // label

UAS_MES_JH/FunctionCode/Make/Make_RePrintLabel.cs

@@ -97,7 +97,7 @@ namespace UAS_MES_NEW.Make
         private void radioButton_CheckedChange(object sender, EventArgs e)
         {
             RadioButton btn = sender as RadioButton;
-            if ((btn.Name == "giftBox" || btn.Name == "fuselagel") && btn.Checked)
+            if ((btn.Name == "giftBox" ) && btn.Checked)
             {
                 //如果是切换成彩盒或者机身标提示用户 输入SN
                 OperateResult.AppendText(">>请输入SN\n", Color.Black);
@@ -108,6 +108,11 @@ namespace UAS_MES_NEW.Make
                 OperateResult.AppendText(">>请输入卡通箱号\n", Color.Black);
                 clearAll();
             }
+            else if (btn.Name == "fuselagel" && btn.Checked)
+            {
+                OperateResult.AppendText(">>请输入栈板号\n", Color.Black);
+                clearAll();
+            }
         }
 
         private void inputText_KeyDown(object sender, KeyEventArgs e)
@@ -122,7 +127,7 @@ namespace UAS_MES_NEW.Make
                 }
                 OperateResult.AppendText(">>" + inputText.Text + "\n", Color.Black);
                 //打印类型为彩盒或者机身标
-                if (giftBox.Checked || fuselagel.Checked)
+                if (giftBox.Checked)
                 {
                     //select max(ms_id)ms_id from makeserial where ms_sncode=? 
                     ms_id = dh.getFieldDataByCondition("makeserial", "max(ms_id) ms_id", "ms_sncode='" + inputText.Text + "'").ToString();
@@ -163,6 +168,24 @@ namespace UAS_MES_NEW.Make
                     //展示产品编号和标签模板到界面
                     inputValue.Text = inputText.Text;
                     inputText.Text = "";
+                }//打印类型为栈板
+                else if (fuselagel.Checked)
+                {
+                    //查询箱号是否存在
+                    dt = (DataTable)dh.ExecuteSql("select pa_id,pa_prodcode pr_code,pa_makecode ms_makecode,pr_detail from package left join product on pr_code=pa_prodcode where pa_outboxcode='" + inputText.Text + "' and pa_type=3", "select");
+                    if (dt.Rows.Count == 0)
+                    {
+                        //无值，返回提示用户“箱号不存在”， “>>请输入卡通箱号”
+                        OperateResult.AppendText("<<栈板号:" + inputText.Text + "不存在\n", Color.Red, inputText);
+                        OperateResult.AppendText(">>请输入栈板号\n", Color.Black);
+                        return;
+                    }
+                    //界面赋值
+                    BaseUtil.SetFormValue(this.Controls, dt);
+                    //有值,可以打
+                    //展示产品编号和标签模板到界面
+                    inputValue.Text = inputText.Text;
+                    inputText.Text = "";
                 }
                 print_Click(sender, new EventArgs());
             }
@@ -175,7 +198,7 @@ namespace UAS_MES_NEW.Make
                 return;
             }
             if (fuselagel.Checked)
-                type = "机身标";
+                type = "栈板标";
             else if (giftBox.Checked)
                 type = "彩盒标";
             else
@@ -206,7 +229,7 @@ namespace UAS_MES_NEW.Make
                 return;
             }
             //打印类型 彩盒或者标签，再次判断是否已装箱，未转号
-            if (giftBox.Checked || fuselagel.Checked)
+            if (giftBox.Checked)
             {
                 mapB = (DataTable)dh.ExecuteSql("select ms_outboxcode, nvl(ms_downstatus,0) ms_downstatus from makeserial where ms_id='" + ms_id + "' and ms_sncode='" + inputValue.Text + "'", "select");
                 if (mapB.Rows.Count == 0)
@@ -273,6 +296,37 @@ namespace UAS_MES_NEW.Make
                 //    putInfo2MakeDown();
                 //}
             }
+            //打印类型为栈板标签
+            else if (fuselagel.Checked)
+            {
+                //select pa_downstatus from package where pa_outboxcode=? 输入值code
+                mapB = (DataTable)dh.ExecuteSql("select pa_downstatus from package where pa_outboxcode='" + inputValue.Text + "'", "select");
+                //无值提示用户箱号错误，不存在。
+                if (mapB.Rows.Count == 0)
+                {
+                    OperateResult.AppendText("<<栈板标号:" + inputValue.Text + "错误,不存在\n", Color.Red);
+                    return;
+                }
+                //doc = lbl.Documents.Open(PrintLabel.Text);
+                if (Print.CodeSoft(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, inputValue.Text, int.Parse(printNum.Text), ms_makecode.Text, pr_code.Text, "栈板标", "-1", out errorMessage))
+                {
+                    //判断通过,打印
+                    OperateResult.AppendText("<<打印成功\n", Color.Green);
+                }
+                else
+                {
+                    OperateResult.AppendText(errorMessage + "\n", Color.Red);
+                }
+                //打印成功,记录日志commandlog , cl_operate彩盒或者机身标补打印，cl_result补打印成功
+                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode.Text, User.UserLineCode, User.UserSourceCode, "栈板标标签补打印,栈板标号:" + inputValue.Text, "补打印成功", inputValue.Text, "");
+                ////如果pa_downstatus<>0，则更新pa_downstatus=-1 where pa_outboxcode=?code，同时插入记录至表 MAKEDOWN
+                //if (mapB.Rows[0]["pa_downstatus"].ToString() == "0")
+                //{
+                //    dh.ExecuteSql("update package set pa_downstatus='-1' where pa_outboxcode='" + inputValue.Text + "'", "update");
+                //    //插入MakeDown表
+                //    putInfo2MakeDown();
+                //}
+            }
         }
 
         /// <summary>

UAS_MES_JH/FunctionCode/Packing/Packing_PalletCollection.cs

@@ -371,7 +371,7 @@ namespace UAS_MES_NEW.Packing
                                 SQLS.Add("delete from packagedetail where pd_outboxcode='" + pa_outboxcode.Text + "' and pd_innerboxcode='" + outboxcode.Text + "'");
                                 //减少箱内容量
                                 SQLS.Add("update package set pa_packageqty=pa_packageqty-1,pa_totalqty=pa_totalqty-(select pa_totalqty from package where pa_outboxcode='" + outboxcode.Text + "'),pa_currentqty=pa_currentqty-1,pa_status=0 where pa_outboxcode='" + pa_outboxcode.Text + "'");
-                                SQLS.Add("update package set pa_mothercode='' where pa_outboxcode='" + outboxcode.Text + "'");
+                                SQLS.Add("update package set pa_mothercode='',pa_nextstep = '"+User.CurrentStepCode+"' where pa_outboxcode='" + outboxcode.Text + "'");
                                 dh.ExecuteSQLTran(SQLS.ToArray());
                                 OperateResult.AppendText(">>箱号" + outboxcode.Text + "取消采集成功\n", Color.Green);
                                 LoadCollectNum();
@@ -496,7 +496,7 @@ namespace UAS_MES_NEW.Packing
                         List<string> SQLS = new List<string>();
                         SQLS.Add("delete from packagedetail where pd_outboxcode='" + pa_outboxcode.Text + "'");
                         SQLS.Add("update package set pa_packageqty=0,pa_totalqty=0,pa_currentqty=0,pa_status=0 where pa_outboxcode='" + pa_outboxcode.Text + "'");
-                        SQLS.Add("update package set pa_mothercode='' where pa_mothercode='" + pa_outboxcode.Text + "'");
+                        SQLS.Add("update package set pa_mothercode='',pa_nextstep = '"+User.CurrentStepCode+"' where pa_mothercode='" + pa_outboxcode.Text + "'");
                         dh.ExecuteSQLTran(SQLS.ToArray());
                     }
                     dh.ExecuteSql("delete package where pa_outboxcode = '"+ pa_outboxcode.Text + "'","select");

UAS_MES_JH/FunctionCode/Query/Query_ExeProgress.cs

@@ -440,7 +440,7 @@ namespace UAS_MES_NEW.Query
         {
             if (e.KeyCode == Keys.Enter)
             {
-                dt = (DataTable)dh.ExecuteSql("select cm_sncode from craftmaterial where cm_barcode = '"+barcode.Text+"' order by cm_id desc", "select");
+                dt = (DataTable)dh.ExecuteSql("select cm_sncode from craftmaterial where cm_barcode = '"+barcode.Text+ "' and cm_status =0 order by cm_id desc", "select");
                 if (dt.Rows.Count == 0)
                 {
                     MessageBox.Show("未找到此零部件对应成品SN号");

UAS_MES_JH/FunctionCode/Special/Special_Collertion.Designer.cs

@@ -42,6 +42,8 @@
             this.OperatResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
             this.input = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.Split = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.label1 = new System.Windows.Forms.Label();
+            this.num = new System.Windows.Forms.Label();
             this.SuspendLayout();
             // 
             // Pallet_label
@@ -214,11 +216,32 @@
             this.Split.UseVisualStyleBackColor = false;
             this.Split.Click += new System.EventHandler(this.Split_Click);
             // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label1.Location = new System.Drawing.Point(474, 176);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(46, 21);
+            this.label1.TabIndex = 246;
+            this.label1.Text = "计数:";
+            // 
+            // num
+            // 
+            this.num.AutoSize = true;
+            this.num.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.num.Location = new System.Drawing.Point(535, 176);
+            this.num.Name = "num";
+            this.num.Size = new System.Drawing.Size(0, 21);
+            this.num.TabIndex = 247;
+            // 
             // Special_Collertion
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(805, 565);
+            this.Controls.Add(this.num);
+            this.Controls.Add(this.label1);
             this.Controls.Add(this.数据清空);
             this.Controls.Add(this.WeighRecord);
             this.Controls.Add(this.ms_makecode_label);
@@ -257,5 +280,7 @@
         private System.Windows.Forms.ListView WeighRecord;
         private System.Windows.Forms.ColumnHeader columnHeader3;
         private CustomControl.ButtonUtil.NormalButton 数据清空;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label num;
     }
 }

UAS_MES_JH/FunctionCode/Special/Special_Collertion.cs

@@ -64,6 +64,7 @@ namespace UAS_MES_NEW.Special
                     }
                     WeighRecord.Clear();
                     sb.Clear();
+                    num.Text = WeighRecord.Items.Count + "";
                 }
                 else if(bigboxBtn.Checked)
                 {
@@ -79,6 +80,7 @@ namespace UAS_MES_NEW.Special
                     }
                     WeighRecord.Clear();
                     sb.Clear();
+                    num.Text = WeighRecord.Items.Count + "";
                 }
             }
 
@@ -128,11 +130,11 @@ namespace UAS_MES_NEW.Special
                     dt = (DataTable)dh.ExecuteSql("select ms_makecode,ms_prodcode,ms_sncode,ms_craftcode cr_code,ms_status,ms_outboxcode from makeserial where ms_sncode = '" + input.Text + "'", "select");
                     if (dt.Rows.Count > 0)
                     {
-                        if (ms_makecode.Text != "" && dt.Rows[0]["ms_makecode"].ToString() != ms_makecode.Text)
-                        {
-                            OperatResult.AppendText("SN：" + input.Text + "所属工单" + dt.Rows[0]["ms_makecode"].ToString() + "与当前工单" + ms_makecode.Text + "不一致\n", Color.Red, input);
-                            return;
-                        }
+                        //if (ms_makecode.Text != "" && dt.Rows[0]["ms_makecode"].ToString() != ms_makecode.Text)
+                        //{
+                        //    OperatResult.AppendText("SN：" + input.Text + "所属工单" + dt.Rows[0]["ms_makecode"].ToString() + "与当前工单" + ms_makecode.Text + "不一致\n", Color.Red, input);
+                        //    return;
+                        //}
                         if (dt.Rows[0]["ms_status"].ToString() == "3")
                         {
                             OperatResult.AppendText("SN：" + input.Text + "为不良品，不允许采集\n", Color.Red, input);
@@ -152,6 +154,7 @@ namespace UAS_MES_NEW.Special
                         WeighRecord.Items.Add(dt.Rows[0]["ms_sncode"].ToString());
                         sb.Add(dt.Rows[0]["ms_sncode"].ToString());
                         OperatResult.AppendText("SN：" + input.Text + "采集\n", Color.Green, input);
+                        num.Text = WeighRecord.Items.Count+"";
                     }
                     else
                     {
@@ -164,11 +167,11 @@ namespace UAS_MES_NEW.Special
                     dt = (DataTable)dh.ExecuteSql("select pa_makecode ms_makecode,pa_prodcode ms_prodcode,pa_outboxcode,pa_mothercode,ma_craftcode cr_code from package left join make on pa_makecode = ma_code where pa_outboxcode = '"+input.Text+"' and pa_type = '1'", "select");
                     if (dt.Rows.Count > 0)
                     {
-                        if (ms_makecode.Text != "" && dt.Rows[0]["ms_makecode"].ToString() != ms_makecode.Text)
-                        {
-                            OperatResult.AppendText("SN：" + input.Text + "所属工单" + dt.Rows[0]["ms_makecode"].ToString() + "与当前工单" + ms_makecode.Text + "不一致\n", Color.Red, input);
-                            return;
-                        }
+                        //if (ms_makecode.Text != "" && dt.Rows[0]["ms_makecode"].ToString() != ms_makecode.Text)
+                        //{
+                        //    OperatResult.AppendText("SN：" + input.Text + "所属工单" + dt.Rows[0]["ms_makecode"].ToString() + "与当前工单" + ms_makecode.Text + "不一致\n", Color.Red, input);
+                        //    return;
+                        //}
                         if (dt.Rows[0]["pa_mothercode"].ToString() != "")
                         {
                             OperatResult.AppendText("卡通箱：" + input.Text + "已装栈板" + dt.Rows[0]["pa_mothercode"].ToString() + "，不允许采集\n", Color.Red, input);
@@ -183,6 +186,7 @@ namespace UAS_MES_NEW.Special
                         WeighRecord.Items.Add(dt.Rows[0]["pa_outboxcode"].ToString());
                         sb.Add(dt.Rows[0]["pa_outboxcode"].ToString());
                         OperatResult.AppendText("卡通箱：" + input.Text + "采集\n", Color.Green, input);
+                        num.Text = WeighRecord.Items.Count + "";
                     }
                     else
                     {
@@ -198,6 +202,7 @@ namespace UAS_MES_NEW.Special
             BaseUtil.CleanControls(this.Controls);
             WeighRecord.Items.Clear();
             sb.Clear();
+            num.Text = WeighRecord.Items.Count + "";
         }
     }
 }

UAS_MES_JH/Properties/Settings.Designer.cs

@@ -124,11 +124,6 @@ namespace UAS_MES_NEW.Properties {
         [global::System.Configuration.DefaultSettingValueAttribute("Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES;Pooling=false" +
             ";Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.1.5" +
             ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));")]
-
-        //[global::System.Configuration.DefaultSettingValueAttribute("Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES;Pooling=false" +
-        //    ";Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=joyhong.tpddns.cn" +
-        //    ")(PORT=1522)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));")]
-
         public string MES {
             get {
                 return ((string)(this["MES"]));

UAS_MES_JH/PublicMethod/LogicHandler.cs

@@ -510,7 +510,7 @@ namespace UAS_MES_NEW.PublicMethod
             //sql.Append("and sp_makecode='" + iMakeCode + "' and sp_stepcode='" + CurrentStep + "'");
             //ExeSQL.Add(sql.ToString());
             //更新大箱或栈板的母箱编号为空
-            ExeSQL.Add("update package set pa_mothercode='' where pa_outboxcode in(select PD_INNERBOXCODE from package left join packagedetail on pa_id=pd_paid where pa_outboxcode='" + iOutBoxCode + "')");
+            ExeSQL.Add("update package set pa_mothercode='',pa_nextstep = '"+User.CurrentStepCode+"' where pa_outboxcode in(select PD_INNERBOXCODE from package left join packagedetail on pa_id=pd_paid where pa_outboxcode='" + iOutBoxCode + "')");
             //删除从表明细
             ExeSQL.Add("delete from packagedetail where pd_paid=(select pa_id from package where pa_outboxcode='" + iOutBoxCode + "')");
             //设置大箱或栈板的已装数量为0

UAS_MES_JH/PublicMethod/Print.cs

@@ -124,7 +124,7 @@ namespace UAS_MES_NEW.PublicMethod
                 if (dh.getFieldDataByCondition("employee", "em_type", "em_code = '" + User.UserCode + "'").ToString() != "admin")
                 {
                     //如果已经打印过了,则不允许再打印
-                    if (dt.Rows.Count > 0&& LabelType == "栈板标")
+                    if (dt.Rows.Count > 0&&LabelType != "彩盒标")
                     {
                         ErrorMessage = SnCode + LabelType + "已打印";
                         return false;