From 333f63482e244f2971e0eac4893a9d9f270cd7bc Mon Sep 17 00:00:00 2001 From: hy2250089 Date: Sun, 15 Dec 2019 16:44:27 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E6=89=B9=E6=AC=A1=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E4=B8=AA=E5=88=AB=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 5 + ..._com_deer_wms_intercept_1_0_0_SNAPSHOT.xml | 6 +- ...m_deer_wms_project_seed_1_0_0_SNAPSHOT.xml | 6 +- .idea/workspace.xml | 707 +- logs/spring.log | 7542 +++++++++++++++++ wms-produce-manage/.gitignore | 2 + ...aveProcess.java => ProductAndProcess.java} | 12 +- .../manage/model/ProductProcessParams.java | 10 + .../manage/service/ProductProcessService.java | 4 +- .../impl/ProductProcessServiceImpl.java | 42 +- .../manage/web/ProcessBomController.java | 1 - .../manage/web/ProductProcessController.java | 50 +- 12 files changed, 8110 insertions(+), 277 deletions(-) rename wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/{ProductProcessHaveProcess.java => ProductAndProcess.java} (60%) diff --git a/.gitignore b/.gitignore index cc1d291..db2a1fa 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ .metadata bin/ tmp/ +logs/ *.tmp *.bak *.swp @@ -11,6 +12,7 @@ local.properties .settings/ .loadpath .recommenders +.idea/ # External tool builders .externalToolBuilders/ @@ -56,3 +58,6 @@ local.properties .scala_dependencies .worksheet +/.idea/libraries/Maven__com_deer_wms_intercept_1_0_0_SNAPSHOT.xml +/.idea/libraries/Maven__com_deer_wms_intercept_1_0_0_SNAPSHOT.xml +/.idea/libraries/Maven__com_deer_wms_project_seed_1_0_0_SNAPSHOT.xml diff --git a/.idea/libraries/Maven__com_deer_wms_intercept_1_0_0_SNAPSHOT.xml b/.idea/libraries/Maven__com_deer_wms_intercept_1_0_0_SNAPSHOT.xml index 935eacc..205a811 100644 --- a/.idea/libraries/Maven__com_deer_wms_intercept_1_0_0_SNAPSHOT.xml +++ b/.idea/libraries/Maven__com_deer_wms_intercept_1_0_0_SNAPSHOT.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_deer_wms_project_seed_1_0_0_SNAPSHOT.xml b/.idea/libraries/Maven__com_deer_wms_project_seed_1_0_0_SNAPSHOT.xml index 826b07d..f4143c9 100644 --- a/.idea/libraries/Maven__com_deer_wms_project_seed_1_0_0_SNAPSHOT.xml +++ b/.idea/libraries/Maven__com_deer_wms_project_seed_1_0_0_SNAPSHOT.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e5f7ef5..f46bc89 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,7 +4,20 @@ -