Home Explore Help
Sign In
liujiankang
/
iamberry-common-parent
forked from hexiugang/iamberry-common-parent
Watch 1
Star 0
Fork 0
Files
Browse Source

后台机器类 机器列表

liujiankang 8 years ago
parent
e4584769d7
commit
308ff07bae
3 changed files with 86 additions and 47 deletions
Unified View Show Diff Stats
  1. 3 21
      watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java
  2. 83 0
      watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_List.ftl
  3. 0 26
      watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_List.html

+ 3 - 21
watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java
View File 

@@ -20,36 +20,18 @@ import java.util.List;
 
 @Controller
 
 @Controller
 
 @RequestMapping("/admin/mcahine")
 
 @RequestMapping("/admin/mcahine")
 
 public class AdminMachineController {
 
 public class AdminMachineController {
 
-    @Autowired
 
-    private ProduceService produceService;
 
 
 
     @Autowired
 
     @Autowired
 
     private MachineService machineService;
 
     private MachineService machineService;
 
-
 
-    @Autowired
 
-    private DeviceService deviceService;
 
-
 
-    @Autowired
 
-    private PtsEmployeeService ptsEmployeeService;
 
-
 
-    @Autowired
 
-    private MachineLogsService machineLogsService;
 
     /**
 
     /**
 
      * 查询机器列表
 
      * 查询机器列表
 
-     *
 
-     * @param request
 
-     * @return
 
-     */
 
-    /**
 
-     * 根据条件查询订单集合
 
-     * @author muzx
 
-     * @date 2017年5月17日
 
+     * @author LJK
 
+     * @date 2017年8月31日16:08:15
 
      * @param pageSize
 
      * @param pageSize
 
      * @param pageNO
 
      * @param pageNO
 
-     * @param order
 
      * @return
 
      * @return
 
      */
 
      */
 
-    @RequiresPermissions("order:select_all:order")
 
+    @RequiresPermissions("machine:select_all:machine")
 
     @RequestMapping("/_machine_list")
 
     @RequestMapping("/_machine_list")
 
     public ModelAndView listOrder(
 
     public ModelAndView listOrder(
 
             @RequestParam(value= "pageSize",defaultValue= "10" ,required=false) Integer pageSize,
 
             @RequestParam(value= "pageSize",defaultValue= "10" ,required=false) Integer pageSize,

+ 83 - 0
watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_List.ftl
View File 

@@ -0,0 +1,83 @@
 
+<!DOCTYPE html>
 
+<html>
 
+	<head>
 
+		<meta charset="UTF-8">
 
+		<title></title>
 
+		<style>
 
+			*{padding: 0;margin: 0;}
 
+			.my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
 
+			.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}
 
+			.my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(images/select-1.png) right center no-repeat;background-size:auto 100%;}
 
+			.my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
 
+		</style>
 
+		<#include "/base/list_base.ftl">
 
+	</head>
 
+	<body>
 
+		<div>
 
+		<input class="my-input" type="text" placeholder="请输入机器编号"/>
 
+		<select class="my-select">
 
+			<option value ="未打印">未打印</option>
 
+		</select>
 
+		<select class="my-select">
 
+			<option value ="正常">正常</option>
 
+		</select>
 
+		<button type="submit" class="my-btn-search">搜索</button>
 
+		</div>
 
+		<div class="mt-20">
 
+			<table class="table table-border table-bordered table-bg table-hover table-sort">
 
+				<thead>
 
+				<tr class="text-c">
 
+					<th width="10">机器条码(点击打印)</th>
 
+					<th width="100">机器二维码(点击打印)</th>
 
+					<th width="100">打印状态</th>
 
+					<th width="100">销售状态</th>
 
+					<th width="100">销售日期</th>
 
+					<th width="100">生产流程状态</th>
 
+					<th width="50">生产时间</th>
 
+					<th width="150">操作</th>
 
+				</tr>
 
+				</thead>
 
+				<tbody id="listid">
 
+					<#list page.dataList as order>
 
+						<tr>
 
+							<td class="text-c" width="10">${list.machineBarcode }</td>
 
+							<td class="text-c" width="100"><div id="${100000 + st.index}"><img style="width: 50px;height: 50px;" src="${list.machineQrcode }"></td>
 
+                            <td class="text-c" width="100">
 
+							<#if list.machineIsPrint == 1>
 
+                                    未打印
 
+							</#if>
 
+							<#if list.machineIsPrint == 2>
 
+                                    已打印
 
+							</#if>
 
+                            </td>
 
+                            <td class="text-c" width="100">
 
+							<#if list.machineSalesState == 1>
 
+                                    已售出
 
+							</#if>
 
+							<#if list.machineSalesState == 2>
 
+                                    未售出
 
+							</#if>
 
+                            </td>
 
+							<td class="text-c" width="100"><fmt:formatDate value="${list.machineSalesDate }" pattern="yyyy-MM-dd HH:mm" /></td>
 
+                            <td class="text-c" width="100">
 
+							<#if list.machineProcessState == 1>
 
+                                    正常
 
+							</#if>
 
+							<#if list.machineProcessState == 2>
 
+                                    异常
 
+							</#if>
 
+                            </td>
 
+                            <td class="text-c" width="100"><fmt:formatDate value="${list.machineProducedTime }" pattern="yyyy-MM-dd HH:mm" /></td>
 
+							<!-- 遍历操作 -->
 
+							<td class="td-manage text-c">
 
+								<#--<a onclick="print(${100000 + st.index},${list.numberId},${list.numberIsPrint})" title="打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe652;</i></a>
 
+								<a onclick="downLoad();" title="下载" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe640;</i></a>-->
 
+							</td>
 
+						</tr>
 
+					</#list>
 
+				</tbody>
 
+			</table>
 
+		</div>
 
+		<#include "/base/page_util.ftl">
 
+	</body>
 
+</html>

+ 0 - 26
watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_List.html
View File 

@@ -1,26 +0,0 @@
 
-<!DOCTYPE html>
 
-<html>
 
-	<head>
 
-		<meta charset="UTF-8">
 
-		<title></title>
 
-		<style>
 
-			*{padding: 0;margin: 0;}
 
-			.my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
 
-			.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}
 
-			.my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(images/select-1.png) right center no-repeat;background-size:auto 100%;}
 
-			.my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
 
-		</style>
 
-	</head>
 
-	<body>
 
-		<div>
 
-		<input class="my-input" type="text" placeholder="请输入机器编号"/>
 
-		<select class="my-select">
 
-			<option value ="未打印">未打印</option>
 
-		</select>
 
-		<select class="my-select">
 
-			<option value ="正常">正常</option>
 
-		</select>
 
-		<button type="submit" class="my-btn-search">搜索</button>
 
-		</div>
 
-	</body>
 
-</html>