仓储列表功能

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

@@ -43,32 +43,32 @@
   </select>
 
   <resultMap id="complaintSignclosedInfoMap" type="ComplaintSignclosedInfo">
-    <id property="signclosed_id" column="signclosedId"/>
-    <result property="signclosed_type" column="signclosedType"/>
-    <result property="signclosed_type_name" column="signclosedTypeName"/>
-    <result property="machine_no" column="machineNo"/>
-    <result property="signclosed_logistics" column="signclosedLogistics"/>
-    <result property="signclosed_logistics_number" column="signclosedLogisticsNumber"/>
-    <result property="signclosed_send_name" column="signclosedSendName"/>
-    <result property="signclosed_send_tel" column="signclosedSendTel"/>
-    <result property="signclosed_addr_provinces" column="signclosedAddrProvinces"/>
-    <result property="signclosed_addr_city" column="signclosedAddrCity"/>
-    <result property="signclosed_is_fittings" column="signclosedIsFittings"/>
-    <result property="signclosed_date" column="signclosedDate"/>
-    <result property="signclosed_is_quality" column="signclosedIsQuality"/>
-    <result property="signclosed_is_into" column="signclosedIsInto"/>
-    <result property="signclosed_state" column="signclosedState"/>
-    <result property="signclosed_objects_state" column="signclosedObjectsState"/>
-    <result property="signclosed_customer_id" column="signclosedCustomerId"/>
-    <result property="signclosed_urged_num" column="signclosedUrgedNum"/>
-    <result property="old_efast_id" column="oldEfastId"/>
-    <result property="new_efast_id" column="newEfastId"/>
-    <result property="signclosed_customer_desc" column="signclosedCustomerDesc"/>
-    <result property="signclosed_desc" column="signclosedDesc"/>
-    <result property="signclosed_create_time" column="signclosedCreateTime"/>
-    <result property="signclosed_update_time" column="signclosedUpdateTime"/>
-    <collection property="awaitingSignclosedProductInfoList" javaType="ArrayList" column="signclosed_id" ofType="AwaitingSignclosedProductInfo" select="listAwaitingSignclosedById"/>
-    <collection property="signclosedProductInfoList" javaType="ArrayList" column="signclosed_id" ofType="SignclosedProductInfo" select="listSignclosedById"/>
+    <id column="signclosed_id" property="signclosedId"/>
+    <result column="signclosed_type" property="signclosedType"/>
+    <result column="signclosed_type_name" property="signclosedTypeName"/>
+    <result column="machine_no" property="machineNo"/>
+    <result column="signclosed_logistics" property="signclosedLogistics"/>
+    <result column="signclosed_logistics_number" property="signclosedLogisticsNumber"/>
+    <result column="signclosed_send_name" property="signclosedSendName"/>
+    <result column="signclosed_send_tel" property="signclosedSendTel"/>
+    <result column="signclosed_addr_provinces" property="signclosedAddrProvinces"/>
+    <result column="signclosed_addr_city" property="signclosedAddrCity"/>
+    <result column="signclosed_is_fittings" property="signclosedIsFittings"/>
+    <result column="signclosed_date" property="signclosedDate"/>
+    <result column="signclosed_is_quality" property="signclosedIsQuality"/>
+    <result column="signclosed_is_into" property="signclosedIsInto"/>
+    <result column="signclosed_state" property="signclosedState"/>
+    <result column="signclosed_objects_state" property="signclosedObjectsState"/>
+    <result column="signclosed_customer_id" property="signclosedCustomerId"/>
+    <result column="signclosed_urged_num" property="signclosedUrgedNum"/>
+    <result column="old_efast_id" property="oldEfastId"/>
+    <result column="new_efast_id" property="newEfastId"/>
+    <result column="signclosed_customer_desc" property="signclosedCustomerDesc"/>
+    <result column="signclosed_desc" property="signclosedDesc"/>
+    <result column="signclosed_create_time" property="signclosedCreateTime"/>
+    <result column="signclosed_update_time" property="signclosedUpdateTime"/>
+    <collection property="awaitingSignclosedProductInfoList" column="signclosed_id" ofType="AwaitingSignclosedProductInfo" select="listAwaitingSignclosedById"/>
+    <collection property="signclosedProductInfoList" column="signclosed_id" ofType="SignclosedProductInfo" select="listSignclosedById"/>
   </resultMap>
   <select id="listAwaitingSignclosedById" resultType="AwaitingSignclosedProductInfo" parameterType="Integer" >
     select

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

@@ -128,7 +128,6 @@
                         <#if signclosed.awaitingSignclosedProductInfoList??>
                             <#if (signclosed.awaitingSignclosedProductInfoList?size > 0)>
                                 <#list signclosed.awaitingSignclosedProductInfoList as info>
-                                    <#assign signclosedId=info.signclosedId>
                                     <#if info.signclosedProductType == 1 >
                                         <span>${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台</span><br>
                                     <#else >
@@ -136,7 +135,6 @@
                                     </#if>
                                 </#list>
                             <#else >
-                                <#assign signclosedId=0>
                                 暂无数据！
                             </#if>
                         <#else >
@@ -200,21 +198,21 @@
                     <td class="td-manage text-c">
                         <#if signclosed.signclosedState == 2>
                             <a style="text-decoration:none" href="javascript:;" title="签收"
-                               onclick="update_info('${path}/admin/signclosed/to_complete_signclosed?signclosedId=${signclosedId!''}');">
+                               onclick="update_info('${path}/admin/signclosed/to_complete_signclosed?signclosedId=${signclosed.signclosedId!''}');">
                                 <i class="Hui-iconfont">&#xe6df;</i>
                             </a>
                         </#if>
                         <a style="text-decoration:none" href="javascript:;" title="修改备注"
-                           onclick="add_remark('修改备注','${path}/admin/signclosed/to_update_remark?signclosedId=${signclosedId!''}','570','450');">
+                           onclick="add_remark('修改备注','${path}/admin/signclosed/to_update_remark?signclosedId=${signclosed.signclosedId!''}','570','450');">
                             <i class="Hui-iconfont">&#xe692;</i>
                         </a>
                         <a style="text-decoration:none" href="javascript:;" title="修改寄件人信息"
-                           onclick="add_remark('修改寄件人信息','${path}/admin/signclosed/to_update_sender?signclosedId=${signclosedId!''}','570','450');">
+                           onclick="add_remark('修改寄件人信息','${path}/admin/signclosed/to_update_sender?signclosedId=${signclosed.signclosedId!''}','570','450');">
                             <i class="Hui-iconfont">&#xe60c;</i>
                         </a>
                         <#if signclosed.signclosedIsInto == 2>
                             <a style="text-decoration:none" href="javascript:;" title="转入品检"
-                               onclick="into_complaint('${signclosedId!''}');">
+                               onclick="into_complaint('${signclosed.signclosedId!''}');">
                                 <i class="Hui-iconfont">&#xe644;</i>
                             </a>
                         </#if>