|
|
@@ -182,7 +182,7 @@ namespace UAS_MES_NEW.OQC
|
|
|
if (LogicHandler.OQCBatchJudge(ob_checkno.Text, User.UserSourceCode, "NG", ReworkRequire.Checked ? "Y" : "N", User.UserCode, Remark.Text, out ReworkCode, out ErrorMessage))
|
|
|
{
|
|
|
OperateResult.AppendText(">>判退批成功\n", Color.Green);
|
|
|
- dh.ExecuteSql("update makeserial set ms_nextstepcode='" + cd_stepcode.Text + "',ms_status=1 where ms_checkno='" + ob_checkno.Text + "' and ms_sncode not in (select OIS_SNCODE from OQCITEMSAMPLES where ois_checkno='" + ob_checkno.Text + "' and nvl(OIS_IFNG,0)<>0)", "update");
|
|
|
+ dh.ExecuteSql("update makeserial set ms_checkno='',ms_nextstepcode='" + cd_stepcode.Text + "',ms_status=1 where ms_checkno='" + ob_checkno.Text + "' and ms_sncode not in (select OIS_SNCODE from OQCITEMSAMPLES where ois_checkno='" + ob_checkno.Text + "' and nvl(OIS_IFNG,0)<>0)", "update");
|
|
|
LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, "", User.UserLineCode, User.UserSourceCode, "判退批", "抽检批: " + ob_checkno.Text + "判退", "", ob_checkno.Text);
|
|
|
if (ReworkRequire.Checked)
|
|
|
{
|
|
|
@@ -223,7 +223,7 @@ namespace UAS_MES_NEW.OQC
|
|
|
if (LogicHandler.OQCBatchJudge(ob_checkno.Text, User.UserSourceCode, "FNG", ReworkRequire.Checked ? "Y" : "N", User.UserCode, Remark.Text, out ReworkCode, out ErrorMessage))
|
|
|
{
|
|
|
OperateResult.AppendText(">>强制退批" + ob_checkno.Text + "成功\n", Color.Green);
|
|
|
- dh.ExecuteSql("update makeserial set ms_nextstepcode='" + cd_stepcode.Text + "',ms_status=1 where ms_checkno='" + ob_checkno.Text + "' and ms_sncode not in (select OIS_SNCODE from OQCITEMSAMPLES where ois_checkno='" + ob_checkno.Text + "' and nvl(OIS_IFNG,0)<>0)", "update");
|
|
|
+ dh.ExecuteSql("update makeserial set ms_checkno='',ms_nextstepcode='" + cd_stepcode.Text + "',ms_status=1 where ms_checkno='" + ob_checkno.Text + "' and ms_sncode not in (select OIS_SNCODE from OQCITEMSAMPLES where ois_checkno='" + ob_checkno.Text + "' and nvl(OIS_IFNG,0)<>0)", "update");
|
|
|
LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, "", User.UserLineCode, User.UserSourceCode, "强制退批", "抽检批: " + ob_checkno.Text + "强制退批", "", ob_checkno.Text);
|
|
|
if (ReworkRequire.Checked)
|
|
|
{
|