Merge remote-tracking branch 'origin/hy2250089' into hy2250089
# Conflicts: # .idea/workspace.xml
Tento commit je obsažen v:
weihongyang
revize
c56f73ed74
@ -7,8 +7,21 @@
|
||||
<option name="autoReloadType" value="SELECTIVE" />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="3fd1674b-533b-4c0c-9ac3-bba39e6841ef" name="Default" comment="生产订单">
|
||||
<list default="true" id="3fd1674b-533b-4c0c-9ac3-bba39e6841ef" name="Default" comment="mark">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.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/main/java/com/deer/wms/produce/manage/dao/MtAloneByAShelfMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByAShelfMapper.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/mapper/MtAloneByAShelfMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByAShelfMapper.xml" 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/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/MtAloneByAShelfService.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByAShelfService.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/impl/MtAloneByAShelfServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByAShelfServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByAShelfController.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByAShelfController.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" />
|
||||
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByProductInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByProductInfoController.java" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
@ -77,7 +90,7 @@
|
||||
<component name="MavenImportPreferences">
|
||||
<option name="generalSettings">
|
||||
<MavenGeneralSettings>
|
||||
<option name="mavenHome" value="E:\idea\IntelliJ IDEA 2019.3.5\plugins\maven\lib\maven3" />
|
||||
<option name="mavenHome" value="$APPLICATION_HOME_DIR$/plugins/maven/lib/maven3" />
|
||||
</MavenGeneralSettings>
|
||||
</option>
|
||||
</component>
|
||||
@ -138,7 +151,7 @@
|
||||
<property name="project.structure.proportion" value="0.15" />
|
||||
<property name="project.structure.side.proportion" value="0.2" />
|
||||
<property name="restartRequiresConfirmation" value="false" />
|
||||
<property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
|
||||
<property name="settings.editor.selected.configurable" value="editor.preferences.completion" />
|
||||
</component>
|
||||
<component name="RecentsManager">
|
||||
<key name="CreateClassDialog.RecentsKey">
|
||||
@ -176,6 +189,19 @@
|
||||
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
|
||||
<module />
|
||||
</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 name="CodeGenerator (1)" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
||||
<option name="MAIN_CLASS_NAME" value="generator.CodeGenerator" />
|
||||
<module name="wms-parent" />
|
||||
@ -294,12 +320,10 @@
|
||||
<item itemvalue="Application.CodeGenerator" />
|
||||
<item itemvalue="Application.CodeGenerator (1)" />
|
||||
<item itemvalue="Application.Test" />
|
||||
<item itemvalue="Spring Boot.PmsApplication" />
|
||||
</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" />
|
||||
@ -503,8 +527,7 @@
|
||||
<workItem from="1597734009753" duration="14000" />
|
||||
<workItem from="1597734148841" duration="568000" />
|
||||
<workItem from="1597971890218" duration="12735000" />
|
||||
<workItem from="1597989143534" duration="11041000" />
|
||||
<workItem from="1598228326441" duration="595000" />
|
||||
<workItem from="1597989143534" duration="10955000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="mark">
|
||||
<created>1597716938734</created>
|
||||
@ -520,21 +543,7 @@
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1597717639939</updated>
|
||||
</task>
|
||||
<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>
|
||||
<task id="LOCAL-00004" summary="commit init">
|
||||
<created>1598228924143</created>
|
||||
<option name="number" value="00004" />
|
||||
<option name="presentableId" value="LOCAL-00004" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1598228924143</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="5" />
|
||||
<option name="localTasksCounter" value="3" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TodoView">
|
||||
@ -551,9 +560,7 @@
|
||||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<MESSAGE value="mark" />
|
||||
<MESSAGE value="生产订单" />
|
||||
<MESSAGE value="commit init" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="commit init" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="mark" />
|
||||
</component>
|
||||
<component name="WindowStateProjectService">
|
||||
<state x="772" y="353" key="#Notifications" timestamp="1597481149033">
|
||||
@ -568,14 +575,17 @@
|
||||
<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 x="510" y="134" key="#com.intellij.ide.util.MemberChooser" timestamp="1598080677329">
|
||||
<screen x="0" y="23" width="1280" height="732" />
|
||||
</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="1598000486034">
|
||||
<state x="510" y="133" key="#com.intellij.ide.util.MemberChooser/0.23.1280.728@0.23.1280.728" timestamp="1598069502140" />
|
||||
<state x="510" y="134" key="#com.intellij.ide.util.MemberChooser/0.23.1280.729@0.23.1280.729" timestamp="1598067919088" />
|
||||
<state x="510" y="134" key="#com.intellij.ide.util.MemberChooser/0.23.1280.732@0.23.1280.732" timestamp="1598080677329" />
|
||||
<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="1598000486034" />
|
||||
<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="198" key="FileChooserDialogImpl" timestamp="1597989841097">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
@ -586,39 +596,51 @@
|
||||
<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="1877" height="275" key="GridCell.Tab.0.bottom" timestamp="1598000513528">
|
||||
<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="1598000513528" />
|
||||
<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="1877" height="275" key="GridCell.Tab.0.center" timestamp="1598000513528">
|
||||
<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="1598000513528" />
|
||||
<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="1877" height="275" key="GridCell.Tab.0.left" timestamp="1598000513528">
|
||||
<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="1598000513528" />
|
||||
<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="1877" height="275" key="GridCell.Tab.0.right" timestamp="1598000513528">
|
||||
<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="1598000513528" />
|
||||
<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 x="244" y="31" key="SettingsEditor" timestamp="1598070794880">
|
||||
<screen x="0" y="23" width="1280" height="730" />
|
||||
</state>
|
||||
<state x="366" y="78" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1597481540846" />
|
||||
<state x="452" y="191" key="Vcs.Push.Dialog.v2" timestamp="1598000510375">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
<state x="244" y="31" key="SettingsEditor/0.23.1280.730@0.23.1280.730" timestamp="1598070794880" />
|
||||
<state x="452" y="193" key="Vcs.Push.Dialog.v2" timestamp="1597717645717">
|
||||
<screen x="0" y="0" width="1920" height="1050" />
|
||||
</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="121" y="23" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1598079461206">
|
||||
<screen x="0" y="23" width="1280" height="732" />
|
||||
</state>
|
||||
<state x="121" y="23" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/0.23.1280.732@0.23.1280.732" timestamp="1598079461206" />
|
||||
<state x="424" y="165" key="refactoring.ChangeSignatureDialog" timestamp="1598081009986">
|
||||
<screen x="0" y="23" width="1280" height="732" />
|
||||
</state>
|
||||
<state x="424" y="165" key="refactoring.ChangeSignatureDialog/0.23.1280.732@0.23.1280.732" timestamp="1598081009986" />
|
||||
<state x="305" y="77" key="search.everywhere.popup" timestamp="1598075207299">
|
||||
<screen x="0" y="23" width="1280" height="730" />
|
||||
</state>
|
||||
<state x="305" y="77" key="search.everywhere.popup/0.23.1280.730@0.23.1280.730" timestamp="1598075207299" />
|
||||
</component>
|
||||
<component name="antWorkspaceConfiguration">
|
||||
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
|
||||
|
||||
@ -10,6 +10,15 @@
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<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" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: com.deer:wms-project-seed:1.0.0-SNAPSHOT" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: com.squareup.okhttp:okhttp:2.7.5" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: com.squareup.okio:okio:1.6.0" level="project" />
|
||||
@ -95,7 +104,7 @@
|
||||
<orderEntry type="module-library">
|
||||
<library name="Maven: com.alibaba:jconsole:1.8.0">
|
||||
<CLASSES>
|
||||
<root url="jar://C:/Program Files/Java/jdk1.8.0_251/lib/jconsole.jar!/" />
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_221.jdk/Contents/Home/lib/jconsole.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
@ -104,7 +113,7 @@
|
||||
<orderEntry type="module-library">
|
||||
<library name="Maven: com.alibaba:tools:1.8.0">
|
||||
<CLASSES>
|
||||
<root url="jar://C:/Program Files/Java/jdk1.8.0_251/lib/tools.jar!/" />
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_221.jdk/Contents/Home/lib/tools.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
|
||||
@ -2,5 +2,9 @@ package com.deer.wms.produce.manage.dao;
|
||||
|
||||
import com.deer.wms.produce.manage.model.MtAloneByAShelf;
|
||||
import com.deer.wms.project.seed.core.mapper.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface MtAloneByAShelfMapper extends Mapper<MtAloneByAShelf> {
|
||||
List<MtAloneByAShelf> getAllByShelfStatus(MtAloneByAShelf aShelfStatus);
|
||||
}
|
||||
@ -2,7 +2,6 @@ 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;
|
||||
|
||||
@ -14,4 +14,11 @@
|
||||
<result column="a_shelf_name" jdbcType="VARCHAR" property="aShelfName" />
|
||||
<result column="note" jdbcType="VARCHAR" property="note" />
|
||||
</resultMap>
|
||||
|
||||
<select id="getAllByShelfStatus" parameterType="Integer" resultMap="BaseResultMap">
|
||||
SELECT *
|
||||
FROM mt_alone_by_a_shelf
|
||||
WHERE a_shelf_status = #{aShelfStatus}
|
||||
AND company_id = #{companyId}
|
||||
</select>
|
||||
</mapper>
|
||||
@ -49,6 +49,7 @@
|
||||
<if test="companyId != null">
|
||||
AND mappb.company_id = #{companyId}
|
||||
</if>
|
||||
AND order_status = 0
|
||||
</where>
|
||||
</select>
|
||||
</mapper>
|
||||
@ -44,5 +44,6 @@
|
||||
SELECT *
|
||||
FROM mt_alone_by_product_info
|
||||
WHERE order_info_id = #{id}
|
||||
AND product_status = 0
|
||||
</select>
|
||||
</mapper>
|
||||
@ -2,6 +2,8 @@ package com.deer.wms.produce.manage.model;
|
||||
|
||||
import com.deer.wms.project.seed.core.service.QueryParams;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Created by on 2020/08/18.
|
||||
*/
|
||||
@ -11,6 +13,12 @@ public class MtAloneByOrderInfoParams extends QueryParams {
|
||||
|
||||
private String endTime;
|
||||
|
||||
private Integer id;
|
||||
|
||||
private MtAloneByOrderInfo mtAloneByOrderInfo;
|
||||
|
||||
private List<MtAloneByProductInfo> mtAloneByProductInfoList;
|
||||
|
||||
public String getBeginTime() {
|
||||
return beginTime;
|
||||
}
|
||||
@ -26,4 +34,28 @@ public class MtAloneByOrderInfoParams extends QueryParams {
|
||||
public void setEndTime(String endTime) {
|
||||
this.endTime = endTime;
|
||||
}
|
||||
|
||||
public Integer getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Integer id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public MtAloneByOrderInfo getMtAloneByOrderInfo() {
|
||||
return mtAloneByOrderInfo;
|
||||
}
|
||||
|
||||
public void setMtAloneByOrderInfo(MtAloneByOrderInfo mtAloneByOrderInfo) {
|
||||
this.mtAloneByOrderInfo = mtAloneByOrderInfo;
|
||||
}
|
||||
|
||||
public List<MtAloneByProductInfo> getMtAloneByProductInfoList() {
|
||||
return mtAloneByProductInfoList;
|
||||
}
|
||||
|
||||
public void setMtAloneByProductInfoList(List<MtAloneByProductInfo> mtAloneByProductInfoList) {
|
||||
this.mtAloneByProductInfoList = mtAloneByProductInfoList;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
package com.deer.wms.produce.manage.service;
|
||||
|
||||
import com.deer.wms.produce.manage.model.MtAloneByAShelf;
|
||||
import com.deer.wms.produce.manage.model.MtAloneByAShelfParams;
|
||||
|
||||
import com.deer.wms.project.seed.core.service.Service;
|
||||
import java.util.List;
|
||||
@ -11,6 +10,6 @@ import java.util.List;
|
||||
*/
|
||||
public interface MtAloneByAShelfService extends Service<MtAloneByAShelf, Integer> {
|
||||
|
||||
|
||||
List<MtAloneByAShelf> getAllByShelfStatus(MtAloneByAShelf mtAloneByAShelf);
|
||||
|
||||
}
|
||||
|
||||
@ -14,4 +14,6 @@ public interface MtAloneByOrderInfoService extends Service<MtAloneByOrderInfo, I
|
||||
|
||||
|
||||
List<MtAloneByOrderInfo> findList(MtAloneByOrderInfoParams params);
|
||||
|
||||
MtAloneByOrderInfo findByIdStatus(Integer id);
|
||||
}
|
||||
|
||||
@ -2,7 +2,6 @@ package com.deer.wms.produce.manage.service.impl;
|
||||
|
||||
import com.deer.wms.produce.manage.dao.MtAloneByAShelfMapper;
|
||||
import com.deer.wms.produce.manage.model.MtAloneByAShelf;
|
||||
import com.deer.wms.produce.manage.model.MtAloneByAShelfParams;
|
||||
import com.deer.wms.produce.manage.service.MtAloneByAShelfService;
|
||||
|
||||
import com.deer.wms.project.seed.core.service.AbstractService;
|
||||
@ -22,5 +21,8 @@ public class MtAloneByAShelfServiceImpl extends AbstractService<MtAloneByAShelf,
|
||||
private MtAloneByAShelfMapper mtAloneByAShelfMapper;
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public List<MtAloneByAShelf> getAllByShelfStatus(MtAloneByAShelf mtAloneByAShelf) {
|
||||
return mtAloneByAShelfMapper.getAllByShelfStatus(mtAloneByAShelf);
|
||||
}
|
||||
}
|
||||
|
||||
@ -29,7 +29,7 @@ import java.util.List;
|
||||
/**
|
||||
* Created by on 2020/08/18.
|
||||
*/
|
||||
@Api(description = "xxx接口")
|
||||
@Api(description = "A字架接口")
|
||||
@RestController
|
||||
@RequestMapping("/mt/alone/by/a/shelfs")
|
||||
public class MtAloneByAShelfController {
|
||||
@ -90,4 +90,19 @@ public class MtAloneByAShelfController {
|
||||
return ResultGenerator.genSuccessResult(pageInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询全部可用的a子架
|
||||
*/
|
||||
@PostMapping("/get/all/by/shelf/status")
|
||||
public Result getAllByShelfStatus(@ApiIgnore @User CurrentUser currentUser){
|
||||
if(currentUser==null){
|
||||
return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
|
||||
}
|
||||
MtAloneByAShelf mtAloneByAShelf = new MtAloneByAShelf();
|
||||
mtAloneByAShelf.setCompanyId(currentUser.getCompanyId());
|
||||
mtAloneByAShelf.setaShelfStatus(0);
|
||||
List<MtAloneByAShelf> list = mtAloneByAShelfService.getAllByShelfStatus(mtAloneByAShelf);
|
||||
return ResultGenerator.genSuccessResult(list);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -59,22 +59,27 @@ public class MtAloneByOrderInfoController {
|
||||
@Autowired
|
||||
private MtAloneByOrderInfoMapping mtAloneByOrderInfoMapping;
|
||||
|
||||
@OperateLog(description = "添加xxx", type = "增加")
|
||||
@ApiOperation(value = "添加xxx", notes = "添加xxx")
|
||||
@OperateLog(description = "添加订单", type = "增加")
|
||||
@ApiOperation(value = "添加订单", notes = "添加订单")
|
||||
@PostMapping("/add")
|
||||
public Result add(@RequestBody MtAloneByOrderInfo mtAloneByOrderInfo, @ApiIgnore @User CurrentUser currentUser) {
|
||||
public Result add(@RequestBody MtAloneByOrderInfoParams mtAloneByOrderInfoParams, @ApiIgnore @User CurrentUser currentUser) {
|
||||
if(currentUser==null){
|
||||
return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null );
|
||||
}
|
||||
mtAloneByOrderInfo.setCreateTime(new Date());
|
||||
mtAloneByOrderInfo.setCompanyId(currentUser.getCompanyId());
|
||||
mtAloneByOrderInfoService.save(mtAloneByOrderInfo);
|
||||
mtAloneByOrderInfoParams.getMtAloneByOrderInfo().setCreateTime(new Date());
|
||||
mtAloneByOrderInfoParams.getMtAloneByOrderInfo().setCompanyId(currentUser.getCompanyId());
|
||||
mtAloneByOrderInfoService.save(mtAloneByOrderInfoParams.getMtAloneByOrderInfo());
|
||||
for (MtAloneByProductInfo mtAloneByProductInfo:mtAloneByOrderInfoParams.getMtAloneByProductInfoList()) {
|
||||
mtAloneByProductInfo.setCreateTime(new Date());
|
||||
mtAloneByProductInfo.setCompanyId(currentUser.getCompanyId());
|
||||
}
|
||||
mtAloneByProductInfoService.save(mtAloneByOrderInfoParams.getMtAloneByProductInfoList());
|
||||
return ResultGenerator.genSuccessResult();
|
||||
}
|
||||
|
||||
@OperateLog(description = "删除订单", type = "删除")
|
||||
@ApiOperation(value = "删除订单", notes = "删除订单")
|
||||
@DeleteMapping("/delete/{id}")
|
||||
@PostMapping("/delete/{id}")
|
||||
public Result delete(@PathVariable Integer Id) {
|
||||
mtAloneByProductInfoService.deleteByOrderInfoId(Id);
|
||||
mtAloneByOrderInfoService.deleteById(Id);
|
||||
@ -83,32 +88,54 @@ public class MtAloneByOrderInfoController {
|
||||
|
||||
/**
|
||||
* 修改保存
|
||||
* @param mtAloneByOrderInfo
|
||||
* @param mtAloneByOrderInfoParams
|
||||
* @return
|
||||
*/
|
||||
@OperateLog(description = "修改订单", type = "更新")
|
||||
@ApiOperation(value = "修改订单", notes = "修改订单")
|
||||
@PostMapping("/update")
|
||||
public Result update(@RequestBody MtAloneByOrderInfo mtAloneByOrderInfo) {
|
||||
mtAloneByOrderInfo.setUpdateTime(new Date());
|
||||
mtAloneByOrderInfoService.update(mtAloneByOrderInfo);
|
||||
public Result update(@RequestBody MtAloneByOrderInfoParams mtAloneByOrderInfoParams) {
|
||||
mtAloneByOrderInfoParams.getMtAloneByOrderInfo().setUpdateTime(new Date());
|
||||
mtAloneByOrderInfoService.update(mtAloneByOrderInfoParams.getMtAloneByOrderInfo());
|
||||
for (MtAloneByProductInfo mtAloneByProductInfo:mtAloneByOrderInfoParams.getMtAloneByProductInfoList()) {
|
||||
mtAloneByProductInfo.setUpdateTime(new Date());
|
||||
mtAloneByProductInfoService.update(mtAloneByProductInfo);
|
||||
}
|
||||
return ResultGenerator.genSuccessResult();
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改订单获取修改的数据并填充
|
||||
* @param id
|
||||
* 根据订单id查询出来产品信息并且分页
|
||||
* @param
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/update/for/data/{id}")
|
||||
public Result updateForData(@PathVariable Integer id){
|
||||
MtAloneByOrderInfo mtAloneByOrderInfo = mtAloneByOrderInfoService.findById(id);
|
||||
@GetMapping("/update/for/product/info")
|
||||
public Result updateForProductInfo(MtAloneByOrderInfoParams params, @ApiIgnore @User CurrentUser currentUser){
|
||||
if(currentUser==null){
|
||||
return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
|
||||
}
|
||||
|
||||
if (currentUser.getCompanyType() != SystemManageConstant.COMPANY_TYPE_MT){
|
||||
params.setCompanyId(currentUser.getCompanyId());
|
||||
}else{
|
||||
params.setCompanyId(null);
|
||||
}
|
||||
PageHelper.startPage(params.getPageNum(), params.getPageSize());
|
||||
List<MtAloneByProductInfo> mtAloneByProductInfoList = mtAloneByProductInfoService.findByOrderInfoId(params.getId());
|
||||
PageInfo pageInfo = new PageInfo(mtAloneByProductInfoList);
|
||||
/*MtAloneByOrderInfo mtAloneByOrderInfo = mtAloneByOrderInfoService.findById(id);
|
||||
List<MtAloneByProductInfo> mtAloneByProductInfos = mtAloneByProductInfoService.findByOrderInfoId(id);
|
||||
MtAloneByOrderInfoVo mtAloneByOrderInfoVo = mtAloneByOrderInfoMapping.MtAloneByOrderInfoToMtAloneByOrderInfoVo(mtAloneByOrderInfo);
|
||||
mtAloneByOrderInfoVo.setMtAloneByProductInfos(mtAloneByProductInfos);
|
||||
return ResultGenerator.genSuccessResult(mtAloneByOrderInfoVo);
|
||||
*/
|
||||
return ResultGenerator.genSuccessResult(pageInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据订单id查询出来订单详情
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/detail/{id}")
|
||||
public Result detail(@PathVariable Integer id) {
|
||||
MtAloneByOrderInfo mtAloneByOrderInfo = mtAloneByOrderInfoService.findById(id);
|
||||
|
||||
@ -1,5 +1,9 @@
|
||||
package com.deer.wms.produce.manage.web;
|
||||
|
||||
import com.deer.wms.base.system.model.MtAloneProductLibrary;
|
||||
import com.deer.wms.base.system.model.MtAloneProductLibraryParams;
|
||||
import com.deer.wms.base.system.service.MtAloneProductLibraryService;
|
||||
import com.deer.wms.base.system.web.MtAloneProductLibraryController;
|
||||
import com.deer.wms.produce.manage.model.MtAloneByAShelf;
|
||||
import com.deer.wms.project.seed.annotation.OperateLog;
|
||||
import com.deer.wms.project.seed.constant.SystemManageConstant;
|
||||
@ -30,7 +34,7 @@ import java.util.List;
|
||||
/**
|
||||
* Created by on 2020/08/18.
|
||||
*/
|
||||
@Api(description = "xxx接口")
|
||||
@Api(description = "产品信息接口")
|
||||
@RestController
|
||||
@RequestMapping("/mt/alone/by/product/infos")
|
||||
public class MtAloneByProductInfoController {
|
||||
@ -38,6 +42,9 @@ public class MtAloneByProductInfoController {
|
||||
@Autowired
|
||||
private MtAloneByProductInfoService mtAloneByProductInfoService;
|
||||
|
||||
@Autowired
|
||||
private MtAloneProductLibraryService mtAloneProductLibraryService;
|
||||
|
||||
@OperateLog(description = "添加xxx", type = "增加")
|
||||
@ApiOperation(value = "添加xxx", notes = "添加xxx")
|
||||
@PostMapping("/add")
|
||||
@ -45,8 +52,8 @@ public class MtAloneByProductInfoController {
|
||||
if(currentUser==null){
|
||||
return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null );
|
||||
}
|
||||
mtAloneByProductInfo.setCreateTime(new Date());
|
||||
mtAloneByProductInfo.setCompanyId(currentUser.getCompanyId());
|
||||
mtAloneByProductInfo.setCreateTime(new Date());
|
||||
mtAloneByProductInfo.setCompanyId(currentUser.getCompanyId());
|
||||
mtAloneByProductInfoService.save(mtAloneByProductInfo);
|
||||
return ResultGenerator.genSuccessResult();
|
||||
}
|
||||
@ -59,8 +66,8 @@ public class MtAloneByProductInfoController {
|
||||
return ResultGenerator.genSuccessResult();
|
||||
}
|
||||
|
||||
@OperateLog(description = "修改xxx", type = "更新")
|
||||
@ApiOperation(value = "修改xxx", notes = "修改xxx")
|
||||
@OperateLog(description = "修改产品信息", type = "更新")
|
||||
@ApiOperation(value = "修改产品信息", notes = "修改产品信息")
|
||||
@PostMapping("/update")
|
||||
public Result update(@RequestBody MtAloneByProductInfo mtAloneByProductInfo) {
|
||||
mtAloneByProductInfo.setUpdateTime(new Date());
|
||||
@ -92,4 +99,18 @@ public class MtAloneByProductInfoController {
|
||||
return ResultGenerator.genSuccessResult(pageInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据公司id获取到产品池的全部产品
|
||||
*/
|
||||
@PostMapping("/get/product/library")
|
||||
public Result getProductLibrary(@ApiIgnore @User CurrentUser currentUser){
|
||||
if(currentUser==null){
|
||||
return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
|
||||
}
|
||||
MtAloneProductLibraryParams mtAloneProductLibraryParams = new MtAloneProductLibraryParams();
|
||||
mtAloneProductLibraryParams.setCompanyId(currentUser.getCompanyId());
|
||||
List<MtAloneProductLibrary> list = mtAloneProductLibraryService.findList(mtAloneProductLibraryParams);
|
||||
return ResultGenerator.genSuccessResult(list);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Načítá se…
Odkázat v novém úkolu
Zablokovat Uživatele