增加最后修改人、修复部分bug

XFFruit/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.3</string>
+	<string>1.2.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.3</string>
+	<string>1.2.4</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

XFFruit/Macro/ICRAppMacro.h

@@ -23,10 +23,10 @@
 #define ICR_IMAGE_BG_COLOR              [UIColor colorWithW:242 a:1]
 
 //********阿里云内部测试环境********
-#define HTTP_REST_API_BASE_URL  @"http://218.244.151.129:7580/cruiser-server/rest"
+//#define HTTP_REST_API_BASE_URL  @"http://218.244.151.129:7580/cruiser-server/rest"
 
-//********现场测试环境********
-//#define HTTP_REST_API_BASE_URL  @"http://122.224.171.126:7280/cruiser-server/rest"
+//********测试环境********
+#define HTTP_REST_API_BASE_URL  @"http://122.224.171.126:7280/cruiser-server/rest"
 
 
 //********现场正式环境*********

XFFruit/ViewControllers/Purchase/Controllers/PurchaseDetailViewController.m

@@ -309,7 +309,7 @@ typedef enum : NSUInteger {
 }
 
 - (void)createPurchaseView{
-    _leftArr = @[@"单号:",@"采购通知单:",@"创建人:",@"采购员:",@"状态:",@"类型:",@"供应商:",@"供应商确认:",@"收货仓库:",@"其他费用:",@"总金额:",@"备注:"];
+    _leftArr = @[@"单号:",@"采购通知单:",@"创建人:",@"最后修改人:",@"采购员:",@"状态:",@"类型:",@"供应商:",@"供应商确认:",@"收货仓库:",@"其他费用:",@"总金额:",@"备注:"];
 
     _purchaseView= [[UIView alloc]initWithFrame:CGRectMake(0, TopMargin, ScreenSize.width, LeftHeight*_leftArr.count +LeftMargin)];
     _purchaseView.backgroundColor = [UIColor whiteColor];
@@ -333,17 +333,19 @@ typedef enum : NSUInteger {
         }else if(i == 2){
             self.createOperNameLabel = rightLabel;
         }else if (i == 3){
-            self.purchaserLabel = rightLabel;
+            self.lastModifyNameLabel = rightLabel;
         }
-        else if(i == 4){
-            self.stateLabel = rightLabel;
+        else if (i == 4){
+            self.purchaserLabel = rightLabel;
         }else if(i == 5){
-            self.typeLabel = rightLabel;
+            self.stateLabel = rightLabel;
         }else if(i == 6){
-            self.vendorNameLabel = rightLabel;
+            self.typeLabel = rightLabel;
         }else if(i == 7){
-            self.vendorIsSureLabel = rightLabel;
+            self.vendorNameLabel = rightLabel;
         }else if(i == 8){
+            self.vendorIsSureLabel = rightLabel;
+        }else if(i == 9){
             self.warehouseLabel = rightLabel;
         }else if(i == _leftArr.count - 3){
             self.otherPriceLabel = rightLabel;

XFFruit/ViewControllers/Purchase/Views/ProductBillCell.m

@@ -143,11 +143,12 @@
 
 - (void)setBillProduct:(PurchaseBillProduct *)billProduct row:(NSInteger)row
 {
+    //查看采购单cell上面顶上的商品、单价、包装数量等
     self.seqLabel.text = [NSString stringWithFormat:@"%@",@(row+1)];
     self.titleLabel.text = billProduct.product_name;
     self.priceLabel.text = [NSString stringWithFormat:@"%.2f元",[billProduct.basePrice floatValue]];
     self.countLabel.text = [NSString stringWithFormat:@"%@%@",[billProduct.qty stringValue],billProduct.unit];
-    self.shippedQtyLabel.text = [NSString stringWithFormat:@"%@%@",billProduct.shippedBaseQty ? [billProduct.shippedBaseQty stringValue]:@"0",billProduct.unit];
+    self.shippedQtyLabel.text = [NSString stringWithFormat:@"%@%@",billProduct.shippedQty ? [billProduct.shippedQty stringValue]:@"0",billProduct.unit];
     
     self.showNameLabel.text = [NSString stringWithFormat:@"商品：%@[%@]",billProduct.product_name,billProduct.product_code];
     self.showStandLabel.text = [NSString stringWithFormat:@"包装规格：1*%@%@",[billProduct.qpc stringValue],billProduct.baseUnit];
@@ -187,8 +188,8 @@
     [attributeStr1 appendAttributedString:[IBTCommon setTextViewFontOfString:str paragraphStyle:0 fontSize:13 color:[UIColor redColor]]];
     self.showShippedFlag.attributedText = attributeStr1;
 
-    self.showShippedBaseQty.text = [NSString stringWithFormat:@"发运包装数量：%@%@",billProduct.shippedBaseQty ? [billProduct.shippedBaseQty stringValue]:@"0",billProduct.unit];
-    self.showShippedQty.text = [NSString stringWithFormat:@"发运基础数量：%@%@",billProduct.shippedQty ? [billProduct.shippedQty stringValue]:@"0",billProduct.baseUnit];
+    self.showShippedBaseQty.text = [NSString stringWithFormat:@"发运包装数量：%@%@",billProduct.shippedQty ? [billProduct.shippedQty stringValue]:@"0",billProduct.unit];
+    self.showShippedQty.text = [NSString stringWithFormat:@"发运基础数量：%@%@",billProduct.shippedBaseQty ? [billProduct.shippedBaseQty stringValue]:@"0",billProduct.baseUnit];
     [self.showView addSubview:self.showShippedFlag];
     [self.showView addSubview:self.showShippedQty];
     [self.showView addSubview:self.showShippedBaseQty];

XFFruit/ViewControllers/Receiving/Controllers/NewReceiveViewController.m

@@ -92,7 +92,7 @@ typedef enum : NSUInteger {
                         [self.defalutState addObject:@"YES"];
                     }else{
                         [self.defalutState addObject:@"NO"];
-
+                        
                     }
                 }
                 transfer.pdtDetails = productArr;
@@ -227,16 +227,15 @@ typedef enum : NSUInteger {
     NSArray *leftArr;
     
     if ([self.transfer.state isEqualToString:TRANSFER_STATE_RECEIVED]) {//已收货
-        leftArr = @[@"单号:",@"来源单据:",@"状态:",@"发货仓库:",@"收货仓库:",@"车辆:",@"司机电话:",@"创建:",
+        leftArr = @[@"单号:",@"来源单据:",@"状态:",@"发货仓库:",@"收货仓库:",@"车辆:",@"司机电话:",@"创建:",@"最后修改人",
                     @"收货人:",
                     @"收货时间:",
                     @"备注"];
     }else if([self.transfer.state isEqualToString:TRANSFER_STATE_ABORTED]){
-        leftArr = @[@"单号:",@"来源单据:",@"状态:",@"发货仓库:",@"收货仓库:",@"车辆:",@"司机电话:",@"创建:",
-                    @"最后修改人:",
+        leftArr = @[@"单号:",@"来源单据:",@"状态:",@"发货仓库:",@"收货仓库:",@"车辆:",@"司机电话:",@"创建:",@"最后修改人:",
                     @"备注"];
     }else{
-        leftArr = @[@"单号:",@"来源单据:",@"状态:",@"发货仓库:",@"收货仓库:",@"车辆:",@"司机电话:",@"创建:",
+        leftArr = @[@"单号:",@"来源单据:",@"状态:",@"发货仓库:",@"收货仓库:",@"车辆:",@"司机电话:",@"创建:",@"最后修改人",
                     @"备注"];
     }
     

XFFruit/ViewControllers/Receiving/Controllers/ReceiveViewController.m

@@ -394,8 +394,8 @@ typedef enum : NSUInteger {
     if (_dataArr.count > 0) {
         Transfer *transfer = _dataArr[indexPath.row];
         
-            NewReceiveViewController *nvc = [NewReceiveViewController new];
-            nvc.transfer = transfer;
+        NewReceiveViewController *nvc = [NewReceiveViewController new];
+        nvc.transfer = transfer;
         if ([transfer.state isEqualToString:TRANSFER_STATE_UNRECEIVED] ) {
             nvc.title = @"收货单收货";
             nvc.isNotShowEdit = NO;
@@ -403,7 +403,7 @@ typedef enum : NSUInteger {
             nvc.title = @"查看收货单";
             nvc.isNotShowEdit = YES;
         }
-         [self PushViewController:nvc animated:YES];
+        [self PushViewController:nvc animated:YES];
     }
 }
 

XFFruit/ViewControllers/Transport/Controllers/TransportDetailViewController.m

@@ -41,6 +41,7 @@ typedef enum : NSUInteger {
 @property (nonatomic,strong)UILabel *carnumberLabel;
 @property (nonatomic,strong)UILabel *carhoneLabel;
 @property (nonatomic,strong)UILabel *createOperLabel;
+@property (nonatomic, strong) UILabel *lastModifierLabel;
 @property (nonatomic,strong)UILabel *arriveDateLabel;
 @property (nonatomic,strong)UILabel *noteLabel;
 
@@ -52,6 +53,7 @@ typedef enum : NSUInteger {
 @property (nonatomic,strong)UILabel *leftCarnumberLabel;
 @property (nonatomic,strong)UILabel *leftCarhoneLabel;
 @property (nonatomic,strong)UILabel *leftCreateOperLabel;
+@property (nonatomic, strong) UILabel *leftLastModifierLabel;
 @property (nonatomic,strong)UILabel *leftArriveDateLabel;
 @property (nonatomic,strong)UILabel *leftNoteLabel;
 @end
@@ -122,6 +124,7 @@ typedef enum : NSUInteger {
     self.carhoneLabel.text = [IBTCommon checkString:self.transport.carphone];
     self.noteLabel.text = [NSString stringWithFormat:@"%@",self.transport.note?self.transport.note:@"无"];
     self.createOperLabel.text = [NSString stringWithFormat:@"%@%@",[IBTCommon checkString:self.transport.create_operName],self.transport.create_time.length > 10 ? [self.transport.create_time substringToIndex:10] : self.transport.create_time];
+    self.lastModifierLabel.text = [IBTCommon checkString:self.transport.lastModify_operName];
     self.arriveDateLabel.text = [NSString stringWithFormat:@"%@",self.transport.arriveDate?[[IBTCommon checkString:self.transport.arriveDate]substringToIndex:10]:@"无"];
     [_transView refreshTranProduct:self.transport.pdtDetails];
     [_transView refreshCost:self.transport.accountDetails];
@@ -174,8 +177,13 @@ typedef enum : NSUInteger {
     self.leftCreateOperLabel.top = self.leftCarhoneLabel.bottom;
     self.createOperLabel.top = self.leftCarhoneLabel.bottom;
     
-    self.leftArriveDateLabel.top = self.leftCreateOperLabel.bottom;
-    self.arriveDateLabel.top = self.leftCreateOperLabel.bottom;
+    
+    
+    self.leftLastModifierLabel.top = self.leftCreateOperLabel.bottom;
+    self.lastModifierLabel.top = self.leftCreateOperLabel.bottom;
+    
+    self.leftArriveDateLabel.top = self.leftLastModifierLabel.bottom;
+    self.arriveDateLabel.top = self.leftLastModifierLabel.bottom;
     
     self.leftNoteLabel.top = self.leftArriveDateLabel.bottom;
     self.noteLabel.top = self.leftArriveDateLabel.bottom;
@@ -187,7 +195,7 @@ typedef enum : NSUInteger {
 
     self.noteLabel.height = height;
     
-    CGFloat totalHeight = height + LeftHeight*8 + purchaseHeight;
+    CGFloat totalHeight = height + LeftHeight*9 + purchaseHeight;
     
     CGRect purchaseFrame = _transportView.frame;
     purchaseFrame.size.height = totalHeight + LeftMargin;
@@ -333,7 +341,7 @@ typedef enum : NSUInteger {
     }else{
         [self hiddenAllBtn];
     }
-    NSArray *leftArr = @[@"单号:",@"采购单:",@"状态:",@"发货仓库:",@"收货仓库:",@"车辆:",@"司机电话:",@"创建:",@"预计到货时间:",@"备注:"];
+    NSArray *leftArr = @[@"单号:",@"采购单:",@"状态:",@"发货仓库:",@"收货仓库:",@"车辆:",@"司机电话:",@"创建:",@"最后修改人:", @"预计到货时间:",@"备注:"];
     
     _transportView= [[UIView alloc]initWithFrame:CGRectMake(0, TopMargin, ScreenSize.width, LeftHeight*leftArr.count +LeftMargin)];
     _transportView.backgroundColor = [UIColor whiteColor];
@@ -376,7 +384,10 @@ typedef enum : NSUInteger {
         }else if(i == 7){
             self.createOperLabel = rightLabel;
             self.leftCreateOperLabel = leftLabel;
-        }else if(i == 8){
+        }else if(i == 8){//最后修改人
+            self.lastModifierLabel = rightLabel;
+            self.leftLastModifierLabel = leftLabel;
+        }else if(i == 9){
             leftLabel.width = LeftWidth + 10;
             rightLabel.left = leftLabel.right;
             rightLabel.width = ScreenSize.width - leftLabel.width - LeftMargin;

XFFruit/ViewControllers/Transport/Models/Transport.h

@@ -28,9 +28,9 @@
 @property (nonatomic,strong)NSString *create_time;//创建时间
 @property (nonatomic,strong)NSString *create_id;//创建人代码
 @property (nonatomic,strong)NSString *create_operName;//create_operName
-@property (nonatomic,strong)NSString *lastModified_time;//最后修改时间
-@property (nonatomic,strong)NSString *lastModified_id;//最后修改人代码
-@property (nonatomic,strong)NSString *lastModified_operName;//最后修改人名称
+@property (nonatomic,strong)NSString *lastModify_time;//最后修改时间
+@property (nonatomic,strong)NSString *lastModify_id;//最后修改人代码
+@property (nonatomic,strong)NSString *lastModify_operName;//最后修改人名称
 @property (nonatomic,strong)NSString *arriveDate;//新增预计到达时
 
 @property (nonatomic,strong)NSArray *pdtDetails;//商品