提交当前本机整理版本

2026-07-02 10:11:39 +00:00
parent c10a5d64c7
commit aacefa24f8
822 changed files with 196665 additions and 14263 deletions
@@ -1317,6 +1317,30 @@ namespace Lskj.PubBill
                    DataRow row = BillImpl.GetDataRowResult(this.SysModel.BillMasterSql);
                    if (row != null)
                    {
+                        if (row.Table.Columns.Contains(this.BillModel.RtagidKey)) 
+                        {
+                            string Rtagid = row[this.BillModel.RtagidKey] + "";
+                            // 初始化红、蓝单
+                            if (Rtagid.Equals("0"))
+                            {
+                                this.rdBlue.Checked = true;
+                                this.rdRed.Checked = false;
+                                this.lbTitle.ForeColor = Color.Blue;
+                                this.pl_red.Visible = false;
+                                this.pl_blue.Visible = true;
+                            }
+                            else if (Rtagid.Equals("1"))
+                            {
+                                this.rdRed.Checked = true;
+                                this.rdBlue.Checked = false;
+                                this.lbTitle.ForeColor = Color.Red;
+                                this.pl_blue.Visible = false;
+                                this.pl_red.Visible = true;
+                            }
+
+                        }
+
+
                        this.ControlObj.SetAllControlValue(row);//去掉第二个参数true，参数8进入的sql固定不默认赋值
                        // 设置Brp模版
                        if (this.IsBrpTemplete || this.BillModel.IsBrp)
@@ -10019,4 +10043,28 @@ namespace Lskj.PubBill
                            if (!ValidateCond(condition, item))
                            {
                                MessageUtil.Show(string.IsNullOrWhiteSpace(CondItem["hintmsg"] + "") ? "条件验证失败" : CondItem["hintmsg"] + "");
-                               
+                                return false;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        List<string> conditionlist = ReplaceHelper.GetParamFields(condition);
+                        foreach (string item in conditionlist)
+                        {
+                            if (!item.Contains("{#")) continue;//只有所有替换参数都包含了{#的（全部都是主表参数），才会去验证条件
+                        }
+                        condition = this.ControlObj.ReplaceParentControlValue(condition);
+                        if (!ValidateCond(condition, null))
+                        {
+                            MessageUtil.Show(string.IsNullOrWhiteSpace(CondItem["hintmsg"] + "") ? "条件验证失败" : CondItem["hintmsg"] + "");
+                            return false;
+                        }
+                    }
+                }
+            }
+            return true;
+        }
+
+    }
+}