彩盒称重修改工单号关联

UAS_MES_PNE/FunctionCode/Make/Make_ColorBoxWeigh_ReadLine.cs

@@ -143,6 +143,7 @@ namespace UAS_MES_NEW.Make
                         //    OperateResult.AppendText("<<序列号:" + sncode.Text + "下一工序是" + nextstepcode + ",不是当前岗位的工序\n", Color.Red, sncode);
                         //    return;
                         //}
+
                         sql.Clear();
                         sql.Append("select ms_makecode ma_code,ma_qty,ma_salecode,pr_detail pr_spec,pr_colorboxunit,pr_code,pr_colorboxgw,");
                         sql.Append("pr_colorboxunit,pr_colorboxmaxw,pr_colorboxminw,nvl(PR_CHECKCOLORBOXW,'0') PR_CHECKCOLORBOXW,nvl(pr_sendchecktype,'LineCode')");
@@ -151,6 +152,7 @@ namespace UAS_MES_NEW.Make
                         dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                         if (dt.Rows.Count > 0)
                         {
+                            dh.ExecuteSql("update makeimeilist set mil_makecode='"+oMakeCode+"' where mil_sncode='"+sncode.Text+"' and mil_makecode is null", "update");
                             //重量的临时变量
                             pr_code.Text = dt.Rows[0]["pr_code"].ToString();
                             string _weight = dt.Rows[0]["pr_colorboxgw"].ToString();

UAS_MES_PNE/FunctionCode/Make/Make_FuselageLabelPrint.cs

@@ -63,9 +63,9 @@ namespace UAS_MES_NEW.Make
             ma_code.SetLockCheckBox(LockMakeCode);
             //工单号放大镜配置
             ma_code.TableName = "make left join product on ma_prodcode=pr_code";
-            ma_code.SelectField = "ma_code # 工单号,ma_prodcode # 产品编号,pr_detail # 产品名称";
+            ma_code.SelectField = "ma_code # 工单号,ma_prodcode # 产品编号,pr_detail # 产品名称,pr_spec # 规格";
             ma_code.FormName = Name;
-            ma_code.SetValueField = new string[] { "ma_code", "ma_prodcode", "pr_detail" };
+            ma_code.SetValueField = new string[] { "ma_code", "ma_prodcode", "pr_detail" ,"pr_spec"};
             ma_code.DbChange += Ma_code_DbChange;
             ma_code.Condition = "(ma_statuscode='STARTED' or ma_statuscode='FINISH')";
             dh = SystemInf.dh;

UAS_MES_PNE/FunctionCode/Make/Make_SeqTransform.cs

@@ -63,7 +63,10 @@ namespace UAS_MES_NEW.Make
                             if (!ChangeResult.Checked)
                             {
                                 //用户填写了工单号，那么序列号必须要是该工单的，否则提示错误
-                                if (!LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsId, out errorMessage))
+                                string status = "";
+                                //核对工序
+                                LogicHandler.GetMakeInfo(sncode.Text, out oMakeCode, out status, out errorMessage);
+                                if (!LogicHandler.CheckStepSNAndMacode(oMakeCode, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsId, out errorMessage))
                                 {
                                     OperateResult.AppendText("<<" + errorMessage + "\n", Color.Red, sncode);
                                     return;