From 921f4f2ad9adb1c8b78bc90b0165f86c07173175 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 26 四月 2024 15:56:52 +0800
Subject: [PATCH] 第一版
---
src/main/java/com/zy/common/model/MatDto.java | 2 +-
/dev/null | 8 --------
src/main/resources/mapper/WrkDetlMapper.xml | 3 ++-
src/main/java/com/zy/core/model/command/LedCommand.java | 2 ++
.idea/misc.xml | 3 ++-
5 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 11ca1b5..afca537 100644
--- a/.idea/misc.xml
+++ b/.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>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index f9a71f2..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://$PROJECT_DIR$/.idea/zy-wcs.iml" filepath="$PROJECT_DIR$/.idea/zy-wcs.iml" />
- </modules>
- </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java
index a454ca7..a4b9cf1 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/src/main/java/com/zy/common/model/MatDto.java
@@ -20,7 +20,7 @@
// 鐗╂枡鏁伴噺
private String specs;
- // 鐗╂枡鏁伴噺
+ // 鍥惧彿
private String model;
public MatDto() {
diff --git a/src/main/java/com/zy/core/model/command/LedCommand.java b/src/main/java/com/zy/core/model/command/LedCommand.java
index 36685e8..f7032fd 100644
--- a/src/main/java/com/zy/core/model/command/LedCommand.java
+++ b/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;
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index da1c6d3..c8e1ba8 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/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">
--
Gitblit v1.9.1