5. 工厂生产管理

watero-rst-core/src/main/java/com.iamberry.rst.core/pts/PtsEmployee.java

@@ -33,6 +33,7 @@ public class PtsEmployee implements Serializable{
 
     private String employeeLine;  //拉线
     private Integer isJoinProcess;//是否已加入当日其他工序 1是 2 否
+    private String processName;//已加入当日其他工序名称
 
     public Integer getEmployeeId() {
         return employeeId;
@@ -145,4 +146,12 @@ public class PtsEmployee implements Serializable{
     public void setIsJoinProcess(Integer isJoinProcess) {
         this.isJoinProcess = isJoinProcess;
     }
+
+    public String getProcessName() {
+        return processName;
+    }
+
+    public void setProcessName(String processName) {
+        this.processName = processName;
+    }
 }

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

@@ -55,5 +55,5 @@ public interface ProductionPlanService {
     Integer getPlanCount();
 
     //获取工序重复员工条数
-    Integer getPlanRepeat(ProductionPlan productionPlan);
+    List<ProductionPlan> getPlanRepeat(ProductionPlan productionPlan);
 }

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

@@ -131,7 +131,7 @@ public class ProductionPlanServiceImpl implements ProductionPlanService {
     }
 
     @Override
-    public Integer getPlanRepeat(ProductionPlan productionPlan) {
+    public List<ProductionPlan> getPlanRepeat(ProductionPlan productionPlan) {
         return productionPlanningMapper.getPlanRepeat(productionPlan);
     }
 }

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

@@ -71,8 +71,10 @@ public class PtsEmployeeServiceImpl implements PtsEmployeeService {
             }
             for(PtsEmployee e : list){
                     plan.setEmployeeId(e.getEmployeeId());
-                    if(productionPlanningMapper.getPlanRepeat(plan) > 0){
+                List<ProductionPlan> plans = productionPlanningMapper.getPlanRepeat(plan);
+                if(plans != null && plans.size() > 0){
                         e.setIsJoinProcess(1);
+                        e.setProcessName(plans.get(0).getProcessName());
                     }else{
                         e.setIsJoinProcess(2);
                     }

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

@@ -47,5 +47,5 @@ public interface ProductionPlanningMapper {
         Integer getPlanCount();
 
         //获取工序重复员工条数
-        Integer getPlanRepeat(ProductionPlan productionPlan);
+        List<ProductionPlan> getPlanRepeat(ProductionPlan productionPlan);
 }

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

@@ -211,15 +211,25 @@
     <select id="getPlanCount" resultType="Integer">
         select count(1) from tb_rst_pts_production_plan where to_days(plan_date) = to_days(now())
     </select>
-    <select id="getPlanRepeat" parameterType="ProductionPlan" resultType="Integer">
+    <select id="getPlanRepeat" parameterType="ProductionPlan" resultType="ProductionPlan">
         SELECT
-            count(1)
+        plan_id AS planId,
+        plan_date AS planDate,
+        plan_process_id AS planProcessId,
+        plan_stay AS  planStay,
+        plan_work_hours AS planWorkHours,
+        plan_results AS  planResults,
+        plan_create_time AS planCreateTime,
+        plan_update_time AS planUpdateTime,
+        process_name AS processName
         FROM
             tb_rst_pts_production_plan pp
         LEFT JOIN tb_rst_pts_production_employees pe on pe.pe_plan_id = pp.plan_id
+                LEFT JOIN tb_rst_pts_production_process ppp on pp.plan_process_id = ppp.process_id
         WHERE
             to_days(plan_date) = to_days(#{planDate})
         AND
         pe.pe_employee_id = #{employeeId}
+        group by plan_id
     </select>
 </mapper>

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

@@ -194,8 +194,8 @@ public class ProductionPlanController {
             for(String employee : employees){
                 if(!employee.equals("")){
                     plan.setEmployeeId(Integer.valueOf(employee));
-                    Integer s = productionPlanService.getPlanRepeat(plan);
-                    if(s > 0){
+                    List<ProductionPlan> plans = productionPlanService.getPlanRepeat(plan);
+                    if(plans != null && plans.size() > 0){
                         is = true;
                         //查询重复员工姓名
                         employeeList.add(ptsEmployeeService.getPtsEmployeeById(Integer.valueOf(employee)));

watero-rst-web/src/main/webapp/WEB-INF/views/pts/employee/employee_list.ftl

@@ -54,14 +54,14 @@
         &lt;#&ndash;<th scope="col" colspan="2">共有数据：<strong>#{page.total}</strong> 条</th>&ndash;&gt;
         </tr>-->
         <tr class="text-c">
+            <th width="100">所属部门</th>
             <th width="80">员工编号</th>
             <th width="100">员工姓名</th>
             <th width="120">员工电话</th>
             <th width="55">员工状态</th>
             <th width="80">入职日期</th>
             <th width="100">员工岗位</th>
-            <th width="100">是否具有清空卡权限</th>
-            <th width="100">拉线</th>
+            <#--<th width="100">是否具有清空卡权限</th>-->
             <th width="80">离职日期</th>
             <th width="150">添加时间</th>
             <th width="100">操作</th>
@@ -71,6 +71,7 @@
             <#if page.dataList?? &&  (page.dataList?size > 0) >
                     <#list page.dataList as employee>
                         <tr class="text-c">
+                            <td>${employee.employeeLine!}</td>
                             <td>${employee.employeeNo!}</td>
                             <td>${employee.employeeName!}</td>
                             <td>${employee.employeeTel!}</td>
@@ -83,14 +84,13 @@
                             </td>
                             <td>${(employee.employeeEntryDate?string("yyyy-MM-dd"))!''}</td>
                             <td>${employee.employeePost!}</td>
-                            <td>
+                            <#--<td>
                                 <#if employee.employeeClearPower == 0>
                                     是
                                 <#elseif employee.employeeClearPower == 1>
                                     否
                                 </#if>
-                            </td>
-                            <td>${employee.employeeLine!}</td>
+                            </td>-->
                             <td>${(employee.employeeDepartureDate?string("yyyy-MM-dd"))!''}</td>
                             <td>${(employee.employeeCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</td>
                             <td>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/employee/save_employee.ftl

@@ -36,6 +36,7 @@
     <form class="form form-horizontal" id="form-admin-addEmployee">
         <div style="padding: 10px;width: 600px;margin: 0 auto;">
             <div class="my-title">员工信息</div>
+            <div class="input-box"><span class="input-dic"><span class="c-red">*</span>所属部门</span>&nbsp;&nbsp;<input class="my-input" type="text" name="employeeLine" id="employeeLine" value="" placeholder="请输入2-30位中文、英文、数字字符描述" required   maxlength="30"  minlength="2" /> </div>
             <div class="input-box"><span class="input-dic"><span class="c-red">*</span>员工编号</span>&nbsp;&nbsp;<input class="my-input" name="employeeNo" id="employeeNo" type="text" value="" placeholder="请输入员工编号" required   maxlength="10"  /> <span style="color: red;" id="employeeNoMsg"></span></div>
             <div class="input-box"><span class="input-dic"><span class="c-red">*</span>员工姓名</span>&nbsp;&nbsp;<input class="my-input" name="employeeName" id="employeeName" type="text" value="" placeholder="请输入2-10位中文" required   maxlength="10" minlength="2" /> </div>
             <div class="input-box"><span class="input-dic"><span class="c-red">&nbsp;</span>手机号码</span>&nbsp;&nbsp;<input class="my-input" name="employeeTel" id="employeeTel" type="text" value="" placeholder="请输入11位的手机号码" /><span style="color: red;" id="employeeTelMsg"></span> </div>
@@ -43,7 +44,7 @@
                 <input type="radio" id="employeeState1" name="employeeState" value="1" checked/><label for="employeeState1">在职</label>
                 <input type="radio" id="employeeState2" name="employeeState" value="0"/><label for="employeeState2">离职</label>
             </div>
-            <div class="input-box"><span class="input-dic" style="margin-top: 0"><span class="c-red">*</span>清空卡权限</span>
+            <div class="input-box" style="display: none;"><span class="input-dic" style="margin-top: 0;"><span class="c-red">*</span>清空卡权限</span>
                 <input type="radio" id="employeeClearPower1" name="employeeClearPower" value="0" /><label for="employeeClearPower1">具有</label>
                 <input type="radio" id="employeeClearPower2" name="employeeClearPower" value="1" checked /><label for="employeeClearPower2">不具有</label>
             </div>
@@ -51,7 +52,6 @@
             <div class="input-box"><span class="input-dic"><span class="c-red">*</span>入职日期</span>&nbsp;&nbsp;<input class="my-input-date" type="text" name="employeeEntryDate" id="employeeEntryDate" value="" placeholder="请选择入职日期" onclick="WdatePicker({skin:'whyGreen'})"  readonly="readonly" /> </div>
             <div class="input-box" id="isDeparture"><span class="input-dic"><span class="c-red">*</span>离职日期</span>&nbsp;&nbsp;<input class="my-input-date" type="text" name="employeeDepartureDate" id="employeeDepartureDate" value="" placeholder="请选择离职日期"  onclick="WdatePicker({ dateFmt:'yyyy-MM-dd',skin:'whyGreen',minDate:'#F{$dp.$D(\'employeeEntryDate\')||\'%y-%M-%d\'}' })"  readonly="readonly"/></div>
             <div class="input-box"><span class="input-dic"><span class="c-red">*</span>员工岗位</span>&nbsp;&nbsp;<input class="my-input" type="text" name="employeePost" id="employeePost" value="" placeholder="请输入2-20位中文、英文字符描述" required   maxlength="20"  minlength="2" /> </div>
-            <div class="input-box"><span class="input-dic">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="c-red">*</span>拉线</span>&nbsp;&nbsp;<input class="my-input" type="text" name="employeeLine" id="employeeLine" value="" placeholder="请输入2-30位中文、英文、数字字符描述" required   maxlength="30"  minlength="2" /> </div>
             <div style="clear: both;"></div>
             <div class="input-box"><span class="input-dic">员工备注</span>&nbsp;&nbsp;
                 <textarea rows="3" cols="20" class="my-textarea" name="employeeDesc" id="employeeDesc"  maxlength="200" msg="员工备注" ></textarea>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/employee/update_employee.ftl

@@ -45,7 +45,7 @@
                 <input type="radio" id="employeeState1" name="employeeState" value="1" <#if employee.employeeState == 1>checked</#if>/><label for="employeeState1">在职</label>
                 <input type="radio" id="employeeState2" name="employeeState" value="0" <#if employee.employeeState == 0>checked</#if>/><label for="employeeState2">离职</label>
             </div>
-            <div class="input-box"><span class="input-dic" style="margin-top: 0">清空卡权限</span>
+            <div class="input-box" style="display: none;"><span class="input-dic" style="margin-top: 0;">清空卡权限</span>
                 <input type="radio" id="employeeClearPower1" name="employeeClearPower" value="0" <#if employee.employeeClearPower == 0>checked</#if>/><label for="employeeClearPower1">具有</label>
                 <input type="radio" id="employeeClearPower2" name="employeeClearPower" value="1" <#if employee.employeeClearPower == 1>checked</#if>/><label for="employeeClearPower2">不具有</label>
             </div>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/productionPlan/add_productionPlan.ftl

@@ -129,7 +129,7 @@
      * 打开员工列表
      */
     function add_employee() {
-        layer_show("员工列表","${path}/admin/employee/employee_list","800","500");
+        layer_show("员工列表","${path}/admin/employee/employee_list?pageSize=1000","800","500");
     }
     /**
      * 选择员工回调

watero-rst-web/src/main/webapp/WEB-INF/views/pts/productionPlan/employee_list.ftl

@@ -49,7 +49,7 @@
 <div class="page-container">
     <div class="order-list">
         <div class="text-c">
-            <form action="${path}/admin/employee/employee_list" method="post">
+            <form action="${path}/admin/employee/employee_list?pageSize=1000" method="post">
                 <div class="row cl" style="margin-left: 0px;">
 
                     <div class="formControls col-2 col-sm-2"  style="padding: 0px 10px 0px 0px; width: 110px;">
@@ -79,7 +79,7 @@
                 <tbody id="employeeHtml">
                 <#if page.dataList?? &&  (page.dataList?size > 0) >
                     <#list page.dataList as employee>
-                        <tr class="text-c">
+                        <tr class="text-c" <#if employee.isJoinProcess == 1>title="该员工已于本日参加${employee.processName}工序"</#if>>
                             <td><input type="checkbox" class="employee_id" <#if employee.isJoinProcess == 1>disabled="true"</#if>  name="employee_Id" value="${employee.employeeId!}" ></td>
                             <td>${employee.employeeNo!}</td>
                             <td>${employee.employeeName!}</td>
@@ -101,7 +101,7 @@
 
 </div>
 <tfoot>
-<#include "/base/page_util.ftl">
+<#--<#include "/base/page_util.ftl">-->
 </tfoot>
 
 <script>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/productionPlan/productionPlan_statistical.ftl

@@ -6,7 +6,7 @@
         <#include "/base/list_base.ftl">
 		<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{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 30px;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; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-11.png) right center no-repeat;background-size:auto 100%;}
             .my-btn-search{border: 1px solid #50a2ea;padding: 1px 25px;height: 32px;background-color: #fff;color: #50a2ea;}

watero-rst-web/src/main/webapp/WEB-INF/views/pts/productionPlan/update_productionPlan.ftl

@@ -141,7 +141,7 @@
      * 打开员工列表
      */
     function add_employee() {
-        layer_show("员工列表","${path}/admin/employee/employee_list","800","500");
+        layer_show("员工列表","${path}/admin/employee/employee_list?pageSize=1000","800","500");
     }
     /**
      * 选择员工回调