Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

gic-store-api/src/main/java/com/gic/store/service/StoreFieldApiService.java

@@ -213,9 +213,10 @@ public interface StoreFieldApiService {
      * @Description:
     
 * @author guojuxing
      * @param storeFieldId
+     * @param code
      * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Void>

     
 */
-    ServiceResponse<Void> setErpMapperCode(Integer storeFieldId);
+    ServiceResponse<Void> setErpMapperCode(Integer storeFieldId, String code);
 
     /**
      * 解除ERP关联

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreFieldApiServiceImpl.java

@@ -418,7 +418,7 @@ public class StoreFieldApiServiceImpl implements StoreFieldApiService {
     }
 
     @Override
-    public ServiceResponse<Void> setErpMapperCode(Integer storeFieldId) {
+    public ServiceResponse<Void> setErpMapperCode(Integer storeFieldId, String code) {
         TabStoreField storeField = storeFieldService.getStoreFieldById(storeFieldId);
         if (storeField == null) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "主键错误，查询不到数据");
@@ -426,7 +426,7 @@ public class StoreFieldApiServiceImpl implements StoreFieldApiService {
         StoreFieldDTO dto = new StoreFieldDTO();
         dto.setStoreFieldId(storeFieldId);
         //表明已经做关联
-        dto.setErpRelCode("1");
+        dto.setErpRelCode(code);
         storeFieldService.edit(dto);
         return ServiceResponse.success();
     }