From a0d7ec0ed431c60ac76ebeca3192b129fdeda753 Mon Sep 17 00:00:00 2001
From: CaiXiang <939387484@qq.com>
Date: Tue, 18 Aug 2020 10:27:19 +0800
Subject: [PATCH] mark

---
 .idea/workspace.xml                        | 88 ++++------------------
 src/test/java/generator/CodeGenerator.java | 13 +---
 2 files changed, 18 insertions(+), 83 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 764e2a0..36d346c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,77 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="3fd1674b-533b-4c0c-9ac3-bba39e6841ef" name="Default" comment="mark">
-      <change afterPath="$PROJECT_DIR$/src/test/java/BillCodeGenerator.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/java/ParseJSON.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/java/generator/CodeGenerator.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/java/generator/CodeGenerator.java.orig" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByAShelfMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByBakeClothMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByCoatingGlueMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByCoatingMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByCoatingProgressMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByGoDyeFactoryMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByLogisticsMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByRunClothMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByTrimmingMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByAShelfMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByBakeClothMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByCoatingGlueMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByCoatingMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByCoatingProgressMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByGoDyeFactoryMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByLogisticsMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByRunClothMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByTrimmingMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByAShelf.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByAShelfParams.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByBakeCloth.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByBakeClothParams.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByCoating.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByCoatingGlue.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByCoatingGlueParams.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByCoatingParams.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByCoatingProgress.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByCoatingProgressParams.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByGoDyeFactory.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByGoDyeFactoryParams.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByLogistics.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByLogisticsParams.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByRunCloth.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByRunClothParams.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByTrimming.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByTrimmingParams.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByAShelfService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByBakeClothService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByCoatingGlueService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByCoatingProgressService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByCoatingService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByGoDyeFactoryService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByLogisticsService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByRunClothService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByTrimmingService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByAShelfServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByBakeClothServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByCoatingGlueServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByCoatingProgressServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByCoatingServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByGoDyeFactoryServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByLogisticsServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByRunClothServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByTrimmingServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByAShelfController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByBakeClothController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByCoatingController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByCoatingGlueController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByCoatingProgressController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByGoDyeFactoryController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByLogisticsController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByRunClothController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByTrimmingController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-parent.iml" beforeDir="false" afterPath="$PROJECT_DIR$/wms-parent.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/test/java/generator/CodeGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/test/java/generator/CodeGenerator.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -558,8 +488,16 @@
       <workItem from="1597651088439" duration="12000" />
       <workItem from="1597653578641" duration="17000" />
       <workItem from="1597710573568" duration="149000" />
-      <workItem from="1597715559594" duration="1123000" />
+      <workItem from="1597715559594" duration="2047000" />
     </task>
+    <task id="LOCAL-00001" summary="mark">
+      <created>1597716938734</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1597716938734</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TodoView">
@@ -591,10 +529,10 @@
       <screen x="0" y="0" width="1920" height="1050" />
     </state>
     <state x="513" y="309" key="#com.intellij.fileTypes.FileTypeChooser/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597710642111" />
-    <state x="389" y="39" key="CommitChangelistDialog2" timestamp="1597716339801">
+    <state x="389" y="39" key="CommitChangelistDialog2" timestamp="1597716937923">
       <screen x="0" y="0" width="1920" height="1050" />
     </state>
-    <state x="389" y="39" key="CommitChangelistDialog2/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597716339801" />
+    <state x="389" y="39" key="CommitChangelistDialog2/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597716937923" />
     <state x="621" y="200" key="FileChooserDialogImpl" timestamp="1597653593780">
       <screen x="0" y="0" width="1920" height="1050" />
     </state>
@@ -624,6 +562,10 @@
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="366" y="78" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1597481540846" />
+    <state x="452" y="193" key="Vcs.Push.Dialog.v2" timestamp="1597716944492">
+      <screen x="0" y="0" width="1920" height="1050" />
+    </state>
+    <state x="452" y="193" key="Vcs.Push.Dialog.v2/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597716944492" />
   </component>
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
diff --git a/src/test/java/generator/CodeGenerator.java b/src/test/java/generator/CodeGenerator.java
index 69309fa..b2411d9 100644
--- a/src/test/java/generator/CodeGenerator.java
+++ b/src/test/java/generator/CodeGenerator.java
@@ -24,16 +24,9 @@ public class CodeGenerator {
         configurer.setModuleName("/wms-produce-manage");
 
         //璁剧疆闇€瑕佺敓鎴愮殑琛
-        configurer.getTables().add(new Table("mt_alone_by_run_cloth", null, "id", "Integer"));
-        configurer.getTables().add(new Table("mt_alone_by_bake_cloth", null, "id", "Integer"));
-        configurer.getTables().add(new Table("mt_alone_by_go_dye_factory", null, "id", "Integer"));
-        configurer.getTables().add(new Table("mt_alone_by_a_shelf", null, "id", "Integer"));
-        configurer.getTables().add(new Table("mt_alone_by_coating_glue", null, "id", "Integer"));
-        configurer.getTables().add(new Table("mt_alone_by_coating", null, "id", "Integer"));
-        configurer.getTables().add(new Table("mt_alone_by_coating_progress", null, "id", "Integer"));
-        configurer.getTables().add(new Table("mt_alone_by_trimming", null, "id", "Integer"));
-        configurer.getTables().add(new Table("mt_alone_by_logistics", null, "id", "Integer"));
-
+        configurer.getTables().add(new Table("mt_alone_by_order_info", null, "id", "Integer"));
+        configurer.getTables().add(new Table("mt_alone_by_product_info", null, "id", "Integer"));
+        configurer.getTables().add(new Table("mt_alone_by_weav_cloth", null, "id", "Integer"));
         //        configurer.getTables().add(new Table("mt_alone_process_methods", null, "id", "Integer"));
 
         //鐢熸垚浠ｇ爜