修改序列号转换功能

UAS_MES_JH/FunctionCode/Make/Make_SeqTransform.cs

@@ -421,43 +421,75 @@ namespace UAS_MES_NEW.Make
                 return;
             }
             //查询表工单序列号防呆规则表
-            rules = (DataTable)dh.ExecuteSql("select msr_startno from makesnrule where msr_makecode='" + ma_code.Text + "' and msr_type='after'", "select");
+            rules = (DataTable)dh.ExecuteSql("select msr_startno,MSR_PREFIX, MSR_LENGTH from makesnrule where msr_makecode='" + ma_code.Text + "' and msr_type='after'", "select");
             if (rules.Rows.Count > 0)
             {
                 hasMakeRule = true;
+                if (rules.Rows.Count > 0)
+                {
+                    hasSaleRule = true;
+                    if (rules.Rows[0]["MSR_PREFIX"].ToString() != "")
+                    {
+                        afterTransSNPre.Text = rules.Rows[0]["MSR_PREFIX"].ToString();
+                        afterTransSNPre.Enabled = false;
+                        afterTransSNPre_checkBox.Checked = true;
+                        afterTransSNPre_checkBox.Enabled = false;
+                    }
+                    if (rules.Rows[0]["MSR_LENGTH"].ToString() != "")
+                    {
+                        afterTransSNLength.Text = rules.Rows[0]["MSR_LENGTH"].ToString();
+                        afterTransSNLength.Enabled = false;
+                        afterTransSNLength_checkBox.Checked = true;
+                        afterTransSNLength_checkBox.Enabled = false;
+                    }
+                }
             }
             else
             {
                 ma_salecode.Text = dh.getFieldDataByCondition("make", "ma_salecode", "ma_code='" + ma_code.Text + "'").ToString();
                 //查询表合同序列号防呆规则表
-                rules = (DataTable)dh.ExecuteSql("select msr_startno from makesnrule where msr_salecode='" + ma_salecode.Text + "' and msr_type='after'", "select");
+                rules = (DataTable)dh.ExecuteSql("select msr_startno，MSR_PREFIX, MSR_LENGTH from makesnrule where msr_salecode='" + ma_salecode.Text + "' and msr_type='after'", "select");
                 if (rules.Rows.Count > 0)
                 {
                     hasSaleRule = true;
+                    if (rules.Rows[0]["MSR_PREFIX"].ToString() != "")
+                    {
+                        afterTransSNPre.Text = rules.Rows[0]["MSR_PREFIX"].ToString();
+                        afterTransSNPre.Enabled = false;
+                        afterTransSNPre_checkBox.Checked = true;
+                        afterTransSNPre_checkBox.Enabled = false;
+                    }
+                    if (rules.Rows[0]["MSR_LENGTH"].ToString() != "")
+                    {
+                        afterTransSNLength.Text = rules.Rows[0]["MSR_LENGTH"].ToString();
+                        afterTransSNLength.Enabled = false;
+                        afterTransSNLength_checkBox.Checked = true;
+                        afterTransSNLength_checkBox.Enabled = false;
+                    }
                 }
                 else
                 {
                     /*	如果转换前没有值，则取 select productsnrule where psr_prodcode=? 产品编号，
                      *	有值则赋值到 转换前，并且自动勾选不可编辑。*/
-                    rules = (DataTable)dh.ExecuteSql("select psr_prefix ,psr_length from productsnrule where psr_prodcode = '" + dt.Rows[0]["ma_prodcode"].ToString() + "' and psr_type='after'", "select");
-                    if (rules.Rows.Count > 0)
-                    {
-                        //将产品序列号防呆规则查出的数据填充
-                        if (rules.Rows[0]["psr_prefix"].ToString() != "")
-                        {
-                            afterTransSNPre.Text = rules.Rows[0]["psr_prefix"].ToString();
-                            afterTransSNPre.Enabled = false;
-                            afterTransSNPre_checkBox.Checked = true;
-                            afterTransSNPre_checkBox.Enabled = false;
-                        }
-                        if (rules.Rows[0]["psr_length"].ToString() != "")
-                        {
-                            afterTransSNLength.Text = rules.Rows[0]["psr_length"].ToString();
-                            afterTransSNLength.Enabled = false;
-                            afterTransSNLength_checkBox.Checked = true;
-                            afterTransSNLength_checkBox.Enabled = false;
-                        }
-                    }
+                    //rules = (DataTable)dh.ExecuteSql("select psr_prefix ,psr_length from productsnrule where psr_prodcode = '" + dt.Rows[0]["ma_prodcode"].ToString() + "' and psr_type='after'", "select");
+                    //if (rules.Rows.Count > 0)
+                    //{
+                    //    //将产品序列号防呆规则查出的数据填充
+                    //    if (rules.Rows[0]["psr_prefix"].ToString() != "")
+                    //    {
+                    //        afterTransSNPre.Text = rules.Rows[0]["psr_prefix"].ToString();
+                    //        afterTransSNPre.Enabled = false;
+                    //        afterTransSNPre_checkBox.Checked = true;
+                    //        afterTransSNPre_checkBox.Enabled = false;
+                    //    }
+                    //    if (rules.Rows[0]["psr_length"].ToString() != "")
+                    //    {
+                    //        afterTransSNLength.Text = rules.Rows[0]["psr_length"].ToString();
+                    //        afterTransSNLength.Enabled = false;
+                    //        afterTransSNLength_checkBox.Checked = true;
+                    //        afterTransSNLength_checkBox.Enabled = false;
+                    //    }
+                    //}
                 }
             }
         }

UAS_MES_JH/FunctionCode/Special/Special_CancelSnChange.cs

@@ -24,7 +24,7 @@ namespace UAS_MES_NEW.Special
         private void Confirm_Click(object sender, EventArgs e)
         {
             //获取序列号的途程
-            DataTable dt = (DataTable)dh.ExecuteSql("select ms_id,ms_firstsn,ms_nextstepcode,ms_currentstepcode,ms_makecode,ms_status,ms_checkno,ms_craftcode,ms_prodcode,ms_stepcode from makeserial where ms_sncode='" + sn_code.Text + "' order by ms_id desc", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select ms_id,ms_firstsn,ms_sncode,ms_nextstepcode,ms_currentstepcode,ms_makecode,ms_status,ms_checkno,ms_craftcode,ms_prodcode,ms_stepcode from makeserial where ms_sncode='" + sn_code.Text + "' order by ms_id desc", "select");
             if (dt.Rows.Count > 0)
             {
                 string ms_firstsn = dt.Rows[0]["ms_firstsn"].ToString();