hanlihui520/T-DAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
jl
2025-06-30 10:14:05 +08:00
parent 722f16a77e
commit fb2aa4f239
10 changed files with 146 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Epost.DAL/OrdersDAL.cs
View File

@ -83,7 +83,7 @@ namespace Epost.DAL
#region 获取回显订单信息
public DataTable GetOrderList_echo(string matchid, string sku, string area, string block)
public DataTable GetOrderList_echo(string matchid, string sku, string area, string block,string usercode="")
{
try
{
@ -92,6 +92,10 @@ namespace Epost.DAL
{
strwhere = "and matchid= '" + matchid + "'";
}
if (!string.IsNullOrEmpty(usercode))
{
strwhere += "and info= '" + usercode + "'";
}
string sql = string.Empty;
if (!string.IsNullOrEmpty(area))
{
@ -1171,13 +1175,11 @@ namespace Epost.DAL
#endregion
#region 删除订单信息
public bool DelOrder(string matchid, string orderid)
public bool DelOrder(string strwhere)
{
try
{
string sql = string.Format(" delete from orders where orderid ='{0}' and matchid='{1}' and oprationstate=3 and state =3 ",
orderid,
matchid);
string sql = string.Format(" delete from orders where state =3 "+strwhere);
LogHelper.WriteLogInfo("-删除订单信息:" + sql);
long x = db.DeleteSql(sql);
if (x > 0)
@ -1229,7 +1231,7 @@ namespace Epost.DAL
#region 查询标签所在区
public DataTable getArea(string address, string ip)
{
string sql = string.Format("select area,block,way,type from v_address where address='{0}' and ControlIP='{1}' group by block,area,way,type",
string sql = string.Format("select area,block,way,type,info from v_address where address='{0}' and ControlIP='{1}' group by block,area,way,type,info",
address,
ip);
LogHelper.WriteLogInfo("查询标签所在区getArea:" + sql);

17
Epost.DAL/OrdersQueueDAL.cs
View File

@ -44,7 +44,7 @@ namespace Epost.DAL
#endregion
#region 获取任务信息
public DataTable getQueuesOrderbyState(string state="0")
{
{
string sql = string.Format("select * from OrdersQueue where state ='{0}'",
state);
// LogHelper.WriteLogInfo("获取正在绑定的信息" + sql);
@ -54,9 +54,14 @@ namespace Epost.DAL
#endregion
#region 获取queue信息
public DataTable getQueuesOrderbyState(string block,string area,string state)
public DataTable getQueuesOrderbyState(string block,string area,string state,string usercode)
{
string sql = string.Format("select * from OrdersQueue where (state ='{0}' or state='0') and taskblock='{1}' and taskarea='{2}' ",
string strwhere = string.Empty;
if (!string.IsNullOrEmpty(usercode))
{
strwhere += " and usercode= '" + usercode + "'";
}
string sql = string.Format("select * from OrdersQueue where (state ='{0}' or state='0') and taskblock='{1}' and taskarea='{2}' "+ strwhere,
state,
block,
area);
@ -311,10 +316,10 @@ namespace Epost.DAL
{
strwhere += "and Taskarea='" + model.Taskarea + "'";
}
string sql = string.Format("update OrdersQueue set state='{0}' where state<>3 and sku = '{1}' and matchid='{2}' "+ strwhere,
string sql = string.Format("update OrdersQueue set state='{0}' where state<>3 and usercode = '{1}' "+ strwhere,
model.State
,model.Sku,
model.Matchid
,model.UserCode
);
LogHelper.WriteLogInfo("修改作业区段"+sql);