tsanie/fleet-contractor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync

Browse Source
This commit is contained in:
Tsanie Lily
2023-04-28 12:21:24 +08:00
parent 156d145a48
commit 88e0a25ecd
162 changed files with 26324 additions and 7519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
IronIntelContractorBusiness/Machines/EngineHoursInfo.cs
View File

@ -65,6 +65,7 @@ namespace IronIntel.Contractor.Machines
/// 前端选择的时区的分钟偏移
/// </summary>
public int OffsetMinute { get; set; }
public string DataSource { get; set; }
}
@ -82,15 +83,15 @@ namespace IronIntel.Contractor.Machines
{
get
{
return AsofTime.ToString("MM/dd/yyyy HH:mm");
return AsofTime.ToString("M/d/yyyy h:m tt");
}
}
public DateTime AsofTime_Local { get; set; }
public DateTime AsofTimeLocal { get; set; }
public string EventTimeLocalText
{
get
{
return AsofTime_Local.ToString("MM/dd/yyyy HH:mm");
return AsofTimeLocal.ToString("M/d/yyyy h:m tt");
}
}
}
@ -108,15 +109,39 @@ namespace IronIntel.Contractor.Machines
{
get
{
return AsofTime.ToString("MM/dd/yyyy HH:mm");
return AsofTime.ToString("M/d/yyyy h:m tt");
}
}
public DateTime AsofTime_Local { get; set; }
public DateTime AsofTimeLocal { get; set; }
public string EventTimeLocalText
{
get
{
return AsofTime_Local.ToString("MM/dd/yyyy HH:mm");
return AsofTimeLocal.ToString("M/d/yyyy h:m tt");
}
}
}
public class OEMDD2EngineHoursInfo
{
public long AssetId { get; set; }
public string SN { get; set; }
public DateTime AsofTime { get; set; }
public string UOM { get; set; }
public double Raw { get; set; }
public double Calculated { get; set; }
public string EventTimeText
{
get
{
return AsofTime.ToString("M/d/yyyy h:m tt");
}
}
public DateTime AsofTimeLocal { get; set; }
public string EventTimeLocalText
{
get
{
return AsofTimeLocal.ToString("M/d/yyyy h:m tt");
}
}
}
@ -125,14 +150,16 @@ namespace IronIntel.Contractor.Machines
{
public long LogId { get; set; }
public long AssetId { get; set; }
public string DisplayName { get; set; }//Asset Name
public string VIN { get; set; }
public DateTime AdjustmentTime { get; set; }
public string AdjustmentTimeText { get { return AdjustmentTime.ToString("MM/dd/yyyy HH:mm"); } }
public string AdjustmentTimeText { get { return AdjustmentTime.ToString("M/d/yyyy h:m tt"); } }
public DateTime EngineHoursTime { get; set; }
public string EngineHoursTimeText { get { return EngineHoursTime.ToString("MM/dd/yyyy HH:mm"); } }
public string EngineHoursTimeText { get { return EngineHoursTime.ToString("M/d/yyyy h:m tt"); } }
public DateTime AdjustmentLocalTime { get; set; }
public string AdjustmentLocalTimeText { get { return AdjustmentLocalTime.ToString("MM/dd/yyyy HH:mm"); } }
public string AdjustmentLocalTimeText { get { return AdjustmentLocalTime.ToString("M/d/yyyy h:m tt"); } }
public DateTime EngineHoursLocalTime { get; set; }
public string EngineHoursLocalTimeText { get { return EngineHoursLocalTime.ToString("MM/dd/yyyy HH:mm"); } }
public string EngineHoursLocalTimeText { get { return EngineHoursLocalTime.ToString("M/d/yyyy h:m tt"); } }
private double _EngineHours;
public double EngineHours

1
IronIntelContractorBusiness/Machines/FuelusedInfo.cs
View File

@ -20,6 +20,7 @@ namespace IronIntel.Contractor.Machines
public double Amount { get; set; }
public double Percent { get; set; }
public string UOM { get; set; }
public string PercentText { get; set; }
public string ReceivedDateStr
{
get

93
IronIntelContractorBusiness/Machines/MachineItem.cs
View File

@ -1,6 +1,5 @@
using Foresight.Fleet.Services.Asset;
using Foresight.ServiceModel;
using IronIntel.Services.Business.Admin;
using System;
using System.Collections.Generic;
using System.Linq;
@ -31,10 +30,13 @@ namespace IronIntel.Contractor.Machines
}
}
public string CalampDeviceAirID { get; set; }
public string CalampDeviceAirID { get; set; }//PairedDeviceSN
public bool TelematicsEnabled { get; set; }
public bool Hide { get; set; }
public bool OnRoad { get; set; }
public bool Attachment { get; set; }
public bool Preloaded { get; set; }
public int MakeYear { get; set; }
public string DealerID { get; set; }
public string Dealer { get; set; }
@ -46,6 +48,19 @@ namespace IronIntel.Contractor.Machines
public int MakeID { get; set; }
public string VIN { get; set; }
public DateTime? EngineHoursDate { get; set; }
public AssetShareStatus ShareStatus { get; set; }
public DateTime? AddedTime { get; set; }
public DateTime? AddedLocalTime { get; set; }
public double Odometer;
public string OdometerUOM { get; set; }
public DateTime? OdometerDate { get; set; }
public string Description { get; set; }
public string AcquisitionType { get; set; }
public string PMPlans { get; set; }
public string AssetGroups { get; set; }
public string Jobsites { get; set; }
public AssetCustomStatus CustomStatus { get; set; }
public string DisplayName
{
get
@ -61,8 +76,10 @@ namespace IronIntel.Contractor.Machines
return name;
}
}
public string EngineHoursDateStr { get { return EngineHoursDate == null ? "" : EngineHoursDate.Value.ToShortDateString(); } }
public string EngineHoursDateTimeStr { get { return EngineHoursDate == null ? "" : EngineHoursDate.Value.ToString(); } }
public string AddedTimeStr { get { return (AddedLocalTime == null || AddedLocalTime.Value <= Helper.DBMinDateTime) ? "" : AddedLocalTime.Value.ToShortDateString(); } }
public string EngineHoursDateStr { get { return (EngineHoursDate == null || EngineHoursDate.Value <= Helper.DBMinDateTime) ? "" : EngineHoursDate.Value.ToShortDateString(); } }
public string EngineHoursDateTimeStr { get { return (EngineHoursDate == null || EngineHoursDate.Value <= Helper.DBMinDateTime) ? "" : EngineHoursDate.Value.ToString(); } }
public string OdometerDateStr { get { return (OdometerDate == null || OdometerDate.Value <= Helper.DBMinDateTime) ? "" : OdometerDate.Value.ToShortDateString(); } }
}
@ -123,6 +140,9 @@ namespace IronIntel.Contractor.Machines
public bool TelematicsEnabled { get; set; }
public bool Hidden { get; set; }
public bool OnRoad { get; set; }
public bool Attachment { get; set; }
public bool Preloaded { get; set; }
public string EQClass { get; set; }
public string CostCenter { get; set; }
public string AquisitionType { get; set; }
@ -133,12 +153,16 @@ namespace IronIntel.Contractor.Machines
public string ContractorID { get; set; }
public long OnSiteJobsiteID { get; set; }
public string[] OnSiteJobsiteIDs { get; set; }
public List<AssetJobsiteInfo> JobSites { get; set; }
public string[] ContactIDs { get; set; }
public string[] MachineGroupIDs { get; set; }
public MachineRentalInfo MachineRental { get; set; }
public MachineAttributeClient[] MachineAttributes { get; set; }
public StringKeyValue[] VisibleOnWorkOrders { get; set; }
public AttachmentAttributeInfo AttachmentInfo { get; set; }
public AssetShareStatus ShareStatus { get; set; }
public AssetCustomStatus CustomStatus { get; set; }
public string AddedOnStr
@ -264,14 +288,6 @@ namespace IronIntel.Contractor.Machines
}//由于地图显示及排序的名称
}
public class MachineOffsetItem
{
public Int64 MachineID { get; set; }
public double Value { get; set; }
public double Offset { get; set; }
public string Notes { get; set; }
public OffsetTypes Type { get; set; }
}
public class DeviceItem
{
@ -296,9 +312,14 @@ namespace IronIntel.Contractor.Machines
public long DeviceID { get; set; }
public bool FIInstalltion { get; set; }
public string Installer { get; set; }
public bool Tamper { get; set; }
public bool Utilization { get; set; }
public string SalesOrderNumber { get; set; }
public string AddDateStr { get { return AddLocalDate == null ? "" : AddLocalDate.Value.ToShortDateString(); } }
public string AddDateStr1 { get { return AddLocalDate == null ? "" : AddLocalDate.Value.ToString("yyyy-MM-dd"); } }
public string InvoiceDateStr { get { return InvoiceDate == null ? "" : InvoiceDate.Value.ToShortDateString(); } }
public string ServiceStartDateStr { get { return ServiceStartDate == null ? "" : ServiceStartDate.Value.ToShortDateString(); } }
public string ServiceStartDateStr1 { get { return ServiceStartDate == null ? "" : ServiceStartDate.Value.ToString("yyyy-MM-dd"); } }
}
public class PairedAssetItem
@ -313,15 +334,30 @@ namespace IronIntel.Contractor.Machines
public double? EngineHours { get; set; }
public DateTime? EngineHoursDate { get; set; }
public DateTime? EngineHoursLocalDate { get; set; }
public string EngineHoursDateStr { get { return EngineHoursLocalDate == null ? "" : EngineHoursLocalDate.Value.ToShortDateString(); } }
public string EngineHoursDateStr { get { return EngineHoursLocalDate == null ? "" : EngineHoursLocalDate.Value.ToString("M/d/yyyy"); } }
}
public class CommentItem
public class CommentItem : Foresight.Fleet.Services.CommentInfo
{
public long Id { get; set; }
public DateTime SubmitLocalDate { get; set; }
public string UserName { get; set; }
public string Comment { get; set; }
public string SubmitDateStr { get { return SubmitLocalDate == DateTime.MinValue ? "" : SubmitLocalDate.ToString(); } }
public string SubmitDateStr { get { return SubmitLocalDate == DateTime.MinValue ? "" : SubmitLocalDate.ToString("M/d/yyyy h:m tt"); } }
public void FormatFollowUp()
{
if (!string.IsNullOrEmpty(FollowUp))
{
string[] fus = FollowUp.Split(';');
for (int i = 0; i < fus.Length; i++)
{
if (!Helper.IsEmail(fus[i]))
fus[i] = Foresight.Standard.PhoneNumber.FormatPhoneNumber(fus[i]);
}
FollowUp = string.Join(";", fus);
}
}
}
public class InstallNotesItemC : Foresight.Fleet.Services.Device.InstallNotesItem
{
public string InstallTimeLocalStr { get { return InstallTimeLocal == DateTime.MinValue ? "" : InstallTimeLocal.ToString("M/d/yyyy h:m:s tt"); } }
}
public class MachineGroup
@ -400,15 +436,16 @@ namespace IronIntel.Contractor.Machines
public class AssetAttachmentItem
{
public long ID { get; set; }
public long AssetId { get; set; }
public string FileName { get; set; }
public string AddedByUserIID { get; set; }
public string AddedByUserName { get; set; }
public string Notes { get; set; }
public bool VisibleOnWorkOrder { get; set; }
public long Id { get; set; }
public string Name { get; set; }
public string FileType { get; set; }
public DateTime AddedOn { get; set; }
public string AddedOnStr { get { return AddedOn.ToString(); } }
public byte[] FileData { get; set; }
public DateTime AddedOnLocal { get; set; }
public string AddedOnLocalStr { get { return AddedOnLocal.ToString(); } }
public string AddedBy { get; set; }
public string Url { get; set; }
public string Description { get; set; }
public bool VisibleOnWorkOrder { get; set; }
}
}

286
IronIntelContractorBusiness/Machines/MachineManagement.cs
View File

@ -5,9 +5,6 @@ using System.Text;
using System.Data;
using Foresight.Data;
using Foresight.ServiceModel;
using IronIntel.Services.Business.Admin;
using IronIntel.Services.MapView;
using IronIntel.Services.Customers;
using IronIntel.Contractor.Maintenance;
using Foresight.Fleet.Services.Asset;
@ -15,13 +12,13 @@ namespace IronIntel.Contractor.Machines
{
public class MachineManagement
{
private static List<MachineMake> _Makes = new List<MachineMake>();
private static List<AssetMake> _Makes = new List<AssetMake>();
private static object _sycmakes = new object();
private static List<MachineType> _MachineTypes = new List<MachineType>();
private static List<AssetType> _MachineTypes = new List<AssetType>();
private static object _syctypes = new object();
private static List<MachineModel> _MachineModels = new List<MachineModel>();
private static List<AssetModel> _MachineModels = new List<AssetModel>();
private static object _sycmodels = new object();
private const string MachineFields = "{0}MACHINEID,{0}MACHINENAME,{0}MAKEID,{0}MODELID,{0}TYPEID,{0}MACHINEICONID,{0}DEVICEID,{0}VIN,{0}MAKEYEAR,{0}NOTES,{0}STATUS,{0}CONTRACTORID,{0}DEALERID,{0}UID,{0}ADDEDON,{0}CUR_LONGITUDE,{0}CUR_LATITUDE,{0}LOCDATE_UTC,{0}ENGINEHOURS,{0}HOURSDATE_UTC,{0}DATASOURCE,{0}HIDE,{0}FUEL_CONSUMED,{0}FUEL_UNITS,{0}FUEL_DATE,{0}ODOMETER,{0}ODODATE_UTC,{0}ODOMETERUOM,{0}FUELCOST,{0}FUELCOSTUOM,{0}MACHINERATE,{0}WORKTYPE,{0}RETIREMENTHOURS,{0}RETIREMENTODO,{0}ALTITUDE,{0}ALTITUDEUNITS,{0}IDLEHOURSUTC,{0}IDLEHOURS,{0}LOADCOUNTUTC,{0}LOADCOUNT,{0}PAYLOADTOTALUTC,{0}PAYLOADTOTAL,{0}PAYLOADTOTALUNITS,{0}DEFREMAININGUTC,{0}DEFREMAINING,{0}FUELREMAININGUTC,{0}FUELREMAININGPERCENT,{0}MACHINENAME2,{0}ONROAD,{0}LEASESTART,{0}LEASEEND,{0}LEASEHOURS,{0}UNDERCARRIAGEHOURS,{0}ODOSTART2,{0}ISDELETED,{0}DELETEDDATE,{0}ODOSTART2DATASOURCE,{0}LOCDATASOURCE,{0}HOURSDATASOURCE,{0}FUELDATASOURCE,{0}AQUISITIONTYPE,{0}ICONFILENAME,{0}STARTINGENGINEHOURS,{0}DISTANCECALCBY,{0}TELEMATICSENABLED,{0}COSTCENTER,{0}EQCLASS,{0}DESCRIPTION,{0}ADDEDBY";
@ -40,11 +37,11 @@ namespace IronIntel.Contractor.Machines
public static void RefreshMakes()
{
MachineMake[] mks = null;
MachineServiceClient2 mc = SystemParams.GetMachineServiceClient();
AssetMake[] mks = null;
var acp = FleetServiceClientHelper.CreateClient<AssetClassProvider>();
try
{
mks = mc.GetMachineMakes();
mks = acp.GetAssetMakes(string.Empty);
}
catch
{
@ -61,11 +58,12 @@ namespace IronIntel.Contractor.Machines
public static void RefreshMachineTypes()
{
MachineType[] mks = null;
MachineServiceClient2 mc = SystemParams.GetMachineServiceClient();
AssetType[] mks = null;
var acp = FleetServiceClientHelper.CreateClient<AssetClassProvider>();
try
{
mks = mc.GetMachineTypes();
mks = acp.GetAssetTypes(string.Empty);
}
catch
{
@ -82,11 +80,11 @@ namespace IronIntel.Contractor.Machines
public static void RefreshModels()
{
MachineModel[] mks = null;
MachineServiceClient2 mc = SystemParams.GetMachineServiceClient();
AssetModel[] mks = null;
var acp = FleetServiceClientHelper.CreateClient<AssetClassProvider>();
try
{
mks = mc.GetMachineModels();
mks = acp.GetAssetModels(-1, string.Empty);
}
catch
{
@ -101,7 +99,7 @@ namespace IronIntel.Contractor.Machines
}
}
public static MachineMake[] GetMachineMakes()
public static AssetMake[] GetMachineMakes()
{
lock (_sycmakes)
{
@ -109,7 +107,7 @@ namespace IronIntel.Contractor.Machines
}
}
public static MachineType[] GetMachineTypes()
public static AssetType[] GetMachineTypes()
{
lock (_syctypes)
{
@ -117,7 +115,7 @@ namespace IronIntel.Contractor.Machines
}
}
public static MachineModel[] GetMachineModels()
public static AssetModel[] GetMachineModels()
{
lock (_sycmodels)
{
@ -125,7 +123,7 @@ namespace IronIntel.Contractor.Machines
}
}
public static MachineMake GetMachineMake(int makeid)
public static AssetMake GetMachineMake(int makeid)
{
var makes = GetMachineMakes();
foreach (var make in makes)
@ -153,7 +151,7 @@ namespace IronIntel.Contractor.Machines
return make == null ? string.Empty : make.Name;
}
public static MachineModel GetMachineModel(int modelid)
public static AssetModel GetMachineModel(int modelid)
{
var models = GetMachineModels();
foreach (var model in models)
@ -181,7 +179,7 @@ namespace IronIntel.Contractor.Machines
return model == null ? string.Empty : model.Name;
}
public static MachineType GetMachineType(int typeid)
public static AssetType GetMachineType(int typeid)
{
var types = GetMachineTypes();
foreach (var mtype in types)
@ -209,9 +207,9 @@ namespace IronIntel.Contractor.Machines
return mtype == null ? string.Empty : mtype.Name;
}
public static MachineMake GetMachineMake(IEnumerable<MachineMake> makes, int id)
public static AssetMake GetMachineMake(IEnumerable<AssetMake> makes, int id)
{
foreach (MachineMake mk in makes)
foreach (AssetMake mk in makes)
{
if (id == mk.ID)
{
@ -221,9 +219,9 @@ namespace IronIntel.Contractor.Machines
return null;
}
public static MachineType GetMachineType(IEnumerable<MachineType> types, int id)
public static AssetType GetMachineType(IEnumerable<AssetType> types, int id)
{
foreach (MachineType mk in types)
foreach (AssetType mk in types)
{
if (id == mk.ID)
{
@ -233,9 +231,9 @@ namespace IronIntel.Contractor.Machines
return null;
}
public static MachineModel GetMachineModel(IEnumerable<MachineModel> models, int id)
public static AssetModel GetMachineModel(IEnumerable<AssetModel> models, int id)
{
foreach (MachineModel mk in models)
foreach (AssetModel mk in models)
{
if (id == mk.ID)
{
@ -257,8 +255,8 @@ namespace IronIntel.Contractor.Machines
{
try
{
MachineServiceClient2 mc = SystemParams.GetMachineServiceClient();
_DefaultMachineTypeIconUrl = mc.GetDefaultMachineTypeIconUrl();
var acp = FleetServiceClientHelper.CreateClient<AssetClassProvider>();
_DefaultMachineTypeIconUrl = acp.GetDefaultMachineTypeIconUrl();
}
catch
{ }
@ -267,13 +265,6 @@ namespace IronIntel.Contractor.Machines
}
}
public static MachineAlertViewClient GetMachineAlertViewClient()
{
string[] address = SystemParams.SystemServiceAddresses;
MachineAlertViewClient ic = new MachineAlertViewClient(address[0]);
return ic;
}
public static bool Contains(string text, string val)
{
if (!string.IsNullOrWhiteSpace(text))
@ -286,50 +277,6 @@ namespace IronIntel.Contractor.Machines
}
}
public static void UpdateMachineHideStatus(IEnumerable<Tuple<long, bool>> machines)
{
const string SQL = "update MACHINES set HIDE={1} where MACHINEID={0}";
FISqlConnection db = SystemParams.GetDbInstance();
foreach (Tuple<long, bool> mac in machines)
{
db.ExecSQL(SQL, mac.Item1, mac.Item2 ? 1 : 0);
}
}
public static MachineItem GetMachineByID(string sessionid, long machineid, FIDbAccess db = null)
{
string SQL = "select " + string.Format(MachineFields, "") + " from MACHINES where MACHINEID={0}";
if (db == null)
{
db = SystemParams.GetDbInstance();
}
DataTable tb = db.GetDataTableBySQL(SQL, machineid);
if (tb.Rows.Count == 0)
{
return null;
}
MachineManagement.RefreshBaseData();
MachineMake[] makes = MachineManagement.GetMachineMakes();
MachineModel[] models = MachineManagement.GetMachineModels();
MachineType[] types = MachineManagement.GetMachineTypes();
MachineItem mi = null;
if (tb.Rows.Count > 0)
{
mi = ConvertToMachineItem(tb.Rows[0], makes, models, types);
mi.AddedOn = FIDbAccess.GetFieldDateTime(tb.Rows[0]["ADDEDON"], DateTime.MinValue).AddHours(SystemParams.GetHoursOffset());
mi.AddedBy = FIDbAccess.GetFieldString(tb.Rows[0]["ADDEDBY"], string.Empty);
if (!string.IsNullOrEmpty(mi.AddedBy))
{
var user = Users.UserManagement.GetUserByIID(mi.AddedBy);
mi.AddedByName = user == null ? mi.AddedBy : user.DisplayName;
}
}
return mi;
}
public static MachineItem[] GetMachines(string sessionid, string useriid, string searchtxt, string companyid = null)
{
string SQL = "select " + string.Format(MachineFields, "") + " from MACHINES order by MACHINENAME";
@ -360,10 +307,10 @@ namespace IronIntel.Contractor.Machines
availableAssetsids = FleetServiceClientHelper.CreateClient<AssetQueryClient>(companyid, sessionid).GetAvailableAssetsForUsers(companyid, useriid);
}
MachineManagement.RefreshBaseData();
MachineMake[] makes = MachineManagement.GetMachineMakes();
MachineModel[] models = MachineManagement.GetMachineModels();
MachineType[] types = MachineManagement.GetMachineTypes();
RefreshBaseData();
AssetMake[] makes = GetMachineMakes();
AssetModel[] models = GetMachineModels();
AssetType[] types = GetMachineTypes();
List<MachineItem> ls = new List<MachineItem>();
if (tb.Rows.Count > 0)
@ -425,10 +372,10 @@ namespace IronIntel.Contractor.Machines
if (user.UserType < Users.UserTypes.Admin)
availableAssetsids = FleetServiceClientHelper.CreateClient<AssetQueryClient>(companyid, sessionid).GetAvailableAssetsForUsers(companyid, useriid);
MachineManagement.RefreshBaseData();
MachineMake[] makes = MachineManagement.GetMachineMakes();
MachineModel[] models = MachineManagement.GetMachineModels();
MachineType[] types = MachineManagement.GetMachineTypes();
RefreshBaseData();
AssetMake[] makes = GetMachineMakes();
AssetModel[] models = GetMachineModels();
AssetType[] types = GetMachineTypes();
List<MachineItem> ls = new List<MachineItem>();
if (tb.Rows.Count > 0)
@ -461,7 +408,7 @@ namespace IronIntel.Contractor.Machines
return ls.ToArray();
}
private static MachineItem ConvertToMachineItem(DataRow dr, MachineMake[] makes, MachineModel[] models, MachineType[] types)
private static MachineItem ConvertToMachineItem(DataRow dr, AssetMake[] makes, AssetModel[] models, AssetType[] types)
{
MachineItem mi = new MachineItem();
mi.MachineID = FIDbAccess.GetFieldInt(dr["MACHINEID"], 0);
@ -489,15 +436,15 @@ namespace IronIntel.Contractor.Machines
mi.RetirementOdo = FIDbAccess.GetFieldDouble(dr["RETIREMENTODO"], 0);
mi.MakeID = FIDbAccess.GetFieldInt(dr["MAKEID"], 0);
MachineMake make = MachineManagement.GetMachineMake(makes, mi.MakeID);
AssetMake make = GetMachineMake(makes, mi.MakeID);
mi.Make = make == null ? string.Empty : make.Name;
mi.ModelID = FIDbAccess.GetFieldInt(dr["MODELID"], 0);
MachineModel model = MachineManagement.GetMachineModel(models, mi.ModelID);
AssetModel model = GetMachineModel(models, mi.ModelID);
mi.Model = model == null ? string.Empty : model.Name;
mi.TypeID = FIDbAccess.GetFieldInt(dr["TYPEID"], 0);
MachineType mtype = MachineManagement.GetMachineType(types, mi.TypeID);
AssetType mtype = GetMachineType(types, mi.TypeID);
mi.MachineType = mtype == null ? string.Empty : mtype.Name;
mi.OnRoad = FIDbAccess.GetFieldInt(dr["ONROAD"], 0) == 1;
mi.LeaseStart = FIDbAccess.GetFieldDateTime(dr["LEASESTART"], DateTime.MinValue);
@ -554,23 +501,6 @@ namespace IronIntel.Contractor.Machines
return 0;
}
public static void SaveMachineToMachineGroups(FISqlConnection db, long machineid, string[] groupids)
{
const string SQL = "insert into MACHINEGROUPMAP(MACHINEID,GROUPID) values({0},{1})";
const string SQL_DEL = "delete from MACHINEGROUPMAP where MACHINEID={0}";
if (db == null)
db = SystemParams.GetDbInstance();
db.ExecSQL(SQL_DEL, machineid);
if (groupids != null && groupids.Length > 0)
{
foreach (var groupid in groupids)
{
db.ExecSQL(SQL, machineid, groupid);
}
}
}
public static int DeleteMachineGroup(string groupID)
{
const string SQL_Delete = "delete from MACHINEGROUPS where GROUPID={0} delete from MACHINEGROUPMAP where GROUPID={0} ";
@ -631,7 +561,7 @@ namespace IronIntel.Contractor.Machines
public static MachineItem[] GetMachineByGroup(string groupid)
{
string SQL = "select " + string.Format(MachineFields, "b.") + " from MACHINEGROUPMAP a left join MACHINES b on a.MACHINEID=b.MACHINEID where a.GROUPID={0} order by MACHINENAME";
string SQL = "select " + string.Format(MachineFields, "b.") + " from MACHINEGROUPMAP a with(nolock) left join MACHINES b with(nolock) on a.MACHINEID=b.MACHINEID where a.GROUPID={0} order by MACHINENAME";
FIDbAccess db = SystemParams.GetDbInstance();
if (db == null)
@ -645,10 +575,10 @@ namespace IronIntel.Contractor.Machines
return new MachineItem[0];
}
MachineManagement.RefreshBaseData();
MachineMake[] makes = MachineManagement.GetMachineMakes();
MachineModel[] models = MachineManagement.GetMachineModels();
MachineType[] types = MachineManagement.GetMachineTypes();
RefreshBaseData();
AssetMake[] makes = GetMachineMakes();
AssetModel[] models = GetMachineModels();
AssetType[] types = GetMachineTypes();
List<MachineItem> ls = new List<MachineItem>();
if (tb.Rows.Count > 0)
@ -664,7 +594,7 @@ namespace IronIntel.Contractor.Machines
public static MachineGroup[] GetMachineGroupByUser(string useriid, FISqlConnection db = null)
{
const string SQL = "select b.* from USERMACHINEGROUPMAP a left join MACHINEGROUPS b on a.GROUPID=b.GROUPID where a.USERIID={0} order by GROUPNAME";
const string SQL = "select b.* from USERMACHINEGROUPMAP a with(nolock) left join MACHINEGROUPS b with(nolock) on a.GROUPID=b.GROUPID where a.USERIID={0} order by GROUPNAME";
if (db == null)
db = SystemParams.GetDbInstance();
@ -682,64 +612,23 @@ namespace IronIntel.Contractor.Machines
return result.ToArray();
}
public static void SaveUserMachineGroup(string useriid, string[] groupids)
public static AssetType[] GetMachineTypesByUser(string useriid, FISqlConnection db = null)
{
const string SQL_DeleteDetail = "delete USERMACHINEGROUPMAP where USERIID={0}";
const string SQL_InsertDetail = "insert USERMACHINEGROUPMAP(USERIID,GROUPID) values({0},{1})";
FISqlConnection db = SystemParams.GetDbInstance();
const string SQL = "select b.* from USERMACHINETYPEMAP a with(nolock) left join MACHINE_TYPE b with(nolock) on a.TYPEID=b.TYPEID where a.USERIID={0} order by TYPENAME";
db.ExecSQL(SQL_DeleteDetail, useriid);
if (groupids != null && groupids.Length > 0)
{
foreach (string gid in groupids)
db.ExecSQL(SQL_InsertDetail, useriid, gid);
}
}
public static Dictionary<int, List<StringKeyValue>> GetGroupsAssets(FISqlConnection db = null)
{
const string SQL_C = "select mgm.MACHINEID,mgm.GROUPID,mg.GROUPNAME from MACHINEGROUPMAP mgm left join MACHINEGROUPS mg on mgm.GROUPID=mg.GROUPID";
Dictionary<int, List<StringKeyValue>> result = new Dictionary<int, List<StringKeyValue>>();
if (db == null)
db = SystemParams.GetDbInstance();
DataTable tb = db.GetDataTableBySQL(SQL_C);
DataTable dt = db.GetDataTableBySQL(SQL, useriid);
foreach (DataRow dr in tb.Rows)
List<AssetType> result = new List<AssetType>();
foreach (DataRow dr in dt.Rows)
{
int machineid = FIDbAccess.GetFieldInt(dr["MACHINEID"], -1);
StringKeyValue kv = new StringKeyValue();
kv.Key = FIDbAccess.GetFieldString(dr["GROUPID"], "");
kv.Value = FIDbAccess.GetFieldString(dr["GROUPNAME"], ""); ;
if (!result.ContainsKey(machineid))
result[machineid] = new List<StringKeyValue>();
result[machineid].Add(kv);
AssetType mg = new AssetType();
mg.ID = FIDbAccess.GetFieldInt(dr["TYPEID"], 0);
mg.Name = FIDbAccess.GetFieldString(dr["TYPENAME"], "");
result.Add(mg);
}
return result;
}
/// <summary>
/// 获取机器组和机器的对应关系
/// </summary>
/// <returns></returns>
public static Dictionary<int, List<string>> GetGroupMachines(FISqlConnection db = null)
{
const string SQL_C = "select MACHINEID,GROUPID from MACHINEGROUPMAP";
Dictionary<int, List<string>> result = new Dictionary<int, List<string>>();
if (db == null)
db = SystemParams.GetDbInstance();
DataTable tb = db.GetDataTableBySQL(SQL_C);
foreach (DataRow dr in tb.Rows)
{
int machineid = FIDbAccess.GetFieldInt(dr["MACHINEID"], -1);
string groupid = FIDbAccess.GetFieldString(dr["GROUPID"], "");
if (!result.ContainsKey(machineid))
result[machineid] = new List<string>();
result[machineid].Add(groupid);
}
return result;
return result.ToArray();
}
/// <summary>
@ -748,7 +637,7 @@ namespace IronIntel.Contractor.Machines
/// <returns></returns>
public static long[] GetGroupMachines(string[] groupids, FISqlConnection db = null)
{
const string SQL_C = "select distinct MACHINEID from MACHINEGROUPMAP where GROUPID in ({0})";
const string SQL_C = "select distinct MACHINEID from MACHINEGROUPMAP with(nolock) where GROUPID in ({0})";
List<long> result = new List<long>();
if (db == null)
@ -763,30 +652,6 @@ namespace IronIntel.Contractor.Machines
return result.ToArray();
}
/// <summary>
/// 获取机器组
/// </summary>
/// <returns></returns>
public static string[] GetGroupByMachineID(FISqlConnection db, long machineid)
{
const string SQL_C = "select GROUPID from MACHINEGROUPMAP where MACHINEID={0}";
Dictionary<int, List<string>> result = new Dictionary<int, List<string>>();
if (db == null)
db = SystemParams.GetDbInstance();
DataTable tb = db.GetDataTableBySQL(SQL_C, machineid);
if (tb.Rows.Count == 0)
return new string[0];
List<string> list = new List<string>();
foreach (DataRow dr in tb.Rows)
{
string groupid = FIDbAccess.GetFieldString(dr["GROUPID"], "");
list.Add(groupid);
}
return list.ToArray();
}
public static void ChangeMachineIconFile(long machineid, string filename, byte[] filebyte, FISqlConnection db = null)
{
const string SQL_NULL = "update MACHINES set ICONFILENAME=null,ICONDATA=null where MACHINEID={0}";
@ -800,37 +665,10 @@ namespace IronIntel.Contractor.Machines
db.ExecSQL(SQL_ICON, machineid, filename, filebyte);
}
public static byte[] GetMachineIconFile(string companyid, long machineid)
{
const string SQL = "select ICONDATA from MACHINES where MACHINEID={0}";
FISqlConnection db = null;
if (SystemParams.IsDealer)
{
string connetionstring = SystemParams.GetDbStringByCompany(companyid);
db = new FISqlConnection(connetionstring);
}
else
db = SystemParams.GetDbInstance();
object obj = db.GetRC1BySQL(SQL, machineid);
return FIDbAccess.GetFieldBytes(obj);
}
public static MachineInfo2 GetMachineByVIN(string vin)
{
MachineServiceClient2 mc = SystemParams.GetMachineServiceClient();
return mc.GetMachineInfoByVIN(vin);
}
public static MachineInfo2 GetMachineByID(long machineid)
{
MachineServiceClient2 mc = SystemParams.GetMachineServiceClient();
return mc.GetMachineInfoByMachineID(machineid);
}
public static string GetMachineIDByVIN(string vin)
{
const string SQL = "select MACHINEID from MACHINES where VIN={0} and isnull(HIDE,0)=0";
const string SQL = "select MACHINEID from MACHINES with(nolock) where VIN={0} and (HIDE is null or HIDE=0)";
FISqlConnection db = SystemParams.GetDbInstance();
object obj = db.GetRC1BySQL(SQL, vin);
@ -840,7 +678,7 @@ namespace IronIntel.Contractor.Machines
public static MaintenanceMachineInfo[] GetContactMachinesByID(string contactid)
{
const string SQL = @"select a.MACHINEID,b.MACHINENAME,b.MACHINENAME2,b.VIN,b.MAKEID,b.MODELID,b.TYPEID,b.HIDE,ISNULL(b.ENGINEHOURS,0) as ENGINEHOURS,
ISNULL(b.ODOMETER,0) as ODOMETER,ISNULL(b.ODOMETERUOM,'Mile') AS ODOMETERUOM from USERMACHINEMAP a,MACHINES b
ISNULL(b.ODOMETER,0) as ODOMETER,ISNULL(b.ODOMETERUOM,'Mile') AS ODOMETERUOM from USERMACHINEMAP a with(nolock),MACHINES b with(nolock)
where a.MACHINEID=b.MACHINEID and a.USERIID={0}";
FISqlConnection db = SystemParams.GetDbInstance();
@ -849,10 +687,10 @@ namespace IronIntel.Contractor.Machines
{
return new MaintenanceMachineInfo[0];
}
MachineManagement.RefreshBaseData();
MachineMake[] makes = MachineManagement.GetMachineMakes();
MachineModel[] models = MachineManagement.GetMachineModels();
MachineType[] types = MachineManagement.GetMachineTypes();
RefreshBaseData();
AssetMake[] makes = GetMachineMakes();
AssetModel[] models = GetMachineModels();
AssetType[] types = GetMachineTypes();
List<MaintenanceMachineInfo> ls = new List<MaintenanceMachineInfo>();
foreach (DataRow dr in tb.Rows)
{

4
IronIntelContractorBusiness/Machines/MachineRentalInfo.cs
View File

@ -30,12 +30,14 @@ namespace IronIntel.Contractor.Machines
public string ReturnDateStr { get { return ReturnDate == null ? "" : ReturnDate.Value.ToShortDateString(); } }
public string PONumber { get; set; }
public string Comments { get; set; }
public double InsuredValue { get; set; }
public DateTime? RentalTermBillingDate { get; set; }
public string RentalTermBillingDateStr { get { return RentalTermBillingDate == null ? "" : RentalTermBillingDate.Value.ToShortDateString(); } }
public int BillingCycleDays { get; set; }
public bool Selected { get; set; }
public bool Hide { get; set; }
public string DisplayName
{
@ -83,7 +85,7 @@ namespace IronIntel.Contractor.Machines
public string LastUpdateUserName { get; set; }
public string LastUpdatedBy { get; set; }
public DateTime? LastUpdateDate { get; set; }
public string LastUpdateDateStr { get { return LastUpdateDate == null ? "" : LastUpdateDate.Value.ToShortDateString(); } }
public string LastUpdateDateStr { get { return LastUpdateDate == null ? "" : LastUpdateDate.Value.ToString("M/d/yyyy h:mm tt"); } }
}
}

49
IronIntelContractorBusiness/Machines/OdometerInfo.cs
View File

@ -80,6 +80,7 @@ namespace IronIntel.Contractor.Machines
/// 前端选择的时区的分钟偏移
/// </summary>
public int OffsetMinute { get; set; }
public string DataSource { get; set; }
}
public class CalampOdometerInfo
{
@ -95,15 +96,15 @@ namespace IronIntel.Contractor.Machines
{
get
{
return AsofTime.ToString("MM/dd/yyyy HH:mm");
return AsofTime.ToString("M/d/yyyy h:m tt");
}
}
public DateTime AsofTime_Local { get; set; }
public DateTime AsofTimeLocal { get; set; }
public string EventTimeLocalText
{
get
{
return AsofTime_Local.ToString("MM/dd/yyyy HH:mm");
return AsofTimeLocal.ToString("M/d/yyyy h:m tt");
}
}
}
@ -123,15 +124,41 @@ namespace IronIntel.Contractor.Machines
{
get
{
return AsofTime.ToString("MM/dd/yyyy HH:mm");
return AsofTime.ToString("M/d/yyyy h:m tt");
}
}
public DateTime AsofTime_Local { get; set; }
public DateTime AsofTimeLocal { get; set; }
public string EventTimeLocalText
{
get
{
return AsofTime_Local.ToString("MM/dd/yyyy HH:mm");
return AsofTimeLocal.ToString("M/d/yyyy h:m tt");
}
}
}
public class SmartWitnessOdometerInfo
{
public long AssetId { get; set; }
public string DeviceSN { get; set; }
public DateTime AsofTime { get; set; }
public string UOM { get; set; }
public double Gps { get; set; }
public double Gps_Calc { get; set; }
//public double VBUS { get; set; }
//public double VBUS_Calc { get; set; }
public string EventTimeText
{
get
{
return AsofTime.ToString("M/d/yyyy h:m tt");
}
}
public DateTime AsofTimeLocal { get; set; }
public string EventTimeLocalText
{
get
{
return AsofTimeLocal.ToString("M/d/yyyy h:m tt");
}
}
}
@ -150,14 +177,16 @@ namespace IronIntel.Contractor.Machines
{
public long LogId { get; set; }
public long AssetId { get; set; }
public string DisplayName { get; set; }//Asset Name
public string VIN { get; set; }
public DateTime AdjustmentTime { get; set; }
public string AdjustmentTimeText { get { return AdjustmentTime.ToString("MM/dd/yyyy HH:mm"); } }
public string AdjustmentTimeText { get { return AdjustmentTime.ToString("M/d/yyyy h:m tt"); } }
public DateTime OdometerTime { get; set; }
public string OdometerTimeText { get { return OdometerTime.ToString("MM/dd/yyyy HH:mm"); } }
public string OdometerTimeText { get { return OdometerTime.ToString("M/d/yyyy h:m tt"); } }
public DateTime AdjustmentLocalTime { get; set; }
public string AdjustmentLocalTimeText { get { return AdjustmentLocalTime.ToString("MM/dd/yyyy HH:mm"); } }
public string AdjustmentLocalTimeText { get { return AdjustmentLocalTime.ToString("M/d/yyyy h:m tt"); } }
public DateTime OdometerLocalTime { get; set; }
public string OdometerLocalTimeText { get { return OdometerLocalTime.ToString("MM/dd/yyyy HH:mm"); } }
public string OdometerLocalTimeText { get { return OdometerLocalTime.ToString("M/d/yyyy h:m tt"); } }
private double _Odometer;
public double Odometer