。。。。。

@@ -1218,6 +1218,7 @@ public class ManifestController extends BasicController {
 						hzWaybillService.save(hzwaybllinfoEntity);
 						hzWaybillService.save(hzwaybllinfoEntity);
 					}
 					}
 				}
 				}
+
 				manifestService.save(manifest);
 				manifestService.save(manifest);
 				receiptService.saveFromManifest(manifest, type);
 				receiptService.saveFromManifest(manifest, type);
 				// 生成报文并且发送
 				// 生成报文并且发送
@@ -2562,7 +2563,7 @@ public class ManifestController extends BasicController {
 								manifestEntity.setShpcusid(arr.get(13));
 								manifestEntity.setShpcusid(arr.get(13));
 								// 发货人公司
 								// 发货人公司
 								manifestEntity.setCo_company(arr.get(14));
 								manifestEntity.setCo_company(arr.get(14));
-								manifestEntity.setCo_name(arr.get(14));
+								manifestEntity.setSh_name(arr.get(14));
 								// 发货人地址
 								// 发货人地址
 								manifestEntity.setCo_address(arr.get(15));
 								manifestEntity.setCo_address(arr.get(15));
 								// 发货人国家代码
 								// 发货人国家代码
@@ -2691,7 +2692,7 @@ public class ManifestController extends BasicController {
 									seconday.setShpcusid(arr.get(13));
 									seconday.setShpcusid(arr.get(13));
 									// 发货人公司
 									// 发货人公司
 									seconday.setCo_company(arr.get(14));
 									seconday.setCo_company(arr.get(14));
-									seconday.setCo_name(arr.get(14));
+									seconday.setSh_name(arr.get(14));
 									// 发货人地址
 									// 发货人地址
 									seconday.setCo_address(arr.get(15));
 									seconday.setCo_address(arr.get(15));
 									// 发货人国家代码
 									// 发货人国家代码

@@ -106,7 +106,7 @@ public class SecurityDeclarationController {
                     sdVo.setSd_iata_number(sd.getIata());
                     sdVo.setSd_iata_number(sd.getIata());
                     sdVo.setUser_id(sd.getUSERID());
                     sdVo.setUser_id(sd.getUSERID());
                     if("1".equals(sd.getStatics())){
                     if("1".equals(sd.getStatics())){
-                        sdVo.setSd_static("已发送安检申报报文");
+                        sdVo.setSd_static("已暂存");
                     }
                     }
                     sdVo.setOperation(sd.getOperation());
                     sdVo.setOperation(sd.getOperation());
                     sdVo.setCustoms(sd.getCustoms());
                     sdVo.setCustoms(sd.getCustoms());