字段调整

UAS_MES_YDCY/FunctionCode/Make/Make_MidBoxWeigh.cs

@@ -100,7 +100,7 @@ namespace UAS_MES_NEW.Make
                 {
                     File.Delete("MidBoxWeigh" + ".txt");
                 }
-                StreamWriter sw = File.AppendText("ColorBox" + ".txt");
+                StreamWriter sw = File.AppendText("MidBoxWeigh" + ".txt");
                 sw.WriteLine(sncode.Handle);
                 sw.WriteLine(weight.Handle);
                 sw.Close();

UAS_MES_YDCY/FunctionCode/Special/Special_ActiveSN.cs

@@ -49,7 +49,7 @@ namespace UAS_MES_NEW.Special
                 OperateResult.AppendText(">>序列号已经装箱" + ms_outboxcode + "\n"); return;
             }
 
-            dh.ExecuteSql("update makeserial set ms_ifactive=-1 where ms_id='" + ms_id + "'", "update");
+            dh.ExecuteSql("update makeserial set MS_ISACTIVE=-1 where ms_id='" + ms_id + "'", "update");
 
             LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode, User.UserLineCode, User.UserSourceCode, "SN激活", "SN激活成功", ms_sncode, ms_checkno);
             OperateResult.AppendText(">>" + SN.Text + "激活成功\n");

UAS_MES_YDCY/FunctionCode/Special/Special_ResetKeyFreeze.cs

@@ -58,7 +58,7 @@ namespace UAS_MES_NEW.Special
 
         private bool ReSN(string sncode, string stepcode)
         {
-            DataTable dt = (DataTable)dh.ExecuteSql("select ms_id,ms_ifactive,ms_paststep,nvl(ms_qccheck,0)ms_qccheck,nvl(ms_ifqccheck,0)ms_ifqccheck,ms_makecode,nvl(ms_outstatus,0)ms_outstatus,nvl(pr_ifrepaircheck,0)pr_ifrepaircheck from makeserial left join product on pr_code=ms_prodcode where ms_sncode ='" + sncode + "' order by ms_id desc", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select ms_id,MS_ISACTIVE,ms_paststep,nvl(ms_qccheck,0)ms_qccheck,nvl(ms_ifqccheck,0)ms_ifqccheck,ms_makecode,nvl(ms_outstatus,0)ms_outstatus,nvl(pr_ifrepaircheck,0)pr_ifrepaircheck from makeserial left join product on pr_code=ms_prodcode where ms_sncode ='" + sncode + "' order by ms_id desc", "select");
             if (!dt.Rows[0]["ms_paststep"].ToString().Contains(cd_stepcode.Text))
             {
                 OperatResult.AppendText(">>序列号" + sncode + "不允许回流到未执行工序\n", Color.Red);
@@ -69,7 +69,7 @@ namespace UAS_MES_NEW.Special
                 OperatResult.AppendText(">>序列号" + sncode + "已出货不允许回流\n", Color.Red);
                 return false;
             }
-            if (dt.Rows[0]["ms_ifactive"].ToString() == "-1")
+            if (dt.Rows[0]["MS_ISACTIVE"].ToString() == "-1")
             {
                 OperatResult.AppendText(">>序列号" + sncode + "已激活不允许冻结\n", Color.Red);
                 return false;

UAS_MES_YDCY/FunctionCode/Special/Special_ResetKeyRelease.cs

@@ -58,7 +58,7 @@ namespace UAS_MES_NEW.Special
 
         private bool ReSN(string sncode, string stepcode)
         {
-            DataTable dt = (DataTable)dh.ExecuteSql("select ms_id,ms_ifactive,ms_paststep,nvl(ms_qccheck,0)ms_qccheck,nvl(ms_ifqccheck,0)ms_ifqccheck,ms_makecode,nvl(ms_outstatus,0)ms_outstatus,nvl(pr_ifrepaircheck,0)pr_ifrepaircheck from makeserial left join product on pr_code=ms_prodcode where ms_sncode ='" + sncode + "' order by ms_id desc", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select ms_id,MS_ISACTIVE,ms_paststep,nvl(ms_qccheck,0)ms_qccheck,nvl(ms_ifqccheck,0)ms_ifqccheck,ms_makecode,nvl(ms_outstatus,0)ms_outstatus,nvl(pr_ifrepaircheck,0)pr_ifrepaircheck from makeserial left join product on pr_code=ms_prodcode where ms_sncode ='" + sncode + "' order by ms_id desc", "select");
             if (!dt.Rows[0]["ms_paststep"].ToString().Contains(cd_stepcode.Text))
             {
                 OperatResult.AppendText(">>序列号" + sncode + "不允许回流到未执行工序\n", Color.Red);
@@ -69,7 +69,7 @@ namespace UAS_MES_NEW.Special
                 OperatResult.AppendText(">>序列号" + sncode + "已出货不允许回流\n", Color.Red);
                 return false;
             }
-            if (dt.Rows[0]["ms_ifactive"].ToString() == "-1")
+            if (dt.Rows[0]["MS_ISACTIVE"].ToString() == "-1")
             {
                 OperatResult.AppendText(">>序列号" + sncode + "已激活不允许释放\n", Color.Red);
                 return false;

UAS_MES_YDCY/FunctionCode/Warehouse/Warehouse_FinishedProductOutSumNEW.cs

@@ -432,7 +432,7 @@ namespace UAS_MES_NEW.Warehouse
                                 input.Text = outboxcode;
                             }
                             sql.Clear();
-                            sql.Append("select pa_id,pr_palletqty,pr_packrule,pa_salecode,pa_outboxcode,pa_mothercode,pa_makecode,pa_status,nvl(pa_iostatus,0) pa_iostatus,nvl(pa_downstatus,0)pa_downstatus,pa_prodcode,pa_outno, pa_mothercode from package left join product on pr_code=pa_prodcode where pa_outboxcode='" + input.Text + "' and pa_type in(1,2)");
+                            sql.Append("select pa_id,pr_palletqty,pr_packrule,pa_salecode,pa_outboxcode,pa_mothercode,pa_makecode,pa_status,nvl(pa_iostatus,0) pa_iostatus,nvl(pa_downstatus,0)pa_downstatus,pa_prodcode,pa_outno, pa_mothercode from package left join product on pr_code=pa_prodcode where pa_outboxcode='" + input.Text + "' and pa_type in(1,2,3)");
                             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                             if (dt.Rows.Count > 0)
                             {