Commit a0d8f265 authored by 吴春's avatar 吴春

1

parent daf2289a
......@@ -3625,7 +3625,7 @@ namespace REBORN.Module.SellModule
Type = 2
});
}
return flag ? "" : "出错了,请联系管理员";
}
}
else
......
......@@ -691,9 +691,9 @@ IFNULL(a.PreferTipAmount,0)- IFNULL(a.CompensationMoney,0) + (IFNULL(A.PreferPr
if (model.LossType == 1)
{
//票务 分配到某个人身上
where += $@" and air.CreateBy={model.LossEmpId}";
where += $@" and air.CreateBy={model.LossEmpId}";//case when B.TeamType =1 then concat(B.TCNUM,'(小包团)') else B.TCNUM end as TCNUM
sql = $@"
SELECT A.*,case when B.TeamType =1 then concat(B.TCNUM,'(小包团)') else B.TCNUM end as TCNUM, B.SendVisaTime, B.StartDate,B.IsOrder,B.Status,B.OutGroupAuditDate,B.OutGroupAuditState,B.OutNotice,C.DayNum,C.LineId,C.LineteamId,C.ID as ConfigId,B.TeamType,B.OutBranchId,D.LineName,E.LtName
SELECT A.*,B.TCNUM, B.SendVisaTime, B.StartDate,B.IsOrder,B.Status,B.OutGroupAuditDate,B.OutGroupAuditState,B.OutNotice,C.DayNum,C.LineId,C.LineteamId,C.ID as ConfigId,B.TeamType,B.OutBranchId,D.LineName,E.LtName
,case when IFNULL(C.StartCityId,0)=IFNULL(A.DepartureCityId,0) OR IFNULL(C.ArriveCityId,0) =IFNULL(A.ReturnArriveCityId,0) THEN 2 ELSE
case when IFNULL(A.IsLeaderOrder,0)=1 THEN 2 ELSE 1 END
END AS IsUnionOrder
......@@ -708,7 +708,7 @@ left join rb_lineteam E on E.LtID=C.LineteamId
else
{
sql = $@"
SELECT A.*,case when B.TeamType =1 then concat(B.TCNUM,'(小包团)') else B.TCNUM end as TCNUM, B.SendVisaTime, B.StartDate,B.IsOrder,B.Status,B.OutGroupAuditDate,B.OutGroupAuditState,B.OutNotice,C.DayNum,C.LineId,C.LineteamId,C.ID as ConfigId,B.TeamType,B.OutBranchId,D.LineName
SELECT A.*,B.TCNUM, B.SendVisaTime, B.StartDate,B.IsOrder,B.Status,B.OutGroupAuditDate,B.OutGroupAuditState,B.OutNotice,C.DayNum,C.LineId,C.LineteamId,C.ID as ConfigId,B.TeamType,B.OutBranchId,D.LineName
,E.LtName,C.Title,C.ImgCover,b.SupplierId,B.PriceTeamType,B.WordPath
,case when IFNULL(C.StartCityId,0)=IFNULL(A.DepartureCityId,0) OR IFNULL(C.ArriveCityId,0) =IFNULL(A.ReturnArriveCityId,0) THEN 2 ELSE
case when IFNULL(A.IsLeaderOrder,0)=1 THEN 2 ELSE 1 END
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment