.idea/misc.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
.idea/modules.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/common/model/MatDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/core/model/command/LedCommand.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/WrkDetlMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.idea/misc.xml
@@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="ExternalStorageConfigurationManager" enabled="true" /> <component name="FrameworkDetectionExcludesConfiguration"> <file type="web" url="file://$PROJECT_DIR$" /> </component> @@ -13,7 +14,7 @@ </list> </option> </component> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/out" /> </component> </project> .idea/modules.xml
File was deleted src/main/java/com/zy/common/model/MatDto.java
@@ -20,7 +20,7 @@ // 物料数量 private String specs; // 物料数量 // 图号 private String model; public MatDto() { src/main/java/com/zy/core/model/command/LedCommand.java
@@ -25,6 +25,8 @@ private String sourceLocNo; private String model; private List<MatDto> matDtos = new ArrayList<>(); private boolean emptyMk = false; src/main/resources/mapper/WrkDetlMapper.xml
@@ -9,6 +9,7 @@ <result column="matnr" property="matnr" /> <result column="maktx" property="maktx" /> <result column="specs" property="specs" /> <result column="model" property="model" /> <result column="size" property="size" /> <result column="color" property="color" /> <result column="weight" property="weight" /> @@ -27,7 +28,7 @@ </resultMap> <select id="findByWorkNo" resultMap="BaseResultMap"> select wrk_no, matnr, maktx, anfme ,specs from asr_wrk_detl where 1=1 and wrk_no = #{workNo} select wrk_no, matnr, maktx, anfme ,specs,model from asr_wrk_detl where 1=1 and wrk_no = #{workNo} </select> <update id="updateIoTime">