Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/mapper/mac/RecPayMapper.xml

@@ -380,7 +380,9 @@
                   LEFT JOIN  dkic_b.t_mac_account tma  on tma.object_id = t.object_id and tma.object_type in ('对象类型-客户')
         where t.rp_type in ('收付款类型-收款', '收付款类型-退收款')
         <include refid="Condition"/>
-
+        <if test="viewVoidedDocuments !=null and viewVoidedDocuments == false">
+            AND  t.flg_valid = true
+        </if>
         <if test="searchText !=null and searchText != ''">
             AND (  tmc.cus_phone LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmc.address_full LIKE concat('%',my_ex.likequery(#{searchText}),'%')
@@ -808,6 +810,9 @@
         LEFT JOIN  dkic_b.t_mac_account tma  on tma.object_id = t.object_id and tma.object_type in ('对象类型-供应商')
         where t.rp_type in ('收付款类型-付款', '收付款类型-退付款')
         <include refid="Condition_sup"/>
+        <if test="viewVoidedDocuments !=null and viewVoidedDocuments == false">
+            AND  t.flg_valid = true
+        </if>
 
         <if test="searchText !=null and searchText != ''">
             AND (  tmsp.contact_phone LIKE concat('%',my_ex.likequery(#{searchText}),'%')

src/main/java/com/dk/mdm/mapper/mst/CusFollowMapper.xml

@@ -62,6 +62,7 @@
         <result column="next_follow_time" property="nextFollowTime" typeHandler="TimestampTypeHandler"/>
         <result column="annex_paths" property="annexPaths" typeHandler="JsonTypeHandler"/>
         <result column="measure_status" property="measureStatus"/>
+        <result column="measure_status_name" property="measureStatusName"/>
         <result column="remarks" property="remarks"/>
         <result column="flg_valid" property="flgValid"/>
         <result column="cp_id" property="cpId"/>
@@ -293,11 +294,19 @@
         tmo.org_name AS "orgName",
         tms.staff_name AS "staffName",
         tmc.follow_count AS follow_count,
+        <if test="measureStatus != null and measureStatus != ''">
+            tcmr.measure_status AS "measureStatus",
+            tdk4.kind_name_i18n ->>  #{i18n} AS "measure_status_name",
+        </if>
         tdk1.kind_name_i18n ->>  #{i18n} AS "follow_status_name",
         tdk2.kind_name_i18n ->>  #{i18n} AS intention_name,
         tdk3.kind_name_i18n ->>  #{i18n} AS stay_time_len_name
 
         FROM dkic_b.t_crm_cus_follow tccf
+        <if test="measureStatus != null and measureStatus != ''">
+            LEFT JOIN dkic_b.t_crm_measure_receipt tcmr ON tcmr.cus_id = tccf.cus_id and tcmr.measure_status = #{measureStatus}
+            LEFT JOIN sys.t_data_kind tdk4 on tdk4.kind_code = tcmr.measure_status
+        </if>
         LEFT JOIN dkic_b.t_mst_customer tmc ON tmc.cus_id = tccf.cus_id
         LEFT JOIN dkic_b.t_mst_org tmo on tmo.org_id = tccf.follow_org
         LEFT JOIN dkic_b.t_mst_staff tms on tms.staff_id = tccf.follow_staff
@@ -333,7 +342,7 @@
         LEFT JOIN  sys.t_data_kind tdk1  on tdk1.kind_code =  tccf.follow_status
 
         <include refid="Condition_Join"/>
-
+        ORDER BY tccf.op_create_time DESC
     </select>
 
     <!-- 查询表t_crm_cus_follow，（条件查询）个数 -->

src/main/java/com/dk/mdm/model/query/mac/RecPayQuery.java

@@ -296,6 +296,8 @@ public class RecPayQuery extends PageInfo<RecPayQuery> implements Serializable {
     @ApiModelProperty(value = "已核销查询标识")
     private Boolean sumAmtReceivableHandleFlag;
 
+    private Boolean viewVoidedDocuments;
+
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/model/response/mst/CusFollowResponse.java

@@ -190,6 +190,7 @@ public class CusFollowResponse implements Serializable {
     @ApiModelProperty(value = "量尺状态 (【系统字典】)")
     private String measureStatus;
 
+    private String measureStatusName;
 
     /**
      * 备注

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleOrderService.java

@@ -1458,8 +1458,6 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                         .setOutAmt(outboundItemVO.getOutingAmt())
                         .setOutingQty(BigDecimal.ZERO).setOutingBox(0).setOutingPiece(BigDecimal.ZERO)
                         .setOutingAmt(BigDecimal.ZERO)
-                        .setCostPrice(outboundItemVO.getPriceOut())
-                        .setCostAmt(outboundItemVO.getOutQty().multiply(outboundItemVO.getPriceOut()).setScale(2, BigDecimal.ROUND_HALF_UP))
                 ;
                 //出库状态
                 String outStatus = this.setOutStatus(outboundItemVO.getOutingQty(), outboundItemVO.getOutQty());
@@ -1493,8 +1491,6 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                         .setOutQty(outboundItemVO.getOutingQty())
                         .setOutBox(outboundItemVO.getOutingBox()).setOutPiece(outboundItemVO.getOutingPiece())
                         .setOutAmt(outboundItemVO.getOutingAmt())
-                        .setCostPrice(outboundItemVO.getPriceOut())
-                        .setCostAmt(outboundItemVO.getOutQty().multiply(outboundItemVO.getPriceOut()).setScale(2, BigDecimal.ROUND_HALF_UP))
                         .setOutType(Constant.OutType.SALE.getName())
                         .setOutingQty(BigDecimal.ZERO)
                         .setOutingAmt(BigDecimal.ZERO)