签收时，增加是否过水选项

watero-rst-core/src/main/java/com.iamberry.rst.core/fm/ComplaintSignclosedInfo.java

@@ -116,6 +116,16 @@ public class ComplaintSignclosedInfo implements Serializable {
     private Integer sendbackIsUse;
     // 签收的仓库id
     private Integer warehouseId;
+    // 是否使用，1：未使用；2：已使用
+    private Integer signclosedIsUse;
+
+    public Integer getSignclosedIsUse() {
+        return signclosedIsUse;
+    }
+
+    public void setSignclosedIsUse(Integer signclosedIsUse) {
+        this.signclosedIsUse = signclosedIsUse;
+    }
 
     public Integer getWarehouseId() {
         return warehouseId;

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/complaintSignclosedInfoMapper.xml

@@ -210,7 +210,7 @@
       signclosed_send_name, signclosed_send_tel, 
       signclosed_addr_provinces, signclosed_addr_city, signclosed_addr_area, signclosed_date,
       signclosed_customer_id,
-      signclosed_desc,signclosed_customer_desc,signclosed_is_receiving,signclosed_company_id,sendback_id,signclosed_is_whetherLess,signclosed_store_id
+      signclosed_desc,signclosed_customer_desc,signclosed_is_receiving,signclosed_company_id,sendback_id,signclosed_is_whetherLess,signclosed_store_id, signclosed_is_use
       )
     values (
       #{signclosedLogistics,jdbcType=VARCHAR}, #{signclosedLogisticsNumber,jdbcType=VARCHAR},
@@ -224,7 +224,8 @@
       #{signclosedCompanyId,jdbcType=VARCHAR},
       #{sendbackId,jdbcType=INTEGER},
       #{signclosedIsWhetherLess,jdbcType=INTEGER},
-      #{signclosedStoreId,jdbcType=INTEGER}
+      #{signclosedStoreId,jdbcType=INTEGER},
+      #{signclosedIsUse}
       )
   </insert>
   <update id="updateSignclosedById" parameterType="ComplaintSignclosedInfo" >
@@ -282,7 +283,10 @@
         signclosed_company_id = #{signclosedCompanyId,jdbcType=INTEGER},
       </if>
       <if test="signclosedStoreId != null" >
-        signclosed_store_id = #{signclosedStoreId,jdbcType=INTEGER}
+        signclosed_store_id = #{signclosedStoreId,jdbcType=INTEGER},
+      </if>
+      <if test="signclosedIsUse != null" >
+        signclosed_is_use = #{signclosedIsUse,jdbcType=INTEGER}
       </if>
     </set>
       where

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/add_signclosed.ftl

@@ -6,7 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
     <meta http-equiv="Cache-Control" content="no-siteapp" />
-<#include "/base/add_base.ftl">
+    <#include "/base/add_base.ftl">
     <link href="${path}/common/lib/jquery.ui/jquery-ui.css" rel="stylesheet" type="text/css"/>
     <link href="${path}/common/lib/webuploader/0.1.5/webuploader.css" rel="stylesheet" type="text/css"/>
     <link href="${path}/common/lib/icheck/icheck.css" rel="stylesheet" type="text/css"/>
@@ -242,13 +242,26 @@
                        </div>
                 </div>
             </div>
+
+            <div class="row cl">
+                <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>是否使用：</label>
+                <div class="formControls col-7 col-sm-7">
+                    <div class="radio-box">
+                        <input type="radio" value="1" checked="checked" name="signclosedIsUse">
+                        <label for="tel-1">未使用</label>
+                    </div>
+                   <div class="radio-box">
+                       <input type="radio" value="2" name="signclosedIsUse">
+                       <label for="tel-1">已使用</label>
+                   </div>
+                </div>
+            </div>
+
             <div class="row cl">
                 <label class="form-label col-xs-3 col-sm-3">签收图片：</label>
-                <div class="formControls col-xs-2 col-sm-2" id="fileDiv" style="width: 17%;width: 100px;height: 100px;">
+                <div class="formControls col-xs-2 col-sm-2" id="fileDiv" style="width: 17%;height: 100px;">
                     <input type="file" name="file" id="fileid" style="opacity: 0; position: absolute; width: 90px;height: 80px;">
                     <img alt="介绍图" src="${path}/common/images/pts/addparts.jpg" id="partsImg" width="90" height="80">
-                    <#--<input type="hidden" id="componentsImg" name="componentsImg" value=""/>-->
-                <#--<button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);" id="uploadSubmit"><i class="Hui-iconfont">&#xe665;</i> 上传</button>-->
                 </div>
                 <div id="imgDiv">
 

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/complete_signclosed.ftl

@@ -193,6 +193,21 @@
                     </div>
                 </div>
             </div>
+
+            <div class="row cl">
+                <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>是否过水：</label>
+                <div class="formControls col-7 col-sm-7">
+                    <div class="radio-box">
+                        <input type="radio" value="1" checked="checked" name="signclosedIsUse">
+                        <label for="tel-1">未过水</label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" value="2" name="signclosedIsUse">
+                        <label for="tel-1">已过水</label>
+                    </div>
+                </div>
+            </div>
+
             <div class="row cl">
                 <label class="form-label col-xs-3 col-sm-3">签收图片：</label>
                     <div class="formControls col-xs-2 col-sm-2" id="fileDiv" style="width: 17%;width: 100px;height: 100px;">

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/signclosed_list.ftl

@@ -122,7 +122,7 @@
                                     <#--<#if info.signclosedProductType == 1 >
                                         <span class="label label-default radius" title="${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台">${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台</span><br>
                                     <#else >-->
-                                        <span class="label label-default radius" title="${info.productName!''} x ${info.productNum!''}件">${info.productName!''}-${info.colorName!''} x ${info.productNum!''}件</span><br>
+                                        <span class="label label-default radius" title="${info.productName!''} x ${info.productNum!''}件">${info.productName!''}(${info.colorName!''})*${info.productNum!''}</span><br>
                                     <#--</#if>-->
                                 </#list>
                             <#else >