wms-parent-manage/mt-pms-api
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'caixiang' of mengtong/mt-pms-api into master

Browse Source
This commit is contained in:
CaiXiangs 2020-01-10 15:06:06 +08:00 committed by Gitea
commit fdb5bd9618
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/compiler.xml
View File

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

9
.idea/dataSources.local.xml
View File

@ -2,11 +2,14 @@
<project version="4"> <project version="4">
<component name="dataSourceStorageLocal"> <component name="dataSourceStorageLocal">
<data-source name="mt_erp@47.96.183.77" uuid="b3cb0d92-041d-41fc-ace7-4cc9410e1df1"> <data-source name="mt_erp@47.96.183.77" uuid="b3cb0d92-041d-41fc-ace7-4cc9410e1df1">
<database-info product="" version="" jdbc-version="" driver-name="" driver-version="" /> <database-info product="" version="" jdbc-version="" driver-name="" driver-version="" dbms="MYSQL" exact-version="0" />
<secret-storage>master_key</secret-storage> <secret-storage>master_key</secret-storage>
<first-sync>true</first-sync>
<user-name>root</user-name> <user-name>root</user-name>
<introspection-schemas>*:</introspection-schemas> <schema-mapping>
<introspection-scope>
<node kind="schema" qname="" />
</introspection-scope>
</schema-mapping>
</data-source> </data-source>
</component> </component>
</project> </project>

1
.idea/encodings.xml
View File

@ -3,5 +3,6 @@
<component name="Encoding"> <component name="Encoding">
<file url="file://$PROJECT_DIR$" charset="UTF-8" /> <file url="file://$PROJECT_DIR$" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/wms-produce-manage" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/wms-produce-manage" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/wms-produce-manage/src/main/java" charset="UTF-8" />
</component> </component>
</project> </project>

4
wms-parent.iml
View File

@ -89,7 +89,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Maven: com.alibaba:jconsole:1.8.0"> <library name="Maven: com.alibaba:jconsole:1.8.0">
<CLASSES> <CLASSES>
<root url="jar://C:/Program Files/Java/jdk1.8.0_171/lib/jconsole.jar!/" /> <root url="jar://C:/Program Files/Java/jdk1.8.0_231/lib/jconsole.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -98,7 +98,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Maven: com.alibaba:tools:1.8.0"> <library name="Maven: com.alibaba:tools:1.8.0">
<CLASSES> <CLASSES>
<root url="jar://C:/Program Files/Java/jdk1.8.0_171/lib/tools.jar!/" /> <root url="jar://C:/Program Files/Java/jdk1.8.0_231/lib/tools.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

6
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MachiningProductVo.java
View File

@ -7,7 +7,7 @@ package com.deer.wms.produce.manage.model;
*/ */
public class MachiningProductVo extends MachiningProduct { public class MachiningProductVo extends MachiningProduct {
private String specificationBom; private String specificationBom;
private Integer unitName; private String unitName;
public String getSpecificationBom() { public String getSpecificationBom() {
return specificationBom; return specificationBom;
@ -17,11 +17,11 @@ public class MachiningProductVo extends MachiningProduct {
this.specificationBom = specificationBom; this.specificationBom = specificationBom;
} }
public Integer getUnitName() { public String getUnitName() {
return unitName; return unitName;
} }
public void setUnitName(Integer unitName) { public void setUnitName(String unitName) {
this.unitName = unitName; this.unitName = unitName;
} }
} }