From 98967900f4674b52ed93fbfdc738abf443c8ae8d Mon Sep 17 00:00:00 2001
From: lenovo <https://gitee.com/lisicode/spring.git>
Date: Mon, 13 Aug 2018 19:06:37 +0800
Subject: [PATCH] 0813 19:05  pro  lisi

---
 .../pro/bus/controller/ProcessController.java |  14 +-
 src/main/java/com/pro/bus/entity/Plan.java    |  27 +++
 .../com/pro/bus/mapper/ProcessMapper.java     |   7 +
 .../com/pro/bus/service/ProcessService.java   |   5 +-
 .../bus/service/impl/ProcessServiceImpl.java  |  35 ++--
 .../pro/sys/controller/LoginController.java   |   2 +-
 .../resources/mapper/bus/ProcessMapper.xml    |  17 ++
 src/main/resources/spring-root-shiro.xml      |  15 ++
 src/main/web/WEB-INF/views/bus/process.jsp    | 162 ++++--------------
 src/main/web/WEB-INF/views/sys/login.jsp      |   2 +-
 10 files changed, 134 insertions(+), 152 deletions(-)

diff --git a/src/main/java/com/pro/bus/controller/ProcessController.java b/src/main/java/com/pro/bus/controller/ProcessController.java
index b6f12d2..1fffc5b 100644
--- a/src/main/java/com/pro/bus/controller/ProcessController.java
+++ b/src/main/java/com/pro/bus/controller/ProcessController.java
@@ -33,17 +33,19 @@ public class ProcessController {
     @RequiresPermissions("/bus/rawcloth")
     @RequestMapping("rawcloth")
     public String toProcess(Model model) {
-        List<Color> colors = processService.getColorName();
-        List<Customer> customers = processService.getCustomerName();
-        List<Standard> standards = processService.getStandardName();
         List<Plan> plans = processService.getPlanId();
-        model.addAttribute("colors", colors);
-        model.addAttribute("customers", customers);
-        model.addAttribute("standards", standards);
         model.addAttribute("plans", plans);
         return "bus/process";
     }
 
+    @RequiresPermissions("/bus/rawcloth")
+    @RequestMapping("getInfoByPlan/{plan_id}")
+    @ResponseBody
+    public Process getInfoByPlan(@PathVariable("plan_id") Integer plan_id) {
+        Process process = processService.getInfoByPlan(plan_id);
+        return process;
+    }
+
     /***
      * 获取坯布准备信息
      * @param page
diff --git a/src/main/java/com/pro/bus/entity/Plan.java b/src/main/java/com/pro/bus/entity/Plan.java
index 87f5ed2..9d998ca 100644
--- a/src/main/java/com/pro/bus/entity/Plan.java
+++ b/src/main/java/com/pro/bus/entity/Plan.java
@@ -3,8 +3,11 @@ package com.pro.bus.entity;
 public class Plan {
     private Integer plan_id;           //计划编号
     private Integer standard_id;     //产品规格编号
+    private String standard_name;    //产品名称
     private Integer cus_id;         //客户编号
+    private String cus_name;        //客户名称
     private Integer co_id;           //花色号
+    private String co_name;          //花色名称
     private Integer plan_xh;         //生产顺序号
     private String plan_month;      //计划月份 格式为：yyyy-MM
     private Double plan_num;        //计划产量
@@ -29,6 +32,14 @@ public class Plan {
         this.standard_id = standard_id;
     }
 
+    public String getStandard_name() {
+        return standard_name;
+    }
+
+    public void setStandard_name(String standard_name) {
+        this.standard_name = standard_name;
+    }
+
     public Integer getCus_id() {
         return cus_id;
     }
@@ -37,6 +48,14 @@ public class Plan {
         this.cus_id = cus_id;
     }
 
+    public String getCus_name() {
+        return cus_name;
+    }
+
+    public void setCus_name(String cus_name) {
+        this.cus_name = cus_name;
+    }
+
     public Integer getCo_id() {
         return co_id;
     }
@@ -45,6 +64,14 @@ public class Plan {
         this.co_id = co_id;
     }
 
+    public String getCo_name() {
+        return co_name;
+    }
+
+    public void setCo_name(String co_name) {
+        this.co_name = co_name;
+    }
+
     public Integer getPlan_xh() {
         return plan_xh;
     }
diff --git a/src/main/java/com/pro/bus/mapper/ProcessMapper.java b/src/main/java/com/pro/bus/mapper/ProcessMapper.java
index 57cf804..2a148fa 100644
--- a/src/main/java/com/pro/bus/mapper/ProcessMapper.java
+++ b/src/main/java/com/pro/bus/mapper/ProcessMapper.java
@@ -64,4 +64,11 @@ public interface ProcessMapper {
      * @return
      */
     int updateProcessStatus(Integer[] process_ids, String process_status);
+
+    /**
+     * 根据计划获得对应的基础信息
+     * @param plan_id
+     * @return
+     */
+    Plan getInfoByPlan(Integer plan_id);
 }
diff --git a/src/main/java/com/pro/bus/service/ProcessService.java b/src/main/java/com/pro/bus/service/ProcessService.java
index 62619ef..eae6a7b 100644
--- a/src/main/java/com/pro/bus/service/ProcessService.java
+++ b/src/main/java/com/pro/bus/service/ProcessService.java
@@ -17,9 +17,6 @@ public interface ProcessService {
      * @return
      */
     List<Process> getProcess(Process process);
-    List<Color> getColorName();
-    List<Customer> getCustomerName();
-    List<Standard> getStandardName();
     List<Plan> getPlanId();
 
     /***
@@ -49,4 +46,6 @@ public interface ProcessService {
      * @return
      */
     Result updateProcessStatus(@Param("process_ids") Integer[] process_ids, @Param("process_status") String process_status);
+
+    Process getInfoByPlan(Integer plan_id);
 }
diff --git a/src/main/java/com/pro/bus/service/impl/ProcessServiceImpl.java b/src/main/java/com/pro/bus/service/impl/ProcessServiceImpl.java
index 38467ea..21c2220 100644
--- a/src/main/java/com/pro/bus/service/impl/ProcessServiceImpl.java
+++ b/src/main/java/com/pro/bus/service/impl/ProcessServiceImpl.java
@@ -28,26 +28,12 @@ public class ProcessServiceImpl implements ProcessService {
         return processMapper.getProcess(process);
     }
 
-    @Override
-    public List<Color> getColorName() {
-        return processMapper.getColorName();
-    }
-
-    @Override
-    public List<Customer> getCustomerName() {
-        return processMapper.getCustomerName();
-    }
-
-    @Override
-    public List<Standard> getStandardName() {
-        return processMapper.getStandardName();
-    }
-
     @Override
     public List<Plan> getPlanId() {
         return processMapper.getPlanId();
     }
 
+
     /***
      * 添加坯布准备信息
      * @param process
@@ -105,4 +91,23 @@ public class ProcessServiceImpl implements ProcessService {
         }
         return Result.failResult("状态修改失败");
     }
+
+    /**
+     * 根据计划获得对应的基础信息
+     * @param plan_id
+     * @return
+     */
+    @Override
+    public Process getInfoByPlan(Integer plan_id) {
+        Plan plan = processMapper.getInfoByPlan(plan_id);
+        if (plan != null) {
+            Process process = new Process();
+            process.setProcess_cus(plan.getCus_id()+"|"+plan.getCus_name());
+            process.setProcess_color(plan.getCo_id()+"|"+plan.getCo_name());
+            process.setProcess_std(plan.getStandard_id()+"|"+plan.getStandard_name());
+            process.setGroup_num(plan.getPlan_num());
+            return process;
+        }
+        return null;
+    }
 }
diff --git a/src/main/java/com/pro/sys/controller/LoginController.java b/src/main/java/com/pro/sys/controller/LoginController.java
index 238c884..bfc3295 100644
--- a/src/main/java/com/pro/sys/controller/LoginController.java
+++ b/src/main/java/com/pro/sys/controller/LoginController.java
@@ -22,7 +22,7 @@ public class LoginController {
     @Autowired
     private ShiroService shiroService;
     @RequestMapping(value = "/login")
-    public String Login(String username, String password, HttpSession session, Model model){
+    public String Login(String username, String password, String rememberMe, HttpSession session, Model model){
         //主体,当前状态为没有认证的状态“未认证”
         Subject subject = SecurityUtils.getSubject();
         if (subject.getSession().getAttribute("user") != null){//防止重复访问login
diff --git a/src/main/resources/mapper/bus/ProcessMapper.xml b/src/main/resources/mapper/bus/ProcessMapper.xml
index d2f461e..924a894 100644
--- a/src/main/resources/mapper/bus/ProcessMapper.xml
+++ b/src/main/resources/mapper/bus/ProcessMapper.xml
@@ -121,4 +121,21 @@
             </where>
         </set>
     </update>
+
+    <select id="getInfoByPlan" resultType="com.pro.bus.entity.Plan">
+        SELECT
+            info_standard.standard_name,
+            info_customer.cus_name,
+            info_color.co_name,
+            bus_plan.standard_id,
+            bus_plan.cus_id,
+            bus_plan.co_id,
+            bus_plan.plan_num
+            FROM
+            bus_plan
+            INNER JOIN info_color ON bus_plan.co_id = info_color.co_id
+            INNER JOIN info_customer ON bus_plan.cus_id = info_customer.cus_id
+            INNER JOIN info_standard ON bus_plan.standard_id = info_standard.standard_id
+            where bus_plan.plan_id=#{plan_id}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/spring-root-shiro.xml b/src/main/resources/spring-root-shiro.xml
index 3e24a92..786afb5 100644
--- a/src/main/resources/spring-root-shiro.xml
+++ b/src/main/resources/spring-root-shiro.xml
@@ -41,6 +41,21 @@
     <bean id="securityManager" class="org.apache.shiro.web.mgt.DefaultWebSecurityManager">
         <!-- 注入realm -->
         <property name="realm" ref="myShiroRealm"/>
+        <!-- 记住我 -->
+        <property name="rememberMeManager" ref="rememberMeManager"></property>
+    </bean>
+
+    <!-- rememberMeManager管理器，写cookie，取出cookie生成用户的信息 -->
+    <bean id="rememberMeManager" class="org.apache.shiro.web.mgt.CookieRememberMeManager">
+        <property name="cookie" ref="rememberMeCookie"></property>
+    </bean>
+
+    <!-- 记住我cookie的相关设置 -->
+    <bean id="rememberMeCookie" class="org.apache.shiro.web.servlet.SimpleCookie">
+        <!-- rememberMe是cookie的名字 -->
+        <constructor-arg value="rememberMe"></constructor-arg>
+        <!-- 记住我cookie生效时间30天 -->
+        <property name="maxAge" value="259200"></property>
     </bean>
 
     <!--声明一个Service 注入到自定义Realm-->
diff --git a/src/main/web/WEB-INF/views/bus/process.jsp b/src/main/web/WEB-INF/views/bus/process.jsp
index afb8f58..9b39ec6 100644
--- a/src/main/web/WEB-INF/views/bus/process.jsp
+++ b/src/main/web/WEB-INF/views/bus/process.jsp
@@ -45,7 +45,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">计划编号</label>
             <div class="layui-input-block">
-                <select name="plan_id" lay-filter="aihao">
+                <select name="plan_id" lay-filter="plan">
                     <option value=""></option>
                     <c:forEach items="${plans}" var="plan">
                         <option value="${plan.plan_id}">${plan.plan_id}</option>
@@ -56,41 +56,26 @@
         <div class="layui-form-item">
             <label class="layui-form-label">客户名称</label>
             <div class="layui-input-block">
-                <select name="process_cus" lay-filter="aihao" required lay-verify="required">
-                    <option value=""></option>
-                    <c:forEach items="${customers}" var="cus">
-                        <option value="${cus.cus_name}">${cus.cus_name}</option>
-                    </c:forEach>
-                </select>
+                <input class="layui-input" id="process_cus" name="process_cus" value="" readonly/>
             </div>
         </div>
 
         <div class="layui-form-item">
             <label class="layui-form-label">规格名称</label>
             <div class="layui-input-block">
-                <select name="process_std" lay-filter="aihao" required lay-verify="required">
-                    <option value=""></option>
-                    <c:forEach items="${standards}" var="standard">
-                        <option value="${standard.standard_name}">${standard.standard_name}</option>
-                    </c:forEach>
-                </select>
+                <input class="layui-input" id="process_std" name="process_std" value="" readonly/>
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">花色名称</label>
             <div class="layui-input-block">
-                <select name="process_color" lay-filter="aihao" required lay-verify="required">
-                    <option value=""></option>
-                    <c:forEach items="${colors}" var="color">
-                        <option value="${color.co_name}">${color.co_name}</option>
-                    </c:forEach>
-                </select>
+                <input class="layui-input" id="process_color" name="process_color" value="" readonly/>
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">布匹数量</label>
             <div class="layui-input-block">
-                <input type="text" name="group_num" required lay-verify="required"
+                <input type="number" id="group_num" readonly="readonly" name="group_num" required lay-verify="required"
                        placeholder="布匹数量" autocomplete="off" class="layui-input">
             </div>
         </div>
@@ -108,111 +93,6 @@
                        placeholder="坯布车间登记人" autocomplete="off" class="layui-input">
             </div>
         </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">前处理产量</label>
-            <div class="layui-input-block">
-                <input type="text" name="pretreat_num"
-                       placeholder="前处理产量" autocomplete="off" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">前处理日期</label>
-            <div class="layui-input-block">
-                <input type="text" name="pretreat_date" placeholder="yyyy-MM-dd"
-                       placeholder="前处理日期" autocomplete="off" class="layui-input test-item">
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">前处理登记人</label>
-            <div class="layui-input-block">
-                <input type="text" name="pretreat_person"
-                       placeholder="前处理登记人" autocomplete="off" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">染色产量</label>
-            <div class="layui-input-block">
-                <input type="text" name="dye_num"
-                       placeholder="染色产量" autocomplete="off" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">染色日期</label>
-            <div class="layui-input-block">
-                <input type="text" name="dye_date" placeholder="yyyy-MM-dd"
-                       placeholder="染色日期" autocomplete="off" class="layui-input test-item">
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">染色登记人</label>
-            <div class="layui-input-block">
-                <input type="text" name="dye_person"
-                       placeholder="染色登记人" autocomplete="off" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">印花产量</label>
-            <div class="layui-input-block">
-                <input type="text" name="print_num"
-                       placeholder="印花产量" autocomplete="off" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">印花日期</label>
-            <div class="layui-input-block">
-                <input type="text" name="print_date" placeholder="yyyy-MM-dd"
-                       placeholder="印花日期" autocomplete="off" class="layui-input test-item">
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">印花登记人</label>
-            <div class="layui-input-block">
-                <input type="text" name="print_person"
-                       placeholder="印花登记人" autocomplete="off" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">整理产量</label>
-            <div class="layui-input-block">
-                <input type="text" name="arrange_num"
-                       placeholder="整理产量" autocomplete="off" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">整理日期</label>
-            <div class="layui-input-block">
-                <input type="text" name="arrange_date" placeholder="yyyy-MM-dd"
-                       placeholder="整理日期" autocomplete="off" class="layui-input test-item">
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">整理登记人</label>
-            <div class="layui-input-block">
-                <input type="text" name="arrange_person"
-                       placeholder="整理登记人" autocomplete="off" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">质检产量</label>
-            <div class="layui-input-block">
-                <input type="text" name="check_num"
-                       placeholder="质检产量" autocomplete="off" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">质检日期</label>
-            <div class="layui-input-block">
-                <input type="text" name="check_date" placeholder="yyyy-MM-dd"
-                       placeholder="质检日期" autocomplete="off" class="layui-input test-item">
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">质检登记人</label>
-            <div class="layui-input-block">
-                <input type="text" name="check_person"
-                       placeholder="质检登记人" autocomplete="off" class="layui-input">
-            </div>
-        </div>
 
         <div class="layui-form-item">
             <div class="layui-input-block">
@@ -248,12 +128,13 @@
 
 
 <script>
+
     //显示按钮是否可用
     var showBns = function(){
         var _pro_status = $('#form-pro-query select[name=process_status]').val();
         console.log("_pro_status="+_pro_status);
         if(_pro_status==''){
-            $('#bn-pro-add,#bn-pro-del-multi').prop('disabled',true).addClass("layui-btn-disabled");
+            $('#bn-pro-add,#bn-pro-del-multi').prop('disabled',false).removeClass("layui-btn-disabled");
         }else if(_pro_status=='00'){
             $('#bn-pro-add,#bn-pro-del-multi').prop('disabled',false).removeClass("layui-btn-disabled");
         }else if(_pro_status=='05'){
@@ -435,6 +316,35 @@
             });
 
         });//打开新增用户信息窗口结束
+
+        var g_group_num;
+        $("#group_num").keyup(function(){
+            console.log($("#group_num").val());
+            if ($("#group_num").val() > g_group_num) {
+                $("#group_num").val(g_group_num);
+            }
+        })
+        //监听选择计划编号
+        form.on('select(plan)', function(data){
+            //console.log(data.elem); //得到select原始DOM对象
+            //console.log(data.value); //得到被选中的值
+            //console.log(data.othis); //得到美化后的DOM对象
+            $.ajax({
+                url:"getInfoByPlan/"+data.value,
+                method:"get",
+                dataType:"json",
+            }).done(function (result) {
+                if (result != null) {
+                    console.log(result);
+                    $("#process_cus").val(result.process_cus);
+                    $("#process_color").val(result.process_color);
+                    $("#process_std").val(result.process_std);
+                    g_group_num = result.group_num;
+                    $("#group_num").prop("max",g_group_num);
+                    $("#group_num").prop("readonly","");
+                }
+            });
+        });
         //监听新增表单提交。bn-pro-do-add是新增表单中提交按钮的lay-filter值
         form.on('submit(bn-pro-do-add)', function (data) {
             //console.log(data.elem) //被执行事件的元素DOM对象，一般为button对象
diff --git a/src/main/web/WEB-INF/views/sys/login.jsp b/src/main/web/WEB-INF/views/sys/login.jsp
index 9d82cc8..cf2c299 100644
--- a/src/main/web/WEB-INF/views/sys/login.jsp
+++ b/src/main/web/WEB-INF/views/sys/login.jsp
@@ -36,7 +36,7 @@
         <input type="password" id="inputPassword" name="password" class="form-control" placeholder="Password" required>
         <div class="checkbox">
             <label>
-                <input type="checkbox" value="remember-me"> Remember me
+                <input type="checkbox" value="rememberMe" name="rememberMe"> Remember me
             </label>
         </div>
         <button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
-- 
Gitee