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

src/main/java/com/dk/mdm/mapper/report/ReportMapper.xml

@@ -66,6 +66,7 @@
     <!-- 采购明细报表明细条件列 -->
     <sql id="Condition_PurDetailReport">
         <where>
+            tppi.flg_valid
             <if test="purNo != null and purNo != ''">
                 AND tpp.pur_no like concat('%', my_ex.likequery(#{purNo}) , '%')
             </if>
@@ -172,6 +173,7 @@
     <!-- 销售明细报表明细条件列 -->
     <sql id="Condition_OrdDetailReport">
         <where>
+            tppi.flg_valid
             <if test="orderNo != null and orderNo != ''">
                 AND t.order_no LIKE concat('%',my_ex.likequery(#{orderNo}),'%')
             </if>
@@ -404,6 +406,7 @@
     <!-- 入库明细报表明细条件列 -->
     <sql id="Condition_IntoboundDetailReport">
         <where>
+            tpoi.flg_valid
             <if test="cpId != null">
                 AND t.cp_id = #{cpId}
             </if>
@@ -1147,8 +1150,6 @@
         <include refid="Condition_RecPayDetailReport"/>
     </select>
 
-
-
     <sql id="ConditionPurTrackingReport">
         <where>
             <if test="cpId != null">
@@ -1157,7 +1158,6 @@
         </where>
     </sql>
 
-
     <!--  销售跟踪表 列表查询 -->
     <select id="getSalesTrackingReport" resultType="java.util.Map">
         SELECT

src/main/java/com/dk/mdm/service/ivt/IntoReturnService.java

@@ -297,18 +297,8 @@ public class IntoReturnService extends BaseService<IntoReturn> {
             //退货金额 (商品数量*退货价)
             intoReturnItemVO.setItemAmt(intoReturnItemVO.getItemQty().multiply(intoReturnItemVO.getPriceReturn()).setScale(2, BigDecimal.ROUND_HALF_UP));
             //自动]出库赋值  已入库数量、已入库金额
-//            if (intoReturnVO.getFlgAutoIvt() != null && intoReturnVO.getFlgAutoIvt()) {
-//                intoReturnItemVO.setOutQty(intoReturnItemVO.getItemQty().abs());
-//                intoReturnItemVO.setOutAmt(intoReturnItemVO.getItemAmt().abs());
-//                intoReturnItemVO.setOutStatus(Constant.OutStatus.YICHUKU.getName());
-//
-//
-//            } else {
-//                intoReturnItemVO.setOutingQty(intoReturnItemVO.getItemQty());
-//                intoReturnItemVO.setOutingAmt(intoReturnItemVO.getItemAmt());
             intoReturnItemVO.setOutStatus(Constant.OutStatus.CHUKUZHONG.getName());
-//            }
-//            //新建明细
+             //新建明细
             IntoReturnItem intoReturnItem = intoReturnItemConvert.convertToPo(intoReturnItemVO);
             intoReturnItemMapper.insert(intoReturnItem);