万利达MES调整

UAS-MES/FunctionCode/Make/Make_GetReMakeSN.cs

@@ -168,6 +168,14 @@ namespace UAS_MES.Make
                                         return;
                                     }
                                 }
+                                if (ms_outboxcode != "")
+                                {
+                                    string logout_confirm = MessageBox.Show(this, "序列号"+ sn_code.Text + "已装入卡通箱"+ ms_outboxcode + "是否确认返工","提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
+                                    if (logout_confirm != "Yes")
+                                    {
+                                        return;
+                                    }
+                                }
                                 if (ma_unlimitin == 0 && ma_inqty - ma_scrapqty + 1 > ma_qty)
                                 {
                                     OperateResult.AppendText(">>工单不允许超数投产\n", Color.Red, sn_code);

UAS-MES/FunctionCode/OQC/OQC_CheckNoSplit.cs

@@ -94,11 +94,11 @@ namespace UAS_MES.OQC
                         {
                             ob_id = dh.GetSEQ("oqcbatch_seq");
                             sql.Clear();
-                            sql.Append("insert into oqcbatch(ob_id,ob_checkno,ob_indate,ob_oldcheckno,ob_source,");
+                            sql.Append("insert into oqcbatch(ob_id,ob_checkno,ob_indate,ob_oldcheckno,ob_source,ob_salecode,");
                             sql.Append("ob_batchqty,ob_status,ob_prodcode,ob_sourcecode,ob_reworkcode,ob_orgcheckno,");
                             sql.Append("OB_CRAFTCODE,OB_STEPCODE,OB_MAKECODE,oB_WCCODE,OB_FACTORY,OB_PROJECTCODE,OB_DESCRIPTION,");
                             sql.Append("OB_AQLCODE,OB_REMARK,OB_INMAN) select '" + ob_id + "','" + new_checkno.Text + "',sysdate,");
-                            sql.Append("'" + ob_checkno.Text + "',ob_source,ob_batchqty,ob_status,ob_prodcode, ob_sourcecode,");
+                            sql.Append("'" + ob_checkno.Text + "',ob_source,ob_batchqty,ob_status,ob_prodcode, ob_sourcecode,ob_salecode,");
                             sql.Append("ob_reworkcode,ob_orgcheckno,OB_CRAFTCODE, OB_STEPCODE,OB_MAKECODE,oB_WCCODE,OB_FACTORY,");
                             sql.Append("OB_PROJECTCODE,OB_DESCRIPTION,OB_AQLCODE,OB_REMARK,'" + User.UserCode + "' from oqcbatch where ob_checkno='" + ob_checkno.Text + "'");
                             sqls.Add(sql.GetString());
@@ -112,7 +112,7 @@ namespace UAS_MES.OQC
                         dh.BatchInsert("delete from oqcbatchdetail where obd_checkno='" + ob_checkno.Text + "' and obd_sncode =:obd_sncode ", new string[] { "obd_sncode" }, DeleteSn.ToArray());
                         dh.BatchInsert("update package set pa_checkno='" + new_checkno.Text + "' where pa_outboxcode in (select distinct obd_outboxcode from oqcbatchdetail where obd_sncode=:obd_sncode)", new string[] { "obd_sncode" }, DeleteSn.ToArray());
                         //删除之前的明细
-                        dh.BatchInsert("update makeserial set ms_checkno='" + new_checkno.Text + "' where ms_makecode='" + ob_makecode.Text + "' and ms_sncode=:obd_sncode ", new string[] { "obd_sncode" }, DeleteSn.ToArray());
+                        dh.BatchInsert("update makeserial set ms_checkno='" + new_checkno.Text + "' where  ms_sncode=:obd_sncode and ms_checkno = '"+ ob_checkno.Text + "'", new string[] { "obd_sncode" }, DeleteSn.ToArray());
                         dh.BatchInsert("delete from oqcbatchdetail where obd_checkno='" + ob_checkno.Text + "' and obd_sncode =:obd_sncode ", new string[] { "obd_sncode" }, DeleteSn.ToArray());
                         //插入新批次的从表,更新两个批次
                         sqls.Add("update OQCBatch set ob_nowcheckqty=(select count(1) from oqcbatchdetail where obd_checkno='" + new_checkno.Text + "') where ob_checkno='" + new_checkno.Text + "'");