Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

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

@@ -136,12 +136,10 @@
             <if test="componentsStatus != null" >
                 components_status = #{componentsStatus},
             </if>
-            <if test="componentsDesc != null and componentsDesc != ''" >
-                components_desc = #{componentsDesc},
-            </if>
             <if test="componentsUpdateTime != null and componentsUpdateTime != ''" >
-                components_update_time = #{componentsUpdateTime}
+                components_update_time = #{componentsUpdateTime},
             </if>
+                components_desc = #{componentsDesc}
         </set>
         <where>
             <if test="componentsId != null and componentsId != ''">

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/ptsBatchMapper.xml

@@ -108,9 +108,7 @@
             <if test="batchStatus !=null">
                 batch_status = #{batchStatus},
             </if>
-            <if test="batchDesc !=null and batchDesc !=''">
                 batch_desc = #{batchDesc}
-            </if>
         </set>
         WHERE
             batch_id = #{batchId}

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

@@ -102,12 +102,10 @@
             <if test="produceId !=null">
                 produce_id = #{produceId},
             </if>
-            <if test="bomRemarks !=null  and bomRemarks !=''">
-                bom_remarks = #{bomRemarks},
-            </if>
             <if test="bomVersion !=null  and bomVersion !=''">
-                bom_version = #{bomVersion}
+                bom_version = #{bomVersion},
             </if>
+                bom_remarks = #{bomRemarks}
         </set>
         where
             `bom_id` = #{bomId}

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/batch/batch_list.ftl

@@ -13,7 +13,7 @@
     <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::-webkit-input-placeholder,.my-select{color: #dcdcdc;}
+        /*.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;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
         .barcodeImg{margin:10px 0px}

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

@@ -153,7 +153,7 @@
             <div class="formControls col-xs-8 col-sm-9">
                 <textarea name="batchDesc" id="batchDesc" cols="" rows="" class="textarea"
                           placeholder="批次描述，最多支持100字符" onKeyUp="$.Huitextarealength(this,100)" >${ptsBatch.batchDesc}</textarea>
-                <p class="textarea-numberbar"><em class="textarea-length">0</em>/100</p>
+                <p class="textarea-numberbar"><em class="textarea-length"><#if ptsBatch.batchDesc??>${ptsBatch.batchDesc?length} <#else>0</#if></em>/100</p>
             </div>
         </div>
 

watero-rst-web/src/main/webapp/WEB-INF/views/pts/bom/bom_list.ftl

@@ -13,7 +13,7 @@
     <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::-webkit-input-placeholder,.my-select{color: #dcdcdc;}
+        /*.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;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
         .barcodeImg{margin:10px 0px}

watero-rst-web/src/main/webapp/WEB-INF/views/pts/bom/update_bom.ftl

@@ -60,7 +60,7 @@
             <div class="formControls col-xs-8 col-sm-9">
                 <textarea name="bomRemarks" id="bomRemarks" cols="" rows="" class="textarea"
                           placeholder="Bom单备注，最多支持100字符" onKeyUp="$.Huitextarealength(this,100)" >${ptsBom.bomRemarks ! ''}</textarea>
-                <p class="textarea-numberbar"><em class="textarea-length">0</em>/100</p>
+                <p class="textarea-numberbar"><em class="textarea-length"><#if ptsBom.bomRemarks??>${ptsBom.bomRemarks?length} <#else>0</#if></em>/100</p>
             </div>
         </div>
 

watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/device_list.ftl

@@ -6,7 +6,7 @@
     <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::-webkit-input-placeholder,.my-select{color: #dcdcdc;}
+        /*.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;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
         .barcodeImg{margin:10px 0px}

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

@@ -13,7 +13,7 @@
     <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::-webkit-input-placeholder,.my-select{color: #dcdcdc;}
+        /*.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;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
         .barcodeImg{margin:10px 0px}
@@ -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_List.ftl

@@ -6,7 +6,7 @@
 		<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::-webkit-input-placeholder,.my-select{color: #dcdcdc;}
+			/*.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;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
 			.my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
             .barcodeImg{margin:10px 0px}

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/machinePtras/parts_list.ftl

@@ -13,7 +13,7 @@
     <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::-webkit-input-placeholder,.my-select{color: #dcdcdc;}
+        /*.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;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
         .barcodeImg{margin:10px 0px}
@@ -46,15 +46,6 @@
 
             <select class="my-select" name="produceId" style="height: 36px;width: 150px">
                 <option value ="">所有产品</option>
-            <#if produceList?? &&  (produceList?size > 0) >
-                <#list produceList as produce>
-                    <option value ="${produce.produceId!}" <#if produceId??><#if produceId ==produce.produceId >selected="selected"</#if></#if>>${produce.produceName!}</option>
-                </#list>
-            </#if>
-            </select>
-
-            <select class="my-select" name="produceId" style="height: 36px;width: 150px">
-                <option value ="">所有产品</option>
                 <#if produceList?? &&  (produceList?size > 0) >
                     <#list produceList as produce>
                         <option value ="${produce.produceId!}" <#if produceId??><#if produceId ==produce.produceId >selected="selected"</#if></#if>>${produce.produceName!}</option>

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

@@ -53,7 +53,7 @@
         </div>
 
         <div class="row cl">
-            <label class="form-label col-xs-4 col-sm-3">供应商：</label>
+            <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"> <span class="select-box">
 				<select class="select" size="1" name="supplierId" id="supplierId">
                 <#if (listSupplier ?size > 0)>

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

@@ -25,7 +25,7 @@
 	<form action="" method="post" class="form form-horizontal" id="form-parts-update">
 
         <div class="row cl">
-            <label class="form-label col-xs-4 col-sm-3">所属机器：</label>
+            <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"> <span class="select-box">
 				<select class="select" size="1" name="produceId" id="produceId">
                 <#if (produceList ?size > 0)>
@@ -54,7 +54,7 @@
         </div>
 
         <div class="row cl">
-            <label class="form-label col-xs-4 col-sm-3">供应商：</label>
+            <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"> <span class="select-box">
 				<select class="select" size="1" name="supplierId" id="supplierId">
                 <#if (listSupplier ?size > 0)>
@@ -75,7 +75,7 @@
 			</div>
         </div>-->
         <div class="row cl">
-            <label class="form-label col-xs-4 col-sm-3">零件图片：</label>
+            <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" id="fileDiv">
                 <input type="file" name="file" id="fileid" style="opacity: 0; position: absolute; width: 90px;height: 80px;">
                 <img alt="介绍图" src="${path}${ptsComponents.componentsImg!''}" id="partsImg" width="90" height="80">
@@ -142,7 +142,7 @@
             <label class="form-label col-xs-4 col-sm-3">备注：</label>
             <div class="formControls col-xs-8 col-sm-9">
                 <textarea name="componentsDesc" id="componentsDesc" cols="" rows="" class="textarea"  placeholder="请输入零件的备注（允许为空）" onKeyUp="$.Huitextarealength(this,100)">${ptsComponents.componentsDesc!''}</textarea>
-                <p class="textarea-numberbar"><em class="textarea-length">0</em>/100</p>
+                <p class="textarea-numberbar"><em class="textarea-length"><#if ptsComponents.componentsDesc??>${ptsComponents.componentsDesc?length} <#else>0</#if></em>/100</p>
             </div>
         </div>
         <div class="row cl">

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

@@ -13,7 +13,7 @@
     <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::-webkit-input-placeholder,.my-select{color: #dcdcdc;}
+        /*.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;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
         .barcodeImg{margin:10px 0px}

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>
 

wateroPF-wechat-web/src/main/java/com/iamberry/wechat/utils/KuaiDi100.java

@@ -49,6 +49,9 @@ public class KuaiDi100 {
           case "ems":
               code = "ems";
               break;
+          case "eyb":
+              code = "ems";
+              break;
           case "zto":
               code = "zhongtong";
               break;
@@ -87,7 +90,7 @@ public class KuaiDi100 {
   }
     /**
      *  快递对应代码
-     *  EMS 		ems
+     *  EMS 		ems/eyb
      * 	申通快递  	shentong
      * 	顺丰速运 	shunfeng
      * 	圆通速递 	yuantong
@@ -102,7 +105,7 @@ public class KuaiDi100 {
      */
     public static void main(String[] agrs){
         KuaiDi100 kuaidi = new KuaiDi100();
-        System.out.println(kuaidi.getExpressInfo("zhongtong","445670484182"));
+        System.out.println(kuaidi.getExpressInfo("ems","9754210807242"));
     }
     /**
      * 查询快递信息

wateroPF-wechat-web/src/main/webapp/view/view_logistics.html

@@ -192,8 +192,8 @@
                         case "ems":
                             name= "邮政EMS";
                             break;
-                        case "zto":
-                            name= "中通快递";
+                        case "eyb":
+                            name= "E邮宝";
                             break;
                         case "zjs":
                             name= "宅急送";