修改何秀刚测试bug

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

@@ -49,9 +49,6 @@
             <if test="supplierAbbreviation !=null and supplierAbbreviation !=''">
                 supplier_abbreviation = #{supplierAbbreviation},
             </if>
-            <if test="supplierAddress !=null and supplierAddress !=''">
-                supplier_address = #{supplierAddress},
-            </if>
             <if test="supplierContactPerson !=null and supplierContactPerson !=''">
                 supplier_contact_person = #{supplierContactPerson},
             </if>
@@ -61,7 +58,9 @@
             <if test="supplierEmail !=null and supplierEmail !=''">
                 supplier_email = #{supplierEmail},
             </if>
-                supplier_phone = #{supplierPhone}
+                supplier_phone = #{supplierPhone},
+                supplier_address = #{supplierAddress}
+            <!--</if>-->
         </set>
          where  supplier_id = #{supplierId}
     </update>

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

@@ -142,15 +142,13 @@
             <if test="employeePost !=null and employeePost !=''">
                 employee_post = #{employeePost},
             </if>
-            <if test="employeeDesc !=null and employeeDesc !=''">
-                employee_desc = #{employeeDesc},
-            </if>
             <if test="employeeClearPower !=null">
                 employee_clear_power = #{employeeClearPower},
             </if>
             <if test="employeeLine !=null and employeeLine !=''">
-                employee_line = #{employeeLine}
+                employee_line = #{employeeLine},
             </if>
+            employee_desc = #{employeeDesc}
         </set>
         where
             employee_id = #{employeeId}

watero-rst-web/src/main/webapp/WEB-INF/views/pts/batch/add_batch.ftl

@@ -69,7 +69,7 @@
         </div>
         <div class="row cl">
             <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-3">
-                <input class="btn btn-primary radius" type="button" value="&nbsp;&nbsp;新增零件&nbsp;&nbsp;" onclick="addBatchColor('','')">
+                <input class="btn btn-primary radius" type="button" value="&nbsp;&nbsp;新增颜色&nbsp;&nbsp;" onclick="addBatchColor('','')">
             </div>
         </div>
 

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

@@ -58,6 +58,8 @@
             <th width="55">员工状态</th>
             <th width="80">入职日期</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>
@@ -79,6 +81,14 @@
                             </td>
                             <td>${(employee.employeeEntryDate?string("yyyy-MM-dd"))!''}</td>
                             <td>${employee.employeePost!}</td>
+                            <td>
+                                <#if employee.employeeClearPower == 0>
+                                    是
+                                <#elseif employee.employeeClearPower == 1>
+                                    否
+                                </#if>
+                            </td>
+                            <td>${employee.employeeLine!}</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,22 +36,22 @@
     <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>&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>&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>&nbsp;&nbsp;<input class="my-input" name="employeeTel" id="employeeTel" type="text" value="" placeholder="请输入11位的手机号码"  required   maxlength="11" minlength="11" /><span style="color: red;" id="employeeTelMsg"></span> </div>
-            <div class="input-box"><span class="input-dic">员工状态</span>&nbsp;&nbsp;
+            <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">*</span>手机号码</span>&nbsp;&nbsp;<input class="my-input" name="employeeTel" id="employeeTel" type="text" value="" placeholder="请输入11位的手机号码"  required   maxlength="11" minlength="11" /><span style="color: red;" id="employeeTelMsg"></span> </div>
+            <div class="input-box"><span class="input-dic"><span class="c-red">*</span>员工状态</span>&nbsp;&nbsp;
                 <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>
+            <div class="input-box"><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>
 
-            <div class="input-box"><span class="input-dic">入职日期</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>&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>&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>&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-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

@@ -24,7 +24,7 @@
         input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
         input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
-    <title>添加员工- 员工管理 - RST</title>
+    <title>修改员工- 员工管理 - RST</title>
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
@@ -161,7 +161,7 @@
             async: false,
             success: function(data){
                 if (data.returnCode == 200) {
-                    window.location.href = '${path}//admin/employee/_employee_list'
+                    window.location.href = '${path}/admin/employee/_employee_list'
                 }
             },
             error: function(XmlHttpRequest, textStatus, errorThrown){

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_particulars.ftl

@@ -159,6 +159,11 @@
             <div style="float: left;width: 200px;">所属Bom：${ptsBom.bomName ! ''}</div>
         </li>
 
+        <li style="width: 100%;height: 25px;">
+            <div style="float: left;width: 200px;">Bom总质量：${ptsBom.allComponentsWeight ! ''}g</div>
+            <div style="float: left;width: 200px;">Bom总价格：${ptsBom.allComponentsCost/100 ! ''}元</div>
+        </li>
+
         <li  style="width: 100%;height: 25px;">Bom零件清单</li>
         <table class="table table-border table-bordered table-bg table-hover table-sort">
             <thead>
@@ -208,13 +213,15 @@
 
         <li>
             <div class="content">
+                <div  style="font-size: 14px;" class="my-title">生产流程</div>
                 <article>
+            <#if machineLogsList?? &&  (machineLogsList?size > 0) >
 				<#list machineLogsList as list>
                     <section style="padding-bottom: 37px;">
                         <span class="point-time point-blue"></span>
-                        <time>
+                        <#--<time>
 							<#if list_index == 1>生产流程：</#if>
-                        </time>
+                        </time>-->
                         <aside>
                             <p class="things">
 							${(list.logsProcessTime?string("yyyy-MM-dd HH:mm:ss"))!''}<span class="items">${list.employeeName!''}</span><span class="items">${list.processName!''}</span><#if list.logsProcessStatus == 0><span class="btn-see-ditails text-red">异常</#if><#if list.logsProcessStatus == 1><span class="btn-see-ditails text-blue">正常</#if></span>
@@ -222,9 +229,9 @@
                             <p class="things text-red">
 								<#if list.logsErrorType??>
 									<#if list.logsErrorType == 1>
-                                        <img style="width: 20px;float: left;margin-top:8px;margin-right: 10px;" src="/rst/common/images/pts/tanhao.png" />提示：<span class="btn-see-ditails text-red">${list.logsProcessPrompt}</span>
+                                        <img style="width: 20px;float: left;margin-top:8px;margin-right: 10px;" src="${path}/common/images/pts/tanhao.png" />提示：<span class="btn-see-ditails text-red">${list.logsProcessPrompt}</span>
 									<#else>
-                                        <img style="width: 20px;float: left;margin-top:8px;margin-right: 10px;" src="/rst/common/images/pts/tanhao.png" />提示：<span class="btn-see-ditails text-red">次品异常</span>
+                                        <img style="width: 20px;float: left;margin-top:8px;margin-right: 10px;" src="${path}/common/images/pts/tanhao.png" />提示：<span class="btn-see-ditails text-red">次品异常</span>
 									</#if>
 								</#if>
                             </p>
@@ -232,6 +239,9 @@
                     </section>
 
 				</#list>
+            <#else>
+                未找到该机器生产流程
+            </#if>
 				<#--<section style="padding-bottom: 37px;">
                     <span class="point-time point-blue"></span>
                     <time>
@@ -246,7 +256,7 @@
                         </p>
                     </aside>
                 </section>-->
-                    <section>
+                    <#--<section>
                         <span class="point-time point-green"></span>
                         <time>
                             销售信息：
@@ -254,14 +264,14 @@
                         <aside>
                             <p class="things">
 							<#if ptsMachine.machineSalesState == 2>
-							${(ptsMachine.machineSalesDate?string("yyyy-MM-dd"))!''}售出<#--<span class="items">王老五</span><span class="items">净水机需求清洗物料</span>-->
+							${(ptsMachine.machineSalesDate?string("yyyy-MM-dd"))!''}售出&lt;#&ndash;<span class="items">王老五</span><span class="items">净水机需求清洗物料</span>&ndash;&gt;
 							<#else >
                                 未售出
 							</#if>
 
                             </p>
                         </aside>
-                    </section>
+                    </section>-->
                 </article>
             </div>
         </li>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/supplier/update_supplier.ftl

@@ -75,7 +75,7 @@
             <div class="formControls col-xs-8 col-sm-9">
                 <textarea name="supplierAddress" id="supplierAddress" cols="" rows="" class="textarea"
                           placeholder="联系人地址，最多支持100字符" onKeyUp="$.Huitextarealength(this,100)" >${ptsSupplier.supplierAddress!''}</textarea>
-                <p class="textarea-numberbar"><em class="textarea-length">0</em>/100</p>
+                <p class="textarea-numberbar"><em class="textarea-length"><#if ptsSupplier.supplierAddress??>${ptsSupplier.supplierAddress?length} <#else>0</#if></em>/100</p>
             </div>
         </div>