add：增加配送查询在库数据

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/MerchantStatisticsDTO.java

@@ -90,6 +90,10 @@ public class MerchantStatisticsDTO implements Serializable {
 	 * 签收状态：0-未签收，1-部分签收，2-已签收
 	 */
 	private Integer signStatus;
+	/**
+	 * 多个签收状态
+	 */
+	private List<Integer> signStatuses;
 	/**
 	 * 计算价格开始时间
 	 */

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

@@ -2425,6 +2425,7 @@
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id
         <where>
             ldsa.is_deleted = 0 and ldsa.order_status in ('10','20','30','40','50','60','70')
+            and ldpl.is_transfer=0
             and ldsa.hand_quantity > 0
             <if test="param.orderCodeNumList != null">
                 and ldsa.order_code in

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml

@@ -697,6 +697,20 @@
             1 ELSE 0
             END   = #{param.signStatus}
         </if>
+
+        <if test="param.signStatuses != null">
+            and CASE
+            lww.waybill_status
+            WHEN 100 THEN
+            2
+            WHEN 90 THEN
+            1 ELSE 0
+            END   in
+            <foreach collection="param.signStatuses" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+
+        </if>
         <if test="param.waybillNo != null and param.waybillNo != '' ">
             and Locate(#{param.waybillNo},lww.waybill_no) > 0
         </if>
@@ -722,10 +736,10 @@
             and lww.document_making_time &lt;= #{param.openTimeEnd}
         </if>
         <if test="param.signTimeStart != null">
-            and lsoi.sign_date &gt;= #{param.signTimeStart}
+            and lww.sign_time &gt;= #{param.signTimeStart}
         </if>
         <if test="param.signTimeEnd != null">
-            and lsoi.sign_date &lt;= #{param.signTimeEnd}
+            and lww.sign_time &lt;= #{param.signTimeEnd}
         </if>
         <if test="param.syncFeeDateStart != null">
             and lsoi.sync_fee_date &gt;= #{param.syncFeeDateStart}