bonus
/
GZMachinesWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

功能修改

This commit is contained in:
hayu 2025-07-14 18:42:16 +08:00
parent f4bd00b4fb
commit 8d6a68ee8e
4 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
WebContent/WEB-INF/views/ma/machinelist.jsp
View File

@ -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>

1
WebContent/static/js/ma/machine.js
View File

@ -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>";

27
resources/mybatis/ma/MachineTypeMapper.xml
View File

@ -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">

3
resources/mybatis/repair/RepairDetailsMapper.xml
View File

@ -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
@ -888,6 +888,7 @@
mt2.`NAME` LIKE CONCAT('%',#{keyWord},'%')
OR mt.`NAME` LIKE CONCAT('%',#{keyWord},'%')
OR wir.`CODE` LIKE CONCAT('%',#{keyWord},'%')
OR mm.REMARK LIKE CONCAT('%',#{keyWord},'%')
)
</if>
ORDER BY wir.TIME DESC