From 8d6a68ee8e86fab0a761787a7d61991ef679c264 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Mon, 14 Jul 2025 18:42:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/WEB-INF/views/ma/machinelist.jsp   |  7 ++---
 WebContent/static/js/ma/machine.js            |  1 +
 resources/mybatis/ma/MachineTypeMapper.xml    | 27 ++++++++++++-------
 .../mybatis/repair/RepairDetailsMapper.xml    |  5 ++--
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/WebContent/WEB-INF/views/ma/machinelist.jsp b/WebContent/WEB-INF/views/ma/machinelist.jsp
index 13911fe..56bba3b 100644
--- a/WebContent/WEB-INF/views/ma/machinelist.jsp
+++ b/WebContent/WEB-INF/views/ma/machinelist.jsp
@@ -57,9 +57,10 @@
 								<th style="width:5%" class="center">原编号</th>
 								<th style="width:5%" class="center">设备编码</th>
 								<th style="width:9%" class="center">资产属性</th>
-								<th style="width:5%" class="center">合格证</th>
-								<th style="width:5%" class="center">技术材料</th>
-								<th style="width:5%" class="center">改造手续</th>
+								<th style="width:6%" class="center">出厂日期</th>
+								<th style="width:4.5%" class="center">合格证</th>
+								<th style="width:4.5%" class="center">技术材料</th>
+								<th style="width:4.5%" class="center">改造手续</th>
 								<th style="width:6%" class="center">操作手册</th>
 								<th style="width:6%" class="center">二维码</th>
 								<th style="width:6%" class="center">机具状态</th>
diff --git a/WebContent/static/js/ma/machine.js b/WebContent/static/js/ma/machine.js
index 1ea38ad..22c36b1 100644
--- a/WebContent/static/js/ma/machine.js
+++ b/WebContent/static/js/ma/machine.js
@@ -199,6 +199,7 @@ function getbaseList(index) {
 					html += "<td style='vertical-align:middle;' class='center'>"+ JY.Object.notEmpty(l.originNum) + "</td>";
 					html += "<td style='vertical-align:middle;' class='center'>"+ JY.Object.notEmpty(l.deviceCode) + "</td>";
 					html += "<td style='vertical-align:middle;' class='center'>"+ JY.Object.notEmpty(l.companyName) + "</td>";
+					html += "<td style='vertical-align:middle;' class='center'>"+ JY.Object.notEmpty(l.outFactortTime) + "</td>";
 					if(l.fileName == null || l.fileName == 'null' || l.fileName == ''){
 						html += "<td style='vertical-align:middle;' class='center'><a href='javascript:void(0)' onclick = 'uploadImg("+l.id+",1)'>上传</a></td>";
 						html += "<td style='vertical-align:middle;' class='center'><a href='javascript:void(0)' onclick = 'uploadMaterials("+l.id+",2)'>上传</a></td>";
diff --git a/resources/mybatis/ma/MachineTypeMapper.xml b/resources/mybatis/ma/MachineTypeMapper.xml
index 1331714..00702b9 100644
--- a/resources/mybatis/ma/MachineTypeMapper.xml
+++ b/resources/mybatis/ma/MachineTypeMapper.xml
@@ -753,7 +753,7 @@
 		mat.UNIT AS unit,
 		mat.LEASE_PRICE AS
 		leasePrice,
-		ROUND(CONVERT ( ( mr.PAY_PRICE ), DECIMAL ( 10, 2 ) )) AS
+		ROUND(CONVERT ( ( mat.PAY_PRICE ), DECIMAL ( 10, 2 ) )) AS
 		payPrice,
 		ROUND(mat.BUY_PRICE) AS buyPrice,
 		mat.IS_TEST AS isTest,
@@ -815,15 +815,22 @@
 	</select>
 
 	<update id="updateModel" parameterType="com.bonus.ma.beans.MachineTypeBean">
-		update mm_type
-		set `NAME`
-		= #{name},
-		WEIGHT = #{weight},
-		UNIT = #{unit},
-		IS_COUNT = #{isCount},
-		RFID_POWER=#{rfidPower}
-
-		where id = #{id}
+		UPDATE mm_type
+    	<set>
+        `NAME` = #{name},
+        <if test="weight != null and weight != ''">
+            WEIGHT = #{weight},
+        </if>
+        UNIT = #{unit},
+        IS_COUNT = #{isCount},
+        <if test="rfidPower != null and rfidPower != ''">
+            RFID_POWER = #{rfidPower},
+        </if>
+        LEASE_PRICE = #{leasePrice},
+        BUY_PRICE = #{buyPrice},
+        PAY_PRICE = #{payPrice}
+    </set>
+    WHERE id = #{id}
 	</update>
 
 	<update id="updateOrgModel" parameterType="com.bonus.ma.beans.MachineTypeBean">
diff --git a/resources/mybatis/repair/RepairDetailsMapper.xml b/resources/mybatis/repair/RepairDetailsMapper.xml
index 7cbbdff..35c68ce 100644
--- a/resources/mybatis/repair/RepairDetailsMapper.xml
+++ b/resources/mybatis/repair/RepairDetailsMapper.xml
@@ -543,7 +543,7 @@
 				mt2.`NAME` LIKE CONCAT('%',#{keyWord},'%')
 				OR mt.`NAME` LIKE CONCAT('%',#{keyWord},'%')	
 				OR wir.`CODE` LIKE CONCAT('%',#{keyWord},'%')	
-				
+				OR wir.REMARK LIKE CONCAT('%',#{keyWord},'%')
 			)
 		</if>
 		ORDER BY wir.TIME DESC
@@ -887,7 +887,8 @@
 				AND(
 					mt2.`NAME` LIKE CONCAT('%',#{keyWord},'%')
 					OR mt.`NAME` LIKE CONCAT('%',#{keyWord},'%')	
-					OR wir.`CODE` LIKE CONCAT('%',#{keyWord},'%')	
+					OR wir.`CODE` LIKE CONCAT('%',#{keyWord},'%')
+					OR mm.REMARK LIKE CONCAT('%',#{keyWord},'%')
 				)
 			</if>
 			ORDER BY wir.TIME DESC