添加机器零件

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

@@ -0,0 +1,15 @@
+package com.iamberry.rst.faces.pts;
+
+
+import com.iamberry.rst.core.pts.PtsComponents;
+
+/**
+ * 机器零件管理
+ * Created by LJK on 2017年9月25日11:17:29.
+ */
+public interface MachinePartsService {
+    /**
+     * 添加机器零件
+     * **/
+    Integer addMachineParts(PtsComponents ptsComponents);
+}

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

@@ -0,0 +1,24 @@
+package com.iamberry.rst.service.pts;
+
+import com.iamberry.rst.core.pts.PtsComponents;
+import com.iamberry.rst.faces.pts.MachinePartsService;
+import com.iamberry.rst.service.pts.mapper.MachineLogsMapper;
+import com.iamberry.rst.service.pts.mapper.MachinePartsMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 机器零件管理
+ * Created by LJK on 2017年9月25日11:17:29.
+ */
+@Service
+public class MachinePartsServiceImpl implements MachinePartsService {
+    @Autowired
+    private MachinePartsMapper machinePartsMapper;
+
+    @Override
+    public Integer addMachineParts(PtsComponents ptsComponents) {
+        return machinePartsMapper.addMachineParts(ptsComponents);
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.iamberry.rst.service.pts.mapper;
+
+
+import com.iamberry.rst.core.pts.PtsComponents;
+
+/**
+ * 机器零件管理
+ * Created by LJK on 2017年9月25日11:17:29.
+ */
+public interface MachinePartsMapper {
+
+    /**
+     * 添加机器零件
+     * **/
+    Integer addMachineParts(PtsComponents ptsComponents);
+}

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

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.iamberry.rst.service.pts.mapper.MachinePartsMapper">
+    <!--<select id="getDevice" parameterType="Integer" resultType="PtsDevice">
+        SELECT
+        device_id AS deviceId,
+        device_number AS deviceNumber,
+        device_name AS deviceName,
+        device_date AS  deviceDate,
+        device_status AS deviceStatus,
+        device_remake AS  deviceRemake,
+        device_create_time AS deviceCreateTime,
+        device_update_time AS deviceUpdateTime
+        FROM
+        tb_rst_pts_device
+        WHERE
+        device_id = #{deviceId}
+    </select>-->
+    <insert id="addMachineParts" parameterType="PtsComponents">
+        INSERT INTO tb_rst_pts_components
+        (supplier_id,produce_id,components_no,components_name,components_type,
+        components_cost,components_weight,components_material,components_mbsc,
+        components_specification,components_img,components_status,components_desc,
+        components_create_time)
+        VALUES
+        (supplierId,produceId,componentsNo,componentsName,componentsType,componentsCost,componentsWeight
+        ,componentsMaterial,componentsMbsc,componentsSpecification,componentsImg,componentsStatus,
+        componentsDesc,componentsCreateTime)
+    </insert>
+</mapper>

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

@@ -1,17 +1,31 @@
 package com.iamberry.rst.controllers.pts;
 
+import com.iamberry.rst.core.pts.Produce;
+import com.iamberry.rst.core.pts.PtsComponents;
+import com.iamberry.rst.faces.pts.MachinePartsService;
+import com.iamberry.rst.faces.pts.ProduceService;
+import com.iamberry.wechat.tools.ResponseJson;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.List;
+
 /**
  * Created by LJK on 2017/8/29.
  */
 @Controller
 @RequestMapping("/admin/machineParts")
 public class AdminMachinePartsController {
+    @Autowired
+    private MachinePartsService  machinePartsService;
 
+    @Autowired
+    private ProduceService produceService;
     /**
      * 进入添加机器零件页面
      * **/
@@ -19,6 +33,30 @@ public class AdminMachinePartsController {
     @RequestMapping("/_to_add_machineParts")
     public ModelAndView toAddMachineParts(){
         ModelAndView mv = new ModelAndView("pts/machinePtras/ptras_add");
+        List<Produce> list = produceService.getProduceList();
+        mv.addObject("produceList", list);
         return mv;
     }
+
+    /**
+     * 添加机器零件
+     * **/
+    @RequiresPermissions("machineParts:add:machineParts")
+    @RequestMapping("/add_machineParts")
+    public ResponseJson addMachineParts(HttpServletRequest request,PtsComponents ptsComponents){
+        ResponseJson responseJson = new ResponseJson();
+        if(ptsComponents == null){
+            responseJson.setReturnCode(500);
+            return responseJson;
+        }
+        ptsComponents.setComponentsCost(ptsComponents.getComponentsCost() * 100);//元转换为分
+        ptsComponents.setComponentsCreateTime(new Date());
+        Integer msg =  machinePartsService.addMachineParts(ptsComponents);
+        if(msg > 0){
+            responseJson.setReturnCode(200);
+        }else{
+            responseJson.setReturnCode(500);
+        }
+        return responseJson;
+    }
 }

watero-rst-web/src/main/resources/watero-rst-orm.xml

@@ -47,6 +47,8 @@
 		<typeAlias type="com.iamberry.rst.core.pts.PtsMachineLogs" alias="PtsMachineLogs"/>
 		<typeAlias type="com.iamberry.rst.core.pts.PtsMachineStatistics" alias="PtsMachineStatistics"/>
 		<typeAlias type="com.iamberry.rst.core.pts.PtsBom" alias="PtsBom"/>
+		<typeAlias type="com.iamberry.rst.core.pts.PtsComponents" alias="PtsComponents"/>
+		<typeAlias type="com.iamberry.rst.core.pts.PtsSupplier" alias="PtsSupplier"/>
 	</typeAliases>
 	<!-- PageHelper -->
 	<plugins>
@@ -69,5 +71,6 @@
 		<mapper resource="com/iamberry/rst/service/pts/mapper/machineLogsMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/pts/mapper/equipmentMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/pts/mapper/ptsBomMapper.xml"/>
+		<mapper resource="com/iamberry/rst/service/pts/mapper/machinePartsMapper.xml"/>
 	</mappers>
 </configuration>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machinePtras/ptras_add.ftl

@@ -20,9 +20,14 @@
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-3">所属机器：</label>
             <div class="formControls col-xs-8 col-sm-9"> <span class="select-box">
-				<select class="select" size="1" name="city">
-					<option value="1">净水机</option>
-					<option value="2">冲奶机</option>
+				<select class="select" size="1" name="produceId" id="produceId">
+                <#if (produceList ?size > 0)>
+                    <#list produceList as list>
+                        <option value ="${list.produceId}">${list.produceName}</option>
+                    </#list>
+                <#else >
+                    <option value ="">暂无产品，请到生产产品列表添加产品</option>
+                </#if>
 				</select>
 				</span> </div>
         </div>
@@ -30,13 +35,13 @@
 		<div class="row cl">
 			<label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>零件编号：</label>
 			<div class="formControls col-xs-8 col-sm-9">
-				<input type="text" class="input-text" value=""  id="username" name="username" placeholder="请输入零件编号，支持数字、字母组合">
+				<input type="text" class="input-text" value=""  id="componentsNo" name="componentsNo" placeholder="请输入零件编号，支持数字、字母组合">
 			</div>
 		</div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>零件名称：</label>
             <div class="formControls col-xs-8 col-sm-9">
-                <input type="text" class="input-text" value=""  id="username" name="username" placeholder="请输入1-30位的名称，支持中文、字母、数字">
+                <input type="text" class="input-text" value=""  id="componentsName" name="componentsName" placeholder="请输入1-30位的名称，支持中文、字母、数字">
             </div>
         </div>
 
@@ -53,7 +58,7 @@
             <label class="form-label col-xs-4 col-sm-3">零件图片：</label>
             <div class="formControls col-xs-8 col-sm-9">
                 <img alt="介绍图" src="/common/images/pts/addparts.jpg" id="partsImg" width="90" height="80">
-                <input type="hidden" id="insertfilePartsImg" name="insertfilePartsImg" value=""/>
+                <input type="hidden" id="componentsImg" name="componentsImg" value=""/>
 			</div>
         </div>
 
@@ -61,12 +66,12 @@
 			<label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>零件状态：</label>
 			<div class="formControls col-xs-8 col-sm-9 skin-minimal">
 				<div class="radio-box">
-					<input name="sex" type="radio" id="sex-1" checked>
-					<label for="sex-1">正在使用</label>
+					<input name="componentsStatus" type="radio" value="0" id="sex-1" checked>
+					<label for="sex-1">停止使用</label>
 				</div>
 				<div class="radio-box">
-					<input type="radio" id="sex-2" name="sex">
-					<label for="sex-2">已取消</label>
+					<input type="radio" id="sex-2" value="1" name="componentsStatus">
+					<label for="sex-2">正常使用</label>
 				</div>
 			</div>
 		</div>
@@ -74,43 +79,47 @@
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>零件成本：</label>
             <div class="formControls col-xs-8 col-sm-9">
-                <input type="text" class="input-text" value=""  id="username" name="username" placeholder="请输入零件成本，单位为元">
+                <input type="text" class="input-text" value=""  id="componentsCost" name="componentsCost" placeholder="请输入零件成本，单位为元">
             </div>
         </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>零件重量：</label>
             <div class="formControls col-xs-8 col-sm-9">
-                <input type="text" class="input-text" value=""  id="username" name="username" placeholder="请输入零件重量，单位为克">
+                <input type="text" class="input-text" value=""  id="componentsWeight" name="componentsWeight" placeholder="请输入零件重量，单位为克">
             </div>
         </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>零件材料：</label>
             <div class="formControls col-xs-8 col-sm-9">
-                <input type="text" class="input-text" value="" id="username" name="username" placeholder="请输入1-30位的材料，支持中文、字母、数字">
+                <input type="text" class="input-text" value="" id="componentsMaterial" name="componentsMaterial" placeholder="请输入1-30位的材料，支持中文、字母、数字">
             </div>
         </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>材料类型：</label>
             <div class="formControls col-xs-8 col-sm-9">
-                <input type="text" class="input-text" value="" id="username" name="username" placeholder="请输入材料的类型">
+                <select class="select" size="1" name="componentsType" id="componentsType">
+                    <option value ="1">塑胶件</option>
+                    <option value ="2">五金件</option>
+                    <option value ="3">其他</option>
+                </select>
             </div>
         </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>MBSC：</label>
             <div class="formControls col-xs-8 col-sm-9">
-                <input type="text" class="input-text" value=""  id="username" name="username" placeholder="请输入MBSC">
+                <input type="text" class="input-text" value=""  id="componentsMbsc" name="componentsMbsc" placeholder="请输入MBSC">
             </div>
         </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>规格：</label>
             <div class="formControls col-xs-8 col-sm-9">
-                <input type="text" class="input-text" value="" id="username" name="username" placeholder="请输入材料规格（允许为空）">
+                <input type="text" class="input-text" value="" id="componentsSpecification" name="componentsSpecification" placeholder="请输入材料规格（允许为空）">
             </div>
         </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-3">备注：</label>
             <div class="formControls col-xs-8 col-sm-9">
-                <textarea name="beizhu" cols="" rows="" class="textarea"  placeholder="请输入零件的备注（允许为空）" onKeyUp="$.Huitextarealength(this,100)"></textarea>
+                <textarea name="componentsDesc" id="componentsDesc" cols="" rows="" class="textarea"  placeholder="请输入零件的备注（允许为空）" onKeyUp="$.Huitextarealength(this,100)"></textarea>
                 <p class="textarea-numberbar"><em class="textarea-length">0</em>/100</p>
             </div>
         </div>
@@ -140,10 +149,10 @@
             editor.loadPlugin('image', function() {
                 editor.plugin.imageDialog({
                     showRemote : false,
-                    imageUrl : K('#insertfilePartsImg').val(),
+                    imageUrl : K('#componentsImg').val(),
                     clickFn : function(url, title, width, height, border, align) {
                         K('#partsImg').attr("src",url);
-                        K('#insertfilePartsImg').val(url);
+                        K('#componentsImg').val(url);
                         editor.hideDialog();
                         return false;
                     }