产品管理。

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

@@ -15,7 +15,7 @@ public interface ProduceService {
     //获取生产产品列表
     List<Produce> getProduceList();
 
-    //获取生产产品，产品工序，工序节点
+    //获取生产产品，产品工序，工序节点 --
     List<Produce> getAllProduceList(Integer employeeId);
 
     //获取单个产品信息
@@ -27,6 +27,9 @@ public interface ProduceService {
     //获取单个工序选项信息
     ProcessNode getprocessNode(Integer ProcessId,String nodeNo);
 
+    //获取所有的工序
+    List<ProduceProcess> listProduceProcess(ProduceProcess produceProcess);
+
     //获取当前产品所有工序信息
     List<ProduceProcess> listProduceProcess(Integer produceId);
 

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

@@ -58,6 +58,11 @@ public class ProduceServiceImpl implements ProduceService {
         return produceMapper.listProduceProcess(produceId);
     }
 
+    @Override
+    public List<ProduceProcess> listProduceProcess(ProduceProcess produceProcess) {
+        return produceMapper.selectProcessList(produceProcess);
+    }
+
     //添加产品
     public Integer saveProduce(Produce produce){
         int flag = produceMapper.saveProduce(produce);

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

@@ -30,6 +30,9 @@ public interface ProduceMapper {
     //获取当前产品所有工序信息
     List<ProduceProcess> listProduceProcess(Integer produceId);
 
+    //获取当前产品所有工序信息
+    List<ProduceProcess> selectProcessList(ProduceProcess produceProcess);
+
     //添加产品
     Integer saveProduce(Produce produce);
 

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

@@ -36,6 +36,7 @@
         <result column="employee_id" property="employeeId"/>
         <result column="drive_id" property="driveId"/>
         <result column="process_status" property="processStatus"/>
+        <result column="process_type" property="processType"/>
         <result column="process_sort" property="processSort"/>
         <result column="process_remake" property="processRemake"/>
         <result column="process_create_time" property="processCreateTime"/>
@@ -66,6 +67,7 @@
         FROM
         tb_rst_pts_produce tp
         LEFT JOIN tb_rst_pts_produce_process ts ON tp.produce_id = ts.produce_id AND ts.employee_id = #{employeeId}
+        WHERE  tp.produce_status = 1
         GROUP BY tp.produce_id
     </select>
     <select id="getProduceProcessList" parameterType="java.util.HashMap" resultMap="ProduceProcessMap">
@@ -77,6 +79,7 @@
         ts.employee_id,
         ts.drive_id,
         ts.process_status,
+        ts.process_type,
         ts.process_sort,
         ts.process_remake,
         ts.process_create_time,
@@ -85,6 +88,8 @@
         tb_rst_pts_produce_process ts
         WHERE  ts.produce_id = #{produceId}
         AND ts.employee_id = #{employeeId}
+        AND ts.process_status = 1
+        ORDER BY ts.process_sort
     </select>
     <select id="getProcessNodeList" parameterType="java.lang.Integer" resultMap="ProcessNodeMap">
         SELECT
@@ -102,7 +107,6 @@
     </select>
     <!--获取产品工序节点的接口sql-end-->
 
-
     <select id="getProduce" parameterType="Integer" resultType="Produce">
         SELECT
         tb_rst_pts_produce.produce_id AS produceId,
@@ -153,6 +157,28 @@
     </select>
 
 
+    <select id="selectProcessList" parameterType="ProduceProcess" resultType="ProduceProcess">
+         SELECT
+            ts.process_id,
+            ts.produce_id,
+            ts.process_no,
+            ts.process_name,
+            ts.employee_id,
+            ts.drive_id,
+            ts.process_status,
+            ts.process_type,
+            ts.process_sort,
+            ts.process_remake,
+            ts.process_create_time,
+            ts.process_update_time
+        FROM
+            tb_rst_pts_produce_process ts
+        WHERE  ts.produce_id = #{produceId}
+        AND ts.process_status = 1
+        ORDER BY ts.process_sort
+    </select>
+
+
     <insert id="saveProduce" parameterType="Produce" useGeneratedKeys="true">
         insert into tbRstPtsProduce (produce_no,produce_name,produce_status,produce_remake,produce_create_time,produce_update_time)
         values (#{produceNo},#{produceName},#{produceStatus},#{produceRemake},#{produceCreateTime},#{produceUpdateTime})
@@ -173,21 +199,19 @@
 
 
     <insert id="saveProduceProcessList" parameterType="java.util.ArrayList" useGeneratedKeys="true">
-        insert into tbRstPtsProduce (produce_no,produce_name,produce_status,produce_remake,produce_create_time,produce_update_time)
-        values (#{produceNo},#{produceName},#{produceStatus},#{produceRemake},#{produceCreateTime},#{produceUpdateTime})
+        insert into tb_rst_pts_produce_process (`produce_id` ,`process_no` ,`process_name` ,`employee_id` ,`drive_id` ,`process_status` ,`process_type` ,`process_sort` ,`process_remake` )
+        values
+        <foreach collection="process" item="pro" index="index" separator="," >
+            (#{pro.produceId},#{pro.processNo},#{pro.processName},#{pro.employeeId},#{pro.driveId},#{pro.processStatus},#{pro.processType},#{pro.processSort},#{pro.processRemake})
+        </foreach>
     </insert>
 
     <update id="updateProduceProcessList" parameterType="java.util.ArrayList" >
-        UPDATE tbRstPtsProduce
-        SET
-        produce_no = #{produceNo},
-        produce_name = #{produceName},
-        produce_status = #{produceStatus},
-        produce_remake = #{produceRemake},
-        produce_create_time = #{produceCreateTime},
-        produce_update_time = #{produceUpdateTime}
-        WHERE
-        produce_id = #{produceId}
+        <foreach collection="process" item="pro" index="index" separator=";" open="" close="">
+            update tb_rst_pts_produce_process
+            set `process_no` = #{pro.processNo},`process_name` = #{pro.processName},`employee_id` = #{pro.employeeId},`drive_id` = #{pro.driveId},`process_status` = #{pro.processStatus},`process_type` = #{pro.processType},`process_sort` = #{pro.processSort},`process_remake` = #{pro.processRemake}
+            where  `process_id` = #{produceId}
+        </foreach>
     </update>
 
 </mapper>

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

@@ -1,62 +0,0 @@
-package com.iamberry.rst.controllers.pts;
-
-import com.iamberry.rst.core.pts.PtsEmployee;
-import com.iamberry.rst.faces.pts.PtsEmployeeService;
-import com.iamberry.wechat.tools.RespJsonBean;
-import com.iamberry.wechat.tools.ResponseJson;
-import com.iamberry.wechat.tools.payUtil.StringUtil;
-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.bind.annotation.ResponseBody;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * pts系统员工信息controller
- * Created by wangxiaoming on 2017/8/29.
- */
-@Controller
-@RequestMapping("/staffmember")
-public class PtsEmployeeController {
-
-    @Autowired
-    private PtsEmployeeService ptsEmployeeService;
-
-    /**
-     * 根据员工编号查询员工信息
-     *
-     * @param request
-     * @return:RespJsonBean  用于对接app的专用Bean
-     */
-    //@RequiresPermissions("produce:list_produce:produce")
-    @ResponseBody
-    @RequestMapping("/getStaffmemberByNumber")
-    public RespJsonBean getStaffmemberByNumber(HttpServletRequest request) {
-        RespJsonBean rsj = new RespJsonBean();
-        String employeeNo = request.getParameter("staffmemberNumber");  //获取员工编号
-        if (employeeNo == null || "".equals(employeeNo)) {
-            rsj.setResultCode(500);
-            rsj.setResultMsg("ERROR");
-            rsj.addResponseKeyValue("员工编号为空");
-            return rsj;
-        }
-        PtsEmployee ptsEmployee = new PtsEmployee();
-        ptsEmployee.setEmployeeNo(employeeNo);
-        ptsEmployee = ptsEmployeeService.getPtsEmployee(ptsEmployee); //查询员工信息
-        if (ptsEmployee == null) {
-            rsj.setResultCode(500);
-            rsj.setResultMsg("ERROR");
-            rsj.addResponseKeyValue("查询不到该员工");
-            return rsj;
-        }
-        rsj.setResultCode(200);
-        rsj.setResultMsg("SUCCESS");
-        rsj.setReturnMsg(ptsEmployee);
-        return rsj;
-    }
-
-}

watero-rst-web/src/main/webapp/WEB-INF/views/pts/produce/produce_list.ftl

@@ -34,75 +34,30 @@
     <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 </nav>
 <div class="page-container">
-    <#--<div class="text-c">
-        <form action="${path}/admin/order/select_list" method="post">
-        <input type="text" onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'datemin\')}',maxDate:'%y-%M-%d' })" id="datemax" class="input-text Wdate" style="width:120px;">&ndash;&gt;
-            <input type="text" class="input-text" style="width:100px" value="${orderAddressName!}" placeholder="请输入姓名" id="orderAddressName" name="orderAddressName">
-            <input type="text" class="input-text" style="width:120px" value="${orderAddressTel!}" placeholder="请输入电话号码" id="orderAddressTel" name="orderAddressTel">
-            <input type="text" class="input-text" style="width:180px" value="${orderOpenId!}" placeholder="请输入身份证号" id="orderOpenId" name="orderOpenId">
-            <select class="select" name="orderRentType" style="height: 30px;width: 150px">
-                <option value="">--选择租赁类型--</option>
-            <#list rentTypeList as rentType>
-                <option <#if orderRentType??><#if orderRentType == rentType.typeId>selected="selected"</#if></#if> value="${rentType.typeId!}">${rentType.typeName!}</option>
-            </#list>
-            </select>
-            <select class="select" name="orderPayType" style="height: 30px;width: 150px">
-                <option value="">--选择付款方式--</option>
-                <option <#if orderPayType??><#if orderPayType == 1>selected="selected"</#if></#if> value="1">微信支付</option>
-                <option <#if orderPayType??><#if orderPayType == 2>selected="selected"</#if></#if> value="2">现金支付</option>
-                <option <#if orderPayType??><#if orderPayType == 3>selected="selected"</#if></#if> value="3">定金支付</option>
-                <option <#if orderPayType??><#if orderPayType == 4>selected="selected"</#if></#if> value="4">刷卡支付</option>
-                <option <#if orderPayType??><#if orderPayType == 5>selected="selected"</#if></#if> value="5">支付宝支付</option>
-            </select>
-            <select class="select" name="orderStatus" style="height: 30px;width: 150px">
-                <option value="">--选择订单状态--</option>
-                <option <#if orderStatus??><#if orderStatus == 13>selected="selected"</#if></#if> value="13">已支付</option>
-                <option <#if orderStatus??><#if orderStatus == 14>selected="selected"</#if></#if> value="14">待支付定金全款</option>
-                <option <#if orderStatus??><#if orderStatus == 12>selected="selected"</#if></#if> value="12">已完成</option>
-            </select>
-            <button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);" id="" name=""><i class="Hui-iconfont">&#xe665;</i> 搜订单</button>
-        </form>
-    </div>-->
 
         <ul class="chanpin-list">
+
+        <#list resultList as produce>
             <li>
                 <div class="title">
-                    <span>净水机</span>
+                    <span>${produce.produceName!}</span>
                 </div>
                 <ul class="items-list">
-                    <li>净水机需求清洗物料</li>
-                    <li>t1滤芯组装</li>
-                    <li>t2滤芯组装</li>
-                    <li>t3滤芯组装</li>
-                    <li>前置、后置，滤瓶接头加工</li>
+                    <#list produce.process as process>
+                        <li>${process.processName!}</li>
+                    </#list>
                     <li>
                         <button type="button" onclick="updateProduce(1)" class="my-btn-edit">编辑流程</button>
                     </li>
                 </ul>
             </li>
-            <li>
-                <div class="title">
-                    <span>净水机</span>
-                </div>
-                <ul class="items-list">
-                    <li>净水机需求清洗物料</li>
-                    <li>t1滤芯组装</li>
-                    <li>t2滤芯组装</li>
-                    <li>t3滤芯组装</li>
-                    <li>前置、后置，滤瓶接头加工</li>
-                    <li>
-                        <button type="button" class="my-btn-edit">编辑流程</button>
-                    </li>
-                </ul>
-            </li>
+        </#list>
             <li class="li-add">
                 <div>添加产品</div>
             </li>
         </ul>
     <div>
-        <#--<#list page.dataList as produce>-->
 
-        <#--</#list>-->
     </div>
 
 </div>