20190327

.idea/workspace.xml

@@ -7,17 +7,14 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="625c4e56-9e2f-4ea4-860b-31adf08342c1" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/artifacts/guangming_war_exploded.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Java_EE_6_Java_EE_6.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/lib.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/lib.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/lib1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/lib1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/lib2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/lib2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/uiDesigner.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/guangming.iml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Web/WEB-INF/jsp/newAdmin/contentAfter.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/Web/WEB-INF/jsp/newAdmin/contentAfter.jsp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Web/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Web/WEB-INF/web.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/guangming/web/FactorymilkTankController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/guangming/web/FactorymilkTankController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/guangming/web/HandoverController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/guangming/web/HandoverController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/jdbc.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/log4j.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/log4j.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/outsidews.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/outsidews.properties" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -30,38 +27,162 @@
     <session id="-1566796062">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
+          <entry key="project.closed" value="1" />
+          <entry key="project.open.time.0" value="1" />
           <entry key="project.open.time.4" value="1" />
-          <entry key="project.opened" value="1" />
+          <entry key="project.opened" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="java" value="1" />
+          <entry key="java" value="16" />
+          <entry key="jsp" value="5" />
+          <entry key="properties" value="5" />
+          <entry key="xml" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="JAVA" value="1" />
+          <entry key="JAVA" value="16" />
+          <entry key="JSP" value="5" />
+          <entry key="Properties" value="5" />
+          <entry key="XML" value="3" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="4" />
+          <entry key="properties" value="41" />
+          <entry key="txt" value="8" />
+          <entry key="xml" value="11" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="4" />
+          <entry key="PLAIN_TEXT" value="8" />
+          <entry key="Properties" value="41" />
+          <entry key="XML" value="11" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
-    <leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/guangming/web/SupplierdemandPlanController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="210">
+              <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/guangming/web/HandoverController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="294">
+              <caret line="487" column="45" lean-forward="true" selection-start-line="487" selection-start-column="45" selection-end-line="487" selection-end-column="45" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/jdbc.properties">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="84">
+              <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/test/com/guangming/service/AiChuangTest.java">
+        <entry file="file://$PROJECT_DIR$/src/outsidews.properties">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="48">
-              <caret line="15" column="71" lean-forward="true" selection-start-line="15" selection-start-column="71" selection-end-line="15" selection-end-column="71" />
+            <state relative-caret-position="210">
+              <caret line="10" column="23" lean-forward="true" selection-start-line="10" selection-start-column="23" selection-end-line="10" selection-end-column="23" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/log4j.properties">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="105">
+              <caret line="5" column="28" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Web/WEB-INF/web.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="85">
+              <caret line="52" column="50" lean-forward="true" selection-start-line="52" selection-start-column="50" selection-end-line="52" selection-end-column="50" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/guangming/web/FactorymilkTankController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="3234">
+              <caret line="172" selection-start-line="172" selection-end-line="172" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/guangming/web/FreshmilkHandoverController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="210">
+              <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/guangming/service/FactorymilkTankService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="273">
+              <caret line="16" column="26" selection-start-line="16" selection-start-column="26" selection-end-line="16" selection-end-column="26" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/guangming/service/impl/FactorymilkTankServiceImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="3948">
+              <caret line="209" column="44" selection-start-line="209" selection-start-column="19" selection-end-line="209" selection-end-column="44" />
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>guangming</find>
+    </findStrings>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/src/jdbc.properties" />
+        <option value="$PROJECT_DIR$/Web/WEB-INF/jsp/newAdmin/index.jsp" />
+        <option value="$PROJECT_DIR$/src/outsidews.properties" />
+        <option value="$PROJECT_DIR$/Web/WEB-INF/jsp/newAdmin/contentAfter.jsp" />
+        <option value="$PROJECT_DIR$/src/com/guangming/web/FactorymilkTankController.java" />
+        <option value="$PROJECT_DIR$/src/com/guangming/web/HandoverController.java" />
+        <option value="$PROJECT_DIR$/src/log4j.properties" />
+        <option value="$PROJECT_DIR$/Web/WEB-INF/web.xml" />
+      </list>
+    </option>
+  </component>
   <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
   <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
   <component name="JsGulpfileManager">
@@ -92,7 +213,6 @@
     </navigator>
     <panes>
       <pane id="Scope" />
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -100,10 +220,33 @@
               <item name="zoumasuyuan" type="b2602c69:ProjectViewProjectNode" />
               <item name="zoumasuyuan" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="zoumasuyuan" type="b2602c69:ProjectViewProjectNode" />
+              <item name="zoumasuyuan" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="zoumasuyuan" type="b2602c69:ProjectViewProjectNode" />
+              <item name="zoumasuyuan" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="guangming" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="zoumasuyuan" type="b2602c69:ProjectViewProjectNode" />
+              <item name="zoumasuyuan" type="462c0819:PsiDirectoryNode" />
+              <item name="Web" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="zoumasuyuan" type="b2602c69:ProjectViewProjectNode" />
+              <item name="zoumasuyuan" type="462c0819:PsiDirectoryNode" />
+              <item name="Web" type="462c0819:PsiDirectoryNode" />
+              <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -112,7 +255,8 @@
     <property name="Repository.Attach.Sources" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1553236506925" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1553249495031" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="project.structure.last.edited" value="Project" />
@@ -219,49 +363,92 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1553235806641</updated>
-      <workItem from="1553235811389" duration="695000" />
+      <workItem from="1553235811389" duration="6641000" />
+      <workItem from="1553668101600" duration="1447000" />
+    </task>
+    <task id="LOCAL-00001" summary="20190322">
+      <created>1553236567235</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1553236567235</updated>
     </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="695000" />
+    <option name="totallyTimeSpent" value="8088000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <layout>
-      <window_info id="Designer" />
-      <window_info id="Image Layers" />
-      <window_info id="UI Designer" />
-      <window_info id="Favorites" side_tool="true" />
-      <window_info id="Capture Tool" />
-      <window_info id="Web" side_tool="true" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24962178" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25340393" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="Application Servers" weight="0.51559937" />
-      <window_info anchor="bottom" id="Spring" />
-      <window_info anchor="bottom" id="Terminal" />
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
-      <window_info anchor="bottom" id="Messages" weight="0.32840723" />
-      <window_info anchor="bottom" id="Java Enterprise" />
-      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.7159278" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.42036125" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="right" id="Palette" />
-      <window_info anchor="right" id="Capture Analysis" />
-      <window_info anchor="right" id="Maven Projects" />
-      <window_info anchor="right" id="Database" />
-      <window_info anchor="right" id="Palette&#9;" />
-      <window_info anchor="right" id="Theme Preview" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.51559937" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.32840723" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
       <window_info anchor="right" id="Commander" order="0" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.24962178" />
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
     </layout>
+    <layout-to-restore>
+      <window_info id="Designer" order="0" />
+      <window_info id="Image Layers" order="1" />
+      <window_info id="UI Designer" order="2" />
+      <window_info id="Favorites" order="3" side_tool="true" />
+      <window_info id="Capture Tool" order="4" />
+      <window_info id="Web" order="5" side_tool="true" />
+      <window_info active="true" content_ui="combo" id="Project" order="6" visible="true" weight="0.24962178" />
+      <window_info id="Structure" order="7" side_tool="true" weight="0.25" />
+      <window_info anchor="bottom" id="Application Servers" order="0" weight="0.51559937" />
+      <window_info anchor="bottom" id="Spring" order="1" />
+      <window_info anchor="bottom" id="Terminal" order="2" />
+      <window_info anchor="bottom" id="Event Log" order="3" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="4" weight="0.32840723" />
+      <window_info anchor="bottom" id="Java Enterprise" order="5" />
+      <window_info anchor="bottom" id="Database Changes" order="6" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="7" />
+      <window_info anchor="bottom" id="Message" order="8" />
+      <window_info anchor="bottom" id="Find" order="9" />
+      <window_info anchor="bottom" id="Run" order="10" visible="true" weight="0.32512316" />
+      <window_info anchor="bottom" id="Debug" order="11" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="12" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="13" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="14" />
+      <window_info anchor="right" id="Palette" order="0" />
+      <window_info anchor="right" id="Capture Analysis" order="1" />
+      <window_info anchor="right" id="Maven Projects" order="2" />
+      <window_info anchor="right" id="Database" order="3" />
+      <window_info anchor="right" id="Palette&#9;" order="4" />
+      <window_info anchor="right" id="Theme Preview" order="5" />
+      <window_info anchor="right" id="Commander" order="6" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="7" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="8" weight="0.25" />
+    </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
@@ -269,6 +456,12 @@
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
+  <component name="VcsManagerConfiguration">
+    <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
+    <option name="CHECK_NEW_TODO" value="false" />
+    <MESSAGE value="20190322" />
+    <option name="LAST_COMMIT_MESSAGE" value="20190322" />
+  </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/src/test/com/guangming/service/AiChuangTest.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -277,6 +470,182 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/appWebServlet.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1323" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/appWebService.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="28" column="46" lean-forward="true" selection-start-line="28" selection-start-column="46" selection-end-line="28" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Web/WEB-INF/jsp/newAdmin/index.jsp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="163">
+          <caret line="37" column="27" lean-forward="true" selection-start-line="37" selection-start-column="27" selection-end-line="37" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Web/WEB-INF/jsp/newAdmin/head.jsp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="126">
+          <caret line="339" column="18" lean-forward="true" selection-start-line="339" selection-start-column="18" selection-end-line="339" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Web/WEB-INF/jsp/newAdmin/login.jsp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-4262" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Web/WEB-INF/jsp/newAdmin/contentBefore.jsp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-4525" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Web/WEB-INF/jsp/newAdmin/contentAfter.jsp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="221">
+          <caret line="17" column="9" lean-forward="true" selection-start-line="17" selection-start-column="9" selection-end-line="17" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/guangming/web/admin/AdminController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-3444">
+          <caret line="29" lean-forward="true" selection-start-line="29" selection-end-line="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/guangming/web/admin/MisController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1186">
+          <caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/guangming/web/TransporterInfoController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-5134">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/guangming/web/MilkPlanTaskController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="142" column="55" selection-start-line="142" selection-start-column="55" selection-end-line="142" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/guangming/service/MilkPlanTaskService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="20" column="17" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/guangming/service/impl/MilkPlanTaskServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1323">
+          <caret line="76" column="24" selection-start-line="76" selection-start-column="24" selection-end-line="76" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/guangming/web/MilkPlanController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/guangming/web/MilkCylinderController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/guangming/web/FreshmilkTransportController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="336">
+          <caret line="36" column="64" selection-start-line="36" selection-start-column="64" selection-end-line="36" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/guangming/web/SupplierdemandPlanController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/guangming/web/FactorymilkTankController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3234">
+          <caret line="172" selection-start-line="172" selection-end-line="172" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/guangming/web/FreshmilkHandoverController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/guangming/service/FactorymilkTankService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="273">
+          <caret line="16" column="26" selection-start-line="16" selection-start-column="26" selection-end-line="16" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/guangming/service/impl/FactorymilkTankServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3948">
+          <caret line="209" column="44" selection-start-line="209" selection-start-column="19" selection-end-line="209" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/guangming/web/HandoverController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="294">
+          <caret line="487" column="45" lean-forward="true" selection-start-line="487" selection-start-column="45" selection-end-line="487" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/jdbc.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="84">
+          <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/log4j.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="5" column="28" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Web/WEB-INF/web.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="85">
+          <caret line="52" column="50" lean-forward="true" selection-start-line="52" selection-start-column="50" selection-end-line="52" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/outsidews.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="10" column="23" lean-forward="true" selection-start-line="10" selection-start-column="23" selection-end-line="10" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

Web/WEB-INF/jsp/newAdmin/contentAfter.jsp

@@ -12,7 +12,7 @@
 </div>
 </div>
 
-<iframe src="http://172.16.84.43/main/login_cs_keep.asp?username=${sessionScope.misSuperUserId}&ticket=${sessionScope.misTicketStr}" id="loginIframe" style="display: none">
+<iframe src="http://116.62.160.108/main/login_cs_keep.asp?username=${sessionScope.misSuperUserId}&ticket=${sessionScope.misTicketStr}" id="loginIframe" style="display: none">
 
 
 </iframe>

Web/WEB-INF/web.xml

@@ -12,7 +12,7 @@
         <session-timeout>30</session-timeout>
     </session-config>
 
-    <display-name>guangming</display-name>
+    <display-name>zoumasuyuan</display-name>
     <welcome-file-list>
         <welcome-file>index.html</welcome-file>
     </welcome-file-list>
@@ -26,7 +26,7 @@
     </context-param>
     <context-param>
         <param-name>webAppRootKey</param-name>
-        <param-value>guangmingWebApp.root</param-value>
+        <param-value>zoumasuyuanWebApp.root</param-value>
     </context-param>
     <context-param>
         <param-name>log4jRefreshInterval</param-name>

src/com/guangming/web/FactorymilkTankController.java

@@ -161,10 +161,10 @@ public class FactorymilkTankController extends BaseController {
             return new Result(true, pp);
         }
 
-        if (!factorymilkTankService.getMesMilkFactorymilkTank(handover)) {//如果mes没值则自动分配
+        //if (!factorymilkTankService.getMesMilkFactorymilkTank(handover)) {//如果mes没值则自动分配
 
             factorymilkTankService.createMilkFactorymilkTank(handover);
-        }
+        //}
 
         List<FactorymilkTank> pp = factorymilkTankService.getMilkFactorymilkTankList(handover);
         if (pp == null) {

src/com/guangming/web/HandoverController.java

@@ -289,44 +289,44 @@ public class HandoverController extends BaseController {
                      */
 
 
-                    //如果已经有交接单进过厂了，则不调用MES接口。
-                    if (supplierdemandPlanList != null && supplierdemandPlanList.size() > 0) {
-                        logger.error("拼车交接单已经入厂了");
-                    } else {
-                        //调MES接口传递工厂号
-                        try {
-
-                            TransporterInfo transporterInfoBycar = new TransporterInfo();
-                            transporterInfoBycar.setCarplate(supplierdemandPlan.getCarplate());
-                            TransporterInfo transporterInfo = transporterInfoService.getTransporterInfo(transporterInfoBycar);
-                            if (transporterInfo != null) {
-                                String url = PropertiesFileLoader.getProerties("MES_BASE_URL") + "/TankerIncoming/GetDataMain";
-                                String gsonString = "FactoryNo=" + supplierdemandPlan.getFactorynumber() + "&TankerNo=" + supplierdemandPlan.getCarplate()
-                                        + "&IncomingTime=" + DateTimeTool.dateTimeToTimeYYYYHHmmssStr(new Date()) + "&carno=" + transporterInfo.getCarno();
-                                String result = NetUtils.psotUrlResponse(url, gsonString);
-
-                                MesTaskLog mesTaskLog = new MesTaskLog();
-
-                                mesTaskLog.setTypeName("入厂通知");
-                                mesTaskLog.setHandoverno(supplierdemandPlan.getFactorynumber() + "_" + supplierdemandPlan.getCarplate() + "_" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(new Date()) + "_" + transporterInfo.getCarno());
-                                mesTaskLog.setMethodName("com.guangming.web.HandoverController.time");
-                                if (result != null) {
-
-                                    mesTaskLog.setMethodResult(result);
-                                } else {
-                                    mesTaskLog.setMethodResult("未获取到MES返回值");
-                                }
-                                mesTaskLogMapper.insertSelective(mesTaskLog);
-
-
-                            }
-
-
-                        } catch (Exception e) {
-                            logger.error("调用MES接口异常", e);
-                        }
-                        //调MES接口传递工厂号
-                    }
+//                    //如果已经有交接单进过厂了，则不调用MES接口。
+//                    if (supplierdemandPlanList != null && supplierdemandPlanList.size() > 0) {
+//                        logger.error("拼车交接单已经入厂了");
+//                    } else {
+//                        //调MES接口传递工厂号
+//                        try {
+//
+//                            TransporterInfo transporterInfoBycar = new TransporterInfo();
+//                            transporterInfoBycar.setCarplate(supplierdemandPlan.getCarplate());
+//                            TransporterInfo transporterInfo = transporterInfoService.getTransporterInfo(transporterInfoBycar);
+//                            if (transporterInfo != null) {
+//                                String url = PropertiesFileLoader.getProerties("MES_BASE_URL") + "/TankerIncoming/GetDataMain";
+//                                String gsonString = "FactoryNo=" + supplierdemandPlan.getFactorynumber() + "&TankerNo=" + supplierdemandPlan.getCarplate()
+//                                        + "&IncomingTime=" + DateTimeTool.dateTimeToTimeYYYYHHmmssStr(new Date()) + "&carno=" + transporterInfo.getCarno();
+//                                String result = NetUtils.psotUrlResponse(url, gsonString);
+//
+//                                MesTaskLog mesTaskLog = new MesTaskLog();
+//
+//                                mesTaskLog.setTypeName("入厂通知");
+//                                mesTaskLog.setHandoverno(supplierdemandPlan.getFactorynumber() + "_" + supplierdemandPlan.getCarplate() + "_" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(new Date()) + "_" + transporterInfo.getCarno());
+//                                mesTaskLog.setMethodName("com.guangming.web.HandoverController.time");
+//                                if (result != null) {
+//
+//                                    mesTaskLog.setMethodResult(result);
+//                                } else {
+//                                    mesTaskLog.setMethodResult("未获取到MES返回值");
+//                                }
+//                                mesTaskLogMapper.insertSelective(mesTaskLog);
+//
+//
+//                            }
+//
+//
+//                        } catch (Exception e) {
+//                            logger.error("调用MES接口异常", e);
+//                        }
+//                        //调MES接口传递工厂号
+//                    }
 
 
                     return new Result(true, "成功记录进出场时间");

src/jdbc.properties

@@ -1,11 +1,4 @@
 jdbc.driverClassName=org.gjt.mm.mysql.Driver
-jdbc.url=jdbc:mysql://121.43.171.110:3306/guangming?autoReconnect=true
-jdbc.username=root
+jdbc.url=jdbc:mysql://120.55.131.232:3306/suyuan_demo
+jdbc.username=microball
 jdbc.password=2wsx@WSX#EDC
-
-#jdbc.url=jdbc:mysql://172.16.84.40:3306/guangming?useUnicode=true&characterEncoding=utf8
-#jdbc.username=guangming
-#jdbc.password=1qaz!QAZ
-
-
-

src/log4j.properties

@@ -7,7 +7,7 @@ log4j.appender.console.layout=org.apache.log4j.PatternLayout
 log4j.appender.console.layout.ConversionPattern=Time    \:\t%d{yyyy-MM-dd HH\:mm\:ss}%nClass   \:\t%c%nPriority\:\t%p%nMessage \:\t%m%n--------------------------------------------------------------------------------%n
 
 log4j.appender.fileout=org.apache.log4j.FileAppender  
-log4j.appender.fileout.File=/home/log/guangming_output.log
+log4j.appender.fileout.File=/home/log/zoumasuyuan_output.log
 log4j.appender.fileout.layout=org.apache.log4j.PatternLayout
 log4j.appender.fileout.layout.ConversionPattern=Time    \:\t%d{yyyy-MM-dd HH\:mm\:ss}%nClass   \:\t%c%nPriority\:\t%p%nMessage \:\t%m%n--------------------------------------------------------------------------------%n
 log4j.appender.fileout.encoding=UTF-8

src/outsidews.properties

@@ -17,14 +17,14 @@ CIP_GET_MILK_TANK_TEMPERATURE=http://10.187.200.244:8080/getMilkTankTemperature
 13-2=http://10.187.200.244/index.php/admin/cip/milkTankT?selectDate=2017-12-23&timeInterval=5
 13-3=http://10.187.200.244/index.php/admin/cip/index
 13-4=http://10.187.200.244/index.php/admin/cip/milksilos_index
-4-2=http://172.16.84.43/main/redirect.asp?menuid=ROOT000000010003000400210001
-4-3=http://172.16.84.43/main/redirect.asp?menuid=ROOT000000010003000400210003
-4-4=http://172.16.84.43/main/redirect.asp?menuid=ROOT000000010003000400210004
-4-5=http://172.16.84.43/main/redirect.asp?menuid=ROOT000000010003000400210005
-3-8=http://172.16.84.43/main/redirect.asp?menuid=ROOT000000010003000400210006
-3-9=http://172.16.84.43/main/redirect.asp?menuid=ROOT000000010003000400210007
-3-10=http://172.16.84.43/main/redirect.asp?menuid=ROOT000000010003000400210008
-2-2=http://172.16.84.43/main/redirect.asp?menuid=ROOT000000010003000400210002
+4-2=http://116.62.160.108/main/redirect.asp?menuid=ROOT000000010003000400210001
+4-3=http://116.62.160.108/main/redirect.asp?menuid=ROOT000000010003000400210003
+4-4=http://116.62.160.108/main/redirect.asp?menuid=ROOT000000010003000400210004
+4-5=http://116.62.160.108/main/redirect.asp?menuid=ROOT000000010003000400210005
+3-8=http://116.62.160.108/main/redirect.asp?menuid=ROOT000000010003000400210006
+3-9=http://116.62.160.108/main/redirect.asp?menuid=ROOT000000010003000400210007
+3-10=http://116.62.160.108/main/redirect.asp?menuid=ROOT000000010003000400210008
+2-2=http://116.62.160.108/main/redirect.asp?menuid=ROOT000000010003000400210002
 #4-2=http://172.16.84.43/main/aspdata/aspedit/kernel.asp?intaction=12&strprogramname=ALI-%B3%C9%C4%B8%C5%A3%B7%B1%D6%B3%D7%B4%BF%F6
 #4-3=http://172.16.84.43/main/aspdata/aspedit/kernel.asp?intaction=12&strprogramname=%B6%BF%C5%A3_%B2%FA%B6%BF%D4%A4%B2%E2
 #4-4=http://172.16.84.43/main/Information/CattleDensity/kernel.asp?intaction=10&strprogramname=%B4%E6%C0%B8%D4%A4%B2%E2_%C3%DA%C8%E9%C5%A3%C9%E1
@@ -35,8 +35,8 @@ CIP_GET_MILK_TANK_TEMPERATURE=http://10.187.200.244:8080/getMilkTankTemperature
 #2-2=http://172.16.84.43/main/aspdata/aspedit/kernel.asp?intaction=12&strprogramname=ALI-%B8%F7%C4%C1%B3%A1%B4%E6%C0%B8%C7%E9%BF%F6
 mis_user_name=linkin_NY
 mis_password=linkintest
-#mis_login_uri=http://116.62.160.108/mfMISWS/wsUser.asmx/userLogin
-mis_login_uri=http://172.16.86.43/mfMISWS/wsUser.asmx/userLogin
+mis_login_uri=http://116.62.160.108/mfMISWS/wsUser.asmx/userLogin
+#mis_login_uri=http://172.16.86.43/mfMISWS/wsUser.asmx/userLogin
 #ai_chuang_base_uri=http://172.16.84.155:90
 #ai_chuang_base_uri=http://172.16.86.141
 ai_chuang_base_uri=http://172.16.86.142