From abac8765bf6a1f400c2377b9999ce7495ba34a3f Mon Sep 17 00:00:00 2001
From: zjf <zhangjf@probim.com.cn>
Date: Fri, 10 Mar 2023 18:05:41 +0800
Subject: [PATCH] 人员、车辆 进出场

---
 IphoneBIMe/IphoneBIMe/Classes/Tools/PBNetworkTools.m |   27 ++++++++++++++++++++++++---
 1 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/IphoneBIMe/IphoneBIMe/Classes/Tools/PBNetworkTools.m b/IphoneBIMe/IphoneBIMe/Classes/Tools/PBNetworkTools.m
index 8427f14..80532f1 100644
--- a/IphoneBIMe/IphoneBIMe/Classes/Tools/PBNetworkTools.m
+++ b/IphoneBIMe/IphoneBIMe/Classes/Tools/PBNetworkTools.m
@@ -1936,15 +1936,36 @@
 - (void)aEntryOrExitWithOrganizeId:(NSString *)organizeId andFillingUserId:(NSString *)fillingUserId andProgressParentId:(NSString *)progressParentId andProgressTreeId:(NSString *)progressTreeId andProgressProjectId:(NSString *)progressProjectId andAddress:(NSString *)address andType:(NSInteger)type andCallBack:(void (^) (NSURLResponse *response, id responseObject, NSError *error))callBack {
     NSDictionary *dict = @{
                            @"OrganizeId": organizeId,
-                           @"FillingUserId": fillingUserId,
+                           @"FillingId": fillingUserId,
                            @"ProgressParentId": progressParentId,
                            @"ProgressTreeId": progressTreeId,
                            @"ProgressProjectId": progressProjectId,
                            @"Address": address,
-                           @"Token": Token,
                            @"Type": [NSNumber numberWithInteger:type]
                            };
-    NSString *url = [NSString stringWithFormat:@"%@/api/Filling/FillingUserLog/EntryOrExit",BaseUrl];
+    NSString *url = [NSString stringWithFormat:@"%@/api/Filling/FillingLog/UserEntryOrExit",BaseUrl];
+    [[PBNetworkTools sharedTools] BodyRequestWithType:POST andCookie:NO andUrl:url andParams:dict andCallBack:callBack];
+}
+#pragma mark - 获取现场车辆扫描信息
+- (void)GetCarInfoWithID:(NSString *)guid andCallBack:(void (^) (NSURLSessionDataTask *task,id response, NSError *error))callBack {
+    NSDictionary *dict = @{
+                           @"id":guid
+                           };
+    NSString *url = [NSString stringWithFormat:@"%@/api/Filling/FillingCar/GetCarInfo",BaseUrl];
+    [[PBNetworkTools sharedTools] RequestWithType:GET andCookie:NO andUrl:url andParams:dict andCallBack:callBack];
+}
+#pragma mark - 现场车辆填报
+- (void)CarEntryOrExitWithOrganizeId:(NSString *)organizeId andFillingId:(NSString *)fillingId andProgressParentId:(NSString *)progressParentId andProgressTreeId:(NSString *)progressTreeId andProgressProjectId:(NSString *)progressProjectId andAddress:(NSString *)address andType:(NSInteger)type andCallBack:(void (^) (NSURLResponse *response, id responseObject, NSError *error))callBack {
+    NSDictionary *dict = @{
+                           @"OrganizeId": organizeId,
+                           @"FillingId": fillingId,
+                           @"ProgressParentId": progressParentId,
+                           @"ProgressTreeId": progressTreeId,
+                           @"ProgressProjectId": progressProjectId,
+                           @"Address": address,
+                           @"Type": [NSNumber numberWithInteger:type]
+                           };
+    NSString *url = [NSString stringWithFormat:@"%@/api/Filling/FillingLog/CarEntryOrExit",BaseUrl];
     [[PBNetworkTools sharedTools] BodyRequestWithType:POST andCookie:NO andUrl:url andParams:dict andCallBack:callBack];
 }
 #pragma mark - 获取现场人员列表

--
Gitblit v1.9.3