cyf/lserp_cs_6.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SVN r799

Browse Source 
SVN-Revision: r799
This commit is contained in:
cyf
2025-06-27 07:40:34 +00:00
parent 9a1847d4cf
commit db2ad34557
3 changed files with 141 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.PubBillSpecial/BillModule.cs
+64 -9
View File
@@ -860,17 +860,37 @@ namespace Lskj.PubBillSpecial
}
}
//获取红蓝单据
string DocumentColor = this.rdBlue.Checked ? "0" : this.rdRed.Checked ? "1" : "";
if ((rowItem["orderid"] + "").Equals("999"))
{
string ModuleCode = model.DllParam2;
FrmSource frmSource = new FrmSource(ModuleCode, SysModel, model.MaxWindow);
FrmSource frmSource = new FrmSource(ModuleCode, SysModel, model.MaxWindow,false);
frmSource.PrimaryKey = this.BillModel.PrimaryKey;
frmSource.PrimaryValue = this.lblOrderNo.Text;
frmSource.DocumentColor = DocumentColor;
frmSource.Text = model.MenuName;
if (frmSource.ShowDialog() == DialogResult.OK)
{
string billNo = this.lblOrderNo.Text = frmSource.PrimaryValue;
this.SetBillStatus(BillImpl.GetDataRowResult(string.Format("select * from {0} where {1}='{2}'", BillModel.MasterTable, BillModel.PrimaryKey, billNo)));
this.lblOrderNo.Text = frmSource.ReturnPrimaryValue;
}
this.SetBillStatus(BillImpl.GetDataRowResult(string.Format("select * from {0} where {1}='{2}'", BillModel.MasterTable, BillModel.PrimaryKey, this.lblOrderNo.Text)));
}
else if ((rowItem["orderid"] + "").Equals("888"))
{
string ModuleCode = model.DllParam2;
FrmSource frmSource = new FrmSource(ModuleCode, SysModel, model.MaxWindow,true);
frmSource.PrimaryKey = this.BillModel.PrimaryKey;
frmSource.PrimaryValue = this.lblOrderNo.Text;
frmSource.DocumentColor = DocumentColor;
frmSource.Text = model.MenuName;
if (frmSource.ShowDialog() == DialogResult.OK)
{
this.lblOrderNo.Text = frmSource.ReturnPrimaryValue;
}
this.SetBillStatus(BillImpl.GetDataRowResult(string.Format("select * from {0} where {1}='{2}'", BillModel.MasterTable, BillModel.PrimaryKey, this.lblOrderNo.Text)));
}
else
{
@@ -6534,10 +6554,6 @@ namespace Lskj.PubBillSpecial
return;
}
}
switch (Type.ToUpper())
{
case "A":
@@ -6612,7 +6628,7 @@ namespace Lskj.PubBillSpecial
/// <summary>
///
/// 执行扫码的存储过程
/// </summary>
/// <param name="MainRowItem">明细选中行</param>
///<param name="Quantity">数量</param>
@@ -6778,4 +6794,43 @@ namespace Lskj.PubBillSpecial
if (rightEdge > maxRightEdge)
{
maxRightEdge = rightEdge;
}
}
}
}
if (minLeft == int.MaxValue) minLeft = 0;
int MovingDistance = (Screen.PrimaryScreen.WorkingArea.Width - maxRightEdge) / 2;
if (dataTable.Columns.Contains("controlLeft") && MovingDistance > 0)
{
foreach (DataRow item in dataTable.Rows)
{
item["controlLeft"] = int.Parse(item["controlLeft"] + "") + MovingDistance - minLeft;
}
}
return dataTable;
}
/// <summary>
/// 判断是不是数值
/// </summary>
/// <param name="oText"></param>
/// <returns></returns>
private bool IsNumberic(string oText)
{
try
{
int var1 = Convert.ToInt32(oText);
return true;
}
catch
{
return false;
}
}
}
}