From fb1cbfcc377cfb568b094c5bc4fbc3b722c359ac Mon Sep 17 00:00:00 2001
From: syruan <321359594@qq.com>
Date: Sun, 4 Jan 2026 16:01:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E7=BB=84=E4=BB=B6=E9=87=8D?=
=?UTF-8?q?=E6=9E=84=E3=80=81=E6=96=B0=E7=B1=BB=E5=9E=8B=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=B8=8A=E7=BA=BF=E3=80=81BootStarp=E8=A1=A8?=
=?UTF-8?q?=E6=A0=BC=E6=96=91=E9=A9=AC=E7=BA=BF=E5=8E=BB=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../WEB-INF/views/ma/machineTypeformNew.jsp | 392 ++++++
.../WEB-INF/views/ma/machineTypelistNew.jsp | 573 +++++++++
WebContent/WEB-INF/views/ma/machinelist.jsp | 2 -
.../WEB-INF/views/ma/machinelistEdit.jsp | 5 +-
.../WEB-INF/views/ma/typeDetailslist.jsp | 2 +-
.../WEB-INF/views/rm/unFinishWorkList.jsp | 21 +-
WebContent/static/css/sys/basic.css | 176 ++-
WebContent/static/img/flowchart.png | Bin 0 -> 180247 bytes
WebContent/static/js/ma/machine.js | 2 -
WebContent/static/js/ma/machineEdit.js | 3 +-
WebContent/static/js/ma/machineTypeNew.js | 1089 +++++++++++++++++
resources/mybatis/ma/MachineTypeMapper.xml | 388 ++++--
resources/spring/spring-shiro.xml | 2 +-
src/com/bonus/ma/beans/MachineTypeBean.java | 34 +-
.../ma/controller/MachineController.java | 3 +
.../ma/controller/MachineTypeController.java | 33 +-
src/com/bonus/ma/dao/MachineTypeDao.java | 8 +
.../bonus/ma/service/MachineTypeService.java | 8 +
.../ma/service/MachineTypeServiceImp.java | 6 +
19 files changed, 2587 insertions(+), 160 deletions(-)
create mode 100644 WebContent/WEB-INF/views/ma/machineTypeformNew.jsp
create mode 100644 WebContent/WEB-INF/views/ma/machineTypelistNew.jsp
create mode 100644 WebContent/static/img/flowchart.png
create mode 100644 WebContent/static/js/ma/machineTypeNew.js
diff --git a/WebContent/WEB-INF/views/ma/machineTypeformNew.jsp b/WebContent/WEB-INF/views/ma/machineTypeformNew.jsp
new file mode 100644
index 0000000..804bf06
--- /dev/null
+++ b/WebContent/WEB-INF/views/ma/machineTypeformNew.jsp
@@ -0,0 +1,392 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | 序号 |
+ 物资类型 |
+ 物资名称 |
+ 规格型号 |
+ 数量 |
+ 单位 |
+ 租赁价格(元) |
+ 丢失赔偿价 |
+ 购置价(元) |
+ 操作 |
+
+
+
+
+
+
+
+
+
+
+
+
+ <%@include file="./machineTypeformNew.jsp" %>
+ <%@include file="../dialog.jsp" %>
+
+
+
+
+
+
diff --git a/WebContent/WEB-INF/views/ma/machinelist.jsp b/WebContent/WEB-INF/views/ma/machinelist.jsp
index 56bba3b..906e4aa 100644
--- a/WebContent/WEB-INF/views/ma/machinelist.jsp
+++ b/WebContent/WEB-INF/views/ma/machinelist.jsp
@@ -54,9 +54,7 @@