BUG调整

UAS-MES/FunctionCode/Make/Make_SMTStencil.Designer.cs

@@ -293,8 +293,8 @@
             this.st_table.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.st_table.FormattingEnabled = true;
             this.st_table.Items.AddRange(new object[] {
-            "Bottom",
-            "Top"});
+            "BOTTOM",
+            "TOP"});
             this.st_table.Location = new System.Drawing.Point(319, 431);
             this.st_table.Name = "st_table";
             this.st_table.Size = new System.Drawing.Size(121, 20);

UAS-MES/FunctionCode/Make/Make_SMTStencil.cs

@@ -46,7 +46,6 @@ namespace UAS_MES.Make
         private void Make_SMTStencil_Load(object sender, EventArgs e)
         {
             asc.controllInitializeSize(this);
-            st_table.SelectedIndex = 0;
             li_code.Text = User.UserLineCode;
             //工单号放大镜配置
             ma_code.TableName = "make left join product on ma_prodcode=pr_code";
@@ -116,13 +115,16 @@ namespace UAS_MES.Make
                 MessageBox.Show("钢网编号" + SU_DEVCODE.Text + "不存在");
             }
             sql.Clear();
-            sql.Append("insert into StencilUse(su_id,su_linecode,su_stcode,su_useman,SU_TABLE,su_usemacode,su_singlepringqty,su_stverison,SU_STATUS)");
-            sql.Append("select StencilUse_seq.nextval,'" + li_code.Text + "','" + SU_DEVCODE.Text + "','" + User.UserName + "','" + st_table.Text + "','" + ma_code.Text + "'");
+            sql.Append("insert into StencilUse(su_id,SU_USEPRODCODE,su_stid,su_linecode,su_stcode,su_usedate,su_useman,SU_USEMANCODE,SU_TABLE,su_usemacode,su_singlepringqty,su_stverison,SU_STATUS)");
+            sql.Append("select StencilUse_seq.nextval,'" + ma_prodcode.Text + "',st_id,'" + li_code.Text + "','" + SU_DEVCODE.Text + "',sysdate,'" + User.UserName + "','" + User.UserCode + "','" + st_table.Text + "','" + ma_code.Text + "'");
             sql.Append(",'" + su_singlepringqty1.Text + "',st_version,'借出' from ");
             sql.Append("Stencil where st_code='" + SU_DEVCODE.Text + "'");
             dh.ExecuteSql(sql.ToString(), "insert");
             dh.ExecuteSql("update Stencil set ST_USESTATUS='借出' where st_code='" + SU_DEVCODE.Text + "'", "update");
             MessageBox.Show("领用成功");
+            st_table.SelectedItem = null;
+            SU_DEVCODE.Text = "";
+            Receive.Enabled = false;
             LoadGridData();
         }
 
@@ -130,37 +132,54 @@ namespace UAS_MES.Make
         {
             if (ST_ENSIONA.Text != "" && ST_ENSIONB.Text != "" && ST_ENSIONC.Text != "" && ST_ENSIOND.Text != "" && ST_ENSIONE.Text != "")
             {
-                DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS,St_USECOUNT from Stencil where st_code='" + SU_DEVCODE1.Text + "'", "select");
-                if (dt.Rows.Count > 0)
+                if (SU_RETURNIFCLEAN.Checked)
                 {
-                    string status = dt.Rows[0]["ST_USESTATUS"].ToString();
-                    if (status == "在仓")
+                    DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS,St_USECOUNT from Stencil where st_code='" + SU_DEVCODE1.Text + "'", "select");
+                    if (dt.Rows.Count > 0)
                     {
-                        MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "未借出,无需归还");
-                        return;
+                        string status = dt.Rows[0]["ST_USESTATUS"].ToString();
+                        if (status == "在仓")
+                        {
+                            MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "未借出,无需归还");
+                            return;
+                        }
+                        if (status == "报废")
+                        {
+                            MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "处于" + status + "状态,无法退回");
+                            return;
+                        }
                     }
-                    if (status == "报废")
+                    else
                     {
-                        MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "处于" + status + "状态,无法退回");
-                        return;
+                        MessageBox.Show("钢网编号" + SU_DEVCODE1.Text + "不存在");
                     }
+                    string St_USECOUNT = dt.Rows[0]["St_USECOUNT"].ToString();
+                    sql.Clear();
+                    sql.Append("update StencilUse set SU_BACKDATE=sysdate,SU_ENSIONA='" + ST_ENSIONA.Text + "',SU_ENSIONB='" + ST_ENSIONB.Text + "',SU_ENSIONC='" + ST_ENSIONC.Text + "',SU_ENSIOND='" + ST_ENSIOND.Text + "',");
+                    sql.Append("SU_ENSIONE='" + ST_ENSIONE.Text + "',SU_THISUSETIMES='" + st_combinenumber.Text + "',SU_STATUS='在仓',su_usecount=" + (St_USECOUNT == "" ? "0" : St_USECOUNT) + "+" + st_combinenumber.Text);
+                    sql.Append(",SU_RETURNIFCLEAN='" + (SU_RETURNIFCLEAN.Checked ? "-1" : "0") + "' where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "')");
+                    dh.ExecuteSql(sql.ToString(), "update");
+                    sql.Clear();
+                    sql.Append("update Stencil set St_USECOUNT=nvl(St_USECOUNT,0)+" + st_combinenumber.Text + ",ST_USESTATUS='在仓',ST_ENSIONA='" + ST_ENSIONA.Text + "',ST_ENSIONB='" + ST_ENSIONB.Text + "',");
+                    sql.Append("ST_ENSIONC='" + ST_ENSIONC.Text + "',ST_ENSIOND='" + ST_ENSIOND.Text + "',ST_ENSIONE='" + ST_ENSIONE.Text + "' ");
+                    sql.Append("where st_code='" + SU_DEVCODE1.Text + "'");
+                    dh.ExecuteSql(sql.ToString(), "update");
+                    MessageBox.Show("钢网" + SU_DEVCODE1.Text + "退回成功！");
+                    SU_DEVCODE1.Text = "";
+                    st_combinenumber.Text = "";
+                    ST_ENSIONA.Text = "";
+                    ST_ENSIONB.Text = "";
+                    ST_ENSIONC.Text = "";
+                    ST_ENSIOND.Text = "";
+                    ST_ENSIONE.Text = "";
+                    SU_RETURNIFCLEAN.Checked = false;
+                    Return.Enabled = false;
+                    Confirm.PerformClick();
                 }
                 else
                 {
-                    MessageBox.Show("钢网编号" + SU_DEVCODE1.Text + "不存在");
+                    MessageBox.Show("请确认是否清洗钢网");
                 }
-                string St_USECOUNT = dt.Rows[0]["St_USECOUNT"].ToString();
-                sql.Clear();
-                sql.Append("update StencilUse set SU_THISUSETIMES='" + st_combinenumber.Text + "',SU_STATUS='在仓',su_usecount=" + (St_USECOUNT == "" ? "0" : St_USECOUNT) + "+" + st_combinenumber.Text);
-                sql.Append(",SU_RETURNIFCLEAN='" + (SU_RETURNIFCLEAN.Checked ? "-1" : "0") + "' where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "')");
-                dh.ExecuteSql(sql.ToString(), "update");
-                sql.Clear();
-                sql.Append("update Stencil set st_combinenumber='" + st_combinenumber.Text + "',St_USECOUNT=nvl(St_USECOUNT,0)+" + st_combinenumber.Text + ",ST_USESTATUS='在仓',ST_ENSIONA='" + ST_ENSIONA.Text + "',ST_ENSIONB='" + ST_ENSIONB.Text + "',");
-                sql.Append("ST_ENSIONC='" + ST_ENSIONC.Text + "',ST_ENSIOND='" + ST_ENSIOND.Text + "',ST_ENSIONE='" + ST_ENSIONE.Text + "' ");
-                sql.Append("where st_code='" + SU_DEVCODE1.Text + "'");
-                dh.ExecuteSql(sql.ToString(), "update");
-                MessageBox.Show("钢网" + SU_DEVCODE1.Text + "退回成功！");
-                Confirm.PerformClick();
             }
             else
             {
@@ -179,9 +198,9 @@ namespace UAS_MES.Make
                     MessageBox.Show("钢网" + SU_DEVCODE1.Text + "已处于报废状态");
                     return;
                 }
-                if (dt.Rows[0]["st_usestatus"].ToString() != "出借")
+                if (dt.Rows[0]["st_usestatus"].ToString() != "借出")
                 {
-                    MessageBox.Show("报废钢网必须" + SU_DEVCODE1.Text + "处于出借状态");
+                    MessageBox.Show("报废钢网必须" + SU_DEVCODE1.Text + "处于借出状态");
                     return;
                 }
                 string closetab_confirm = MessageBox.Show(this.ParentForm, "报废后不可撤销，是否确认报废", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
@@ -222,6 +241,7 @@ namespace UAS_MES.Make
                 LogicHandler.SendMessage(emid[i], em_name, "钢网" + SU_DEVCODE1.Text + "已报废");
             }
             form.Close();
+            Scrap.Enabled = false;
         }
 
         private void Radio_CheckedChanged(object sender, EventArgs e)
@@ -295,13 +315,21 @@ namespace UAS_MES.Make
         {
             if (e.KeyCode == Keys.Enter)
             {
-                DataTable dt = (DataTable)dh.ExecuteSql("select st_usestatus from stencil where st_code='" + SU_DEVCODE.Text + "'", "select");
+                DataTable dt = (DataTable)dh.ExecuteSql("select st_usestatus,st_table from stencil where st_code='" + SU_DEVCODE.Text + "'", "select");
                 if (dt.Rows.Count == 0)
                 {
                     MessageBox.Show("钢网编号" + SU_DEVCODE.Text + "不存在");
                 }
                 if (dt.Rows.Count > 0)
                 {
+                    for (int i = 0; i < st_table.Items.Count; i++)
+                    {
+                        if (st_table.Items[i].ToString() == dt.Rows[0]["st_table"].ToString())
+                        {
+                            st_table.SelectedItem = st_table.Items[i];
+                        }
+                    }
+                    Receive.Enabled = true;
                     if (dt.Rows[0]["st_usestatus"].ToString() == "报废")
                     {
                         MessageBox.Show("钢网编号" + SU_DEVCODE.Text + "已报废");
@@ -317,6 +345,7 @@ namespace UAS_MES.Make
                 DataTable dt = (DataTable)dh.ExecuteSql("select case when nvl(ST_COMBINENUMBER,1)=0 then 1 else nvl(ST_COMBINENUMBER,1) end from STENCIL where st_code='" + SU_DEVCODE1.Text + "'", "select");
                 if (dt.Rows.Count > 0)
                 {
+                    Console.WriteLine(dt.Rows[0][0].ToString());
                     st_combinenumber.Text = (int.Parse(ma_qty.Text) / int.Parse(dt.Rows[0][0].ToString())).ToString();
                 }
                 else

UAS-MES/PublicMethod/LogicHandler.cs

@@ -37,6 +37,34 @@ namespace UAS_MES.PublicMethod
             dh.ExecuteSql(sql.ToString(), "insert");
         }
 
+
+        public static void SendMessage(string iUserID, string iUserName, string iContext)
+        {
+            string id = dh.GetSEQ("pagingrelease_seq");
+            sql.Clear();
+            sql.Append("insert into pagingrelease(pr_id,pr_releaser,pr_date,pr_context,PR_FROM,pr_title,pr_caller,pr_keyvalue,pr_codevalue)");
+            sql.Append("values(" + id + ",'系统管理员',sysdate,'" + iContext + "','system','知会消息','','','')");
+            dh.ExecuteSql(sql.ToString(), "insert");
+            sql.Clear();
+            sql.Append("insert into pagingreleasedetail(prd_id,prd_prid,PRD_RECIPIENTID,PRD_RECIPIENT) ");
+            sql.Append("values(PAGINGRELEASEDETAIL_SEQ.NEXTVAL, " + id + ", " + iUserID + ", '" + iUserName + "')");
+            dh.ExecuteSql(sql.ToString(), "insert");
+            sql.Clear();
+            sql.Append("insert into pagingreleasedetail(prd_id,prd_prid,PRD_RECIPIENTID,PRD_RECIPIENT) ");
+            sql.Append("values(PAGINGRELEASEDETAIL_SEQ.NEXTVAL, " + id + ", " + iUserID + ", '" + iUserName + "')");
+            dh.ExecuteSql(sql.ToString(), "insert");
+            string id1 = dh.GetSEQ("ICQHISTORY_seq");
+            sql.Clear();
+            sql.Append("Insert into ICQHISTORY (IH_ID,IH_CALL,IH_CALLID,IH_DATE,IH_CONTEXT,IH_ATTACH,IH_FROM,IH_CODEVALUE,IH_CALLER,IH_TITLE,IH_KEYVALUE,IH_PRID) ");
+            sql.Append("select " + id1 + ",pr_releaser,pr_releaserid,pr_date,pr_context,pr_attach,pr_from,pr_codevalue,pr_caller,pr_title,pr_keyvalue,pr_id from PAGINGRELEASE  where pr_id=" + id);
+            dh.ExecuteSql(sql.ToString(), "insert");
+            sql.Clear();
+            sql.Append("Insert into ICQHISTORYdetail (IHD_ID,IHD_IHID,IHD_RECEIVE,IHD_RECEIVEID,IHD_MOBILE,IHD_READSTATUS,IHD_STATUS)  ");
+            sql.Append("select ICQHISTORYdetail_seq.nextval," + id1 + ",prd_recipient,prd_recipientid,prd_mobile,0,0 ");
+            sql.Append("from PAGINGRELEASEdetail where prd_prid=" + id);
+            dh.ExecuteSql(sql.ToString(), "insert");
+        }
+
         /// <summary>
         /// 判断工单是否已经下放
         /// </summary>