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

# Conflicts:
#	watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/add_order.ftl

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

@@ -16,6 +16,7 @@ public class ComplaintAfterSalesNum implements Serializable{
     private Integer maintenanceCutTimeNum;//超过最晚完成检测时间
     private Integer completeCutTimeNum;//超过最晚完成维修时间
 
+
     //维修列表统计字段
     private Integer beDetectedNum;//待检测数量
     private Integer forMaintenanceNum;//待维修数量
@@ -24,6 +25,8 @@ public class ComplaintAfterSalesNum implements Serializable{
     private Integer beRefurbishedNum;//待翻新数量
     private Integer forQCNum;//待QC检测数量
 
+    private Integer completeSent;//待换货发出数量
+
     public Integer getTodaysignNum() {
         return todaysignNum;
     }
@@ -159,4 +162,12 @@ public class ComplaintAfterSalesNum implements Serializable{
     public void setForQCNum(Integer forQCNum) {
         this.forQCNum = forQCNum;
     }
+
+    public Integer getCompleteSent() {
+        return completeSent;
+    }
+
+    public void setCompleteSent(Integer completeSent) {
+        this.completeSent = completeSent;
+    }
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/fm/ComplaintSignclosedInfoService.java

@@ -114,4 +114,10 @@ public interface ComplaintSignclosedInfoService {
      * @return
      */
     Integer delSignclosedById(Integer signclosedId);
+
+    /**
+     * 查询待换货寄出的数量
+     * @return
+     */
+    Integer getCompleteSent(ComplaintSignclosedInfo complaintSignclosedInfo);
 }

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

@@ -520,6 +520,9 @@
       <if test="afterState != null and afterState == 10">
         and cd.complete_cut_time &lt; now()   AND cc.procTypeId = 3 and cd.detect_placeorder = 1  and detect_state != 32 AND detect_state != 36
       </if>
+      <if test="afterState != null and afterState == 11">
+        and  cc.procTypeId = 2  AND cs.signclosed_is_receiving = 2 AND (soi.sales_shipping_status = 0 OR soi.sales_shipping_status is NULL)
+      </if>
       <if test="warehouseDate != null">
         and cs.signclosed_date = #{warehouseDate}
       </if>

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

@@ -506,6 +506,11 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
         return complaintSignclosedInfoMapper.delSignclosedById(signclosedId);
     }
 
+    @Override
+    public Integer getCompleteSent(ComplaintSignclosedInfo complaintSignclosedInfo) {
+        return complaintSignclosedInfoMapper.getCompleteSent(complaintSignclosedInfo);
+    }
+
     private Integer addSifnclosed(Map<String,Integer> Map,Integer signclosedId) {
         Integer msg = 0;
         for (Map.Entry<String, Integer> entry : Map.entrySet()) {

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

@@ -77,4 +77,10 @@ public interface ComplaintSignclosedInfoMapper {
      * @return
      */
     Integer delSignclosedById(Integer signclosedId);
+    /**
+     * 查询待换货寄出的数量
+     * @return
+     */
+    Integer getCompleteSent(ComplaintSignclosedInfo complaintSignclosedInfo);
+
 }

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

@@ -384,4 +384,21 @@
   <delete id="delSignclosedById" parameterType="Integer">
     DELETE FROM tb_rst_complaint_signclosed WHERE signclosed_id = #{signclosedId}
   </delete>
+
+  <select id="getCompleteSent" parameterType="ComplaintSignclosedInfo" resultType="Integer">
+    SELECT count(1) from (SELECT c.customer_id customerId,c.admin_id adminId from
+    tb_rst_cm_customer_info c
+    LEFT JOIN tb_rst_cm_relation cr ON cr.customer_id = c.customer_id
+    LEFT JOIN tb_rst_cm_proc_method ON tb_rst_cm_proc_method.proc_method_id = cr.proc_method_id
+    LEFT JOIN tb_rst_cm_proc_type cc ON cc.proc_type_id = tb_rst_cm_proc_method.proc_type_id
+    LEFT JOIN tb_rst_complaint_signclosed s on c.customer_id = s.signclosed_customer_id
+    LEFT JOIN tb_rst_sales_order_info soi ON soi.sales_customer_id = c.customer_id
+    WHERE cc.proc_type_id = 2 AND s.signclosed_is_receiving = 2 AND (soi.sales_shipping_status = 0 OR soi.sales_shipping_status is NULL)
+    GROUP BY c.customer_id) cs
+    <where>
+      <if test="adminId != null and adminId != ''" >
+        AND cs.adminId = #{adminId}
+      </if>
+    </where>
+  </select>
 </mapper>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

@@ -2684,6 +2684,12 @@ public class AdminCustomerController {
         signclosed.setIsBinding(1);
         signclosed.setDate(null);
         complaintAfterSalesNum.setContactNum(complaintSignclosedInfoService.getSignclosedDay(signclosed));
+        //待换货发出数量
+        ComplaintSignclosedInfo signcloseds = new ComplaintSignclosedInfo();
+        if (isOneself == 2) {
+            signcloseds.setAdminId(loginAdminId);
+        }
+        complaintAfterSalesNum.setCompleteSent(complaintSignclosedInfoService.getCompleteSent(signcloseds));
         /*查询签收数据 end*/
         rj.addResponseKeyValue("complaintAfterSalesNum",complaintAfterSalesNum);
         rj.addResponseKeyValue("isOneself",isOneself);