Compare commits
3 Commits
116c981486
...
6b838944ba
| Author | SHA1 | Date | |
|---|---|---|---|
|
6b838944ba | ||
|
|
0eec7c0f85 | ||
|
|
909b1906c7 |
@ -1,13 +0,0 @@
|
||||
<component name="libraryTable">
|
||||
<library name="Maven: org.mapstruct:mapstruct:1.1.0.Final">
|
||||
<CLASSES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/mapstruct/mapstruct/1.1.0.Final/mapstruct-1.1.0.Final.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/mapstruct/mapstruct/1.1.0.Final/mapstruct-1.1.0.Final-javadoc.jar!/" />
|
||||
</JAVADOC>
|
||||
<SOURCES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/mapstruct/mapstruct/1.1.0.Final/mapstruct-1.1.0.Final-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
</component>
|
||||
@ -3,94 +3,30 @@
|
||||
<component name="AnalysisUIOptions">
|
||||
<option name="GROUP_BY_SEVERITY" value="true" />
|
||||
</component>
|
||||
<component name="AutoImportSettings">
|
||||
<option name="autoReloadType" value="SELECTIVE" />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="3fd1674b-533b-4c0c-9ac3-bba39e6841ef" name="Default" comment="mark">
|
||||
<change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapstruct/MtAloneByOrderInfoMapping.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByOrderInfoVo.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mapstruct_mapstruct_1_1_0_Final.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/test/java/generator/CodeGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/generator/CodeGenerator.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByAShelfMapper.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByBakeClothMapper.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByCoatingGlueMapper.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByCoatingMapper.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByCoatingProgressMapper.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByGoDyeFactoryMapper.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByLogisticsMapper.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByOrderInfoMapper.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByProductInfoMapper.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByRunClothMapper.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByTrimmingMapper.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByWeavClothMapper.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByAShelfMapper.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByBakeClothMapper.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByCoatingGlueMapper.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByCoatingMapper.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByCoatingProgressMapper.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByGoDyeFactoryMapper.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByLogisticsMapper.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByOrderInfoMapper.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByProductInfoMapper.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByRunClothMapper.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByTrimmingMapper.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByWeavClothMapper.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByAShelf.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByAShelfParams.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByBakeCloth.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByBakeClothParams.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByCoating.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByCoatingGlue.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByCoatingGlueParams.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByCoatingParams.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByCoatingProgress.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByCoatingProgressParams.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByGoDyeFactory.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByGoDyeFactoryParams.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByLogistics.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByLogisticsParams.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByOrderInfo.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByOrderInfoParams.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByProductInfo.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByProductInfoParams.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByRunCloth.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByRunClothParams.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByTrimming.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByTrimmingParams.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByWeavCloth.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByWeavClothParams.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByAShelfService.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByBakeClothService.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByCoatingGlueService.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByCoatingProgressService.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByCoatingService.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByGoDyeFactoryService.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByLogisticsService.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByOrderInfoService.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByProductInfoService.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByRunClothService.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByTrimmingService.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByWeavClothService.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByAShelfServiceImpl.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByBakeClothServiceImpl.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByCoatingGlueServiceImpl.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByCoatingProgressServiceImpl.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByCoatingServiceImpl.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByGoDyeFactoryServiceImpl.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByLogisticsServiceImpl.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByOrderInfoServiceImpl.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByProductInfoServiceImpl.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByRunClothServiceImpl.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByTrimmingServiceImpl.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByWeavClothServiceImpl.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByAShelfController.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByBakeClothController.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByCoatingController.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByCoatingGlueController.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByCoatingProgressController.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByGoDyeFactoryController.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByLogisticsController.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByOrderInfoController.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByProductInfoController.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByRunClothController.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByTrimmingController.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByWeavClothController.java" beforeDir="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/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/pom.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/constant/ProduceManagePublicMethod.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/constant/ProduceManagePublicMethod.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByOrderInfoMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByOrderInfoMapper.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByProductInfoMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByProductInfoMapper.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByOrderInfoMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByOrderInfoMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByProductInfoMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByProductInfoMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByOrderInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByOrderInfo.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByOrderInfoParams.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByOrderInfoParams.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByOrderInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByOrderInfoService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByProductInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByProductInfoService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByOrderInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByOrderInfoServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByProductInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByProductInfoServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByOrderInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByOrderInfoController.java" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
@ -156,6 +92,13 @@
|
||||
<component name="Git.Settings">
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="MavenImportPreferences">
|
||||
<option name="generalSettings">
|
||||
<MavenGeneralSettings>
|
||||
<option name="mavenHome" value="E:\idea\IntelliJ IDEA 2019.3.5\plugins\maven\lib\maven3" />
|
||||
</MavenGeneralSettings>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectId" id="1g7xPULNnjVlBcQ5DdLGUGBm9kJ" />
|
||||
<component name="ProjectInspectionProfilesVisibleTreeState">
|
||||
<entry key="Project Default">
|
||||
@ -243,7 +186,7 @@
|
||||
</set>
|
||||
</option>
|
||||
</component>
|
||||
<component name="RunManager" selected="Spring Boot.PmsApplication">
|
||||
<component name="RunManager" selected="Application.Test">
|
||||
<configuration default="true" type="Applet" factoryName="Applet">
|
||||
<option name="HTML_USED" value="false" />
|
||||
<option name="WIDTH" value="400" />
|
||||
@ -279,20 +222,6 @@
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration name="ProduceManagePublicMethod" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
||||
<option name="MAIN_CLASS_NAME" value="com.deer.wms.produce.manage.constant.ProduceManagePublicMethod" />
|
||||
<module name="wms-produce-manage" />
|
||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||
<extension name="coverage">
|
||||
<pattern>
|
||||
<option name="PATTERN" value="com.deer.wms.produce.manage.constant.*" />
|
||||
<option name="ENABLED" value="true" />
|
||||
</pattern>
|
||||
</extension>
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration name="ProductProcessBatchDetServiceImpl" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
||||
<option name="MAIN_CLASS_NAME" value="com.deer.wms.produce.manage.service.impl.ProductProcessBatchDetServiceImpl" />
|
||||
<module name="wms-produce-manage" />
|
||||
@ -307,12 +236,39 @@
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration name="Test" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
||||
<option name="MAIN_CLASS_NAME" value="com.deer.wms.produce.manage.web.Test" />
|
||||
<module name="wms-produce-manage" />
|
||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||
<extension name="coverage">
|
||||
<pattern>
|
||||
<option name="PATTERN" value="com.deer.wms.produce.manage.web.*" />
|
||||
<option name="ENABLED" value="true" />
|
||||
</pattern>
|
||||
</extension>
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration default="true" type="Application" factoryName="Application">
|
||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration default="true" type="ArquillianTestNG" factoryName="" nameIsGenerated="true">
|
||||
<option name="arquillianRunConfiguration">
|
||||
<value>
|
||||
<option name="containerStateName" value="" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="TEST_OBJECT" value="CLASS" />
|
||||
<properties />
|
||||
<listeners />
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration default="true" type="JUnit" factoryName="JUnit">
|
||||
<option name="TEST_OBJECT" value="class" />
|
||||
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
|
||||
@ -365,22 +321,23 @@
|
||||
</method>
|
||||
</configuration>
|
||||
<list>
|
||||
<item itemvalue="Application.ProduceManagePublicMethod" />
|
||||
<item itemvalue="Application.ProductProcessBatchDetServiceImpl" />
|
||||
<item itemvalue="Application.CodeGenerator" />
|
||||
<item itemvalue="Application.CodeGenerator (1)" />
|
||||
<item itemvalue="Spring Boot.PmsApplication" />
|
||||
<item itemvalue="Application.Test" />
|
||||
</list>
|
||||
<recent_temporary>
|
||||
<list>
|
||||
<item itemvalue="Application.Test" />
|
||||
<item itemvalue="Spring Boot.PmsApplication" />
|
||||
<item itemvalue="Application.CodeGenerator (1)" />
|
||||
<item itemvalue="Application.CodeGenerator" />
|
||||
<item itemvalue="Application.ProductProcessBatchDetServiceImpl" />
|
||||
<item itemvalue="Application.ProduceManagePublicMethod" />
|
||||
</list>
|
||||
</recent_temporary>
|
||||
</component>
|
||||
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
|
||||
<component name="SvnConfiguration">
|
||||
<configuration />
|
||||
</component>
|
||||
@ -576,6 +533,8 @@
|
||||
<workItem from="1597715559594" duration="2738000" />
|
||||
<workItem from="1597734009753" duration="14000" />
|
||||
<workItem from="1597734148841" duration="568000" />
|
||||
<workItem from="1597971890218" duration="12735000" />
|
||||
<workItem from="1597989143534" duration="10955000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="mark">
|
||||
<created>1597716938734</created>
|
||||
@ -604,7 +563,7 @@
|
||||
</todo-panel>
|
||||
</component>
|
||||
<component name="TypeScriptGeneratedFilesManager">
|
||||
<option name="version" value="2" />
|
||||
<option name="version" value="3" />
|
||||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<MESSAGE value="mark" />
|
||||
@ -623,36 +582,48 @@
|
||||
<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="765" y="223" key="#com.intellij.ide.util.MemberChooser" timestamp="1597999710196">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state x="765" y="223" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040@0.0.1920.1040" timestamp="1597999710196" />
|
||||
<state x="389" y="0" key="CommitChangelistDialog2" timestamp="1597718387821">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state x="389" y="0" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1597718387821" />
|
||||
<state x="389" y="39" key="CommitChangelistDialog2/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597717639469" />
|
||||
<state x="621" y="200" key="FileChooserDialogImpl" timestamp="1597734021850">
|
||||
<screen x="0" y="0" width="1920" height="1050" />
|
||||
<state x="621" y="198" key="FileChooserDialogImpl" timestamp="1597989841097">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state x="621" y="198" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1597481488476" />
|
||||
<state x="621" y="198" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1597989841097" />
|
||||
<state x="621" y="200" key="FileChooserDialogImpl/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597734021850" />
|
||||
<state x="730" y="396" key="Gitee.ShareDialog" timestamp="1597481505655">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state x="730" y="396" key="Gitee.ShareDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1597481505655" />
|
||||
<state width="1921" height="28" key="GridCell.Tab.0.bottom" timestamp="1597717630394">
|
||||
<screen x="0" y="0" width="1920" height="1050" />
|
||||
<state width="1877" height="275" key="GridCell.Tab.0.bottom" timestamp="1598000181099">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1877" height="275" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1598000181099" />
|
||||
<state width="1921" height="28" key="GridCell.Tab.0.bottom/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597717630394" />
|
||||
<state width="1921" height="28" key="GridCell.Tab.0.center" timestamp="1597717630394">
|
||||
<screen x="0" y="0" width="1920" height="1050" />
|
||||
<state width="1877" height="275" key="GridCell.Tab.0.center" timestamp="1598000181098">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1877" height="275" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1598000181098" />
|
||||
<state width="1921" height="28" key="GridCell.Tab.0.center/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597717630394" />
|
||||
<state width="1921" height="28" key="GridCell.Tab.0.left" timestamp="1597717630393">
|
||||
<screen x="0" y="0" width="1920" height="1050" />
|
||||
<state width="1877" height="275" key="GridCell.Tab.0.left" timestamp="1598000181098">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1877" height="275" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1598000181098" />
|
||||
<state width="1921" height="28" key="GridCell.Tab.0.left/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597717630393" />
|
||||
<state width="1921" height="28" key="GridCell.Tab.0.right" timestamp="1597717630394">
|
||||
<screen x="0" y="0" width="1920" height="1050" />
|
||||
<state width="1877" height="275" key="GridCell.Tab.0.right" timestamp="1598000181098">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1877" height="275" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1598000181098" />
|
||||
<state width="1921" height="28" key="GridCell.Tab.0.right/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597717630394" />
|
||||
<state x="490" y="174" key="Maven.ArtifactSearchDialog" timestamp="1597988929076">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state x="490" y="174" key="Maven.ArtifactSearchDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1597988929076" />
|
||||
<state x="366" y="78" key="SettingsEditor" timestamp="1597481540846">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
|
||||
18
pom.xml
18
pom.xml
@ -31,6 +31,7 @@
|
||||
<mybatis.plus.version>3.0.5</mybatis.plus.version>
|
||||
<hutool.version>4.1.19</hutool.version>
|
||||
<fastjson.version>1.2.22</fastjson.version>
|
||||
<org.mapstruct.version>1.3.0.Final</org.mapstruct.version>
|
||||
</properties>
|
||||
|
||||
|
||||
@ -241,6 +242,19 @@
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- MapStruct -->
|
||||
<dependency>
|
||||
<groupId>org.mapstruct</groupId>
|
||||
<artifactId>mapstruct-jdk8</artifactId>
|
||||
<version>${org.mapstruct.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.mapstruct</groupId>
|
||||
<artifactId>mapstruct-processor</artifactId>
|
||||
<version>${org.mapstruct.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
@ -262,7 +276,7 @@
|
||||
</resources>
|
||||
</build>
|
||||
|
||||
<repositories>
|
||||
<!--<repositories>
|
||||
<repository>
|
||||
<id>nexus</id>
|
||||
<name>local private nexus</name>
|
||||
@ -287,6 +301,6 @@
|
||||
<enabled>true</enabled>
|
||||
</snapshots>
|
||||
</pluginRepository>
|
||||
</pluginRepositories>
|
||||
</pluginRepositories>-->
|
||||
|
||||
</project>
|
||||
@ -128,7 +128,6 @@
|
||||
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.1.0.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.10.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.13" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.poi:poi:3.13" level="project" />
|
||||
@ -159,5 +158,14 @@
|
||||
<orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
|
||||
<orderEntry type="module" module-name="wms-produce-manage" scope="TEST" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: com.deer:wms-system-manage:1.0.0-SNAPSHOT" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: com.deer:wms-file:1.0.0-SNAPSHOT" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: com.deer:wms-message:1.0.0-SNAPSHOT" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: com.deer:wms-bill-manage:1.0.0-SNAPSHOT" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: com.deer:wms-report:1.0.0-SNAPSHOT" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: eu.bitwalker:UserAgentUtils:1.20" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: com.deer:wms-base-system:1.0.0-SNAPSHOT" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.3.0.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mapstruct:mapstruct-processor:1.3.0.Final" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
@ -33,6 +33,16 @@
|
||||
<version>${project.version}</version>
|
||||
<!--<scope>compile</scope>-->
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.deer</groupId>
|
||||
<artifactId>wms-system-manage</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.deer</groupId>
|
||||
<artifactId>wms-base-system</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
<build>
|
||||
|
||||
@ -42,4 +42,9 @@ public class ProduceManagePublicMethod {
|
||||
String code = creatBatchDetCode(new Date(), 10, "1", "1");
|
||||
System.out.println("----------"+code);
|
||||
}
|
||||
|
||||
public static String getUUID(){
|
||||
String uuid = UUID.randomUUID().toString().replace("-", "");
|
||||
return uuid;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,6 +1,13 @@
|
||||
package com.deer.wms.produce.manage.dao;
|
||||
|
||||
import com.deer.wms.produce.manage.model.MtAloneByOrderInfo;
|
||||
import com.deer.wms.produce.manage.model.MtAloneByOrderInfoParams;
|
||||
import com.deer.wms.produce.manage.model.MtAloneByOrderInfoVo;
|
||||
import com.deer.wms.project.seed.core.mapper.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface MtAloneByOrderInfoMapper extends Mapper<MtAloneByOrderInfo> {
|
||||
List<MtAloneByOrderInfo> findList(MtAloneByOrderInfoParams params);
|
||||
|
||||
}
|
||||
@ -2,5 +2,11 @@ package com.deer.wms.produce.manage.dao;
|
||||
|
||||
import com.deer.wms.produce.manage.model.MtAloneByProductInfo;
|
||||
import com.deer.wms.project.seed.core.mapper.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface MtAloneByProductInfoMapper extends Mapper<MtAloneByProductInfo> {
|
||||
void deleteByOrderInfoId(Integer id);
|
||||
|
||||
List<MtAloneByProductInfo> findByOrderInfoId(Integer id);
|
||||
}
|
||||
@ -28,4 +28,27 @@
|
||||
<result column="description" jdbcType="VARCHAR" property="description" />
|
||||
<result column="note" jdbcType="VARCHAR" property="note" />
|
||||
</resultMap>
|
||||
|
||||
|
||||
<select id="findList" resultMap="BaseResultMap">
|
||||
SELECT id,operator_id,create_time,update_time,creator_id,updater_id,order_status,order_name,order_code,follow_id,follow_name,
|
||||
schedule,carry_out_time,client_id,client_code,client_name,client_tel,ship_time,description,note
|
||||
FROM mt_alone_by_order_info
|
||||
<where>
|
||||
<if test="keywords != null and keywords != ''">
|
||||
order_code LIKE CONCAT('%', #{keywords}, '%')
|
||||
OR client_code LIKE CONCAT('%', #{keywords}, '%')
|
||||
OR order_name LIKE CONCAT('%', #{keywords}, '%')
|
||||
</if>
|
||||
<if test="beginTime!=null and beginTime!=''">
|
||||
<![CDATA[ AND DATE_FORMAT(create_time, '%Y-%m-%d')>= DATE_FORMAT(#{beginTime}, '%Y-%m-%d') ]]>
|
||||
</if>
|
||||
<if test="endTime!=null and endTime!=''">
|
||||
<![CDATA[ AND DATE_FORMAT(create_time, '%Y-%m-%d') <= DATE_FORMAT(#{endTime}, '%Y-%m-%d') ]]>
|
||||
</if>
|
||||
<if test="companyId != null">
|
||||
AND mappb.company_id = #{companyId}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
</mapper>
|
||||
@ -34,4 +34,15 @@
|
||||
<result column="deliver_goods" jdbcType="INTEGER" property="deliverGoods" />
|
||||
<result column="complete" jdbcType="INTEGER" property="complete" />
|
||||
</resultMap>
|
||||
|
||||
<delete id="deleteByOrderInfoId" parameterType="Integer">
|
||||
delete FROM mt_alone_by_product_info
|
||||
WHERE order_info_id = #{id}
|
||||
</delete>
|
||||
|
||||
<select id="findByOrderInfoId" parameterType="Integer" resultMap="BaseResultMap">
|
||||
SELECT *
|
||||
FROM mt_alone_by_product_info
|
||||
WHERE order_info_id = #{id}
|
||||
</select>
|
||||
</mapper>
|
||||
@ -0,0 +1,16 @@
|
||||
package com.deer.wms.produce.manage.mapstruct;
|
||||
|
||||
import com.deer.wms.produce.manage.model.MtAloneByOrderInfo;
|
||||
import com.deer.wms.produce.manage.model.MtAloneByOrderInfoVo;
|
||||
import org.mapstruct.Mapper;
|
||||
|
||||
/**
|
||||
* @Author weihongyang
|
||||
* @Date 2020/8/21 16:24
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Mapper
|
||||
public interface MtAloneByOrderInfoMapping {
|
||||
|
||||
MtAloneByOrderInfoVo MtAloneByOrderInfoToMtAloneByOrderInfoVo(MtAloneByOrderInfo mtAloneByOrderInfo);
|
||||
}
|
||||
@ -1,5 +1,7 @@
|
||||
package com.deer.wms.produce.manage.model;
|
||||
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
|
||||
import java.util.Date;
|
||||
import javax.persistence.*;
|
||||
|
||||
@ -521,4 +523,11 @@ public class MtAloneByOrderInfo {
|
||||
public void setNote(String note) {
|
||||
this.note = note;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return ToStringBuilder.reflectionToString(this);
|
||||
}
|
||||
|
||||
}
|
||||
@ -6,4 +6,24 @@ import com.deer.wms.project.seed.core.service.QueryParams;
|
||||
* Created by on 2020/08/18.
|
||||
*/
|
||||
public class MtAloneByOrderInfoParams extends QueryParams {
|
||||
|
||||
private String beginTime;
|
||||
|
||||
private String endTime;
|
||||
|
||||
public String getBeginTime() {
|
||||
return beginTime;
|
||||
}
|
||||
|
||||
public void setBeginTime(String beginTime) {
|
||||
this.beginTime = beginTime;
|
||||
}
|
||||
|
||||
public String getEndTime() {
|
||||
return endTime;
|
||||
}
|
||||
|
||||
public void setEndTime(String endTime) {
|
||||
this.endTime = endTime;
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,21 @@
|
||||
package com.deer.wms.produce.manage.model;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Author weihongyang
|
||||
* @Date 2020/8/21 15:09
|
||||
* @Version 1.0
|
||||
*/
|
||||
public class MtAloneByOrderInfoVo extends MtAloneByOrderInfo{
|
||||
private List<MtAloneByProductInfo> mtAloneByProductInfos;
|
||||
|
||||
public List<MtAloneByProductInfo> getMtAloneByProductInfos() {
|
||||
return mtAloneByProductInfos;
|
||||
}
|
||||
|
||||
public void setMtAloneByProductInfos(List<MtAloneByProductInfo> mtAloneByProductInfos) {
|
||||
this.mtAloneByProductInfos = mtAloneByProductInfos;
|
||||
}
|
||||
}
|
||||
@ -3,6 +3,7 @@ package com.deer.wms.produce.manage.service;
|
||||
import com.deer.wms.produce.manage.model.MtAloneByOrderInfo;
|
||||
import com.deer.wms.produce.manage.model.MtAloneByOrderInfoParams;
|
||||
|
||||
import com.deer.wms.produce.manage.model.MtAloneByOrderInfoVo;
|
||||
import com.deer.wms.project.seed.core.service.Service;
|
||||
import java.util.List;
|
||||
|
||||
@ -12,5 +13,5 @@ import java.util.List;
|
||||
public interface MtAloneByOrderInfoService extends Service<MtAloneByOrderInfo, Integer> {
|
||||
|
||||
|
||||
|
||||
List<MtAloneByOrderInfo> findList(MtAloneByOrderInfoParams params);
|
||||
}
|
||||
|
||||
@ -12,5 +12,7 @@ import java.util.List;
|
||||
public interface MtAloneByProductInfoService extends Service<MtAloneByProductInfo, Integer> {
|
||||
|
||||
|
||||
void deleteByOrderInfoId(Integer id);
|
||||
|
||||
List<MtAloneByProductInfo> findByOrderInfoId(Integer id);
|
||||
}
|
||||
|
||||
@ -3,6 +3,7 @@ package com.deer.wms.produce.manage.service.impl;
|
||||
import com.deer.wms.produce.manage.dao.MtAloneByOrderInfoMapper;
|
||||
import com.deer.wms.produce.manage.model.MtAloneByOrderInfo;
|
||||
import com.deer.wms.produce.manage.model.MtAloneByOrderInfoParams;
|
||||
import com.deer.wms.produce.manage.model.MtAloneByOrderInfoVo;
|
||||
import com.deer.wms.produce.manage.service.MtAloneByOrderInfoService;
|
||||
|
||||
import com.deer.wms.project.seed.core.service.AbstractService;
|
||||
@ -22,5 +23,9 @@ public class MtAloneByOrderInfoServiceImpl extends AbstractService<MtAloneByOrde
|
||||
private MtAloneByOrderInfoMapper mtAloneByOrderInfoMapper;
|
||||
|
||||
|
||||
@Override
|
||||
public List<MtAloneByOrderInfo> findList(MtAloneByOrderInfoParams params) {
|
||||
return mtAloneByOrderInfoMapper.findList(params);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -22,5 +22,13 @@ public class MtAloneByProductInfoServiceImpl extends AbstractService<MtAloneByPr
|
||||
private MtAloneByProductInfoMapper mtAloneByProductInfoMapper;
|
||||
|
||||
|
||||
@Override
|
||||
public void deleteByOrderInfoId(Integer id) {
|
||||
mtAloneByProductInfoMapper.deleteByOrderInfoId(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<MtAloneByProductInfo> findByOrderInfoId(Integer id) {
|
||||
return mtAloneByProductInfoMapper.findByOrderInfoId(id);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,16 +1,25 @@
|
||||
package com.deer.wms.produce.manage.web;
|
||||
|
||||
import com.deer.wms.produce.manage.model.MtAloneByAShelf;
|
||||
import com.deer.wms.base.system.model.ClientManage;
|
||||
import com.deer.wms.base.system.model.ClientManageCriteria;
|
||||
import com.deer.wms.base.system.service.ClientManageService;
|
||||
import com.deer.wms.produce.manage.constant.ProduceManagePublicMethod;
|
||||
import com.deer.wms.produce.manage.mapstruct.MtAloneByOrderInfoMapping;
|
||||
import com.deer.wms.produce.manage.model.*;
|
||||
import com.deer.wms.produce.manage.service.MtAloneByProductInfoService;
|
||||
import com.deer.wms.project.seed.annotation.OperateLog;
|
||||
import com.deer.wms.project.seed.constant.SystemManageConstant;
|
||||
import com.deer.wms.project.seed.core.result.CommonCode;
|
||||
import com.deer.wms.project.seed.core.result.Result;
|
||||
import com.deer.wms.project.seed.core.result.ResultGenerator;
|
||||
import com.deer.wms.produce.manage.model.MtAloneByOrderInfo;
|
||||
import com.deer.wms.produce.manage.model.MtAloneByOrderInfoParams;
|
||||
import com.deer.wms.produce.manage.service.MtAloneByOrderInfoService;
|
||||
import com.deer.wms.intercept.annotation.User;
|
||||
import com.deer.wms.intercept.common.data.CurrentUser;
|
||||
import com.deer.wms.system.manage.model.user.UserInfo;
|
||||
import com.deer.wms.system.manage.model.user.UserInfoCriteria;
|
||||
import com.deer.wms.system.manage.model.user.UserInfoVO;
|
||||
import com.deer.wms.system.manage.model.user.UserListVO;
|
||||
import com.deer.wms.system.manage.service.UserInfoService;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
|
||||
@ -30,7 +39,7 @@ import java.util.List;
|
||||
/**
|
||||
* Created by on 2020/08/18.
|
||||
*/
|
||||
@Api(description = "xxx接口")
|
||||
@Api(description = "订单接口")
|
||||
@RestController
|
||||
@RequestMapping("/mt/alone/by/order/infos")
|
||||
public class MtAloneByOrderInfoController {
|
||||
@ -38,6 +47,18 @@ public class MtAloneByOrderInfoController {
|
||||
@Autowired
|
||||
private MtAloneByOrderInfoService mtAloneByOrderInfoService;
|
||||
|
||||
@Autowired
|
||||
private ClientManageService clientManageService;
|
||||
|
||||
@Autowired
|
||||
private UserInfoService userInfoService;
|
||||
|
||||
@Autowired
|
||||
private MtAloneByProductInfoService mtAloneByProductInfoService;
|
||||
|
||||
@Autowired
|
||||
private MtAloneByOrderInfoMapping mtAloneByOrderInfoMapping;
|
||||
|
||||
@OperateLog(description = "添加xxx", type = "增加")
|
||||
@ApiOperation(value = "添加xxx", notes = "添加xxx")
|
||||
@PostMapping("/add")
|
||||
@ -51,16 +72,22 @@ public class MtAloneByOrderInfoController {
|
||||
return ResultGenerator.genSuccessResult();
|
||||
}
|
||||
|
||||
@OperateLog(description = "删除xxx", type = "删除")
|
||||
@ApiOperation(value = "删除xxx", notes = "删除xxx")
|
||||
@OperateLog(description = "删除订单", type = "删除")
|
||||
@ApiOperation(value = "删除订单", notes = "删除订单")
|
||||
@DeleteMapping("/delete/{id}")
|
||||
public Result delete(@PathVariable Integer Id) {
|
||||
mtAloneByProductInfoService.deleteByOrderInfoId(Id);
|
||||
mtAloneByOrderInfoService.deleteById(Id);
|
||||
return ResultGenerator.genSuccessResult();
|
||||
}
|
||||
|
||||
@OperateLog(description = "修改xxx", type = "更新")
|
||||
@ApiOperation(value = "修改xxx", notes = "修改xxx")
|
||||
/**
|
||||
* 修改保存
|
||||
* @param mtAloneByOrderInfo
|
||||
* @return
|
||||
*/
|
||||
@OperateLog(description = "修改订单", type = "更新")
|
||||
@ApiOperation(value = "修改订单", notes = "修改订单")
|
||||
@PostMapping("/update")
|
||||
public Result update(@RequestBody MtAloneByOrderInfo mtAloneByOrderInfo) {
|
||||
mtAloneByOrderInfo.setUpdateTime(new Date());
|
||||
@ -68,13 +95,32 @@ public class MtAloneByOrderInfoController {
|
||||
return ResultGenerator.genSuccessResult();
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改订单获取修改的数据并填充
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/update/for/data/{id}")
|
||||
public Result updateForData(@PathVariable Integer id){
|
||||
MtAloneByOrderInfo mtAloneByOrderInfo = mtAloneByOrderInfoService.findById(id);
|
||||
List<MtAloneByProductInfo> mtAloneByProductInfos = mtAloneByProductInfoService.findByOrderInfoId(id);
|
||||
MtAloneByOrderInfoVo mtAloneByOrderInfoVo = mtAloneByOrderInfoMapping.MtAloneByOrderInfoToMtAloneByOrderInfoVo(mtAloneByOrderInfo);
|
||||
mtAloneByOrderInfoVo.setMtAloneByProductInfos(mtAloneByProductInfos);
|
||||
return ResultGenerator.genSuccessResult(mtAloneByOrderInfoVo);
|
||||
}
|
||||
|
||||
@GetMapping("/detail/{id}")
|
||||
public Result detail(@PathVariable Integer id) {
|
||||
MtAloneByOrderInfo mtAloneByOrderInfo = mtAloneByOrderInfoService.findById(id);
|
||||
return ResultGenerator.genSuccessResult(mtAloneByOrderInfo);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 订单条件列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
@ApiOperation(value = "查看订单", notes = "查看")
|
||||
public Result list(MtAloneByOrderInfoParams params, @ApiIgnore @User CurrentUser currentUser) {
|
||||
if(currentUser==null){
|
||||
return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
|
||||
@ -86,10 +132,48 @@ public class MtAloneByOrderInfoController {
|
||||
params.setCompanyId(null);
|
||||
}
|
||||
PageHelper.startPage(params.getPageNum(), params.getPageSize());
|
||||
//List<MtAloneByOrderInfo> list = mtAloneByOrderInfoService.findList(params);
|
||||
List<MtAloneByAShelf> list = new ArrayList<>();
|
||||
List<MtAloneByOrderInfo> list = mtAloneByOrderInfoService.findList(params);
|
||||
PageInfo pageInfo = new PageInfo(list);
|
||||
return ResultGenerator.genSuccessResult(pageInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加订单的时候获取uuid作为订单编码
|
||||
*/
|
||||
@PostMapping("get/order/code")
|
||||
public Result getOrderCode(@ApiIgnore @User CurrentUser currentUser){
|
||||
if(currentUser==null){
|
||||
return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
|
||||
}
|
||||
String orderCode = ProduceManagePublicMethod.getUUID();
|
||||
return ResultGenerator.genSuccessResult(orderCode);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增订单的获取客户编码
|
||||
*/
|
||||
@PostMapping("get/client/code")
|
||||
public Result getClientCode(@ApiIgnore @User CurrentUser currentUser){
|
||||
if(currentUser==null){
|
||||
return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
|
||||
}
|
||||
ClientManageCriteria clientManageCriteria = new ClientManageCriteria();
|
||||
clientManageCriteria.setCompanyId(currentUser.getCompanyId());
|
||||
List<ClientManage> list = clientManageService.findList(clientManageCriteria);
|
||||
return ResultGenerator.genSuccessResult(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增订单的获取跟单员
|
||||
*/
|
||||
@PostMapping("get/follow/name")
|
||||
public Result getFollowName(@ApiIgnore @User CurrentUser currentUser){
|
||||
if(currentUser==null){
|
||||
return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
|
||||
}
|
||||
UserInfoCriteria userInfoCriteria = new UserInfoCriteria();
|
||||
userInfoCriteria.setCompanyId(currentUser.getCompanyId());
|
||||
List<UserListVO> list = userInfoService.findUserFormList(userInfoCriteria);
|
||||
return ResultGenerator.genSuccessResult(list);
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user