1.泽天出货单列表条件修改

2.设备管理周期盘点闪退修复
3.工作周报的调整

shiku_im/shiku_im/controller/DocumentListVC.m

@@ -225,7 +225,7 @@ static NSString *cellID = @"cellID";
         
     }else if ([_caller isEqualToString:@"ProdInOut!Sale"])//泽天-出货单
     {
-        url = [NSString stringWithFormat:@"%@mobile/common/list.action?caller=%@&condition=%@&page=%@&pageSize=%@&emcode=%@&currentMaster=%@&sessionId=%@",ip,_caller,@"pi_invostatuscode='AUDITED'  and  pi_statuscode='POSTED'",page,pageSize,emcode,currentMaster,sessionId];
+        url = [NSString stringWithFormat:@"%@mobile/common/list.action?caller=%@&condition=%@&page=%@&pageSize=%@&currentMaster=%@&sessionId=%@",ip,_caller,@"pi_invostatuscode='AUDITED' and pi_transport='自提' and pi_signstatus='未签名'",page,pageSize,currentMaster,sessionId];
     }
     else{
         

shiku_im/shiku_im/controller/myOA/工作汇报/LYYWorkReportEditeVC.m

@@ -195,8 +195,8 @@
 -(UILabel *)dateLabel
 {
     if (!_dateLabel) {
-        _dateLabel = [[UILabel alloc] initWithFrame:CGRectMake(10, 16.5, 220, 20)];
-        _dateLabel.font = FONT_SIZE(14);
+        _dateLabel = [[UILabel alloc] initWithFrame:CGRectMake(10, 16.5, 250, 20)];
+        _dateLabel.font = FONT_SIZE(13);
         _dateLabel.textColor = Color(153, 153, 153, 1.0);
         
     }
@@ -402,9 +402,8 @@
                 str1 = [model.wd_date substringWithRange:NSMakeRange(0, 4)];
             }
             
-            
-            self.dateLabel.text = FORMAT(@"%@年 %@",str1,str);
-        
+            self.dateLabel.text = FORMAT(@"%@年 %@ 周次:%@",str1,str,model.wd_weekDays);
+
             _planlbl.text = Localized(@"UU_Thisweeksplan");
         }
             break;

shiku_im/shiku_im/shiku_im-Info.plist

@@ -33,7 +33,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.3.6</string>
+	<string>6.3.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -112,7 +112,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>6.0.0</string>
+	<string>6.0.2</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>baidumap</string>

shiku_im/shiku_im/文件夹1/设备管理/viewcontellers/设备的盘点/LYYDMCheckDetailVC.m

@@ -207,7 +207,7 @@
                     model.nameSting = dicD[@"caption"];
                     NSString *str = [NSString toUpper:dicD[@"dataIndex"]];
                     DLog(@"%@",str);
-                    model.imageString = dicM[str];
+                    model.imageString = FORMAT(@"%@",dicM[str]);
                     
                     [arr addObject:model];