设备列表。添加设备功能

watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/EquipmentService.java

@@ -61,4 +61,10 @@ public interface EquipmentService {
      * @return
      */
     boolean updateProcessInfo(ProduceProcess process);
+
+    /**
+     * 查询是否存在机器
+     * @return
+     */
+    List<PtsDevice> listDeviceByNo(PtsDevice ptsDevice);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/EquipmentServiceImpl.java

@@ -91,4 +91,9 @@ public class EquipmentServiceImpl implements EquipmentService {
             return false;
         }
     }
+
+    @Override
+    public List<PtsDevice> listDeviceByNo(PtsDevice ptsDevice) {
+        return equipmentMapper.listDevice(ptsDevice);
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/equipmentMapper.xml

@@ -31,6 +31,9 @@
             <if test="deviceId != null">
                 and device_id = #{deviceId}
             </if>
+            <if test="deviceNumber != null and deviceNumber !='' ">
+                and device_number = #{deviceNumber}
+            </if>
         </where>
         ORDER BY device_id DESC
     </select>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/EquipmentController.java

@@ -296,4 +296,26 @@ public class EquipmentController {
             return msg;
         }
     }
+
+    /**
+     *
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/is_equipment")
+    public ResponseJson getEmployee(HttpServletRequest request){
+        String deviceNumber = request.getParameter("deviceNumber");
+        if(deviceNumber == null  || "".equals(deviceNumber)){
+            return new ResponseJson(500, "设备编号为空", 501);
+        }
+        PtsDevice ptsDevice = new PtsDevice();
+        ptsDevice.setDeviceNumber(deviceNumber);
+        List<PtsDevice>  ptsDevicelist = equipmentService.listDeviceByNo(ptsDevice);
+        if (ptsDevicelist != null && ptsDevicelist.size() > 0 ){
+            return new ResponseJson(200, "SUCCESS", 200);
+        }else {
+            return new ResponseJson(500, "设备不存在", 502);
+        }
+    }
 }

watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/add_device.ftl

@@ -88,19 +88,76 @@
         var flag = true;
         var deviceNumber = $('#deviceNumber').val();
         var deviceName = $('#deviceName').val();
+        var device_date = $('#device_date').val();
+        var deviceRemake = $('#deviceRemake').val();
+
         if (deviceNumber == null || !check_number.test(deviceNumber)) {
             flag = false;
             layer.msg('设备编号格式不正确，请重新输入!',{icon: 5,time:1000});
             return flag;
         }
+        $.ajax({
+            cache: true,
+            type: "POST",
+            data: {
+                deviceNumber:deviceNumber
+            },
+            url: "${path}/admin/equipment/is_equipment",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    flag = false;
+                    layer.msg('该设备编号已存在',{icon: 5,time:1000});
+
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+
+            }
+        });
+        if(flag == false){
+            return flag;
+        }
         if (deviceName == null || !check_name.test(deviceName)) {
             flag = false;
             layer.msg('设备名称格式不正确，请重新输入!',{icon: 5,time:1000});
             return flag;
         }
+        if (device_date == null || device_date == "" ) {
+            flag = false;
+            layer.msg('购买日期不能为空!',{icon: 5,time:1000});
+            return flag;
+        }
+        if(deviceRemake != null){
+            if(deviceRemake.length > 50){
+                layer.msg('备注长度为0-50个字符!',{icon: 5,time:1000});
+            }
+        }
         return flag;
     }
 
+    /*验证编号*/
+    function ptsValiDataNo(thVal) {
+        $.ajax({
+            cache: true,
+            type: "POST",
+            data: {
+                deviceNumber:thVal
+            },
+            url: "${path}/admin/equipment/is_equipment",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    layer.msg('该设备编号已存在',{icon: 5,time:1000});
+                    return false;
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+
+            }
+        });
+    }
+
     function submit_value() {
         var deviceNumber = $('#deviceNumber').val();
         var deviceName = $('#deviceName').val();