diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/controller/ShipScheduleController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/controller/ShipScheduleController.java
index fff3c97..067209b 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/controller/ShipScheduleController.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/controller/ShipScheduleController.java
@@ -1,5 +1,6 @@
 package com.xjrsoft.module.ship.controller;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 import javax.validation.Valid;
@@ -112,7 +113,8 @@ public class ShipScheduleController {
     @ApiOperation(value = "新增LngShipSchedule")
     @SaCheckPermission("shipSchedule:add")
     public R add(@Valid @RequestBody UpdateLngShipScheduleDto dto){
-      	String ssNo = codeRuleClient.genEncode(SHIP_SCHEDULE_CODE);
+    	    LocalDateTime dateEta = dto.getDateEta();
+      	String ssNo = dateEta.getYear()+codeRuleClient.genEncode(SHIP_SCHEDULE_CODE);
 		dto.setSsNo(ssNo);
     	    UpdateLngShipScheduleDto res = dataService.insert(dto,new DataOperationListener<UpdateLngShipScheduleDto>() {
 	
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/mapper/LngShipScheduleMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/mapper/LngShipScheduleMapper.java
index 9096bdb..56dce72 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/mapper/LngShipScheduleMapper.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/mapper/LngShipScheduleMapper.java
@@ -18,7 +18,7 @@ import com.xjrsoft.module.ship.vo.LngShipScheduleVo;
 @Mapper
 public interface LngShipScheduleMapper extends BaseMapper<LngShipSchedule> {
 	
-	@Select("SELECT ss.*,k.k_name,"+
+	@Select("SELECT ss.*,k.k_name,NVL(com.short_name,com.name) AS comName  ,"+
 		    "  dd_l.name AS long_spot_name, sl.full_name AS sta_name, dd_st.name AS ss_type_name, " +
 		    "  port.full_name AS port_unloading1_name" +
             " FROM  lng_ship_schedule ss " +
@@ -29,7 +29,8 @@ public interface LngShipScheduleMapper extends BaseMapper<LngShipSchedule> {
             " LEFT JOIN lng_b_station_lng sl ON sl.code=ss.sta_code " +
             " LEFT JOIN xjr_dictionary_item di_st on di_st.code='LNG_SHP_S' " +
             " LEFT JOIN xjr_dictionary_detail dd_st on dd_st.item_id=di_st.id AND dd_st.code=ss.ss_type_code " +
-            " WHERE ss.id = #{id}")
+            " LEFT JOIN  xjr_department com on com.id=ss.com_id  "+
+			" WHERE ss.id = #{id}")
 	LngShipScheduleVo getInfoBygId(@Param("id") Long id);
 
 }
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierScoreMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierScoreMapper.java
index 9d63873..123c878 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierScoreMapper.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierScoreMapper.java
@@ -1,10 +1,13 @@
 package com.xjrsoft.module.supplier.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.supplier.entity.LngScore;
+import com.xjrsoft.module.supplier.vo.LngScoreVo;
 
 /**
 * @title: mapper
@@ -14,5 +17,10 @@ import com.xjrsoft.module.supplier.entity.LngScore;
 */
 @Mapper
 public interface LngSupplierScoreMapper extends MPJBaseMapper<LngScore>,BaseMapper<LngScore> {
-
+			
+	@Select("SELECT ss.*,ls.class_code as cp_class_code,ls.su_name as cp_name" +
+            " FROM  lng_score ss " +
+            " LEFT JOIN  lng_supplier ls on ls.su_code=ss.cp_code  "+
+			" WHERE ss.id = #{id}")
+	LngScoreVo getInfoBygId(@Param("id") Long id);
 }
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/impl/SupplierScoreServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/impl/SupplierScoreServiceImpl.java
index 12a4890..343287b 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/impl/SupplierScoreServiceImpl.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/impl/SupplierScoreServiceImpl.java
@@ -13,6 +13,7 @@ import com.xjrsoft.module.supplier.mapper.LngSupplierScoreDtlMapper;
 import com.xjrsoft.module.supplier.mapper.LngSupplierScoreMapper;
 import com.xjrsoft.module.supplier.service.IScoreSupplierService;
 import com.xjrsoft.module.supplier.vo.LngScoreVo;
+import com.xjrsoft.module.supplier.vo.LngSupplierVo;
 import com.xjrsoft.module.system.client.IFileClient;
 import com.xjrsoft.module.system.vo.LngFileUploadVo;
 
@@ -48,15 +49,9 @@ public class SupplierScoreServiceImpl extends MPJBaseServiceImpl<LngSupplierScor
       	}
       	LngScoreVo vo = BeanUtil.toBean(lngScore, LngScoreVo.class);
       	
-      	LambdaQueryWrapper<LngSupplier> queryWrapper = new LambdaQueryWrapper<LngSupplier>();
-	   	queryWrapper.eq(LngSupplier::getSuCode,lngScore.getCpCode());
-      	LngSupplier supplier = supplierMapper.selectOne(queryWrapper);
-      	
-      	if(supplier != null) {
-      		vo.setCpClassCode(supplier.getClassCode());
-      		vo.setCpName(supplier.getSuName());
-      	}
-      	
+      	LngScoreVo temp = supplierScoreMapper.getInfoBygId(vo.getId());
+      	vo.setCpClassCode(temp.getCpClassCode());
+      	vo.setCpName(temp.getCpName());
       	List<LngFileUploadVo> fileList = fileClient.getTableFiles("lng_score", "lngFileUploadList", vo.getId());
       	vo.setLngFileUploadList(fileList);
       	return vo;