修改运力

src/main/java/com/steerinfo/dil/controller/RmsCapacityController.java

@@ -79,7 +79,8 @@ public class RmsCapacityController extends BaseRESTfulController {
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "Short")
     @PostMapping(value = "/deleteCapacity/{id}")
     public RESTfulResult deleteCapacity(@PathVariable("id") BigDecimal id){
-        return success(rmsCapacityService.deleteCapacity(id));
+        String s = rmsCapacityService.deleteCapacity(id);
+        return success(s);
     }
 
     /**

src/main/java/com/steerinfo/dil/mapper/RmsCapacityMapper.java

@@ -28,4 +28,7 @@ public interface RmsCapacityMapper extends IBaseMapper<RmsCapacity, BigDecimal>
 
    //根据ssoId查询承运商名称
     Map<String, Object> getCarrierNameBySSOId(String carrierSSOId);
+
+    //根据运力id查找ssoId
+    String ssoIdBycapacityId(BigDecimal id);
 }

src/main/java/com/steerinfo/dil/service/IRmsCapacityService.java

@@ -28,7 +28,7 @@ public interface IRmsCapacityService{
 
     int updateCapacity(RmsCapacity rmsCapacity);
 
-    int deleteCapacity(BigDecimal id);
+    String deleteCapacity(BigDecimal id);
 
     List<Map<String, Object>> getCapacityById(BigDecimal id);
 

src/main/java/com/steerinfo/dil/service/impl/RmsCapacityServiceImpl.java

@@ -1,12 +1,10 @@
 package com.steerinfo.dil.service.impl;
 
-import com.google.inject.internal.cglib.core.$Constants;
 import com.steerinfo.dil.mapper.RmsCapacityMapper;
 import com.steerinfo.dil.mapper.RmsCarrierMapper;
 import com.steerinfo.dil.model.RmsCapacity;
 import com.steerinfo.dil.service.IRmsCapacityService;
 import com.steerinfo.dil.util.DataChange;
-import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -89,11 +87,14 @@ public class RmsCapacityServiceImpl implements IRmsCapacityService {
     * 删除运力信息
     * */
     @Override
-    public int deleteCapacity(BigDecimal id) {
-        RmsCapacity rmsCapacity = rmsCapacityMapper.selectByPrimaryKey(id);
-       rmsCapacity.setDeleted(new BigDecimal(1));
-        return rmsCapacityMapper.updateByPrimaryKeySelective(rmsCapacity);
-
+    public String deleteCapacity(BigDecimal id) {
+          RmsCapacity rmsCapacity=new RmsCapacity();
+          rmsCapacity.setCapacityId(id);
+         //根据id查找ssoid
+          String ssoId = rmsCapacityMapper.ssoIdBycapacityId(id);
+          rmsCapacity.setDeleted(new BigDecimal(1));
+          rmsCapacityMapper.updateByPrimaryKeySelective(rmsCapacity);
+          return  ssoId;
     }
 
     /**

src/main/java/com/steerinfo/dil/service/impl/RmsMaterialServiceImpl.java

@@ -143,7 +143,7 @@ public class RmsMaterialServiceImpl implements IRmsMaterialService {
     @Override
     public int insertMaterial(RmsMaterial rmsMaterial) {
         int i = rmsMaterialMapper.selectMaterialByMaterialName(rmsMaterial.getMaterialName());
-        if (i<0) {
+        if (i==0) {
             String code = "lx";
             Integer id = rmsMaterialMapper.getMaterialId().intValue();
             String materialCode = DataChange.generateEightDigitsNumber(code, id);

src/main/resources/com/steerinfo/dil/mapper/RmsCapacityMapper.xml

@@ -845,4 +845,10 @@
        from RMS_CARRIER RC
       where RC.CARRIER_SSO_ID=#{carrierSSOId}
   </select>
+
+  <select id="ssoIdBycapacityId" parameterType="java.math.BigDecimal" resultType="java.lang.String">
+    select RC.CAPACITY_SSO_ID "capacitySsoId"
+    from RMS_CAPACITY RC
+    where  RC.CAPACITY_ID=#{id}
+  </select>
 </mapper>