tijiao12.24

.idea/workspace.xml

@@ -20,9 +20,6 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="abe40335-1998-468a-9c83-8ed884d8e030" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/dataSources.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/sqldialects.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__cglib_cglib_3_2_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__cglib_cglib_3_2_5.xml" afterDir="false" />
@@ -257,28 +254,74 @@
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dil-api.iml" beforeDir="false" afterPath="$PROJECT_DIR$/dil-api.iml" 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/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/RmsCarrierController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsCarrierController.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/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/RmsCarrierMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsCarrierMapper.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/mapper/RmsGatepostMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsGatepostMapper.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/mapper/RmsShipperMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsShipperMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsSupplierMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsSupplierMapper.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/IRmsCarrierService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsCarrierService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsBidAreaServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsBidAreaServiceImpl.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/service/IRmsGatepostService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsGatepostService.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/RmsCarrierServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsCarrierServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsPersonnelServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsPersonnelServiceImpl.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/RmsGatepostServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsGatepostServiceImpl.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/java/com/steerinfo/dil/service/impl/RmsShipperServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsShipperServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsSupplierServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsSupplierServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bootstrap.yml" 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/RmsCarrierMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsCarrierMapper.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/RmsDriverCapacityMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsDriverCapacityMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsGatepostMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsGatepostMapper.xml" 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$/src/main/resources/com/steerinfo/dil/mapper/RmsShipperMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsShipperMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsSupplierMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsSupplierMapper.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$/target/classes/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/bootstrap.yml" 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/RmsCarDriverController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsCarDriverController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsCarrierController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsCarrierController.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/mapper/RmsCapacityMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCapacityMapper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCapacityMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCapacityMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCarDriverMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCarDriverMapper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCarDriverMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCarDriverMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCarrierMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCarrierMapper.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCarrierMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCarrierMapper.xml" 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/RmsDriverCapacityMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsDriverCapacityMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsGatepostMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsGatepostMapper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsGatepostMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsGatepostMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsMaterialMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsMaterialMapper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsMaterialMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsMaterialMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsShipperMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsShipperMapper.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsShipperMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsShipperMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsSupplierMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsSupplierMapper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsSupplierMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsSupplierMapper.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/IRmsCapacityService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsCapacityService.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsCarrierService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsCarrierService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsBidAreaServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsBidAreaServiceImpl.class" 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/RmsCarrierServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsCarrierServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsPersonnelServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsPersonnelServiceImpl.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/classes/com/steerinfo/dil/service/impl/RmsGatepostServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsGatepostServiceImpl.class" afterDir="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" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsShipperServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsShipperServiceImpl.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsSupplierServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsSupplierServiceImpl.class" afterDir="false" />
     </list>
@@ -287,6 +330,13 @@
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Class" />
+      </list>
+    </option>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
@@ -312,7 +362,6 @@
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
@@ -351,7 +400,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" />
@@ -364,6 +413,11 @@
       <workItem from="1640142169953" duration="297000" />
       <workItem from="1640142781611" duration="5098000" />
       <workItem from="1640263987979" duration="19444000" />
+      <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>
@@ -387,99 +441,115 @@
       <screen x="0" y="0" width="1280" height="680" />
     </state>
     <state x="233" y="0" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1280.680@0.0.1280.680" timestamp="1640311504613" />
-    <state x="446" y="46" key="#com.intellij.ide.util.MemberChooser" timestamp="1640320396336">
+    <state x="446" y="46" key="#com.intellij.ide.util.MemberChooser" timestamp="1640328548794">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state x="446" y="46" key="#com.intellij.ide.util.MemberChooser/0.0.1280.680@0.0.1280.680" timestamp="1640320396336" />
+    <state x="446" y="46" key="#com.intellij.ide.util.MemberChooser/0.0.1280.680@0.0.1280.680" timestamp="1640328548794" />
+    <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>
     <state width="444" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1639818003519" />
-    <state x="549" y="166" key="FileChooserDialogImpl" timestamp="1640144752213">
+    <state x="549" y="166" key="FileChooserDialogImpl" timestamp="1640272173598">
       <screen x="0" y="0" width="1536" height="824" />
     </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="1640144752213" />
-    <state width="1237" height="230" key="GridCell.Tab.0.bottom" timestamp="1640325921852">
+    <state x="549" y="166" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1640272173598" />
+    <state width="1237" height="99" key="GridCell.Tab.0.bottom" timestamp="1640338194677">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="230" key="GridCell.Tab.0.bottom/0.0.1280.680@0.0.1280.680" timestamp="1640325921852" />
-    <state width="1493" height="186" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1640158329031" />
-    <state width="1237" height="230" key="GridCell.Tab.0.center" timestamp="1640325921852">
+    <state width="1237" height="99" key="GridCell.Tab.0.bottom/0.0.1280.680@0.0.1280.680" timestamp="1640338194677" />
+    <state width="1493" height="136" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
+    <state width="1237" height="99" key="GridCell.Tab.0.center" timestamp="1640338194677">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="230" key="GridCell.Tab.0.center/0.0.1280.680@0.0.1280.680" timestamp="1640325921852" />
-    <state width="1493" height="186" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1640158329031" />
-    <state width="1237" height="230" key="GridCell.Tab.0.left" timestamp="1640325921852">
+    <state width="1237" height="99" key="GridCell.Tab.0.center/0.0.1280.680@0.0.1280.680" timestamp="1640338194677" />
+    <state width="1493" height="136" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
+    <state width="1237" height="99" key="GridCell.Tab.0.left" timestamp="1640338194676">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="230" key="GridCell.Tab.0.left/0.0.1280.680@0.0.1280.680" timestamp="1640325921852" />
-    <state width="1493" height="186" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1640158329030" />
-    <state width="1237" height="230" key="GridCell.Tab.0.right" timestamp="1640325921852">
+    <state width="1237" height="99" key="GridCell.Tab.0.left/0.0.1280.680@0.0.1280.680" timestamp="1640338194676" />
+    <state width="1493" height="136" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1640319438695" />
+    <state width="1237" height="99" key="GridCell.Tab.0.right" timestamp="1640338194677">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="230" key="GridCell.Tab.0.right/0.0.1280.680@0.0.1280.680" timestamp="1640325921852" />
-    <state width="1493" height="186" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1640158329031" />
-    <state width="1237" height="230" key="GridCell.Tab.1.bottom" timestamp="1640325921852">
+    <state width="1237" height="99" key="GridCell.Tab.0.right/0.0.1280.680@0.0.1280.680" timestamp="1640338194677" />
+    <state width="1493" height="136" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
+    <state width="1237" height="99" key="GridCell.Tab.1.bottom" timestamp="1640338194348">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="230" key="GridCell.Tab.1.bottom/0.0.1280.680@0.0.1280.680" timestamp="1640325921852" />
-    <state width="1493" height="186" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1640158329031" />
-    <state width="1237" height="230" key="GridCell.Tab.1.center" timestamp="1640325921852">
+    <state width="1237" height="99" key="GridCell.Tab.1.bottom/0.0.1280.680@0.0.1280.680" timestamp="1640338194348" />
+    <state width="1493" height="136" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
+    <state width="1237" height="99" key="GridCell.Tab.1.center" timestamp="1640338194348">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="230" key="GridCell.Tab.1.center/0.0.1280.680@0.0.1280.680" timestamp="1640325921852" />
-    <state width="1493" height="186" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1640158329031" />
-    <state width="1237" height="230" key="GridCell.Tab.1.left" timestamp="1640325921852">
+    <state width="1237" height="99" key="GridCell.Tab.1.center/0.0.1280.680@0.0.1280.680" timestamp="1640338194348" />
+    <state width="1493" height="136" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
+    <state width="1237" height="99" key="GridCell.Tab.1.left" timestamp="1640338194348">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="230" key="GridCell.Tab.1.left/0.0.1280.680@0.0.1280.680" timestamp="1640325921852" />
-    <state width="1493" height="186" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1640158329031" />
-    <state width="1237" height="230" key="GridCell.Tab.1.right" timestamp="1640325921852">
+    <state width="1237" height="99" key="GridCell.Tab.1.left/0.0.1280.680@0.0.1280.680" timestamp="1640338194348" />
+    <state width="1493" height="136" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
+    <state width="1237" height="99" key="GridCell.Tab.1.right" timestamp="1640338194348">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="230" key="GridCell.Tab.1.right/0.0.1280.680@0.0.1280.680" timestamp="1640325921852" />
-    <state width="1493" height="186" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1640158329031" />
-    <state width="1237" height="230" key="GridCell.Tab.2.bottom" timestamp="1640325921852">
+    <state width="1237" height="99" key="GridCell.Tab.1.right/0.0.1280.680@0.0.1280.680" timestamp="1640338194348" />
+    <state width="1493" height="136" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
+    <state width="1237" height="99" key="GridCell.Tab.2.bottom" timestamp="1640338194349">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="230" key="GridCell.Tab.2.bottom/0.0.1280.680@0.0.1280.680" timestamp="1640325921852" />
-    <state width="1493" height="186" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1640158329031" />
-    <state width="1237" height="230" key="GridCell.Tab.2.center" timestamp="1640325921852">
+    <state width="1237" height="99" key="GridCell.Tab.2.bottom/0.0.1280.680@0.0.1280.680" timestamp="1640338194349" />
+    <state width="1493" height="136" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1640319438697" />
+    <state width="1237" height="99" key="GridCell.Tab.2.center" timestamp="1640338194349">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="230" key="GridCell.Tab.2.center/0.0.1280.680@0.0.1280.680" timestamp="1640325921852" />
-    <state width="1493" height="186" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1640158329031" />
-    <state width="1237" height="230" key="GridCell.Tab.2.left" timestamp="1640325921852">
+    <state width="1237" height="99" key="GridCell.Tab.2.center/0.0.1280.680@0.0.1280.680" timestamp="1640338194349" />
+    <state width="1493" height="136" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1640319438697" />
+    <state width="1237" height="99" key="GridCell.Tab.2.left" timestamp="1640338194348">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="230" key="GridCell.Tab.2.left/0.0.1280.680@0.0.1280.680" timestamp="1640325921852" />
-    <state width="1493" height="186" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1640158329031" />
-    <state width="1237" height="230" key="GridCell.Tab.2.right" timestamp="1640325921852">
+    <state width="1237" height="99" key="GridCell.Tab.2.left/0.0.1280.680@0.0.1280.680" timestamp="1640338194348" />
+    <state width="1493" height="136" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1640319438697" />
+    <state width="1237" height="99" key="GridCell.Tab.2.right" timestamp="1640338194349">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="230" key="GridCell.Tab.2.right/0.0.1280.680@0.0.1280.680" timestamp="1640325921852" />
-    <state width="1493" height="186" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1640158329031" />
-    <state x="228" y="0" key="SettingsEditor" timestamp="1640312119460">
+    <state width="1237" height="99" key="GridCell.Tab.2.right/0.0.1280.680@0.0.1280.680" timestamp="1640338194349" />
+    <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="1640336659804">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state x="228" y="0" key="SettingsEditor/0.0.1280.680@0.0.1280.680" timestamp="1640312119460" />
-    <state x="270" y="56" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1640117922911" />
-    <state width="200" height="461" key="SqlResolveConfigurable" timestamp="1640312117166">
+    <state x="225" y="0" key="SettingsEditor/0.0.1280.680@0.0.1280.680" timestamp="1640336659804" />
+    <state x="270" y="56" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1639799919381" />
+    <state width="200" height="461" key="SqlResolveConfigurable" timestamp="1640336658685">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="200" height="461" key="SqlResolveConfigurable/0.0.1280.680@0.0.1280.680" timestamp="1640312117166" />
+    <state width="200" height="461" key="SqlResolveConfigurable/0.0.1280.680@0.0.1280.680" timestamp="1640336658685" />
     <state x="235" y="0" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1639818889347">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state x="235" y="0" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/0.0.1536.824@0.0.1536.824" timestamp="1639818889347" />
-    <state x="425" y="187" key="run.anything.popup" timestamp="1639814402364">
+    <state x="425" y="187" key="run.anything.popup" timestamp="1640242657012">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state x="425" y="187" key="run.anything.popup/0.0.1536.824@0.0.1536.824" timestamp="1639814402364" />
-    <state x="303" y="1" width="672" height="678" key="search.everywhere.popup" timestamp="1640311140695">
+    <state x="425" y="187" key="run.anything.popup/0.0.1536.824@0.0.1536.824" timestamp="1640242657012" />
+    <state x="303" y="1" width="672" height="678" key="search.everywhere.popup" timestamp="1640330298620">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state x="303" y="1" width="672" height="678" key="search.everywhere.popup/0.0.1280.680@0.0.1280.680" timestamp="1640311140695" />
+    <state x="303" y="1" width="672" height="678" key="search.everywhere.popup/0.0.1280.680@0.0.1280.680" timestamp="1640330298620" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsCarrierServiceImpl.java</url>
+          <line>131</line>
+          <option name="timeStamp" value="43" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
   </component>
 </project>

dil-api.iml

@@ -258,5 +258,238 @@
     <orderEntry type="library" name="Maven: io.github.openfeign:feign-httpclient:9.7.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.6" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.10.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.10.0" level="project" />
+    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.11.RELEASE" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.7" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.7" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.7" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.7" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.7" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.35" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.35" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.35" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.13.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.20" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.20" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.7.11" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.17" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
+    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" />
+    <orderEntry type="library" name="Maven: com.steerinfo:framework:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.caches:mybatis-ehcache:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j:1.3.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.25" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.assertj:assertj-core:3.9.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-core:2.15.0" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.7.11" level="project" />
+    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.0.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.5" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:2.7.9" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.4" level="project" />
+    <orderEntry type="library" name="Maven: redis.clients:jedis:2.9.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.7.0" level="project" />
+    <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.10" level="project" />
+    <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.16.22" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" />
+    <orderEntry type="library" name="Maven: cglib:cglib:3.2.5" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm:6.0_ALPHA" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.ant:ant:1.9.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.9.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
+    <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.9" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
+    <orderEntry type="library" name="Maven: com.google.zxing:core:3.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.zxing:javase:3.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.beust:jcommander:1.48" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jai-imageio:jai-imageio-core:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.10" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.10" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.oracle:ojdbc6:11.2.0.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.60" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.60" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-core:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-eureka-client:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.eureka:eureka-client:1.9.3" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.jettison:jettison:1.3.7" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-eventbus:0.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-infix:0.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-jxpath:commons-jxpath:1.3" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.antlr:antlr-runtime:3.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.antlr:stringtemplate:3.2.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: antlr:antlr:2.7.7" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.commons:commons-math:2.2" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.12.21" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.github.vlsi.compactmap:compactmap:1.2.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.github.andrewoma.dexx:dexx-collections:0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.eureka:eureka-core:1.9.3" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.4.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.2.5" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.2.5" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.2.5" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.2.5" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-eureka:2.2.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.3.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:3.0.1" level="project" />
+    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.0.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:9.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:9.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:9.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-java8:9.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-config:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-config-client:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.0.8" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.10" level="project" />
+    <orderEntry type="library" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-hystrix:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.12" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-serialization:1.5.12" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.jackson.module:jackson-module-afterburner:2.9.7" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-metrics-event-stream:1.5.12" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-javanica:1.5.12" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava-reactive-streams:1.2.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.ctrip.framework.apollo:apollo-client:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.ctrip.framework.apollo:apollo-core:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
+    <orderEntry type="library" name="Maven: com.google.inject:guice:4.1.0" level="project" />
+    <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.24.1-GA" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-httpclient:9.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.10" level="project" />
   </component>
 </module>

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/RmsCarDriverController.java

@@ -9,11 +9,14 @@ import com.steerinfo.dil.util.ColumnDataUtil;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.utils.misc.IdGenerator;
+import com.steerinfo.framework.utils.upload.UploadUtils;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
 import java.util.HashMap;
@@ -164,4 +167,20 @@ public class RmsCarDriverController extends BaseRESTfulController {
       List<Map<String, Object>> carrierName = rmsCarDriverService.getCarrierName(state);
       return success(carrierName);
   }
-}
+
+
+  /*
+  * 图片上传
+  *
+   */
+    @PostMapping("/upload")
+    public String upLoadPhoto(@RequestParam("file") MultipartFile file)  {
+
+       IdGenerator idGenerator=new IdGenerator(1023,1023);
+       String upLoad="C:\\stworkspace\\image\\";
+       String imgPath=file.getOriginalFilename();
+        return UploadUtils.uploadFile(file,idGenerator,upLoad,imgPath);
+    }
+
+
+ }

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

@@ -275,7 +275,7 @@ public class RmsCarrierController extends BaseRESTfulController {
     @PostMapping("/uploadCarrier1")
     public RESTfulResult uploadCarrier1(@RequestParam("file") MultipartFile multipartFile) {
         String str="运输证";
-        Integer result=rmsCarrierService.uploadCarrier(multipartFile,str);
+        int result=rmsCarrierService.uploadCarrier(multipartFile,str);
         if (result==-1){
             return failed();
         }
@@ -283,31 +283,23 @@ public class RmsCarrierController extends BaseRESTfulController {
     }
     //    处理承运商照片
     @PostMapping("/uploadCarrier2")
-    public String uploadCarrier2(@RequestParam("file") MultipartFile multipartFile) {
-        String name = multipartFile.getName();
-        Long workId = 0L;
-        Long datacenterId = 0L;
-//        id自动生成器
-        IdGenerator idGenerator = new IdGenerator(workId, datacenterId);
-//        图片存储的地址
-        String uploadPath = "C:/workspaces/stworkspace/12.22/image/";
-//        图片名称默认为空
-        String imagePath = "经营许可证";
-        return UploadUtils.uploadFile(multipartFile, idGenerator, uploadPath, imagePath);
+    public RESTfulResult uploadCarrier2(@RequestParam("file") MultipartFile multipartFile) {
+        String str = "经营许可证";
+        Integer result=rmsCarrierService.uploadCarrier(multipartFile,str);
+        if (result==-1){
+            return failed();
+        }
+        return success(result);
     }
     //    处理承运商照片
     @PostMapping("/uploadCarrier3")
-    public String uploadCarrier3(@RequestParam("file") MultipartFile multipartFile) {
-        String name = multipartFile.getName();
-        Long workId = 0L;
-        Long datacenterId = 0L;
-//        id自动生成器
-        IdGenerator idGenerator = new IdGenerator(workId, datacenterId);
-//        图片存储的地址
-        String uploadPath = "C:/workspaces/stworkspace/12.22/image/";
-//        图片名称默认为空
-        String imagePath = "营业执照";
-        return UploadUtils.uploadFile(multipartFile, idGenerator, uploadPath, imagePath);
+    public RESTfulResult uploadCarrier3(@RequestParam("file") MultipartFile  multipartFile) {
+        String str = "营业执照";
+        Integer result=rmsCarrierService.uploadCarrier(multipartFile,str);
+        if (result==-1){
+        return failed();
+        }
+        return success(result);
     }
 
 

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

@@ -2,6 +2,8 @@ package com.steerinfo.dil.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.steerinfo.dil.feign.ESFeign;
+import com.steerinfo.dil.model.RmsCapacity;
+import com.steerinfo.dil.model.RmsConsignee;
 import com.steerinfo.dil.service.impl.RmsConsigneeServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
@@ -12,11 +14,10 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
+import java.text.ParseException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -82,4 +83,63 @@ public class RmsConsigneeController extends BaseRESTfulController {
         PageListAdd data = columnDataUtil.tableColumnData(apiId, listTotal, columnList);
         return success(data);
     }
+
+    /**
+     * 创建收货客户信息
+     * @param
+     * @return
+     */
+    @ApiOperation(value="创建", notes="根据RmsConsignee对象创建")
+    @ApiImplicitParam(name = "rmsCapacity", value = "详细实体rmsConsignee", required = true, dataType = "RmsCapacity")
+    @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);
+    }
+
+    /**
+     * 根据id更新客户信息
+     * @param
+     * @return
+     */
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的rmsConsignee信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "Short"),
+            @ApiImplicitParam(name = "rmsConsignee", value = "详细实体rmsConsignee", required = true, dataType = "RmsConsignee")
+    })
+    @PostMapping(value = "/updateConsignee", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult updateConsignee( @RequestBody Map<String,Object> mapVal )throws ParseException{
+        int result = rmsConsigneeService.updateConsignee(mapVal);
+        return success(result);
+    }
+
+    /**
+     * 根据id删除客户信息
+     * @param id
+     * @return
+     */
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "Short")
+    @PostMapping(value = "/deleteConsignee/{id}")
+    public RESTfulResult deleteConsignee(@PathVariable("id") BigDecimal id){
+        return success(rmsConsigneeService.deleteConsignee(id));
+    }
+
+    /**
+     * 根据id获取客户信息
+     * @param id
+     * @return
+     */
+    @ApiOperation(value="获取客户信息详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/getConsigneeById/{id}")
+    public RESTfulResult getConsigneeById(@PathVariable("id") BigDecimal id){
+        List<Map<String,Object>> list= rmsConsigneeService.getConsigneeById(id);
+        return success(list);
+    }
+
 }

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/RmsCarrierMapper.java

@@ -21,5 +21,7 @@ public interface RmsCarrierMapper extends IBaseMapper<RmsCarrier, BigDecimal> {
     @Select("SELECT seq__RMS_CARRIER.nextval FROM dual")
     BigDecimal getCarrierId();
 
-    int selectParameterCarrierName();
+    int selectParameterCarrierName(String carrierName);
+//    获得当前表中的最大id
+    BigDecimal getMaxCarrierId();
 }

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

@@ -3,12 +3,20 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.RmsConsignee;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
 @Mapper
-public interface RmsConsigneeMapper extends IBaseMapper<RmsConsignee, Long> {
+public interface RmsConsigneeMapper extends IBaseMapper<RmsConsignee, BigDecimal> {
 
     List<Map<String, Object>> getConsigneeList(Map<String, Object> mapValue);
+    //序列号
+    BigDecimal selectConsigneeId();
+
+    List<Map<String, Object>> getConsigneeById(BigDecimal id);
+
+    int getConsigneeByCompanyName(String companyName);
 }

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

@@ -29,4 +29,6 @@ public interface RmsGatepostMapper extends IBaseMapper<RmsGatepost, BigDecimal>
     BigDecimal getGatepostMaxId();
 //根据门岗id查询门岗名
     Map<String, Object> getGatepostName(BigDecimal gatepostId);
+//    根据门岗名获取当前表中是否相同名的数量
+    int selectParamaterGatepostName(String gatepostName);
 }

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/mapper/RmsShipperMapper.java

@@ -21,4 +21,6 @@ public interface RmsShipperMapper extends IBaseMapper<RmsShipper, BigDecimal> {
     BigDecimal getShipperId();
 //根据id详细获取托运人信息
     List<Map<String, Object>> selectShipperById(BigDecimal id);
+
+    int selectByParametersCompanyBranch(String shipperCompanyBranch);
 }

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

@@ -23,4 +23,6 @@ public interface RmsSupplierMapper extends IBaseMapper<RmsSupplier, BigDecimal>
 
 //   通过id值详细获取供应商信息
     List<Map<String, Object>> selectSupplierById(BigDecimal id);
+
+    int selectByParametersSupplierName(String supplierName);
 }

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/IRmsCarrierService.java

@@ -35,5 +35,7 @@ public interface IRmsCarrierService {
 //    展示中标区域
     List<Map<String, Object>> getCarrierBidAreaList(Map<String, Object> mapVal);
 //    处理承运商照片
-    Integer uploadCarrier(MultipartFile multipartFile, String str);
+    int uploadCarrier(MultipartFile multipartFile, String str);
+//    将承运商照片插入到相对应的字段数据中
+//    int insertCarrierPhoto(Map<String, Object> map);
 }

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

@@ -3,6 +3,8 @@ package com.steerinfo.dil.service;
 import com.steerinfo.dil.model.RmsConsignee;
 import com.steerinfo.framework.service.IBaseService;
 
+import java.math.BigDecimal;
+import java.text.ParseException;
 import java.util.List;
 import java.util.Map;
 
@@ -22,4 +24,12 @@ import java.util.Map;
 public interface IRmsConsigneeService{
 
     List<Map<String, Object>> getConsigneeList(Map<String, Object> mapValue);
+
+    int insertConsignee(Map<String,Object> mapVal) throws ParseException;
+
+    int updateConsignee(Map<String,Object> mapVal) throws ParseException;
+
+    int deleteConsignee(BigDecimal id);
+
+    List<Map<String, Object>> getConsigneeById(BigDecimal id);
 }

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

@@ -42,4 +42,5 @@ public interface IRmsGatepostService {
     int insertGatepostRule(Map<String, Object> mapValue);
 //根据门岗id查询门岗名
     Map<String, Object> getGatepostName(BigDecimal gatepostId);
+
 }

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

@@ -2,14 +2,13 @@ package com.steerinfo.dil.service.impl;
 
 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;
 
 import java.math.BigDecimal;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -36,35 +35,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/RmsCarrierServiceImpl.java

@@ -14,6 +14,7 @@ import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -34,11 +35,12 @@ import java.util.Map;
 public class RmsCarrierServiceImpl implements IRmsCarrierService {
 
     @Autowired
-    private RmsCarrierMapper rmsCarrierMapper;
+    RmsCarrierMapper rmsCarrierMapper;
 
     @Autowired
     private RmsBidAreaMapper rmsBidAreaMapper;
 
+
     /**
      * 查询承运商表
      *
@@ -112,7 +114,7 @@ public class RmsCarrierServiceImpl implements IRmsCarrierService {
         rmsCarrier.setOperationPeriod((String) map1.get("operationPeriod"));
         rmsCarrier.setRegisterOrganization((String) map1.get("registerOrganization"));
         rmsCarrier.setRegisterAptitudes((String) map1.get("registerAptitudes"));
-        rmsCarrier.setContactsName((String) map1.get("contactName"));
+        rmsCarrier.setContactsName((String) map1.get("contactsName"));
         rmsCarrier.setCarrierContactNumber((String) map1.get("carrierContactNumber"));
         rmsCarrier.setCarrierType((String) map1.get("carrierType"));
         return rmsCarrierMapper.updateByPrimaryKeySelective(rmsCarrier);
@@ -135,10 +137,11 @@ public class RmsCarrierServiceImpl implements IRmsCarrierService {
         RmsCarrier rmsCarrier = new RmsCarrier();
         Map<String, Object> map1 = (Map<String, Object>) mapValue.get("RmsCarrier");
         Map<String, Object> registerDate = (Map<String, Object>) mapValue.get("registerDate");
+        String carrierName=(String) map1.get("carrierName");
         Date date = new Date(0);
         int i = 0;
         Integer transportType = (Integer) map1.get("carrierTransportType");
-        int size = rmsCarrierMapper.selectParameterCarrierName();
+        int size = rmsCarrierMapper.selectParameterCarrierName(carrierName);
         String registerDates = (String) registerDate.get("registerDate");
         Date registerDate2 = simpleDateFormat.parse(registerDates);
         if (size == 0) {
@@ -203,23 +206,46 @@ public class RmsCarrierServiceImpl implements IRmsCarrierService {
          return rmsBidAreaMapper.getCarrierBidAreaList();
      }
 
+
+//     对承运商的照片进行处理
      @Override
-     public Integer uploadCarrier (MultipartFile multipartFile, String str){
+     public int uploadCarrier (MultipartFile multipartFile, String str){
         int result = 0;
 //        根据str判断当前照片类型
         String name = multipartFile.getName();
-        System.out.println("*********" + name);
         Long workId = 0L;
         Long datacenterId = 0L;
+        byte[] fileNames=null;
 //        id自动生成器
         IdGenerator idGenerator = new IdGenerator(workId, datacenterId);
 //        图片存储的地址
         String uploadPath = "C:/workspaces/stworkspace/12.22/image/";
 //        图片名称默认为空
         String imagePath = str;
-
-        String FileNames = UploadUtils.uploadFile(multipartFile, idGenerator, uploadPath, imagePath);
-
+//        创建一个map用来存储三张照片的地址
+         Map<String, Object> map=new HashMap<>();
+         String FileNames = UploadUtils.uploadFile(multipartFile, idGenerator, uploadPath, imagePath);
+         System.out.println(FileNames);
+         //         判断照片是否能上传成功
+         if (FileNames!=null){
+             fileNames = UploadUtils.imageToByte(FileNames);
+             map.put(str,fileNames);
+//             将照片的二进制插入到数据库
+//             RmsCarrier rmsCarrier=new RmsCarrier();
+//             rmsCarrier.setCarrierId(rmsCarrierMapper.getMaxCarrierId());
+//             if (map.get("运输证")!=null){
+//                 rmsCarrier.setCarrierTransportCertificate((byte[]) map.get("运输证"));
+//             }
+//             if (map.get("经营许可证")!=null){
+//                 rmsCarrier.setCarrierBusinessLicense((byte[])map.get("经营许可证"));
+//             }
+//             if (map.get("营业执照")!=null){
+//                 rmsCarrier.setCarrierBusinessAblelicense((byte[])map.get("营业执照"));
+//             }
+//             result+=rmsCarrierMapper.updateByPrimaryKeySelective(rmsCarrier);
+         }else{
+             result=-1;
+         }
          return result;
      }
 }

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

@@ -1,13 +1,21 @@
 package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.RmsConsigneeMapper;
+import com.steerinfo.dil.model.RmsCapacity;
 import com.steerinfo.dil.model.RmsConsignee;
 import com.steerinfo.dil.service.IRmsConsigneeService;
+import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -35,4 +43,93 @@ public class RmsConsigneeServiceImpl implements IRmsConsigneeService {
     public List<Map<String, Object>> getConsigneeList(Map<String, Object> mapValue) {
         return rmsConsigneeMapper.getConsigneeList(mapValue);
     }
+
+    /*
+     * 增加收货客户信息
+     * */
+    @Override
+    public int insertConsignee(Map<String,Object> mapVal) throws ParseException {
+        SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
+        String companyName=(String) mapVal.get("companyName");
+        String consigneeAbbreviation=(String)mapVal.get("consigneeAbbreviation");
+        String consigneeRegisteredAddress=(String) mapVal.get("consigneeRegisteredAddress");
+        String consigneeReceiveAddress=(String) mapVal.get("consigneeReceiveAddress");
+        String consigneeRegistrationTime=(String)mapVal.get("consigneeRegistrationTime");
+        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);
+            rmsConsignee.setConsigneeReceiveAddress(consigneeReceiveAddress);
+            rmsConsignee.setConsigneeRegistrationTime(time);
+            rmsConsignee.setConsigneeContactName(consigneeContactName);
+            rmsConsignee.setConsigneeContactTel(consigneeContactTel);
+            rmsConsignee.setDeleted(new BigDecimal(0));
+            rmsConsignee.setInsertTime(new Date());
+            rmsConsignee.setInsertUsername("admin");
+            rmsConsignee.setConsigneeId(rmsConsigneeMapper.selectConsigneeId());
+            i+=rmsConsigneeMapper.insertSelective(rmsConsignee);
+        }
+      else{
+          i=-1;
+        }
+
+            return  i;
+    }
+
+    /*
+     * 修改收货客户信息
+     * */
+    @Override
+    public int updateConsignee(Map<String,Object> mapVal) throws ParseException {
+        BigDecimal consigneeId=DataChange.dataToBigDecimal(mapVal.get("consigneeId"));
+        SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
+        String companyName=(String) mapVal.get("companyName");
+        String consigneeAbbreviation=(String)mapVal.get("consigneeAbbreviation");
+        String consigneeRegisteredAddress=(String) mapVal.get("consigneeRegisteredAddress");
+        String consigneeReceiveAddress=(String) mapVal.get("consigneeReceiveAddress");
+        String consigneeRegistrationTime=(String)mapVal.get("consigneeRegistrationTime");
+        Date time = simpleDateFormat.parse(consigneeRegistrationTime);
+        String consigneeContactName=(String) mapVal.get("consigneeContactName");
+        String consigneeContactTel=(String)mapVal.get("consigneeContactTel");
+        RmsConsignee rmsConsignee=new RmsConsignee();
+        rmsConsignee.setConsigneeId(consigneeId);
+        rmsConsignee.setConsigneeCompanyName(companyName);
+        rmsConsignee.setConsigneeAbbreviation(consigneeAbbreviation);
+        rmsConsignee.setConsigneeRegisteredAddress(consigneeRegisteredAddress);
+        rmsConsignee.setConsigneeReceiveAddress(consigneeReceiveAddress);
+        rmsConsignee.setConsigneeRegistrationTime(time);
+        rmsConsignee.setConsigneeContactName(consigneeContactName);
+        rmsConsignee.setConsigneeContactTel(consigneeContactTel);
+        rmsConsignee.setUpdateTime(new Date());
+        rmsConsignee.setUpdateUsername("admin");
+        return rmsConsigneeMapper.updateByPrimaryKeySelective(rmsConsignee);
+    }
+
+    /*
+     * 删除收货客户信息
+     * */
+    @Override
+    public int deleteConsignee(BigDecimal id) {
+        RmsConsignee rmsConsignee = rmsConsigneeMapper.selectByPrimaryKey(id);
+        rmsConsignee.setDeleted(new BigDecimal(1));
+        return rmsConsigneeMapper.updateByPrimaryKeySelective(rmsConsignee);
+
+    }
+
+    /**
+     * 根据id获取收货客户信息
+     * @param id
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getConsigneeById(BigDecimal id) {
+        return rmsConsigneeMapper.getConsigneeById(id);
+    }
+
 }

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

@@ -130,29 +130,17 @@ public class RmsGatepostServiceImpl implements IRmsGatepostService {
     public int insertGatepost(RmsGatepost rmsGatepost){
         int i=0;
         String gatepostName=rmsGatepost.getGatepostName();
-        Map<String, Object> map=new HashMap<>();
-        map.put("gatepostName",gatepostName);
-        List<RmsGatepost> rmsGateposts=rmsGatepostMapper.selectByParameters(map);
-        if (rmsGateposts.size()!=0){
-            RmsGatepost rmsGatepost1=rmsGateposts.get(0);
-            if (rmsGatepost1.getDeleted().equals(new BigDecimal(1))){
-                rmsGatepost.setInsertUsername("admin");
-                rmsGatepost.setInsertTime(new Date());
-                rmsGatepost.setDeleted(new BigDecimal(0));
-                rmsGatepost.setGatepostId(rmsGatepostMapper.getGatepostId());
-                i += rmsGatepostMapper.insertSelective(rmsGatepost);
-            }
-            else{
-                i=-1;
-            }
-        }
-        else {
+        int size=rmsGatepostMapper.selectParamaterGatepostName(gatepostName);
+        if (size==0) {
             rmsGatepost.setInsertUsername("admin");
             rmsGatepost.setInsertTime(new Date());
             rmsGatepost.setDeleted(new BigDecimal(0));
             rmsGatepost.setGatepostId(rmsGatepostMapper.getGatepostId());
             i += rmsGatepostMapper.insertSelective(rmsGatepost);
         }
+        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/java/com/steerinfo/dil/service/impl/RmsShipperServiceImpl.java

@@ -52,29 +52,17 @@ public class RmsShipperServiceImpl implements IRmsShipperService {
     public int insertShipper(RmsShipper rmsShipper) {
         int i=0;
         String shipperCompanyBranch=rmsShipper.getShipperCompanyBranch();
-        Map<String, Object> map=new HashMap<>();
-        map.put("shipperCompanyBranch",shipperCompanyBranch);
-        List<RmsShipper> rmsShippers=rmsShipperMapper.selectByParameters(map);
-        if (rmsShippers.size()!=0){
-            RmsShipper rmsShipper1=rmsShippers.get(0);
-            if (rmsShipper1.getDeleted().equals(new BigDecimal(1))){
-                rmsShipper.setInsertTime(new Date());
-                rmsShipper.setInsertUsername("admin");
-                rmsShipper.setDeleted(new BigDecimal(0));
-                rmsShipper.setShipperId(rmsShipperMapper.getShipperId());
-                i+=rmsShipperMapper.insertSelective(rmsShipper);
-            }
-            else{
-                i=-1;
-            }
-        }
-        else{
+        int size=rmsShipperMapper.selectByParametersCompanyBranch(shipperCompanyBranch);
+        if (size==0){
             rmsShipper.setInsertTime(new Date());
             rmsShipper.setInsertUsername("admin");
             rmsShipper.setDeleted(new BigDecimal(0));
             rmsShipper.setShipperId(rmsShipperMapper.getShipperId());
             i+=rmsShipperMapper.insertSelective(rmsShipper);
         }
+        else{
+            i=-1;
+        }
         return i;
     }
 

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

@@ -120,31 +120,18 @@ public class RmsSupplierServiceImpl implements IRmsSupplierService {
         int i=0;
 //            判断用户输入的船名在数据库中是否存在
         String supplierName=rmsSupplier.getSupplierName();
-        Map<String,Object> map = new HashMap<>();
-        map.put("supplierName",supplierName);
-        List<RmsSupplier> rmsSuppliers = rmsSupplierMapper.selectByParameters(map);
-        if (rmsSuppliers.size() != 0 ) {
-            RmsSupplier rmsSupplier1=rmsSuppliers.get(0);
-//                当供应商编号存在的时候，直接返回已经存在数据就行了
-            if (rmsSupplier1.getDeleted().equals(new BigDecimal(1))){
-                rmsSupplier.setInsertTime(new Date());
-                rmsSupplier.setInsertUsername("admin");
-                rmsSupplier.setDeleted(new BigDecimal(0));
-                rmsSupplier.setSupplierId(rmsSupplierMapper.getSupplierId());
-                i+=rmsSupplierMapper.insertSelective(rmsSupplier);
-            }
-            else{
-                i=-1;
-            }
-        }
-        else {
-//                当供应商编号不存在的话，就直接加入
+
+        int size = rmsSupplierMapper.selectByParametersSupplierName(supplierName);
+        if (size == 0 ) {
             rmsSupplier.setInsertTime(new Date());
             rmsSupplier.setInsertUsername("admin");
             rmsSupplier.setDeleted(new BigDecimal(0));
             rmsSupplier.setSupplierId(rmsSupplierMapper.getSupplierId());
             i+=rmsSupplierMapper.insertSelective(rmsSupplier);
         }
+        else{
+            i=-1;
+        }
         return i;
     }
 

src/main/resources/bootstrap.yml

@@ -61,4 +61,4 @@ mybatis:
     call-setters-on-nulls: true
 
 server:
-  port: 8069
+  port: 8070

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/RmsCarrierMapper.xml

@@ -1260,4 +1260,9 @@
     WHERE RC.CARRIER_NAME = #{carrierName}
     AND RC.DELETED =0
   </select>
+<!--  获取表中的最大id-->
+  <select id="getMaxCarrierId" resultType="java.math.BigDecimal">
+    SELECT MAX(RC.CARRIER_ID)
+        FROM RMS_CARRIER RC
+  </select>
 </mapper>

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

@@ -449,7 +449,7 @@
     </set>
     where CONSIGNEE_ID = #{consigneeId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
     <include refid="select" />
     where CONSIGNEE_ID = #{consigneeId,jdbcType=DECIMAL}
   </select>
@@ -653,4 +653,31 @@
     </if>
   </if>
   </sql>
+
+
+  <select id="getConsigneeById" resultType="java.util.LinkedHashMap">
+     SELECT
+      RC.CONSIGNEE_ID AS "consigneeId",
+      RC.CONSIGNEE_COMPANY_NAME AS "companyName",
+      RC.CONSIGNEE_ABBREVIATION AS "consigneeAbbreviation",
+      RC.CONSIGNEE_REGISTERED_ADDRESS AS "consigneeRegisteredAddress",
+      RC.CONSIGNEE_RECEIVE_ADDRESS AS "consigneeReceiveAddress",
+      RC.CONSIGNEE_REGISTRATION_TIME AS "consigneeRegistrationTime",
+      RC.CONSIGNEE_CONTACT_NAME AS "consigneeContactName",
+      RC.CONSIGNEE_CONTACT_TEL AS "consigneeContactTel"
+   FROM RMS_CONSIGNEE RC
+   WHERE RC.CONSIGNEE_ID = #{id}
+  </select>
+
+  <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/RmsDriverCapacityMapper.xml

@@ -421,7 +421,7 @@
     RC.CARRIER_ID AS "value",
     RC.CARRIER_NAME AS "label"
     FROM RMS_CARRIER RC
-    WHERE RC!=1
+    WHERE RC.DELETED!=1
   </select>
 
   <select id="getDriverId" resultType="java.util.LinkedHashMap">
@@ -430,7 +430,7 @@
     RCD.DRIVER_ID AS "value",
     RCD.DRIVER_NAME AS "label"
     FROM RMS_CAR_DRIVER RCD
-    WHERE RCD!=1
+    WHERE RCD.DELETED!=1
   </select>
 
   <select id="getCapacityTypeId" resultType="java.util.LinkedHashMap">
@@ -439,6 +439,5 @@
     RCT.CAPACITY_TYPE_ID AS "value",
     RCT.CAPACITY_TYPE_NAME AS "label"
     FROM RMS_CAPACITY_TYPE RCT
-    WHERE RCT!=1
   </select>
 </mapper>

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

@@ -471,7 +471,7 @@
     RGR.RULES_GATEPOST_ENTRY_OUT_TYPE "entityOutType",
     RGR.RULES_GATEPOST_START_TIME "startTime",
     RGR.RULES_GATEPOST_END_TIME "endTime",
-    RGR.VEHICLE_TYPE "vehicleType"
+    RGR.VEHICLE_TYPE_ID "vehicleType"
     FROM
     RMS_GATEPOST_RULES RGR
     WHERE
@@ -491,4 +491,11 @@
     WHERE RG.GATEPOST_ID=#{gatepostId}
   </select>
 
+<!--  根据门岗名得到当前表中门岗名的数量-->
+  <select id="selectParamaterGatepostName" parameterType="java.lang.String" resultType="java.lang.Integer">
+    SELECT count(*)
+    FROM RMS_GATEPOST RG
+    WHERE RG.GATEPOST_NAME =#{gatepostName}
+    AND  RG.DELETED=0
+  </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>

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

@@ -1093,4 +1093,11 @@
     where RS.SHIPPER_ID=#{id}
     and RS.DELETED != 1
   </select>
+
+    <select id="selectByParametersCompanyBranch" resultType="java.lang.Integer">
+      SELECT count(*)
+        FROM RMS_SHIPPER RS
+        WHERE  RS.SHIPPER_COMPANY_BRANCH =#{shipperCompanyBranch}
+        AND RS.DELETED=0
+    </select>
 </mapper>

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

@@ -945,4 +945,11 @@
         FROM RMS_SUPPLIER RS
         WHERE RS.SUPPLIER_ID=#{id}
     </select>
+<!--  根据名称查询当前表中相对应的供应商的数量-->
+    <select id="selectByParametersSupplierName" resultType="java.lang.Integer">
+      SELECT count(*)
+        FROM RMS_SUPPLIER RS
+        WHERE RS.SUPPLIER_NAME = #{supplierName}
+        AND RS.DELETED=0
+    </select>
 </mapper>

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

@@ -448,7 +448,11 @@
     SELECT
     RW.WAREHOUSE_ID AS "warehouseId",
     RW.WAREHOUSE_NAME AS "warehouseName",
-    RS.SHIPPER_NAME AS "shipperName"
+    RS.SHIPPER_NAME AS "shipperName",
+    RS.SHIPPER_ABBREVIATION AS "shipperAbbreviation",
+    RS.SHIPPER_COMPANY_BRANCH AS "shipperCompanyBranch",
+    RS.SHIPPER_BRANCH_FACTORY AS "shipperBranchFactory",
+    RS.SHIPPER_FACTORY_AREA AS "shipperFactoryArea"
     FROM RMS_WAREHOUSE RW
     LEFT JOIN RMS_SHIPPER RS
     ON RW.SHIPPER_ID=RS.SHIPPER_ID
@@ -474,6 +478,30 @@
           "shipperName" in #{item}
         </foreach>
       </if>
+      <if test="shipperAbbreviation!= null">
+        and
+        <foreach collection="shipperAbbreviation" item="item" open="(" separator="," close=")">
+          "shipperAbbreviation" in #{item}
+        </foreach>
+      </if>
+      <if test="shipperCompanyBranch!= null">
+        and
+        <foreach collection="shipperCompanyBranch" item="item" open="(" separator="," close=")">
+          "shipperCompanyBranch" in #{item}
+        </foreach>
+      </if>
+      <if test="shipperBranchFactory!= null">
+        and
+        <foreach collection="shipperBranchFactory" item="item" open="(" separator="," close=")">
+          "shipperBranchFactory" in #{item}
+        </foreach>
+      </if>
+      <if test="shipperFactoryArea!= null">
+        and
+        <foreach collection="shipperFactoryArea" item="item" open="(" separator="," close=")">
+          "shipperFactoryArea" in #{item}
+        </foreach>
+      </if>
     </where>
     <include refid="orderBy"></include>
   </select>
@@ -489,7 +517,8 @@
   <select id="getWarehouseById" resultType="java.util.LinkedHashMap">
     SELECT
     RW.WAREHOUSE_ID AS "warehouseId",
-    RW.WAREHOUSE_NAME AS "warehouseName"
+    RW.WAREHOUSE_NAME AS "warehouseName",
+    RW.SHIPPER_ID AS "shipperId"
     FROM RMS_WAREHOUSE RW
     WHERE RW.WAREHOUSE_ID=#{id}
   </select>

target/classes/bootstrap.yml

@@ -61,4 +61,4 @@ mybatis:
     call-setters-on-nulls: true
 
 server:
-  port: 8069
+  port: 8070

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/RmsCarrierMapper.xml

@@ -1260,4 +1260,9 @@
     WHERE RC.CARRIER_NAME = #{carrierName}
     AND RC.DELETED =0
   </select>
+<!--  获取表中的最大id-->
+  <select id="getMaxCarrierId" resultType="java.math.BigDecimal">
+    SELECT MAX(RC.CARRIER_ID)
+        FROM RMS_CARRIER RC
+  </select>
 </mapper>

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

@@ -449,7 +449,7 @@
     </set>
     where CONSIGNEE_ID = #{consigneeId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
     <include refid="select" />
     where CONSIGNEE_ID = #{consigneeId,jdbcType=DECIMAL}
   </select>
@@ -653,4 +653,31 @@
     </if>
   </if>
   </sql>
+
+
+  <select id="getConsigneeById" resultType="java.util.LinkedHashMap">
+     SELECT
+      RC.CONSIGNEE_ID AS "consigneeId",
+      RC.CONSIGNEE_COMPANY_NAME AS "companyName",
+      RC.CONSIGNEE_ABBREVIATION AS "consigneeAbbreviation",
+      RC.CONSIGNEE_REGISTERED_ADDRESS AS "consigneeRegisteredAddress",
+      RC.CONSIGNEE_RECEIVE_ADDRESS AS "consigneeReceiveAddress",
+      RC.CONSIGNEE_REGISTRATION_TIME AS "consigneeRegistrationTime",
+      RC.CONSIGNEE_CONTACT_NAME AS "consigneeContactName",
+      RC.CONSIGNEE_CONTACT_TEL AS "consigneeContactTel"
+   FROM RMS_CONSIGNEE RC
+   WHERE RC.CONSIGNEE_ID = #{id}
+  </select>
+
+  <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/RmsDriverCapacityMapper.xml

@@ -421,7 +421,7 @@
     RC.CARRIER_ID AS "value",
     RC.CARRIER_NAME AS "label"
     FROM RMS_CARRIER RC
-    WHERE RC!=1
+    WHERE RC.DELETED!=1
   </select>
 
   <select id="getDriverId" resultType="java.util.LinkedHashMap">
@@ -430,7 +430,7 @@
     RCD.DRIVER_ID AS "value",
     RCD.DRIVER_NAME AS "label"
     FROM RMS_CAR_DRIVER RCD
-    WHERE RCD!=1
+    WHERE RCD.DELETED!=1
   </select>
 
   <select id="getCapacityTypeId" resultType="java.util.LinkedHashMap">
@@ -439,6 +439,5 @@
     RCT.CAPACITY_TYPE_ID AS "value",
     RCT.CAPACITY_TYPE_NAME AS "label"
     FROM RMS_CAPACITY_TYPE RCT
-    WHERE RCT!=1
   </select>
 </mapper>

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

@@ -471,7 +471,7 @@
     RGR.RULES_GATEPOST_ENTRY_OUT_TYPE "entityOutType",
     RGR.RULES_GATEPOST_START_TIME "startTime",
     RGR.RULES_GATEPOST_END_TIME "endTime",
-    RGR.VEHICLE_TYPE "vehicleType"
+    RGR.VEHICLE_TYPE_ID "vehicleType"
     FROM
     RMS_GATEPOST_RULES RGR
     WHERE
@@ -491,4 +491,11 @@
     WHERE RG.GATEPOST_ID=#{gatepostId}
   </select>
 
+<!--  根据门岗名得到当前表中门岗名的数量-->
+  <select id="selectParamaterGatepostName" parameterType="java.lang.String" resultType="java.lang.Integer">
+    SELECT count(*)
+    FROM RMS_GATEPOST RG
+    WHERE RG.GATEPOST_NAME =#{gatepostName}
+    AND  RG.DELETED=0
+  </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>

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

@@ -1093,4 +1093,11 @@
     where RS.SHIPPER_ID=#{id}
     and RS.DELETED != 1
   </select>
+
+    <select id="selectByParametersCompanyBranch" resultType="java.lang.Integer">
+      SELECT count(*)
+        FROM RMS_SHIPPER RS
+        WHERE  RS.SHIPPER_COMPANY_BRANCH =#{shipperCompanyBranch}
+        AND RS.DELETED=0
+    </select>
 </mapper>

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

@@ -945,4 +945,11 @@
         FROM RMS_SUPPLIER RS
         WHERE RS.SUPPLIER_ID=#{id}
     </select>
+<!--  根据名称查询当前表中相对应的供应商的数量-->
+    <select id="selectByParametersSupplierName" resultType="java.lang.Integer">
+      SELECT count(*)
+        FROM RMS_SUPPLIER RS
+        WHERE RS.SUPPLIER_NAME = #{supplierName}
+        AND RS.DELETED=0
+    </select>
 </mapper>

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

@@ -448,7 +448,11 @@
     SELECT
     RW.WAREHOUSE_ID AS "warehouseId",
     RW.WAREHOUSE_NAME AS "warehouseName",
-    RS.SHIPPER_NAME AS "shipperName"
+    RS.SHIPPER_NAME AS "shipperName",
+    RS.SHIPPER_ABBREVIATION AS "shipperAbbreviation",
+    RS.SHIPPER_COMPANY_BRANCH AS "shipperCompanyBranch",
+    RS.SHIPPER_BRANCH_FACTORY AS "shipperBranchFactory",
+    RS.SHIPPER_FACTORY_AREA AS "shipperFactoryArea"
     FROM RMS_WAREHOUSE RW
     LEFT JOIN RMS_SHIPPER RS
     ON RW.SHIPPER_ID=RS.SHIPPER_ID
@@ -474,6 +478,30 @@
           "shipperName" in #{item}
         </foreach>
       </if>
+      <if test="shipperAbbreviation!= null">
+        and
+        <foreach collection="shipperAbbreviation" item="item" open="(" separator="," close=")">
+          "shipperAbbreviation" in #{item}
+        </foreach>
+      </if>
+      <if test="shipperCompanyBranch!= null">
+        and
+        <foreach collection="shipperCompanyBranch" item="item" open="(" separator="," close=")">
+          "shipperCompanyBranch" in #{item}
+        </foreach>
+      </if>
+      <if test="shipperBranchFactory!= null">
+        and
+        <foreach collection="shipperBranchFactory" item="item" open="(" separator="," close=")">
+          "shipperBranchFactory" in #{item}
+        </foreach>
+      </if>
+      <if test="shipperFactoryArea!= null">
+        and
+        <foreach collection="shipperFactoryArea" item="item" open="(" separator="," close=")">
+          "shipperFactoryArea" in #{item}
+        </foreach>
+      </if>
     </where>
     <include refid="orderBy"></include>
   </select>
@@ -489,7 +517,8 @@
   <select id="getWarehouseById" resultType="java.util.LinkedHashMap">
     SELECT
     RW.WAREHOUSE_ID AS "warehouseId",
-    RW.WAREHOUSE_NAME AS "warehouseName"
+    RW.WAREHOUSE_NAME AS "warehouseName",
+    RW.SHIPPER_ID AS "shipperId"
     FROM RMS_WAREHOUSE RW
     WHERE RW.WAREHOUSE_ID=#{id}
   </select>