Merge branch 'master' of ssh://10.10.101.21/source/mes-client

UAS-MES/FunctionCode/Packing/Packing_CartonTransfer.cs

@@ -37,7 +37,7 @@ namespace UAS_MES.Packing
         string new_pa_prodcode;
         string new_pa_salecode;
         string new_pa_checkno;
-        string new_ob_result;
+        string new_ob_status;
         string new_pa_mothercode;
 
         public Packing_CartonTransfer()
@@ -131,7 +131,7 @@ namespace UAS_MES.Packing
                             string pa_checkno = dtbar.Rows[0]["pa_checkno"].ToString();
                             string PA_DOWNSTATUS = dtbar.Rows[0]["PA_DOWNSTATUS"].ToString();
                             string old_pa_id = dtbar.Rows[0]["pa_id"].ToString();
-                            string ob_result = dh.getFieldDataByCondition("oqcbatch", "ob_result", "ob_checkno = '" + pa_checkno + "'").ToString();
+                            string ob_status = dh.getFieldDataByCondition("oqcbatch", "ob_status", "ob_checkno = '" + pa_checkno + "'").ToString();
                             if (pa_mothercode != "")
                             {
                                 OperateResult.AppendText(">>原箱" + ms_outboxcode + "已装入大箱或栈板"+ pa_mothercode + "，不允许转移\n", Color.Red, sn_code);
@@ -152,7 +152,7 @@ namespace UAS_MES.Packing
 
                                 if (newpack.Checked)
                                 {
-                                    if (ob_result == "")
+                                    if (ob_status != "UNCHECK" || ob_status != "CHECKING")
                                     {
                                         if (pa_standardqty.Text != "")
                                         {
@@ -171,9 +171,9 @@ namespace UAS_MES.Packing
                                                     sql.Clear();
                                                     sql.Append("insert into package (PA_ID, PA_OUTBOXCODE,PA_PRODCODE, PA_PACKDATE,");
                                                     sql.Append("PA_LEVEL,PA_PACKAGEQTY,PA_TOTALQTY,PA_MAKECODE,PA_STATUS,PA_INDATE,");
-                                                    sql.Append("PA_SALECODE,PA_CUSTCODE,PA_TYPE,PA_CURRENTQTY,PA_PACKTYPE,PA_STANDARDQTY,pa_nextstep,pa_sccode)");
+                                                    sql.Append("PA_SALECODE,PA_CUSTCODE,PA_TYPE,PA_CURRENTQTY,PA_PACKTYPE,PA_STANDARDQTY,pa_nextstep,pa_sccode,pa_checkno)");
                                                     sql.Append("values ('" + pa_id + "','" + pa_outboxcode.Text + "','" + msprodcode + "',sysdate,'" + pa_level.Text + "','0','0'");
-                                                    sql.Append(",'" + ms_makecode + "','0',sysdate,'" + pa_salecode.Text + "','" + pa_custcode.Text + "','" + pa_type.Text + "','0','" + pa_packtype.Text + "','" + pa_standardqty.Text + "','"+pa_nextstep.Text+"','"+pa_sccode.Text+"')");
+                                                    sql.Append(",'" + ms_makecode + "','0',sysdate,'" + pa_salecode.Text + "','" + pa_custcode.Text + "','" + pa_type.Text + "','0','" + pa_packtype.Text + "','" + pa_standardqty.Text + "','"+pa_nextstep.Text+"','"+pa_sccode.Text+"','"+pa_checkno+"')");
                                                     dh.ExecuteSql(sql.GetString(), "insert");
                                                     //删除原明细
                                                     dh.ExecuteSql("delete from packagedetail where pd_paid='" + old_pa_id + "' and pd_barcode = '" + sn_code.Text + "'", "delete");
@@ -245,12 +245,12 @@ namespace UAS_MES.Packing
                                         {
                                             if ((pa_checkno == "" && new_pa_checkno != "") || (pa_checkno != "" && new_pa_checkno == ""))
                                             {
-                                                if (pa_checkno != "" && ob_result == "")
+                                                if (pa_checkno != "" && (ob_status == "UNCHECK" || ob_status == "CHECKING"))
                                                 {
                                                     OperateResult.AppendText(">>原箱号处于送检状态，不允许转移\n", Color.Red, sn_code);
                                                     return;
                                                 }
-                                                if (new_pa_checkno != "" && new_pa_checkno == "")
+                                                if (new_pa_checkno != "" && (new_ob_status == "UNCHECK" || new_ob_status == "CHECKING"))
                                                 {
                                                     OperateResult.AppendText(">>目标箱号处于送检状态，不允许转移\n", Color.Red, sn_code);
                                                     return;
@@ -289,7 +289,7 @@ namespace UAS_MES.Packing
                                         dh.UpdateByCondition("oqcbatchdetail", "obd_outboxcode = '" + pa_outboxcode.Text + "'","obd_sncode = '" + sn_code.Text + "'");
                                         LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode, User.UserLineCode, User.UserSourceCode, "卡通箱转移", "序列号:" + sn_code.Text + ",从原箱号:" + ms_outboxcode + "转移至目标箱号:" + pa_outboxcode.Text + "", sn_code.Text, "");
                                         OperateResult.AppendText(">>序列号:" + sn_code.Text + ",从原箱号:" + ms_outboxcode + "转移至目标箱号:" + pa_outboxcode.Text + "\n", Color.Green);
-                                        pa_outboxcode_KeyDown(sender, e);
+                                       // pa_outboxcode_KeyDown(sender, e);
                                         sql.Clear();
                                         sql.Append("select pa_id,pa_checkno,PA_CURRENTQTY pa_qty,PA_PACKTYPE,nvl(PA_DOWNSTATUS,0) PA_DOWNSTATUS,pa_prodcode  pa_macode,pa_salecode,pa_level,pa_custcode,pa_type,pa_packtype,pa_mothercode from package where pa_outboxcode='" + ms_outboxcode + "'");
                                         dtbar = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
@@ -323,7 +323,7 @@ namespace UAS_MES.Packing
                 new_pa_salecode = dt.Rows[0]["pa_salecode"].ToString();
                 new_pa_checkno = dt.Rows[0]["pa_checkno"].ToString();
                 new_pa_mothercode = dt.Rows[0]["pa_mothercode"].ToString();
-                new_ob_result = dh.getFieldDataByCondition("oqcbatch", "ob_result", "ob_checkno = '" + new_pa_checkno + "'").ToString();
+                new_ob_status = dh.getFieldDataByCondition("oqcbatch", "ob_status", "ob_checkno = '" + new_pa_checkno + "'").ToString();
                 if (new_pa_downstatus != "0")
                 {
                     OperateResult.AppendText(">>该目标箱号" + pa_outboxcode.Text + "处于下地状态，不允许操作\n", Color.Red, pa_outboxcode);
@@ -403,13 +403,13 @@ namespace UAS_MES.Packing
             string old_pa_id = dtbar.Rows[0]["pa_id"].ToString();
             string pa_makecode = dtbar.Rows[0]["pa_makecode"].ToString();
             string pa_macode = dtbar.Rows[0]["pa_macode"].ToString();
-            string ob_result = dh.getFieldDataByCondition("oqcbatch", "ob_result", "ob_checkno = '" + pa_checkno + "'").ToString();
+            string ob_status = dh.getFieldDataByCondition("oqcbatch", "ob_status", "ob_checkno = '" + pa_checkno + "'").ToString();
             if (pa_mothercode != "")
             {
                 OperateResult.AppendText(">>原箱" + ms_outboxcode.Text + "已装入大箱，不允许转移\n", Color.Red, sn_code);
                 return;
             }
-            if (ob_result == "")
+            if (ob_status != "UNCHECK" || ob_status != "CHECKING")
             {
                 if (pa_standardqty.Text != "")
                 {
@@ -470,7 +470,7 @@ namespace UAS_MES.Packing
             }
             else
             {
-                OperateResult.AppendText(">>原箱" + ms_outboxcode + "处于送检状态，不允许转移\n", Color.Red, sn_code);
+                OperateResult.AppendText(">>原箱" + ms_outboxcode.Text + "处于送检状态，不允许转移\n", Color.Red, sn_code);
                 return;
             }