Tento commit je obsažen v:
weihongyang 2020-08-24 08:28:43 +08:00
rodič 6b838944ba
revize 45bc22522f

Zobrazit soubor

@ -7,26 +7,8 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="3fd1674b-533b-4c0c-9ac3-bba39e6841ef" name="Default" comment="mark"> <list default="true" id="3fd1674b-533b-4c0c-9ac3-bba39e6841ef" name="Default" comment="生产订单">
<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$/.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/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> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -256,19 +238,6 @@
<option name="Make" enabled="true" /> <option name="Make" enabled="true" />
</method> </method>
</configuration> </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"> <configuration default="true" type="JUnit" factoryName="JUnit">
<option name="TEST_OBJECT" value="class" /> <option name="TEST_OBJECT" value="class" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" /> <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
@ -324,8 +293,8 @@
<item itemvalue="Application.ProductProcessBatchDetServiceImpl" /> <item itemvalue="Application.ProductProcessBatchDetServiceImpl" />
<item itemvalue="Application.CodeGenerator" /> <item itemvalue="Application.CodeGenerator" />
<item itemvalue="Application.CodeGenerator (1)" /> <item itemvalue="Application.CodeGenerator (1)" />
<item itemvalue="Spring Boot.PmsApplication" />
<item itemvalue="Application.Test" /> <item itemvalue="Application.Test" />
<item itemvalue="Spring Boot.PmsApplication" />
</list> </list>
<recent_temporary> <recent_temporary>
<list> <list>
@ -534,7 +503,8 @@
<workItem from="1597734009753" duration="14000" /> <workItem from="1597734009753" duration="14000" />
<workItem from="1597734148841" duration="568000" /> <workItem from="1597734148841" duration="568000" />
<workItem from="1597971890218" duration="12735000" /> <workItem from="1597971890218" duration="12735000" />
<workItem from="1597989143534" duration="10955000" /> <workItem from="1597989143534" duration="11041000" />
<workItem from="1598228326441" duration="294000" />
</task> </task>
<task id="LOCAL-00001" summary="mark"> <task id="LOCAL-00001" summary="mark">
<created>1597716938734</created> <created>1597716938734</created>
@ -550,7 +520,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1597717639939</updated> <updated>1597717639939</updated>
</task> </task>
<option name="localTasksCounter" value="3" /> <task id="LOCAL-00003" summary="生产订单">
<created>1598000490139</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1598000490139</updated>
</task>
<option name="localTasksCounter" value="4" />
<servers /> <servers />
</component> </component>
<component name="TodoView"> <component name="TodoView">
@ -567,7 +544,8 @@
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="mark" /> <MESSAGE value="mark" />
<option name="LAST_COMMIT_MESSAGE" value="mark" /> <MESSAGE value="生产订单" />
<option name="LAST_COMMIT_MESSAGE" value="生产订单" />
</component> </component>
<component name="WindowStateProjectService"> <component name="WindowStateProjectService">
<state x="772" y="353" key="#Notifications" timestamp="1597481149033"> <state x="772" y="353" key="#Notifications" timestamp="1597481149033">
@ -586,10 +564,10 @@
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="765" y="223" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040@0.0.1920.1040" timestamp="1597999710196" /> <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"> <state x="389" y="0" key="CommitChangelistDialog2" timestamp="1598000486034">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="389" y="0" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1597718387821" /> <state x="389" y="0" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1598000486034" />
<state x="389" y="39" key="CommitChangelistDialog2/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597717639469" /> <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="198" key="FileChooserDialogImpl" timestamp="1597989841097"> <state x="621" y="198" key="FileChooserDialogImpl" timestamp="1597989841097">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
@ -600,25 +578,25 @@
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="730" y="396" key="Gitee.ShareDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1597481505655" /> <state x="730" y="396" key="Gitee.ShareDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1597481505655" />
<state width="1877" height="275" key="GridCell.Tab.0.bottom" timestamp="1598000181099"> <state width="1877" height="275" key="GridCell.Tab.0.bottom" timestamp="1598000513528">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="275" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1598000181099" /> <state width="1877" height="275" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1598000513528" />
<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.bottom/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597717630394" />
<state width="1877" height="275" key="GridCell.Tab.0.center" timestamp="1598000181098"> <state width="1877" height="275" key="GridCell.Tab.0.center" timestamp="1598000513528">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="275" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1598000181098" /> <state width="1877" height="275" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1598000513528" />
<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.center/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597717630394" />
<state width="1877" height="275" key="GridCell.Tab.0.left" timestamp="1598000181098"> <state width="1877" height="275" key="GridCell.Tab.0.left" timestamp="1598000513528">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="275" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1598000181098" /> <state width="1877" height="275" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1598000513528" />
<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.left/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597717630393" />
<state width="1877" height="275" key="GridCell.Tab.0.right" timestamp="1598000181098"> <state width="1877" height="275" key="GridCell.Tab.0.right" timestamp="1598000513528">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="275" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1598000181098" /> <state width="1877" height="275" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1598000513528" />
<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 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"> <state x="490" y="174" key="Maven.ArtifactSearchDialog" timestamp="1597988929076">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
@ -628,9 +606,10 @@
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="366" y="78" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1597481540846" /> <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="1597717645717"> <state x="452" y="191" key="Vcs.Push.Dialog.v2" timestamp="1598000510375">
<screen x="0" y="0" width="1920" height="1050" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="452" y="191" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1598000510375" />
<state x="452" y="193" key="Vcs.Push.Dialog.v2/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597717645717" /> <state x="452" y="193" key="Vcs.Push.Dialog.v2/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597717645717" />
</component> </component>
<component name="antWorkspaceConfiguration"> <component name="antWorkspaceConfiguration">