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

# Conflicts:
#	watero-rst-core/src/main/java/com.iamberry.rst.core/order/ProductColor.java

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/ComplaintSignclosedInfoServiceImpl.java

@@ -65,18 +65,19 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
                             if(productColor == null){
                                 msg = false;
                             }
-                        for (int j = 0;j<salesOrderItem.getItemNum();j++){
                             signclosedProductInfo.setSignclosedId(record.getSignclosedId());
                             signclosedProductInfo.setProductName(productColor.getProductName());
-                            signclosedProductInfo.setProductNum(1);
+                            signclosedProductInfo.setProductNum(salesOrderItem.getItemNum());
                             signclosedProductInfo.setSignclosedProductType(1);
                             signclosedProductInfo.setSignclosedProductId(productColor.getColorProductId());
                             signclosedProductInfo.setSignclosedProductColor(salesOrderItem.getItemColorId());
                             signclosedProductInfo.setSignclosedCreateTime(new Date());
                             signclosedProductInfo.setSignclosedState(2);
                             complaintSignclosedProductInfoMapper.insert(signclosedProductInfo);
+                        /*for (int j = 0;j<salesOrderItem.getItemNum();j++){
+
                             //判断是否需要生成维修记录
-                            /*if(product.getProductIsDetection() == 1){
+                            *//*if(product.getProductIsDetection() == 1){
                                 //添加待检测信息
                                 //查询签收信息
                                 ComplaintSignclosedInfo signclosedInfo = complaintSignclosedInfoMapper.getSignclosedById(record.getSignclosedId());
@@ -94,10 +95,10 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
                                 }catch (Exception e){
                                     throw new RuntimeException("------------生成检测信息出错------------");
                                 }
-                            }*/
+                            }*//*
 
-                            i++;
-                        }
+                            j++;
+                        }*/
 
                     }
                 }
@@ -371,21 +372,22 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
                         if(productColor == null){
                             msg = false;
                         }
-                        for (int j = 0;j<salesOrderItem.getItemNum();j++){
-                            signclosedProductInfo.setSignclosedId(record.getSignclosedId());
-                            signclosedProductInfo.setProductName(productColor.getProductName());
-                            signclosedProductInfo.setProductNum(1);
-                            signclosedProductInfo.setSignclosedProductType(1);
-                            signclosedProductInfo.setSignclosedProductId(productColor.getColorProductId());
-                            signclosedProductInfo.setSignclosedProductColor(salesOrderItem.getItemColorId());
-                            signclosedProductInfo.setSignclosedCreateTime(new Date());
-                            signclosedProductInfo.setSignclosedState(2);
-                            try {
-                                complaintSignclosedProductInfoMapper.insert(signclosedProductInfo);
-                            }catch (Exception e){
-                                    throw new RuntimeException("------------生成签收产品出错------------");
-                            }
-                            /*//判断是否需要生成维修记录
+                        signclosedProductInfo.setSignclosedId(record.getSignclosedId());
+                        signclosedProductInfo.setProductName(productColor.getProductName());
+                        signclosedProductInfo.setProductNum(1);
+                        signclosedProductInfo.setSignclosedProductType(1);
+                        signclosedProductInfo.setSignclosedProductId(productColor.getColorProductId());
+                        signclosedProductInfo.setSignclosedProductColor(salesOrderItem.getItemColorId());
+                        signclosedProductInfo.setSignclosedCreateTime(new Date());
+                        signclosedProductInfo.setSignclosedState(2);
+                        try {
+                            complaintSignclosedProductInfoMapper.insert(signclosedProductInfo);
+                        }catch (Exception e){
+                            throw new RuntimeException("------------生成签收产品出错------------");
+                        }
+                        /*for (int j = 0;j<salesOrderItem.getItemNum();j++){
+
+                            //判断是否需要生成维修记录
                             if(product.getProductIsDetection() == 1){
                                 //添加待检测信息
                                 //查询签收信息
@@ -405,9 +407,9 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
                                 }catch (Exception e){
                                     throw new RuntimeException("------------生成检测信息出错------------");
                                 }
-                            }*/
-                            i++;
-                        }
+                            }
+                            j++;
+                        }*/
                     }
                 }
             }

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_relation.ftl

@@ -337,7 +337,7 @@
             </div>
         </div>
         <div <#if procMethod.procMethodIsBack == 1>class="tabCon"</#if> style="display: none;">
-            <div class="row cl" id="backTransferInfo">
+            <#--<div class="row cl" id="backTransferInfo">
                 <div class="formControls col-2 col-sm-2 text-r">
                     <strong>邮费处理</strong>
                 </div>
@@ -352,8 +352,8 @@
                     </div>
 
                 </div>
-            </div>
-            <div class="row cl" id="postageInformation" style="display: none;">
+            </div>-->
+            <div class="row cl" id="postageInformation">s
                 <#--<div class="formControls col-2 col-sm-2 text-r">
                     <strong>邮费信息</strong>
                 </div>-->