12.18测试rms

.idea/compiler.xml

@@ -2,7 +2,6 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <annotationProcessing>
-      <profile default="true" name="Default" enabled="true" />
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />

.idea/jarRepositories.xml

@@ -1,26 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="http://nexus.steerinfo.com/repository/maven-public/" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="maven-public" />
       <option name="name" value="steerinfo maven-public" />
       <option name="url" value="http://nexus.steerinfo.com/repository/maven-public/" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven-public" />
-      <option name="name" value="steerinfo maven-public" />
-      <option name="url" value="https://nexus.steerinfo.com/repository/maven-public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://repo.maven.apache.org/maven2" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Maven Central repository" />
@@ -31,5 +16,10 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="http://nexus.steerinfo.com/repository/maven-public/" />
+    </remote-repository>
   </component>
 </project>

.idea/workspace.xml

@@ -1,15 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="180937f6-642f-44a2-965f-710bb87a0d18" name="Default Changelist" comment="">
+    <list default="true" id="abe40335-1998-468a-9c83-8ed884d8e030" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.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/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/RmsGatepostController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsGatepostController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsMaterialController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsMaterialController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsPersonnelController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsPersonnelController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsShipperController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsShipperController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsSupplierController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsSupplierController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsWarehouseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsWarehouseController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/model/RmsCapacity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/model/RmsCapacity.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/model/RmsMaterial.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/model/RmsMaterial.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsSupplierService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsSupplierService.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/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/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/RmsPortServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsPortServiceImpl.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/java/com/steerinfo/dil/service/impl/RmsTruckCalculateServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsTruckCalculateServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsWarehouseServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsWarehouseServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsCapacityMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsCapacityMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/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/RmsPersonnelMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsPersonnelMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsCapacityController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsCapacityController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/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/RmsGatepostController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsGatepostController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsMaterialController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsMaterialController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsPersonnelController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsPersonnelController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsShipperController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsShipperController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsSupplierController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsSupplierController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsWarehouseController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsWarehouseController.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/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/RmsPersonnelMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsPersonnelMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsCapacity.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsCapacity.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsMaterial.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsMaterial.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/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/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/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" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsTruckCalculateServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsTruckCalculateServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsWarehouseServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsWarehouseServiceImpl.class" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -28,7 +73,7 @@
       </MavenGeneralSettings>
     </option>
   </component>
-  <component name="ProjectId" id="22MWd6iWn6b3kKo9jze4mPKPvnP" />
+  <component name="ProjectId" id="22RUOijcqfbhd16tNawXmjbRHEA" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
@@ -42,9 +87,23 @@
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../DAL-TMS-TRUCK-API" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper" />
+    <property name="node.js.detected.package.eslint" value="true" />
+    <property name="node.js.detected.package.tslint" value="true" />
+    <property name="node.js.path.for.package.eslint" value="project" />
+    <property name="node.js.path.for.package.tslint" value="project" />
+    <property name="node.js.selected.package.eslint" value="(autodetect)" />
+    <property name="node.js.selected.package.tslint" value="(autodetect)" />
     <property name="settings.editor.selected.configurable" value="MavenSettings" />
   </component>
+  <component name="RecentsManager">
+    <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.steerinfo.dil.model" />
+    </key>
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\Users\mdzzojbk\IdeaProjects\DAL-DAZHOU-RMS-API\src\main\resources\com\steerinfo\dil\mapper" />
+    </key>
+  </component>
   <component name="RunManager">
     <configuration name="DilApplicationMain" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
       <module name="dil-api" />
@@ -59,12 +118,12 @@
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="180937f6-642f-44a2-965f-710bb87a0d18" name="Default Changelist" comment="" />
-      <created>1639648020294</created>
+      <changelist id="abe40335-1998-468a-9c83-8ed884d8e030" name="Default Changelist" comment="" />
+      <created>1639799862423</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
-      <updated>1639648020294</updated>
-      <workItem from="1639648025349" duration="8159000" />
+      <updated>1639799862423</updated>
+      <workItem from="1639799866763" duration="17113000" />
     </task>
     <servers />
   </component>
@@ -72,61 +131,73 @@
     <option name="version" value="2" />
   </component>
   <component name="WindowStateProjectService">
-    <state x="421" y="95" key="FileChooserDialogImpl" timestamp="1639648620568">
-      <screen x="0" y="0" width="1280" height="680" />
+    <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="1639799913289">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state x="549" y="166" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1639799913289" />
+    <state width="1493" height="40" key="GridCell.Tab.0.bottom" timestamp="1639820263752">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state width="1493" height="40" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639820263752" />
+    <state width="1493" height="40" key="GridCell.Tab.0.center" timestamp="1639820263751">
+      <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state x="421" y="95" key="FileChooserDialogImpl/0.0.1280.680@0.0.1280.680" timestamp="1639648620568" />
-    <state width="1222" height="64" key="GridCell.Tab.0.bottom" timestamp="1639718829565">
-      <screen x="0" y="0" width="1280" height="680" />
+    <state width="1493" height="40" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1639820263751" />
+    <state width="1493" height="40" key="GridCell.Tab.0.left" timestamp="1639820263751">
+      <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1222" height="64" key="GridCell.Tab.0.bottom/0.0.1280.680@0.0.1280.680" timestamp="1639718829565" />
-    <state width="1222" height="64" key="GridCell.Tab.0.center" timestamp="1639718829565">
-      <screen x="0" y="0" width="1280" height="680" />
+    <state width="1493" height="40" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1639820263751" />
+    <state width="1493" height="40" key="GridCell.Tab.0.right" timestamp="1639820263752">
+      <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1222" height="64" key="GridCell.Tab.0.center/0.0.1280.680@0.0.1280.680" timestamp="1639718829565" />
-    <state width="1222" height="64" key="GridCell.Tab.0.left" timestamp="1639718829564">
-      <screen x="0" y="0" width="1280" height="680" />
+    <state width="1493" height="40" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1639820263752" />
+    <state width="1493" height="40" key="GridCell.Tab.1.bottom" timestamp="1639820263609">
+      <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1222" height="64" key="GridCell.Tab.0.left/0.0.1280.680@0.0.1280.680" timestamp="1639718829564" />
-    <state width="1222" height="64" key="GridCell.Tab.0.right" timestamp="1639718829565">
-      <screen x="0" y="0" width="1280" height="680" />
+    <state width="1493" height="40" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639820263609" />
+    <state width="1493" height="40" key="GridCell.Tab.1.center" timestamp="1639820263608">
+      <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1222" height="64" key="GridCell.Tab.0.right/0.0.1280.680@0.0.1280.680" timestamp="1639718829565" />
-    <state width="1222" height="64" key="GridCell.Tab.1.bottom" timestamp="1639718829338">
-      <screen x="0" y="0" width="1280" height="680" />
+    <state width="1493" height="40" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1639820263608" />
+    <state width="1493" height="40" key="GridCell.Tab.1.left" timestamp="1639820263608">
+      <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1222" height="64" key="GridCell.Tab.1.bottom/0.0.1280.680@0.0.1280.680" timestamp="1639718829338" />
-    <state width="1222" height="64" key="GridCell.Tab.1.center" timestamp="1639718829337">
-      <screen x="0" y="0" width="1280" height="680" />
+    <state width="1493" height="40" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1639820263608" />
+    <state width="1493" height="40" key="GridCell.Tab.1.right" timestamp="1639820263609">
+      <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1222" height="64" key="GridCell.Tab.1.center/0.0.1280.680@0.0.1280.680" timestamp="1639718829337" />
-    <state width="1222" height="64" key="GridCell.Tab.1.left" timestamp="1639718829337">
-      <screen x="0" y="0" width="1280" height="680" />
+    <state width="1493" height="40" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1639820263609" />
+    <state width="1493" height="40" key="GridCell.Tab.2.bottom" timestamp="1639820263610">
+      <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1222" height="64" key="GridCell.Tab.1.left/0.0.1280.680@0.0.1280.680" timestamp="1639718829337" />
-    <state width="1222" height="64" key="GridCell.Tab.1.right" timestamp="1639718829337">
-      <screen x="0" y="0" width="1280" height="680" />
+    <state width="1493" height="40" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639820263610" />
+    <state width="1493" height="40" key="GridCell.Tab.2.center" timestamp="1639820263609">
+      <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1222" height="64" key="GridCell.Tab.1.right/0.0.1280.680@0.0.1280.680" timestamp="1639718829337" />
-    <state width="1222" height="64" key="GridCell.Tab.2.bottom" timestamp="1639718829338">
-      <screen x="0" y="0" width="1280" height="680" />
+    <state width="1493" height="40" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1639820263609" />
+    <state width="1493" height="40" key="GridCell.Tab.2.left" timestamp="1639820263609">
+      <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1222" height="64" key="GridCell.Tab.2.bottom/0.0.1280.680@0.0.1280.680" timestamp="1639718829338" />
-    <state width="1222" height="64" key="GridCell.Tab.2.center" timestamp="1639718829338">
-      <screen x="0" y="0" width="1280" height="680" />
+    <state width="1493" height="40" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1639820263609" />
+    <state width="1493" height="40" key="GridCell.Tab.2.right" timestamp="1639820263610">
+      <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1222" height="64" key="GridCell.Tab.2.center/0.0.1280.680@0.0.1280.680" timestamp="1639718829338" />
-    <state width="1222" height="64" key="GridCell.Tab.2.left" timestamp="1639718829338">
-      <screen x="0" y="0" width="1280" height="680" />
+    <state width="1493" height="40" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1639820263610" />
+    <state x="270" y="56" key="SettingsEditor" timestamp="1639799919381">
+      <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1222" height="64" key="GridCell.Tab.2.left/0.0.1280.680@0.0.1280.680" timestamp="1639718829338" />
-    <state width="1222" height="64" key="GridCell.Tab.2.right" timestamp="1639718829338">
-      <screen x="0" y="0" width="1280" height="680" />
+    <state x="270" y="56" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1639799919381" />
+    <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 width="1222" height="64" key="GridCell.Tab.2.right/0.0.1280.680@0.0.1280.680" timestamp="1639718829338" />
-    <state x="142" y="0" key="SettingsEditor" timestamp="1639648057246">
-      <screen x="0" y="0" width="1280" height="680" />
+    <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">
+      <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state x="142" y="0" key="SettingsEditor/0.0.1280.680@0.0.1280.680" timestamp="1639648057246" />
+    <state x="425" y="187" key="run.anything.popup/0.0.1536.824@0.0.1536.824" timestamp="1639814402364" />
   </component>
 </project>

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

@@ -47,6 +47,9 @@ public class RmsCapacityController extends BaseRESTfulController {
     @PostMapping(value = "/insertCapacity")
     public RESTfulResult insertCapacity(@RequestBody RmsCapacity rmsCapacity){
        int result = rmsCapacityService.insertCapacity(rmsCapacity);
+       if (result==-1){
+           return failed();
+       }
         return success(result);
     }
 

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

@@ -47,6 +47,9 @@ public class RmsCarDriverController extends BaseRESTfulController {
     @PostMapping(value = "/insertCarDriver")
     public RESTfulResult insertCarDriver(@RequestBody(required = false) RmsCarDriver rmsCarDriver){
         int result = rmsCarDriverService.insertCarDriver(rmsCarDriver);
+        if (result==-1){
+            return failed();
+        }
         return success(result);
     }
 

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

@@ -118,6 +118,9 @@ public class RmsCarrierController extends BaseRESTfulController {
     @PostMapping(value = "/insertCarrier")
     public RESTfulResult insertCarrier(@RequestBody(required = false) RmsCarrier rmsCarrier){
         int result = rmsCarrierService.insertCarrier(rmsCarrier);
+        if (result==-1){
+            return failed();
+        }
         return success(result);
     }
 

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

@@ -118,6 +118,9 @@ public class RmsGatepostController extends BaseRESTfulController {
     @PostMapping(value = "/insertGatepost")
     public RESTfulResult insertGatepost(@RequestBody RmsGatepost rmsGatepost)  {
         int result= rmsGatepostService.insertGatepost(rmsGatepost);
+        if (result==-1){
+            return failed();
+        }
         return success(result);
     }
 

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

@@ -111,6 +111,9 @@ public class RmsMaterialController extends BaseRESTfulController {
     @PostMapping(value = "/insertMaterial")
     public RESTfulResult insertMaterial(@RequestBody RmsMaterial rmsMaterial){
         int result = rmsMaterialService.insertMaterial(rmsMaterial);
+        if (result==-1){
+            return failed();
+        }
         return success(result);
     }
 
@@ -128,7 +131,6 @@ public class RmsMaterialController extends BaseRESTfulController {
     //@RequiresPermissions("rmsmaterial:update")
     @PostMapping(value = "/updateMaterial", produces  = "application/json;charset=UTF-8")
     public RESTfulResult updateMaterial(@RequestBody RmsMaterial rmsMaterial){
-
         int result = rmsMaterialService.updateMaterial(rmsMaterial);
         return success(result);
     }

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

@@ -117,6 +117,9 @@ public class RmsPersonnelController extends BaseRESTfulController {
     @PostMapping(value = "/insertPersonnel")
     public RESTfulResult insertPersonnel(@RequestBody RmsPersonnel rmsPersonnel){
         int result=rmsPersonnelService.insertPersonnel(rmsPersonnel);
+        if (result==-1){
+            return failed();
+        }
         return success(result);
     }
     /**
@@ -162,6 +165,7 @@ public class RmsPersonnelController extends BaseRESTfulController {
     @PostMapping(value = "/getPersonnelById/{id}")
     public RESTfulResult getPersonnelById(@PathVariable("id") BigDecimal id){
         List<Map<String, Object>> list= rmsPersonnelService.getPersonnelById(id);
+        System.out.println(list);
         return success(list);
     }
     /**

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

@@ -119,6 +119,9 @@ public class RmsShipperController extends BaseRESTfulController {
     @PostMapping(value = "/insertShipper")
     public RESTfulResult insertShipper(@RequestBody RmsShipper rmsShipper){
         int result= rmsShipperService.insertShipper(rmsShipper);
+        if(result==-1){
+            return failed();
+        }
         return success(result);
     }
 

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

@@ -104,6 +104,9 @@ public class RmsSupplierController extends BaseRESTfulController {
     @PostMapping(value = "/insertSupplier")
     public RESTfulResult insertSupplier(@RequestBody RmsSupplier rmsSupplier){
         int result= rmsSupplierService.insertSupplier(rmsSupplier);
+        if (result==-1){
+            return failed();
+        }
         return success(result);
     }
 

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

@@ -50,6 +50,9 @@ public class RmsWarehouseController extends BaseRESTfulController {
     @PostMapping(value = "/insertWarehouse")
     public RESTfulResult insertWarehouse(@RequestBody(required = false) RmsWarehouse rmsWarehouse){
         int result = rmsWarehouseService.insertWarehouse(rmsWarehouse);
+        if (result==-1){
+            return failed();
+        }
         return success(result);
     }
 

src/main/java/com/steerinfo/dil/model/RmsCapacity.java

@@ -37,7 +37,7 @@ public class RmsCapacity implements IBasePO<BigDecimal> {
      * 运力状态(0：空闲中、1：运输中:2：待运中:3：维保中)(CAPACITY_STATUS,VARCHAR,32)
      */
     @ApiModelProperty(value="运力状态(0：空闲中、1：运输中:2：待运中:3：维保中)",required=false)
-    private String capacityStatus;
+    private BigDecimal capacityStatus;
 
     /**
      * 承运单位(CARRIER_ID,DECIMAL,0)
@@ -191,12 +191,12 @@ public class RmsCapacity implements IBasePO<BigDecimal> {
         this.capacityTypeId = capacityTypeId;
     }
 
-    public String getCapacityStatus() {
+    public BigDecimal getCapacityStatus() {
         return capacityStatus;
     }
 
-    public void setCapacityStatus(String capacityStatus) {
-        this.capacityStatus = capacityStatus == null ? null : capacityStatus.trim();
+    public void setCapacityStatus(BigDecimal capacityStatus) {
+        this.capacityStatus = capacityStatus;
     }
 
     public BigDecimal getCarrierId() {

src/main/java/com/steerinfo/dil/model/RmsMaterial.java

@@ -91,7 +91,7 @@ public class RmsMaterial implements IBasePO<BigDecimal> {
      * 金蝶物资主键ID(EAS_MATERIAL_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="金蝶物资主键ID",required=false)
-    private BigDecimal easMaterialId;
+    private String easMaterialId;
 
     /**
      * 逻辑删除(DELETED,DECIMAL,0)
@@ -224,12 +224,12 @@ public class RmsMaterial implements IBasePO<BigDecimal> {
         this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
     }
 
-    public BigDecimal getEasMaterialId() {
+    public String getEasMaterialId() {
         return easMaterialId;
     }
 
-    public void setEasMaterialId(BigDecimal easMaterialId) {
-        this.easMaterialId = easMaterialId;
+    public void setEasMaterialId(String easMaterialId) {
+        this.easMaterialId = easMaterialId== null ? null : easMaterialId.trim();
     }
 
     public BigDecimal getDeleted() {

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

@@ -33,4 +33,5 @@ public interface IRmsSupplierService {
     int deleteSupplier(BigDecimal id);
 //根据id获取详细供应商
     List<Map<String, Object>> getSupplierById(BigDecimal id);
+
 }

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

@@ -2,12 +2,14 @@ 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 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;
 
@@ -35,11 +37,23 @@ public class RmsCapacityServiceImpl implements IRmsCapacityService {
     * */
     @Override
     public int insertCapacity(RmsCapacity rmsCapacity) {
-        rmsCapacity.setDeleted(new BigDecimal(0));
-        rmsCapacity.setInsertTime(new Date());
-        rmsCapacity.setInsertUsername("admin");
-       rmsCapacity.setCapacityId(rmsCapacityMapper.selectCapacityId());
-        return rmsCapacityMapper.insertSelective(rmsCapacity);
+        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){
+            i=-1;
+        }
+        else {
+            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);
+        }
+        return i;
     }
 
     /*

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

@@ -2,12 +2,14 @@ package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.RmsCarDriverMapper;
 import com.steerinfo.dil.model.RmsCarDriver;
+import com.steerinfo.dil.model.RmsCarrier;
 import com.steerinfo.dil.service.IRmsCarDriverService;
 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;
 
@@ -58,11 +60,22 @@ public class RmsCarDriverServiceImpl implements IRmsCarDriverService {
  * */
     @Override
     public int insertCarDriver(RmsCarDriver rmsCarDriver) {
-        rmsCarDriver.setInsertUsername("admin");
-        rmsCarDriver.setInsertTime(new Date());
-        rmsCarDriver.setDeleted(new BigDecimal(0));
-        rmsCarDriver.setDriverId(rmsCarDriverMapper.selectCarDriverId());
-       return rmsCarDriverMapper.insertSelective(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){
+            i=-1;
+        }
+        else {
+            rmsCarDriver.setInsertUsername("admin");
+            rmsCarDriver.setInsertTime(new Date());
+            rmsCarDriver.setDeleted(new BigDecimal(0));
+            rmsCarDriver.setDriverId(rmsCarDriverMapper.selectCarDriverId());
+            i+= rmsCarDriverMapper.insertSelective(rmsCarDriver);
+        }
+        return i;
     }
 
     /**

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

@@ -2,12 +2,14 @@ package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.RmsCarrierMapper;
 import com.steerinfo.dil.model.RmsCarrier;
+import com.steerinfo.dil.model.RmsShipper;
 import com.steerinfo.dil.service.IRmsCarrierService;
 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;
 
@@ -59,25 +61,18 @@ public class RmsCarrierServiceImpl implements IRmsCarrierService {
     @Override
     public int updateCarrier(RmsCarrier rmsCarrier) {
         String transportType=rmsCarrier.getCarrierTransportType();
-        Date date=new Date(0);
-        if (rmsCarrier.getRegisterDate().equals(date)){
-            if (transportType!=null){
-                if (transportType.equals("1")){
-                    rmsCarrier.setCarrierTransportType("危化品");
-                }
-                if(transportType.equals("2")){
-                    rmsCarrier.setCarrierTransportType("其他");
-                }
+        if (transportType!=null){
+            if (transportType.equals("1")){
+                rmsCarrier.setCarrierTransportType("危化品");
+            }
+            if(transportType.equals("2")){
+                rmsCarrier.setCarrierTransportType("其他");
             }
-            rmsCarrier.setRegisterDate(null);
-            rmsCarrier.setInsertTime(new Date());
-            rmsCarrier.setInsertUsername("admin");
-            rmsCarrier.setDeleted(new BigDecimal(1));
-            rmsCarrier.setCarrierId(new BigDecimal(String.valueOf(rmsCarrierMapper.getCarrierId())));
-            System.out.println(rmsCarrier);
         }
         rmsCarrier.setUpdateUsername("admin");
         rmsCarrier.setUpdateTime(new Date());
+        rmsCarrier.setRegisterDate(rmsCarrier.getRegisterDate());
+
         return rmsCarrierMapper.updateByPrimaryKeySelective(rmsCarrier);
     }
 
@@ -88,26 +83,37 @@ public class RmsCarrierServiceImpl implements IRmsCarrierService {
      */
     @Override
     public int insertCarrier(RmsCarrier rmsCarrier) {
-        String transportType=rmsCarrier.getCarrierTransportType();
-        Date date=new Date(0);
-        if (rmsCarrier.getRegisterDate().equals(date)){
-            if (transportType!=null){
-                if (transportType.equals("1")){
-                    rmsCarrier.setCarrierTransportType("危化品");
-                }
-                if(transportType.equals("2")){
-                    rmsCarrier.setCarrierTransportType("其他");
+        int i=0;
+        String carrierName=rmsCarrier.getCarrierName();
+        Map<String, Object> map=new HashMap<>();
+        map.put("carrierName",carrierName);
+        List<RmsCarrier> rmsCarriers=rmsCarrierMapper.selectByParameters(map);
+        if (rmsCarriers.size()!=0){
+            i=-1;
+        }
+        else {
+            String transportType = rmsCarrier.getCarrierTransportType();
+            Date date = new Date(0);
+            if (!rmsCarrier.getRegisterDate().equals(date)) {
+                if (transportType != null) {
+                    if (transportType.equals("1")) {
+                        rmsCarrier.setCarrierTransportType("危化品");
+                    }
+                    if (transportType.equals("2")) {
+                        rmsCarrier.setCarrierTransportType("其他");
+                    }
                 }
+                rmsCarrier.setInsertTime(new Date());
+                rmsCarrier.setInsertUsername("admin");
+                rmsCarrier.setDeleted(new BigDecimal(0));
+                rmsCarrier.setCarrierId(rmsCarrierMapper.getCarrierId());
+                i+=rmsCarrierMapper.insertSelective(rmsCarrier);
+            }else{
+                rmsCarrier.setRegisterDate(null);
             }
-            rmsCarrier.setRegisterDate(null);
-            rmsCarrier.setInsertTime(new Date());
-            rmsCarrier.setInsertUsername("admin");
-            rmsCarrier.setDeleted(new BigDecimal(0));
-            rmsCarrier.setCarrierId(new BigDecimal(String.valueOf(rmsCarrierMapper.getCarrierId())));
-            System.out.println(rmsCarrier);
         }
 
-        return rmsCarrierMapper.insertSelective(rmsCarrier);
+        return i;
     }
 
     /**

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

@@ -2,6 +2,7 @@ package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.RmsGatepostMapper;
 import com.steerinfo.dil.mapper.RmsGatepostRulesMapper;
+import com.steerinfo.dil.model.RmsCarrier;
 import com.steerinfo.dil.model.RmsGatepost;
 import com.steerinfo.dil.model.RmsGatepostRules;
 import com.steerinfo.dil.service.IRmsGatepostService;
@@ -13,10 +14,7 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * RmsGatepost服务实现：
@@ -130,10 +128,22 @@ public class RmsGatepostServiceImpl implements IRmsGatepostService {
      */
     @Override
     public int insertGatepost(RmsGatepost rmsGatepost){
-        rmsGatepost.setInsertUsername("admin");
-        rmsGatepost.setInsertTime(new Date());
-        rmsGatepost.setDeleted(new BigDecimal(0));
-        return rmsGatepostMapper.insertSelective(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){
+            i=-1;
+        }
+        else {
+            rmsGatepost.setInsertUsername("admin");
+            rmsGatepost.setInsertTime(new Date());
+            rmsGatepost.setDeleted(new BigDecimal(0));
+            rmsGatepost.setGatepostId(rmsGatepostMapper.getGatepostId());
+            i += rmsGatepostMapper.insertSelective(rmsGatepost);
+        }
+        return i;
     }
 
 

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

@@ -4,6 +4,7 @@ import com.steerinfo.dil.mapper.RmsMaterialMapper;
 import com.steerinfo.dil.mapper.RmsMaterialSteelMapper;
 import com.steerinfo.dil.mapper.RmsMaterialTypeMapper;
 import com.steerinfo.dil.mapper.RmsUnitOfMeasureMapper;
+import com.steerinfo.dil.model.RmsCarrier;
 import com.steerinfo.dil.model.RmsMaterial;
 import com.steerinfo.dil.model.RmsMaterialType;
 import com.steerinfo.dil.model.RmsUnitOfMeasure;
@@ -53,7 +54,7 @@ public class RmsMaterialServiceImpl implements IRmsMaterialService {
     public int operationMaterial(Map<String, Object> mapVal) {
         // 得到金蝶物资主键id
         Integer EASMaterialIdValue = (Integer) mapVal.get("EASMaterialId");
-        BigDecimal EASMaterialId = new BigDecimal(EASMaterialIdValue);
+        String EASMaterialId =  EASMaterialIdValue.toString();
         // 得到物资唯一编码
         String materialCode = (String) mapVal.get("materialCode");
         // 得到物资类型
@@ -140,12 +141,23 @@ public class RmsMaterialServiceImpl implements IRmsMaterialService {
      */
     @Override
     public int insertMaterial(RmsMaterial rmsMaterial) {
-        rmsMaterial.setDeleted(new BigDecimal(0));
-        rmsMaterial.setMaterialId(rmsMaterialMapper.getMaterialId());
-        rmsMaterial.setInsertTime(new Date());
-        rmsMaterial.setInsertUsername("admin");
-        int result= rmsMaterialMapper.insertSelective(rmsMaterial);
-        return result;
+        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){
+            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/RmsPersonnelServiceImpl.java

@@ -3,6 +3,7 @@ package com.steerinfo.dil.service.impl;
 import com.steerinfo.dil.mapper.RmsPersonnelMapper;
 import com.steerinfo.dil.mapper.RmsShipperMapper;
 import com.steerinfo.dil.model.RmsPersonnel;
+import com.steerinfo.dil.model.RmsShipper;
 import com.steerinfo.dil.service.IRmsPersonnelService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -102,12 +103,22 @@ public class RmsPersonnelServiceImpl implements IRmsPersonnelService {
      */
     @Override
     public int insertPersonnel(RmsPersonnel rmsPersonnel) {
-
-        rmsPersonnel.setInsertTime(new Date());
-        rmsPersonnel.setInsertUsername("admin");
-        rmsPersonnel.setDeleted(new BigDecimal(0));
-        rmsPersonnel.setPersonnelId(rmsPersonnelMapper.getPersonnelId());
-        return  rmsPersonnelMapper.insertSelective(rmsPersonnel);
+        int i=0;
+        String personnelJobNumber=rmsPersonnel.getPersonnelJobNumber();
+        Map<String, Object> map=new HashMap<>();
+        map.put("personnelJobNumber",personnelJobNumber);
+        List<RmsShipper> rmsShippers=rmsShipperMapper.selectByParameters(map);
+        if (rmsShippers.size()!=0){
+            i=-1;
+        }
+        else {
+            rmsPersonnel.setInsertTime(new Date());
+            rmsPersonnel.setInsertUsername("admin");
+            rmsPersonnel.setDeleted(new BigDecimal(0));
+            rmsPersonnel.setPersonnelId(rmsPersonnelMapper.getPersonnelId());
+            i+= rmsPersonnelMapper.insertSelective(rmsPersonnel);
+        }
+        return i;
     }
 
     /**
@@ -117,7 +128,6 @@ public class RmsPersonnelServiceImpl implements IRmsPersonnelService {
      */
     @Override
     public int updatePersonnel(RmsPersonnel rmsPersonnel) {
-        rmsPersonnel.setDeleted(new BigDecimal(1));
         rmsPersonnel.setUpdateUsername("admin");
         rmsPersonnel.setUpdateTime(new Date());
         return rmsPersonnelMapper.updateByPrimaryKeySelective(rmsPersonnel);

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

@@ -47,7 +47,6 @@ public class RmsPortServiceImpl implements IRmsPortService {
 
     @Override
     public int updatePort(RmsPort rmsPort) {
-        rmsPort.setDeleted(new BigDecimal(1));
         rmsPort.setUpdateUsername("admin");
         rmsPort.setUpdateTime(new Date());
         return rmsPortMapper.updateByPrimaryKeySelective(rmsPort);

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

@@ -8,6 +8,7 @@ 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;
 
@@ -48,11 +49,22 @@ public class RmsShipperServiceImpl implements IRmsShipperService {
      */
     @Override
     public int insertShipper(RmsShipper rmsShipper) {
-        rmsShipper.setInsertTime(new Date());
-        rmsShipper.setInsertUsername("admin");
-        rmsShipper.setDeleted(new BigDecimal(0));
-        rmsShipper.setShipperId(rmsShipperMapper.getShipperId());
-        return rmsShipperMapper.insertSelective(rmsShipper);
+        int i=0;
+        String shipperName=rmsShipper.getShipperName();
+        Map<String, Object> map=new HashMap<>();
+        map.put("shipperName",shipperName);
+        List<RmsShipper> rmsShippers=rmsShipperMapper.selectByParameters(map);
+        if (rmsShippers.size()!=0){
+            i=-1;
+        }
+        else{
+            rmsShipper.setInsertTime(new Date());
+            rmsShipper.setInsertUsername("admin");
+            rmsShipper.setDeleted(new BigDecimal(0));
+            rmsShipper.setShipperId(rmsShipperMapper.getShipperId());
+            i+=rmsShipperMapper.insertSelective(rmsShipper);
+        }
+        return i;
     }
 
     /**
@@ -62,7 +74,6 @@ public class RmsShipperServiceImpl implements IRmsShipperService {
      */
     @Override
     public int updateShipper(RmsShipper rmsShipper) {
-        rmsShipper.setDeleted(new BigDecimal(1));
         rmsShipper.setUpdateUsername("admin");
         rmsShipper.setUpdateTime(new Date());
         return rmsShipperMapper.updateByPrimaryKeySelective(rmsShipper);

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

@@ -113,11 +113,26 @@ public class RmsSupplierServiceImpl implements IRmsSupplierService {
      */
     @Override
     public int insertSupplier(RmsSupplier rmsSupplier) {
-        rmsSupplier.setInsertTime(new Date());
-        rmsSupplier.setInsertUsername("admin");
-        rmsSupplier.setDeleted(new BigDecimal(0));
-        rmsSupplier.setSupplierId(rmsSupplierMapper.getSupplierId());
-        return rmsSupplierMapper.insertSelective(rmsSupplier);
+        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 ) {
+//                当供应商编号存在的时候，直接返回已经存在数据就行了
+            i=-1;
+        }
+        else {
+//                当供应商编号不存在的话，就直接加入
+            rmsSupplier.setInsertTime(new Date());
+            rmsSupplier.setInsertUsername("admin");
+            rmsSupplier.setDeleted(new BigDecimal(0));
+            rmsSupplier.setSupplierId(rmsSupplierMapper.getSupplierId());
+            i+=rmsSupplierMapper.insertSelective(rmsSupplier);
+        }
+        return i;
     }
 
     /**
@@ -127,7 +142,6 @@ public class RmsSupplierServiceImpl implements IRmsSupplierService {
      */
     @Override
     public int updateSupplier(RmsSupplier rmsSupplier) {
-        rmsSupplier.setDeleted(new BigDecimal(1));
         rmsSupplier.setUpdateUsername("admin");
 //        增加修改时间
         rmsSupplier.setUpdateTime(new Date());
@@ -143,7 +157,7 @@ public class RmsSupplierServiceImpl implements IRmsSupplierService {
     public int deleteSupplier(BigDecimal id) {
 //        使用逻辑删除
         RmsSupplier rmsSupplier=rmsSupplierMapper.selectByPrimaryKey(id);
-//        对于我们要删除的供应商，将他的deleted字段的值变为0
+//        对于我们要删除的供应商，将他的deleted字段的值变为1
         rmsSupplier.setDeleted(new BigDecimal(1));
         return rmsSupplierMapper.updateByPrimaryKeySelective(rmsSupplier);
     }

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

@@ -12,6 +12,7 @@ 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;
 
@@ -53,40 +54,41 @@ public class RmsTruckCalculateServiceImpl implements IRmsTruckCalculateService {
     * */
     @Override
     public int insertTruckCalculate(Map<String, Object> map) {
-        int result=0;
+        int i=0;
         Map<String,Object> map1= (Map<String, Object>) map.get("rmsTruckCalculate");
         RmsTruckCalculate rmsTruckCalculate=new RmsTruckCalculate();
-        rmsTruckCalculate.setInsertUsername("admin");
-        rmsTruckCalculate.setInsertTime(new Date());
-        rmsTruckCalculate.setTruckCalculatePriority(new BigDecimal(1));
-        rmsTruckCalculate.setTruckCalculateStatus("正常");
-        rmsTruckCalculate.setTruckCalculateStatusTime(new Date());
-        rmsTruckCalculate.setDeleted(new BigDecimal(0));
-        //汽车衡编号
-        rmsTruckCalculate.setTruckCalculateNumber((String) map1.get("truckCalculateNumber"));
-        //纬度
-        rmsTruckCalculate.setTruckCalculateLongitude((String) map1.get("truckCalculateLongitude"));
-        //经度
-        rmsTruckCalculate.setTruckCalculateLatitude((String) map1.get("truckCalculateLatitude"));
-        //汽车衡/轨道衡
-        rmsTruckCalculate.setCalculateType((String)map1.get("calculateType"));
-        rmsTruckCalculate.setTruckCalculateId(rmsTruckCalculateMapper.selectTruckCalculateId());
-        result+=rmsTruckCalculateMapper.insertSelective(rmsTruckCalculate);
-        // RmsTruckCalculateMaterial表处理
-        List<Map<String,Object>> mapList=(List<Map<String, Object>>) map.get("mapList");
-        for(Map<String,Object> map2:mapList){
-            BigDecimal materialId = DataChange.dataToBigDecimal(map2.get("materialId"));
-            RmsTruckCalculateMaterial rmsTruckCalculateMaterial=new RmsTruckCalculateMaterial();
-            rmsTruckCalculateMaterial.setTruckCalculateId(rmsTruckCalculate.getTruckCalculateId());
-            rmsTruckCalculateMaterial.setMaterialId(materialId);
-            rmsTruckCalculateMaterial.setDeleted(new BigDecimal(0));
-            rmsTruckCalculateMaterial.setInsertTime(new Date());
-            rmsTruckCalculateMaterial.setInsertUsername("admin");
-            rmsTruckCalculateMaterial.setTruckCalculateMaterialId(rmsTruckCalculateMaterialMapper.getTruckCalculateMaterialId());
-            result+=rmsTruckCalculateMaterialMapper.insertSelective(rmsTruckCalculateMaterial);
-        }
-
-        return result;
+            rmsTruckCalculate.setInsertUsername("admin");
+            rmsTruckCalculate.setInsertTime(new Date());
+            rmsTruckCalculate.setTruckCalculatePriority(new BigDecimal(1));
+            rmsTruckCalculate.setTruckCalculateStatus("正常");
+            rmsTruckCalculate.setTruckCalculateStatusTime(new Date());
+            rmsTruckCalculate.setDeleted(new BigDecimal(0));
+            //汽车衡编号
+            rmsTruckCalculate.setTruckCalculateNumber((String) map1.get("truckCalculateNumber"));
+            //纬度
+            rmsTruckCalculate.setTruckCalculateLongitude((String) map1.get("truckCalculateLongitude"));
+            //经度
+            rmsTruckCalculate.setTruckCalculateLatitude((String) map1.get("truckCalculateLatitude"));
+            //汽车衡/轨道衡
+            rmsTruckCalculate.setCalculateType((String)map1.get("calculateType"));
+            rmsTruckCalculate.setTruckCalculateId(rmsTruckCalculateMapper.selectTruckCalculateId());
+            i+=rmsTruckCalculateMapper.insertSelective(rmsTruckCalculate);
+            // RmsTruckCalculateMaterial表处理
+            List<Map<String,Object>> mapList=(List<Map<String, Object>>) map.get("mapList");
+            for(Map<String,Object> map2:mapList){
+                BigDecimal materialId = DataChange.dataToBigDecimal(map2.get("materialId"));
+                RmsTruckCalculateMaterial rmsTruckCalculateMaterial=new RmsTruckCalculateMaterial();
+                rmsTruckCalculateMaterial.setTruckCalculateId(rmsTruckCalculate.getTruckCalculateId());
+                rmsTruckCalculateMaterial.setMaterialId(materialId);
+                rmsTruckCalculateMaterial.setDeleted(new BigDecimal(0));
+                rmsTruckCalculateMaterial.setInsertTime(new Date());
+                rmsTruckCalculateMaterial.setInsertUsername("admin");
+                rmsTruckCalculateMaterial.setTruckCalculateMaterialId(rmsTruckCalculateMaterialMapper.getTruckCalculateMaterialId());
+                i+=rmsTruckCalculateMaterialMapper.insertSelective(rmsTruckCalculateMaterial);
+            }
+
+
+        return i;
     }
     //删除汽车衡与物资中间表
     @Override

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.RmsWarehouseMapper;
+import com.steerinfo.dil.model.RmsShipper;
 import com.steerinfo.dil.model.RmsWarehouse;
 import com.steerinfo.dil.service.IRmsWarehouseService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,6 +9,7 @@ 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;
 
@@ -42,11 +44,23 @@ public class RmsWarehouseServiceImpl  implements IRmsWarehouseService {
     * */
     @Override
     public int insertWarehouse(RmsWarehouse rmsWarehouse) {
-        rmsWarehouse.setDeleted(new BigDecimal(0));
-        rmsWarehouse.setInsertUsername("admin");
-        rmsWarehouse.setInsertTime(new Date());
-        rmsWarehouse.setWarehouseId(new BigDecimal(String.valueOf(rmsWarehouseMapper.selectWarehouseId())));
-        return rmsWarehouseMapper.insertSelective(rmsWarehouse);
+        int i=0;
+        String warehouseName=rmsWarehouse.getWarehouseName();
+        Map<String, Object> map=new HashMap<>();
+        map.put("warehouseName",warehouseName);
+        List<RmsWarehouse> rmsWarehouses=rmsWarehouseMapper.selectByParameters(map);
+        if (rmsWarehouses.size()!=0){
+            i=-1;
+        }
+        else {
+            rmsWarehouse.setWarehouseTypeId(new BigDecimal(3));
+            rmsWarehouse.setDeleted(new BigDecimal(0));
+            rmsWarehouse.setInsertUsername("admin");
+            rmsWarehouse.setInsertTime(new Date());
+            rmsWarehouse.setWarehouseId(new BigDecimal(String.valueOf(rmsWarehouseMapper.selectWarehouseId())));
+            i+= rmsWarehouseMapper.insertSelective(rmsWarehouse);
+        }
+        return i;
     }
     /*
     * 更改原料工厂

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

@@ -6,7 +6,7 @@
     <result column="CAPACITY_NUMBER" jdbcType="VARCHAR" property="capacityNumber" />
     <result column="CAPACITY_MAX_LOAD" jdbcType="DECIMAL" property="capacityMaxLoad" />
     <result column="CAPACITY_TYPE_ID" jdbcType="DECIMAL" property="capacityTypeId" />
-    <result column="CAPACITY_STATUS" jdbcType="VARCHAR" property="capacityStatus" />
+    <result column="CAPACITY_STATUS" jdbcType="DECIMAL" property="capacityStatus" />
     <result column="CARRIER_ID" jdbcType="DECIMAL" property="carrierId" />
     <result column="CAPACITY_ENERGY_ID" jdbcType="VARCHAR" property="capacityEnergyId" />
     <result column="CAPACITY_LEN_VAL" jdbcType="DECIMAL" property="capacityLenVal" />
@@ -276,7 +276,7 @@
       UPDATE_TIME, INSERT_UPDATE_REMARK, CAPACITY_CORLOR, 
       CAPACITY_VIP, DELETED)
     values (#{capacityId,jdbcType=DECIMAL}, #{capacityNumber,jdbcType=VARCHAR}, #{capacityMaxLoad,jdbcType=DECIMAL}, 
-      #{capacityTypeId,jdbcType=DECIMAL}, #{capacityStatus,jdbcType=VARCHAR}, #{carrierId,jdbcType=DECIMAL}, 
+      #{capacityTypeId,jdbcType=DECIMAL}, #{capacityStatus,jdbcType=DECIMAL}, #{carrierId,jdbcType=DECIMAL},
       #{capacityEnergyId,jdbcType=VARCHAR}, #{capacityLenVal,jdbcType=DECIMAL}, #{capacityWidVal,jdbcType=DECIMAL}, 
       #{capacityHigVal,jdbcType=DECIMAL}, #{capacityOilId,jdbcType=DECIMAL}, #{capacityFuelConsumption,jdbcType=VARCHAR}, 
       #{capacityOwneris,jdbcType=VARCHAR}, #{capacityBlacklist,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, 
@@ -371,7 +371,7 @@
         #{capacityTypeId,jdbcType=DECIMAL},
       </if>
       <if test="capacityStatus != null">
-        #{capacityStatus,jdbcType=VARCHAR},
+        #{capacityStatus,jdbcType=DECIMAL},
       </if>
       <if test="carrierId != null">
         #{carrierId,jdbcType=DECIMAL},
@@ -434,7 +434,7 @@
     set CAPACITY_NUMBER = #{capacityNumber,jdbcType=VARCHAR},
       CAPACITY_MAX_LOAD = #{capacityMaxLoad,jdbcType=DECIMAL},
       CAPACITY_TYPE_ID = #{capacityTypeId,jdbcType=DECIMAL},
-      CAPACITY_STATUS = #{capacityStatus,jdbcType=VARCHAR},
+      CAPACITY_STATUS = #{capacityStatus,jdbcType=DECIMAL},
       CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
       CAPACITY_ENERGY_ID = #{capacityEnergyId,jdbcType=VARCHAR},
       CAPACITY_LEN_VAL = #{capacityLenVal,jdbcType=DECIMAL},
@@ -468,7 +468,7 @@
         CAPACITY_TYPE_ID = #{capacityTypeId,jdbcType=DECIMAL},
       </if>
       <if test="capacityStatus != null">
-        CAPACITY_STATUS = #{capacityStatus,jdbcType=VARCHAR},
+        CAPACITY_STATUS = #{capacityStatus,jdbcType=DECIMAL},
       </if>
       <if test="carrierId != null">
         CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
@@ -557,7 +557,7 @@
    select  
       #{item.capacityId,jdbcType=DECIMAL}, 
       #{item.capacityNumber,jdbcType=VARCHAR}, #{item.capacityMaxLoad,jdbcType=DECIMAL}, 
-      #{item.capacityTypeId,jdbcType=DECIMAL}, #{item.capacityStatus,jdbcType=VARCHAR}, 
+      #{item.capacityTypeId,jdbcType=DECIMAL}, #{item.capacityStatus,jdbcType=DECIMAL},
       #{item.carrierId,jdbcType=DECIMAL}, #{item.capacityEnergyId,jdbcType=VARCHAR}, 
       #{item.capacityLenVal,jdbcType=DECIMAL}, #{item.capacityWidVal,jdbcType=DECIMAL}, 
       #{item.capacityHigVal,jdbcType=DECIMAL}, #{item.capacityOilId,jdbcType=DECIMAL}, 
@@ -590,7 +590,7 @@
        </foreach>
        ,CAPACITY_STATUS=
        <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityStatus,jdbcType=VARCHAR}
+          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityStatus,jdbcType=DECIMAL}
        </foreach>
        ,CARRIER_ID=
        <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">

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

@@ -15,7 +15,7 @@
         <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername"/>
         <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime"/>
         <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark"/>
-        <result column="EAS_MATERIAL_ID" jdbcType="DECIMAL" property="easMaterialId"/>
+        <result column="EAS_MATERIAL_ID" jdbcType="VARCHAR" property="easMaterialId"/>
         <result column="DELETED" jdbcType="DECIMAL" property="deleted"/>
         <result column="MATERIAL_THEORETICAL_WEIGHT" jdbcType="DECIMAL" property="materialTheoreticalWeight"/>
         <result column="MATERIAL_ORDER" jdbcType="DECIMAL" property="materialOrder"/>
@@ -221,7 +221,7 @@
                 #{materialModel,jdbcType=VARCHAR}, #{materialLength,jdbcType=DECIMAL},
                 #{insertUsername,jdbcType=VARCHAR},
                 #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
-                #{insertUpdateRemark,jdbcType=VARCHAR}, #{easMaterialId,jdbcType=DECIMAL}, #{deleted,jdbcType=DECIMAL},
+                #{insertUpdateRemark,jdbcType=VARCHAR}, #{easMaterialId,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL},
                  #{materialTheoreticalWeight,jdbcType=DECIMAL},#{materialOrder,jdbcType=DECIMAL} )
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsMaterial">
@@ -320,7 +320,7 @@
                 #{insertUpdateRemark,jdbcType=VARCHAR},
             </if>
             <if test="easMaterialId != null">
-                #{easMaterialId,jdbcType=DECIMAL},
+                #{easMaterialId,jdbcType=VARCHAR},
             </if>
             <if test="deleted != null">
                 #{deleted,jdbcType=DECIMAL},
@@ -347,7 +347,7 @@
             UPDATE_USERNAME        = #{updateUsername,jdbcType=VARCHAR},
             UPDATE_TIME            = #{updateTime,jdbcType=TIMESTAMP},
             INSERT_UPDATE_REMARK   = #{insertUpdateRemark,jdbcType=VARCHAR},
-            EAS_MATERIAL_ID        = #{easMaterialId,jdbcType=DECIMAL},
+            EAS_MATERIAL_ID        = #{easMaterialId,jdbcType=VARCHAR},
             DELETED                = #{deleted,jdbcType=DECIMAL},
             MATERIAL_THEORETICAL_WEIGHT = #{materialTheoreticalWeight,jdbcType=DECIMAL},
             MATERIAL_ORDER         = #{MATERIAL_ORDER}
@@ -393,7 +393,7 @@
                 INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
             </if>
             <if test="easMaterialId != null">
-                EAS_MATERIAL_ID = #{easMaterialId,jdbcType=DECIMAL},
+                EAS_MATERIAL_ID = #{easMaterialId,jdbcType=VARCHAR},
             </if>
             <if test="deleted != null">
                 DELETED = #{deleted,jdbcType=DECIMAL},
@@ -438,7 +438,7 @@
         #{item.materialModel,jdbcType=VARCHAR}, #{item.materialLength,jdbcType=DECIMAL},
         #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
         #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
-        #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.easMaterialId,jdbcType=DECIMAL},
+        #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.easMaterialId,jdbcType=VARCHAR},
         #{item.deleted,jdbcType=DECIMAL},#{item.materialTheoreticalWeight,jdbcType=DECIMAL},
         #{item.materialOrder,jdbcType=DECIMAL}
         from dual
@@ -501,7 +501,7 @@
         </foreach>
         ,EAS_MATERIAL_ID=
         <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
-            when #{item.materialId,jdbcType=DECIMAL} then #{item.easMaterialId,jdbcType=DECIMAL}
+            when #{item.materialId,jdbcType=DECIMAL} then #{item.easMaterialId,jdbcType=VARCHAR}
         </foreach>
         ,DELETED=
         <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">

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

@@ -605,7 +605,7 @@
         RP.PERSONNEL_NAME AS "personnelName",
         RP.PERSONNEL_POST AS "personnelPost",
         RP.PERSONNEL_WORKSHOPID AS "personnelWorkshopid",
-        RP.PERSONNEL_SHIFTS AS "personnelShifts"
+        RP.PERSONNEL_SHIFTS AS "personnelShifts",
         RP.PERSONNEL_TEAM AS "personnelTeam"
         FROM RMS_PERSONNEL RP
         WHERE RP.PERSONNEL_ID=#{id}

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

@@ -6,7 +6,7 @@
     <result column="CAPACITY_NUMBER" jdbcType="VARCHAR" property="capacityNumber" />
     <result column="CAPACITY_MAX_LOAD" jdbcType="DECIMAL" property="capacityMaxLoad" />
     <result column="CAPACITY_TYPE_ID" jdbcType="DECIMAL" property="capacityTypeId" />
-    <result column="CAPACITY_STATUS" jdbcType="VARCHAR" property="capacityStatus" />
+    <result column="CAPACITY_STATUS" jdbcType="DECIMAL" property="capacityStatus" />
     <result column="CARRIER_ID" jdbcType="DECIMAL" property="carrierId" />
     <result column="CAPACITY_ENERGY_ID" jdbcType="VARCHAR" property="capacityEnergyId" />
     <result column="CAPACITY_LEN_VAL" jdbcType="DECIMAL" property="capacityLenVal" />
@@ -276,7 +276,7 @@
       UPDATE_TIME, INSERT_UPDATE_REMARK, CAPACITY_CORLOR, 
       CAPACITY_VIP, DELETED)
     values (#{capacityId,jdbcType=DECIMAL}, #{capacityNumber,jdbcType=VARCHAR}, #{capacityMaxLoad,jdbcType=DECIMAL}, 
-      #{capacityTypeId,jdbcType=DECIMAL}, #{capacityStatus,jdbcType=VARCHAR}, #{carrierId,jdbcType=DECIMAL}, 
+      #{capacityTypeId,jdbcType=DECIMAL}, #{capacityStatus,jdbcType=DECIMAL}, #{carrierId,jdbcType=DECIMAL},
       #{capacityEnergyId,jdbcType=VARCHAR}, #{capacityLenVal,jdbcType=DECIMAL}, #{capacityWidVal,jdbcType=DECIMAL}, 
       #{capacityHigVal,jdbcType=DECIMAL}, #{capacityOilId,jdbcType=DECIMAL}, #{capacityFuelConsumption,jdbcType=VARCHAR}, 
       #{capacityOwneris,jdbcType=VARCHAR}, #{capacityBlacklist,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, 
@@ -371,7 +371,7 @@
         #{capacityTypeId,jdbcType=DECIMAL},
       </if>
       <if test="capacityStatus != null">
-        #{capacityStatus,jdbcType=VARCHAR},
+        #{capacityStatus,jdbcType=DECIMAL},
       </if>
       <if test="carrierId != null">
         #{carrierId,jdbcType=DECIMAL},
@@ -434,7 +434,7 @@
     set CAPACITY_NUMBER = #{capacityNumber,jdbcType=VARCHAR},
       CAPACITY_MAX_LOAD = #{capacityMaxLoad,jdbcType=DECIMAL},
       CAPACITY_TYPE_ID = #{capacityTypeId,jdbcType=DECIMAL},
-      CAPACITY_STATUS = #{capacityStatus,jdbcType=VARCHAR},
+      CAPACITY_STATUS = #{capacityStatus,jdbcType=DECIMAL},
       CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
       CAPACITY_ENERGY_ID = #{capacityEnergyId,jdbcType=VARCHAR},
       CAPACITY_LEN_VAL = #{capacityLenVal,jdbcType=DECIMAL},
@@ -468,7 +468,7 @@
         CAPACITY_TYPE_ID = #{capacityTypeId,jdbcType=DECIMAL},
       </if>
       <if test="capacityStatus != null">
-        CAPACITY_STATUS = #{capacityStatus,jdbcType=VARCHAR},
+        CAPACITY_STATUS = #{capacityStatus,jdbcType=DECIMAL},
       </if>
       <if test="carrierId != null">
         CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
@@ -557,7 +557,7 @@
    select  
       #{item.capacityId,jdbcType=DECIMAL}, 
       #{item.capacityNumber,jdbcType=VARCHAR}, #{item.capacityMaxLoad,jdbcType=DECIMAL}, 
-      #{item.capacityTypeId,jdbcType=DECIMAL}, #{item.capacityStatus,jdbcType=VARCHAR}, 
+      #{item.capacityTypeId,jdbcType=DECIMAL}, #{item.capacityStatus,jdbcType=DECIMAL},
       #{item.carrierId,jdbcType=DECIMAL}, #{item.capacityEnergyId,jdbcType=VARCHAR}, 
       #{item.capacityLenVal,jdbcType=DECIMAL}, #{item.capacityWidVal,jdbcType=DECIMAL}, 
       #{item.capacityHigVal,jdbcType=DECIMAL}, #{item.capacityOilId,jdbcType=DECIMAL}, 
@@ -590,7 +590,7 @@
        </foreach>
        ,CAPACITY_STATUS=
        <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityStatus,jdbcType=VARCHAR}
+          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityStatus,jdbcType=DECIMAL}
        </foreach>
        ,CARRIER_ID=
        <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">

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

@@ -15,7 +15,7 @@
         <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername"/>
         <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime"/>
         <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark"/>
-        <result column="EAS_MATERIAL_ID" jdbcType="DECIMAL" property="easMaterialId"/>
+        <result column="EAS_MATERIAL_ID" jdbcType="VARCHAR" property="easMaterialId"/>
         <result column="DELETED" jdbcType="DECIMAL" property="deleted"/>
         <result column="MATERIAL_THEORETICAL_WEIGHT" jdbcType="DECIMAL" property="materialTheoreticalWeight"/>
         <result column="MATERIAL_ORDER" jdbcType="DECIMAL" property="materialOrder"/>
@@ -221,7 +221,7 @@
                 #{materialModel,jdbcType=VARCHAR}, #{materialLength,jdbcType=DECIMAL},
                 #{insertUsername,jdbcType=VARCHAR},
                 #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
-                #{insertUpdateRemark,jdbcType=VARCHAR}, #{easMaterialId,jdbcType=DECIMAL}, #{deleted,jdbcType=DECIMAL},
+                #{insertUpdateRemark,jdbcType=VARCHAR}, #{easMaterialId,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL},
                  #{materialTheoreticalWeight,jdbcType=DECIMAL},#{materialOrder,jdbcType=DECIMAL} )
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsMaterial">
@@ -320,7 +320,7 @@
                 #{insertUpdateRemark,jdbcType=VARCHAR},
             </if>
             <if test="easMaterialId != null">
-                #{easMaterialId,jdbcType=DECIMAL},
+                #{easMaterialId,jdbcType=VARCHAR},
             </if>
             <if test="deleted != null">
                 #{deleted,jdbcType=DECIMAL},
@@ -347,7 +347,7 @@
             UPDATE_USERNAME        = #{updateUsername,jdbcType=VARCHAR},
             UPDATE_TIME            = #{updateTime,jdbcType=TIMESTAMP},
             INSERT_UPDATE_REMARK   = #{insertUpdateRemark,jdbcType=VARCHAR},
-            EAS_MATERIAL_ID        = #{easMaterialId,jdbcType=DECIMAL},
+            EAS_MATERIAL_ID        = #{easMaterialId,jdbcType=VARCHAR},
             DELETED                = #{deleted,jdbcType=DECIMAL},
             MATERIAL_THEORETICAL_WEIGHT = #{materialTheoreticalWeight,jdbcType=DECIMAL},
             MATERIAL_ORDER         = #{MATERIAL_ORDER}
@@ -393,7 +393,7 @@
                 INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
             </if>
             <if test="easMaterialId != null">
-                EAS_MATERIAL_ID = #{easMaterialId,jdbcType=DECIMAL},
+                EAS_MATERIAL_ID = #{easMaterialId,jdbcType=VARCHAR},
             </if>
             <if test="deleted != null">
                 DELETED = #{deleted,jdbcType=DECIMAL},
@@ -438,7 +438,7 @@
         #{item.materialModel,jdbcType=VARCHAR}, #{item.materialLength,jdbcType=DECIMAL},
         #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
         #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
-        #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.easMaterialId,jdbcType=DECIMAL},
+        #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.easMaterialId,jdbcType=VARCHAR},
         #{item.deleted,jdbcType=DECIMAL},#{item.materialTheoreticalWeight,jdbcType=DECIMAL},
         #{item.materialOrder,jdbcType=DECIMAL}
         from dual
@@ -501,7 +501,7 @@
         </foreach>
         ,EAS_MATERIAL_ID=
         <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
-            when #{item.materialId,jdbcType=DECIMAL} then #{item.easMaterialId,jdbcType=DECIMAL}
+            when #{item.materialId,jdbcType=DECIMAL} then #{item.easMaterialId,jdbcType=VARCHAR}
         </foreach>
         ,DELETED=
         <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">

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

@@ -605,7 +605,7 @@
         RP.PERSONNEL_NAME AS "personnelName",
         RP.PERSONNEL_POST AS "personnelPost",
         RP.PERSONNEL_WORKSHOPID AS "personnelWorkshopid",
-        RP.PERSONNEL_SHIFTS AS "personnelShifts"
+        RP.PERSONNEL_SHIFTS AS "personnelShifts",
         RP.PERSONNEL_TEAM AS "personnelTeam"
         FROM RMS_PERSONNEL RP
         WHERE RP.PERSONNEL_ID=#{id}