Browse Source

Merge repos.ubtob.net:usoft/mes-client

callm 3 days ago
parent
commit
4774e83d0e

+ 2 - 2
UAS_MES_WEIP/FunctionCode/Make/Make_SMTSStencil.cs

@@ -171,7 +171,7 @@ namespace UAS_MES_NEW.Make
                     sql.Append(",'" + su_singlepringqty1.Text + "',st_version,'上线',sysdate from ");
                     sql.Append(",'" + su_singlepringqty1.Text + "',st_version,'上线',sysdate from ");
                     sql.Append("Stencil where st_code='" + SU_DEVCODE.Text + "'");
                     sql.Append("Stencil where st_code='" + SU_DEVCODE.Text + "'");
                     dh.ExecuteSql(sql.ToString(), "insert");
                     dh.ExecuteSql(sql.ToString(), "insert");
-                    dh.ExecuteSql("update Stencil set ST_USESTATUS='在线' where st_code='" + SU_DEVCODE.Text + "'", "update");
+                    dh.ExecuteSql($"update Stencil set ST_USESTATUS='在线',ST_LINE = '{li_code.Text}' where st_code='" + SU_DEVCODE.Text + "'", "update");
                     MessageBox.Show("上线成功");
                     MessageBox.Show("上线成功");
                     st_table.SelectedItem = null;
                     st_table.SelectedItem = null;
                     SU_DEVCODE.Text = "";
                     SU_DEVCODE.Text = "";
@@ -243,7 +243,7 @@ namespace UAS_MES_NEW.Make
                     dh.ExecuteSql(sql.ToString(), "insert");
                     dh.ExecuteSql(sql.ToString(), "insert");
 
 
                     dh.ExecuteSql($@"UPDATE stencil SET st_cleannums = nvl(st_cleannums, 0) + 1,st_ensiona = '{ST_ENSIONA.Text}',st_ensionb = '{ST_ENSIONB.Text}',
                     dh.ExecuteSql($@"UPDATE stencil SET st_cleannums = nvl(st_cleannums, 0) + 1,st_ensiona = '{ST_ENSIONA.Text}',st_ensionb = '{ST_ENSIONB.Text}',
-                            st_ensionc = '{ST_ENSIONC.Text}',st_ensiond = '{ST_ENSIOND.Text}',st_ensione = '{ST_ENSIONE.Text}',st_usestatus = '借出'
+                            st_ensionc = '{ST_ENSIONC.Text}',st_ensiond = '{ST_ENSIOND.Text}',st_ensione = '{ST_ENSIONE.Text}',st_usestatus = '借出',ST_LINE = ''
                             WHERE st_code = '{SU_DEVCODE1.Text}'", "update");
                             WHERE st_code = '{SU_DEVCODE1.Text}'", "update");
 
 
 
 

+ 2 - 2
UAS_MES_WEIP/FunctionCode/Make/Make_SMTStencil.cs

@@ -171,7 +171,7 @@ namespace UAS_MES_NEW.Make
                     sql.Append(",'" + su_singlepringqty1.Text + "',st_version,'上线',sysdate from ");
                     sql.Append(",'" + su_singlepringqty1.Text + "',st_version,'上线',sysdate from ");
                     sql.Append("Stencil where st_code='" + SU_DEVCODE.Text + "'");
                     sql.Append("Stencil where st_code='" + SU_DEVCODE.Text + "'");
                     dh.ExecuteSql(sql.ToString(), "insert");
                     dh.ExecuteSql(sql.ToString(), "insert");
-                    dh.ExecuteSql("update Stencil set ST_USESTATUS='在线' where st_code='" + SU_DEVCODE.Text + "'", "update");
+                    dh.ExecuteSql($"update Stencil set ST_USESTATUS='在线',ST_LINE = '{li_code.Text}' where st_code='" + SU_DEVCODE.Text + "'", "update");
                     MessageBox.Show("上线成功");
                     MessageBox.Show("上线成功");
                     st_table.SelectedItem = null;
                     st_table.SelectedItem = null;
                     SU_DEVCODE.Text = "";
                     SU_DEVCODE.Text = "";
@@ -245,7 +245,7 @@ namespace UAS_MES_NEW.Make
                         dh.ExecuteSql(sql.ToString(), "insert");
                         dh.ExecuteSql(sql.ToString(), "insert");
 
 
                         dh.ExecuteSql($@"UPDATE stencil SET st_cleannums = nvl(st_cleannums, 0) + 1,st_ensiona = '{ST_ENSIONA.Text}',st_ensionb = '{ST_ENSIONB.Text}',
                         dh.ExecuteSql($@"UPDATE stencil SET st_cleannums = nvl(st_cleannums, 0) + 1,st_ensiona = '{ST_ENSIONA.Text}',st_ensionb = '{ST_ENSIONB.Text}',
-                            st_ensionc = '{ST_ENSIONC.Text}',st_ensiond = '{ST_ENSIOND.Text}',st_ensione = '{ST_ENSIONE.Text}',st_usestatus = '借出'
+                            st_ensionc = '{ST_ENSIONC.Text}',st_ensiond = '{ST_ENSIOND.Text}',st_ensione = '{ST_ENSIONE.Text}',st_usestatus = '借出',ST_LINE = ''
                             WHERE st_code = '{SU_DEVCODE1.Text}'", "update");
                             WHERE st_code = '{SU_DEVCODE1.Text}'", "update");
 
 
                         MessageBox.Show("钢网" + SU_DEVCODE1.Text + "下线成功!");
                         MessageBox.Show("钢网" + SU_DEVCODE1.Text + "下线成功!");