所有修改页面备注栏修改bug

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

@@ -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">