rms资源管理

.idea/workspace.xml

@@ -10,37 +10,29 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="abe40335-1998-468a-9c83-8ed884d8e030" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/target/test-classes/Test.class" afterDir="false" />
+    <list default="true" id="63a9508b-a79b-4e42-90a6-b7f9eba63c9f" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsCarDriverController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsCarDriverController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsCapacityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsCapacityController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsConsigneeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsConsigneeController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsDriverCapacityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsDriverCapacityController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsCapacityMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsCapacityMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsCarDriverMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsCarDriverMapper.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsConsigneeMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsConsigneeMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsCarDriverService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsCarDriverService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsConsigneeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsConsigneeService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsMaterialMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsMaterialMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsCapacityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsCapacityService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsCapacityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsCapacityServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsCarDriverServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsCarDriverServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsConsigneeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsConsigneeServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsMaterialServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsMaterialServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsCapacityMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsCapacityMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsCarDriverMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsCarDriverMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsConsigneeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsConsigneeMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsWarehouseMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsWarehouseMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/steerinfo/dil/rmsbidarea/controller/RmsBidAreaController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/steerinfo/dil/rmsbidarea/controller/RmsBidAreaController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/steerinfo/dil/rmsbidarea/mapper/RmsBidAreaMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/steerinfo/dil/rmsbidarea/mapper/RmsBidAreaMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/steerinfo/dil/rmsbidarea/service/IRmsBidAreaService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/steerinfo/dil/rmsbidarea/service/IRmsBidAreaService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/steerinfo/dil/rmsbidarea/service/impl/RmsBidAreaServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/steerinfo/dil/rmsbidarea/service/impl/RmsBidAreaServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsCarDriverController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsCarDriverController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsMaterialMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsMaterialMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsCapacityController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsCapacityController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsConsigneeController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsConsigneeController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsDriverCapacityController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsDriverCapacityController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsConsigneeMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsConsigneeMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsConsigneeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsConsigneeMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsWarehouseMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsWarehouseMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsConsigneeService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsConsigneeService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsCapacityServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsCapacityServiceImpl.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsCarDriverServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsCarDriverServiceImpl.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsConsigneeServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsConsigneeServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/dil-api-1.0-SNAPSHOT.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/dil-api-1.0-SNAPSHOT.jar.original" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-archiver/pom.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsMaterialServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsMaterialServiceImpl.class" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -80,7 +72,7 @@
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../12.22/DAL-DAZHOU-RMS-API" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.path.for.package.eslint" value="project" />
@@ -116,7 +108,7 @@
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="abe40335-1998-468a-9c83-8ed884d8e030" name="Default Changelist" comment="" />
+      <changelist id="63a9508b-a79b-4e42-90a6-b7f9eba63c9f" name="Default Changelist" comment="" />
       <created>1639799862423</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
@@ -128,6 +120,8 @@
       <workItem from="1640051164076" duration="1408000" />
       <workItem from="1640172635152" duration="309000" />
       <workItem from="1640222259574" duration="36095000" />
+      <workItem from="1640308588528" duration="620000" />
+      <workItem from="1640309362007" duration="9949000" />
     </task>
     <servers />
   </component>
@@ -152,6 +146,10 @@
     </state>
     <state x="446" y="46" key="#com.intellij.ide.util.MemberChooser/0.0.1280.680@0.0.1280.680" timestamp="1639985896075" />
     <state x="535" y="56" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1640232070241" />
+    <state x="544" y="279" width="448" height="273" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes" timestamp="1640315914802">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state x="544" y="279" width="448" height="273" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes/0.0.1536.824@0.0.1536.824" timestamp="1640315914802" />
     <state width="444" height="466" key="DebuggerActiveHint" timestamp="1639818003519">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
@@ -161,66 +159,66 @@
     </state>
     <state x="458" y="137" key="FileChooserDialogImpl/0.0.1280.680@0.0.1280.680" timestamp="1639965013078" />
     <state x="549" y="166" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1640272173598" />
-    <state width="1493" height="250" key="GridCell.Tab.0.bottom" timestamp="1640265341762">
+    <state width="1493" height="136" key="GridCell.Tab.0.bottom" timestamp="1640319438696">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="1237" height="305" key="GridCell.Tab.0.bottom/0.0.1280.680@0.0.1280.680" timestamp="1639989735386" />
-    <state width="1493" height="250" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1640265341762" />
-    <state width="1493" height="250" key="GridCell.Tab.0.center" timestamp="1640265341762">
+    <state width="1493" height="136" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
+    <state width="1493" height="136" key="GridCell.Tab.0.center" timestamp="1640319438696">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="1237" height="305" key="GridCell.Tab.0.center/0.0.1280.680@0.0.1280.680" timestamp="1639989735386" />
-    <state width="1493" height="250" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1640265341762" />
-    <state width="1493" height="250" key="GridCell.Tab.0.left" timestamp="1640265341761">
+    <state width="1493" height="136" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
+    <state width="1493" height="136" key="GridCell.Tab.0.left" timestamp="1640319438695">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="1237" height="305" key="GridCell.Tab.0.left/0.0.1280.680@0.0.1280.680" timestamp="1639989735385" />
-    <state width="1493" height="250" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1640265341761" />
-    <state width="1493" height="250" key="GridCell.Tab.0.right" timestamp="1640265341762">
+    <state width="1493" height="136" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1640319438695" />
+    <state width="1493" height="136" key="GridCell.Tab.0.right" timestamp="1640319438696">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="1237" height="305" key="GridCell.Tab.0.right/0.0.1280.680@0.0.1280.680" timestamp="1639989735386" />
-    <state width="1493" height="250" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1640265341762" />
-    <state width="1493" height="250" key="GridCell.Tab.1.bottom" timestamp="1640265341762">
+    <state width="1493" height="136" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
+    <state width="1493" height="136" key="GridCell.Tab.1.bottom" timestamp="1640319438696">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="1237" height="305" key="GridCell.Tab.1.bottom/0.0.1280.680@0.0.1280.680" timestamp="1639989735900" />
-    <state width="1493" height="250" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1640265341762" />
-    <state width="1493" height="250" key="GridCell.Tab.1.center" timestamp="1640265341762">
+    <state width="1493" height="136" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
+    <state width="1493" height="136" key="GridCell.Tab.1.center" timestamp="1640319438696">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="1237" height="305" key="GridCell.Tab.1.center/0.0.1280.680@0.0.1280.680" timestamp="1639989735900" />
-    <state width="1493" height="250" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1640265341762" />
-    <state width="1493" height="250" key="GridCell.Tab.1.left" timestamp="1640265341762">
+    <state width="1493" height="136" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
+    <state width="1493" height="136" key="GridCell.Tab.1.left" timestamp="1640319438696">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="1237" height="305" key="GridCell.Tab.1.left/0.0.1280.680@0.0.1280.680" timestamp="1639989735900" />
-    <state width="1493" height="250" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1640265341762" />
-    <state width="1493" height="250" key="GridCell.Tab.1.right" timestamp="1640265341762">
+    <state width="1493" height="136" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
+    <state width="1493" height="136" key="GridCell.Tab.1.right" timestamp="1640319438696">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="1237" height="305" key="GridCell.Tab.1.right/0.0.1280.680@0.0.1280.680" timestamp="1639989735900" />
-    <state width="1493" height="250" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1640265341762" />
-    <state width="1493" height="250" key="GridCell.Tab.2.bottom" timestamp="1640265341763">
+    <state width="1493" height="136" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
+    <state width="1493" height="136" key="GridCell.Tab.2.bottom" timestamp="1640319438697">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="1237" height="242" key="GridCell.Tab.2.bottom/0.0.1280.680@0.0.1280.680" timestamp="1639989772908" />
-    <state width="1493" height="250" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1640265341763" />
-    <state width="1493" height="250" key="GridCell.Tab.2.center" timestamp="1640265341762">
+    <state width="1493" height="136" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1640319438697" />
+    <state width="1493" height="136" key="GridCell.Tab.2.center" timestamp="1640319438697">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="1237" height="242" key="GridCell.Tab.2.center/0.0.1280.680@0.0.1280.680" timestamp="1639989772908" />
-    <state width="1493" height="250" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1640265341762" />
-    <state width="1493" height="250" key="GridCell.Tab.2.left" timestamp="1640265341762">
+    <state width="1493" height="136" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1640319438697" />
+    <state width="1493" height="136" key="GridCell.Tab.2.left" timestamp="1640319438697">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="1237" height="242" key="GridCell.Tab.2.left/0.0.1280.680@0.0.1280.680" timestamp="1639989772908" />
-    <state width="1493" height="250" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1640265341762" />
-    <state width="1493" height="250" key="GridCell.Tab.2.right" timestamp="1640265341762">
+    <state width="1493" height="136" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1640319438697" />
+    <state width="1493" height="136" key="GridCell.Tab.2.right" timestamp="1640319438697">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="1237" height="242" key="GridCell.Tab.2.right/0.0.1280.680@0.0.1280.680" timestamp="1639989772908" />
-    <state width="1493" height="250" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1640265341762" />
+    <state width="1493" height="136" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1640319438697" />
     <state x="225" y="0" key="SettingsEditor" timestamp="1639963719060">
       <screen x="0" y="0" width="1280" height="680" />
     </state>

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

@@ -39,14 +39,14 @@ public class RmsCapacityController extends BaseRESTfulController {
 
     /**
      * 创建运力信息
-     * @param rmsCapacity
+     * @param
      * @return
      */
     @ApiOperation(value="创建", notes="根据RmsCapacity对象创建")
     @ApiImplicitParam(name = "rmsCapacity", value = "详细实体rmsCapacity", required = true, dataType = "RmsCapacity")
     @PostMapping(value = "/insertCapacity")
-    public RESTfulResult insertCapacity(@RequestBody RmsCapacity rmsCapacity){
-       int result = rmsCapacityService.insertCapacity(rmsCapacity);
+    public RESTfulResult insertCapacity(@RequestBody(required = false) Map<String,Object> mapValue){
+       int result = rmsCapacityService.insertCapacity(mapValue);
        if (result==-1){
            return failed();
        }

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

@@ -94,6 +94,9 @@ public class RmsConsigneeController extends BaseRESTfulController {
     @PostMapping(value = "/insertConsignee")
     public RESTfulResult insertConsignee(@RequestBody Map<String,Object> mapVal)throws ParseException {
         int result = rmsConsigneeService.insertConsignee(mapVal);
+        if(result==-1){
+            return failed();
+        }
         return success(result);
     }
 

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

@@ -23,4 +23,6 @@ public interface RmsCapacityMapper extends IBaseMapper<RmsCapacity, BigDecimal>
     BigDecimal selectCapacityId();
    //承运商下拉框
     List<Map<String, Object>> getCarrierId();
+    //通过车牌号查询是否存在重复值
+    int selectBycapacityNumber(String number);
 }

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

@@ -31,4 +31,6 @@ public interface RmsCarDriverMapper extends IBaseMapper<RmsCarDriver,BigDecimal>
     List<Map<String, Object>> getTransportTypeId();
 
     List<Map<String, Object>> getCarrierName(String state);
+
+    int selectByIdentityCard(String driverIdentityCardId);
 }

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

@@ -17,4 +17,6 @@ public interface RmsConsigneeMapper extends IBaseMapper<RmsConsignee, BigDecimal
     BigDecimal selectConsigneeId();
 
     List<Map<String, Object>> getConsigneeById(BigDecimal id);
+
+    int getConsigneeByCompanyName(String companyName);
 }

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

@@ -28,4 +28,6 @@ public interface RmsMaterialMapper extends IBaseMapper<RmsMaterial, BigDecimal>
     List<Map<String, Object>> getUnitOfMeasureId();
 // 根据汽车衡测量的物资id，进行展示物资
     List<Map<String, Object>> getCalculateOfMaterialList(Map<String, Object> mapVal);
+
+    int selectMaterialByCode(String materialCode);
 }

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

@@ -24,7 +24,7 @@ public interface IRmsCapacityService{
 
     List<Map<String, Object>> getCapacityList(Map<String, Object> mapVal);
 
-    int insertCapacity(RmsCapacity rmsCapacity);
+    int insertCapacity(Map<String,Object> mapValue);
 
     int updateCapacity(RmsCapacity rmsCapacity);
 

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

@@ -4,6 +4,7 @@ import com.steerinfo.dil.mapper.RmsCapacityMapper;
 import com.steerinfo.dil.model.RmsCapacity;
 import com.steerinfo.dil.model.RmsCarrier;
 import com.steerinfo.dil.service.IRmsCapacityService;
+import com.steerinfo.dil.util.DataChange;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -36,34 +37,34 @@ public class RmsCapacityServiceImpl implements IRmsCapacityService {
     * 增加运力信息
     * */
     @Override
-    public int insertCapacity(RmsCapacity rmsCapacity) {
+    public int insertCapacity(Map<String,Object> mapValue) {
+        BigDecimal carrierId= DataChange.dataToBigDecimal(mapValue.get("carrierIds"));
+        BigDecimal capacityTypeId =DataChange.dataToBigDecimal(mapValue.get("capacityTypeId")) ;
+        String number=(String) mapValue.get("capacityNumber");
+        String capacityCorlor=(String) mapValue.get("capacityCorlor");
+        String  capacityOwneris=(String)mapValue.get("capacityOwneris");
+        String  capacityVip=(String)mapValue.get("capacityVip");
+        String  capacityBlacklist=(String)mapValue.get("capacityBlacklist");
         int i=0;
-        String capacityNumber=rmsCapacity.getCapacityNumber();
-        Map<String, Object> map=new HashMap<>();
-        map.put("capacityNumber",capacityNumber);
-        List<RmsCapacity> rmsCapacities=rmsCapacityMapper.selectByParameters(map);
-
-        if (rmsCapacities.size()!=0){
-            RmsCapacity rmsCapacity1=rmsCapacities.get(0);
-            if (rmsCapacity1.getDeleted().equals(new BigDecimal(1))){
-                rmsCapacity.setCapacityStatus(new BigDecimal(0));
-                rmsCapacity.setDeleted(new BigDecimal(0));
-                rmsCapacity.setInsertTime(new Date());
-                rmsCapacity.setInsertUsername("admin");
-                rmsCapacity.setCapacityId(rmsCapacityMapper.selectCapacityId());
-                i+=rmsCapacityMapper.insertSelective(rmsCapacity);
-            }
-            else{
-                i=-1;
-            }
-        }
-        else {
+        //返回没有逻辑删除，且存在该车牌号的数量
+        int isrmsCapacitie = rmsCapacityMapper.selectBycapacityNumber(number);
+        RmsCapacity rmsCapacity=new RmsCapacity();
+        if(isrmsCapacitie==0){
+            rmsCapacity.setCarrierId(carrierId);
+            rmsCapacity.setCapacityTypeId(capacityTypeId);
+            rmsCapacity.setCapacityNumber(number);
+            rmsCapacity.setCapacityCorlor(capacityCorlor);
+            rmsCapacity.setCapacityOwneris(capacityOwneris);
+            rmsCapacity.setCapacityVip(capacityVip);
+            rmsCapacity.setCapacityBlacklist(capacityBlacklist);
             rmsCapacity.setCapacityStatus(new BigDecimal(0));
             rmsCapacity.setDeleted(new BigDecimal(0));
             rmsCapacity.setInsertTime(new Date());
             rmsCapacity.setInsertUsername("admin");
             rmsCapacity.setCapacityId(rmsCapacityMapper.selectCapacityId());
             i+= rmsCapacityMapper.insertSelective(rmsCapacity);
+        }else {
+            return -1;
         }
         return i;
     }

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

@@ -68,33 +68,10 @@ public class RmsCarDriverServiceImpl implements IRmsCarDriverService {
         String driverIdentityCardId=(String) mapValue.get("driverIdentityCard");
         String driverPhone=(String)  mapValue.get("driverPhone");
         BigDecimal transportTypeId=DataChange.dataToBigDecimal(mapValue.get("transportTypeId"));
-        RmsCarDriver rmsCarDriver=new RmsCarDriver();
         int i=0;
-        String driverIdentityCard=rmsCarDriver.getDriverIdentityCard();
-        Map<String, Object> map=new HashMap<>();
-        map.put("driverIdentityCard",driverIdentityCard);
-        List<RmsCarDriver> rmsCarDrivers=rmsCarDriverMapper.selectByParameters(map);
-
-        if (rmsCarDrivers.size()!=0){
-            RmsCarDriver rmsCarDriver1=rmsCarDrivers.get(0);
-            if (rmsCarDriver1.getDeleted().equals(new BigDecimal(1))){
-                rmsCarDriver.setDriverName(driverName);
-                rmsCarDriver.setDriverSex(driverSex);
-                rmsCarDriver.setDriverAge(driverAge);
-                rmsCarDriver.setDriverIdentityCard(driverIdentityCardId);
-                rmsCarDriver.setDriverPhone(driverPhone);
-                rmsCarDriver.setTransportTypeId(transportTypeId);
-                rmsCarDriver.setCarrierId(carrierId);
-                rmsCarDriver.setInsertUsername("admin");
-                rmsCarDriver.setInsertTime(new Date());
-                rmsCarDriver.setDeleted(new BigDecimal(0));
-                rmsCarDriver.setDriverId(rmsCarDriverMapper.selectCarDriverId());
-                i+= rmsCarDriverMapper.insertSelective(rmsCarDriver);
-            }else {
-                i = -1;
-            }
-        }
-        else {
+        int rmsCarDrivers=rmsCarDriverMapper.selectByIdentityCard(driverIdentityCardId);
+        RmsCarDriver rmsCarDriver=new RmsCarDriver();
+        if(rmsCarDrivers==0){
             rmsCarDriver.setDriverName(driverName);
             rmsCarDriver.setDriverSex(driverSex);
             rmsCarDriver.setDriverAge(driverAge);
@@ -107,6 +84,8 @@ public class RmsCarDriverServiceImpl implements IRmsCarDriverService {
             rmsCarDriver.setDeleted(new BigDecimal(0));
             rmsCarDriver.setDriverId(rmsCarDriverMapper.selectCarDriverId());
             i+= rmsCarDriverMapper.insertSelective(rmsCarDriver);
+        }else{
+            i=-1;
         }
         return i;
     }

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

@@ -58,7 +58,10 @@ public class RmsConsigneeServiceImpl implements IRmsConsigneeService {
         Date time = simpleDateFormat.parse(consigneeRegistrationTime);
         String consigneeContactName=(String) mapVal.get("consigneeContactName");
         String consigneeContactTel=(String)mapVal.get("consigneeContactTel");
+        int i=0;
+        int rmsConsignees=rmsConsigneeMapper.getConsigneeByCompanyName(companyName);
         RmsConsignee rmsConsignee=new RmsConsignee();
+        if(rmsConsignees==0){
             rmsConsignee.setConsigneeCompanyName(companyName);
             rmsConsignee.setConsigneeAbbreviation(consigneeAbbreviation);
             rmsConsignee.setConsigneeRegisteredAddress(consigneeRegisteredAddress);
@@ -70,7 +73,13 @@ public class RmsConsigneeServiceImpl implements IRmsConsigneeService {
             rmsConsignee.setInsertTime(new Date());
             rmsConsignee.setInsertUsername("admin");
             rmsConsignee.setConsigneeId(rmsConsigneeMapper.selectConsigneeId());
-            return  rmsConsigneeMapper.insertSelective(rmsConsignee);
+            i+=rmsConsigneeMapper.insertSelective(rmsConsignee);
+        }
+      else{
+          i=-1;
+        }
+
+            return  i;
     }
 
     /*

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

@@ -143,12 +143,8 @@ public class RmsMaterialServiceImpl implements IRmsMaterialService {
     public int insertMaterial(RmsMaterial rmsMaterial) {
         int i=0;
         String materialCode=rmsMaterial.getMaterialCode();
-        Map<String, Object> map=new HashMap<>();
-        map.put("materialCode",materialCode);
-        List<RmsMaterial> rmsMaterials=rmsMaterialMapper.selectByParameters(map);
-        if (rmsMaterials.size()!=0){
-            RmsMaterial rmsMaterial1=rmsMaterials.get(0);
-            if (rmsMaterial1.getDeleted().equals(new BigDecimal(1))){
+        int rmsMaterials=rmsMaterialMapper.selectMaterialByCode(materialCode);
+            if (rmsMaterials==0){
                 rmsMaterial.setDeleted(new BigDecimal(0));
                 rmsMaterial.setMaterialId(rmsMaterialMapper.getMaterialId());
                 rmsMaterial.setInsertTime(new Date());
@@ -158,15 +154,7 @@ public class RmsMaterialServiceImpl implements IRmsMaterialService {
             else{
                 i=-1;
             }
-        }
-        else {
-            rmsMaterial.setDeleted(new BigDecimal(0));
-            rmsMaterial.setMaterialId(rmsMaterialMapper.getMaterialId());
-            rmsMaterial.setInsertTime(new Date());
-            rmsMaterial.setInsertUsername("admin");
-            i += rmsMaterialMapper.insertSelective(rmsMaterial);
 
-        }
         return i;
     }
 

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

@@ -797,4 +797,9 @@
     FROM RMS_CARRIER RC
     WHERE RC.DELETED!=1
   </select>
+
+  <select id="selectBycapacityNumber" parameterType="java.lang.String" resultType="int">
+    select count(*) from RMS_CAPACITY RC where RC.CAPACITY_NUMBER=#{number}
+    and RC.DELETED=0
+  </select>
 </mapper>

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

@@ -1086,5 +1086,12 @@
       from RMS_CARRIER  RC
       where RC.CARRIER_NAME like #{state}
     </select>
+
+  <select id="selectByIdentityCard" resultType="int" parameterType="java.lang.String">
+    select count(*)
+    from RMS_CAR_DRIVER RCD
+    where RCD.DRIVER_IDENTITY_CARD=#{driverIdentityCardId}
+    and RCD.DELETED!=1
+  </select>
 </mapper>
 

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

@@ -672,4 +672,12 @@
   <select id="selectConsigneeId" resultType="DECIMAL" >
     select max(RC.CONSIGNEE_ID+1) from RMS_CONSIGNEE RC
   </select>
+
+  <select id="getConsigneeByCompanyName" parameterType="java.lang.String" resultType="int">
+    select count(*)
+    from RMS_CONSIGNEE RC
+    where RC.CONSIGNEE_COMPANY_NAME=#{companyName}
+    and RC.DELETED!=1
+  </select>
+
 </mapper>

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

@@ -693,4 +693,8 @@
             </if>
         </where>
     </select>
+
+    <select id="selectMaterialByCode" resultType="int" parameterType="java.lang.String">
+        select count(*) from RMS_MATERIAL RM where RM.MATERIAL_CODE=#{materialCode} and RM.DELETED!=1
+    </select>
 </mapper>

target/classes/com/steerinfo/dil/mapper/RmsCapacityMapper.xml

@@ -797,4 +797,9 @@
     FROM RMS_CARRIER RC
     WHERE RC.DELETED!=1
   </select>
+
+  <select id="selectBycapacityNumber" parameterType="java.lang.String" resultType="int">
+    select count(*) from RMS_CAPACITY RC where RC.CAPACITY_NUMBER=#{number}
+    and RC.DELETED=0
+  </select>
 </mapper>

target/classes/com/steerinfo/dil/mapper/RmsCarDriverMapper.xml

@@ -1086,5 +1086,12 @@
       from RMS_CARRIER  RC
       where RC.CARRIER_NAME like #{state}
     </select>
+
+  <select id="selectByIdentityCard" resultType="int" parameterType="java.lang.String">
+    select count(*)
+    from RMS_CAR_DRIVER RCD
+    where RCD.DRIVER_IDENTITY_CARD=#{driverIdentityCardId}
+    and RCD.DELETED!=1
+  </select>
 </mapper>
 

target/classes/com/steerinfo/dil/mapper/RmsConsigneeMapper.xml

@@ -672,4 +672,12 @@
   <select id="selectConsigneeId" resultType="DECIMAL" >
     select max(RC.CONSIGNEE_ID+1) from RMS_CONSIGNEE RC
   </select>
+
+  <select id="getConsigneeByCompanyName" parameterType="java.lang.String" resultType="int">
+    select count(*)
+    from RMS_CONSIGNEE RC
+    where RC.CONSIGNEE_COMPANY_NAME=#{companyName}
+    and RC.DELETED!=1
+  </select>
+
 </mapper>

target/classes/com/steerinfo/dil/mapper/RmsMaterialMapper.xml

@@ -693,4 +693,8 @@
             </if>
         </where>
     </select>
+
+    <select id="selectMaterialByCode" resultType="int" parameterType="java.lang.String">
+        select count(*) from RMS_MATERIAL RM where RM.MATERIAL_CODE=#{materialCode} and RM.DELETED!=1
+    </select>
 </mapper>