客户

src/main/java/com/dk/mdm/mapper/sale/OrderMapper.xml

@@ -254,8 +254,6 @@
             <result column="inv_qty" property="invQty"/>
             <result column="usable_qty" property="usableQty"/>
             <result column="wh_name" property="whName"/>
-            <result column="fact_price" property="factPrice"/>
-            <result column="fact_amt" property="factAmt"/>
 
     </resultMap>
     <!--小程序用 总单-->
@@ -479,16 +477,6 @@
                 AND  t.flg_valid = true
             </if>
 
-            <if test="searchText !=null">
-                AND (  t.order_no LIKE concat('%', my_ex.likequery(#{searchText}), '%')
-                OR   t.contact_phone LIKE concat('%', my_ex.likequery(#{searchText}), '%')
-                OR   t.cus_name LIKE concat('%', my_ex.likequery(#{searchText}), '%')
-                OR   t.cus_phone LIKE concat('%', my_ex.likequery(#{searchText}), '%')
-                OR   t.address_full LIKE concat('%', my_ex.likequery(#{searchText}), '%')
-                OR   t.remarks LIKE concat('%', my_ex.likequery(#{searchText}), '%')
-                )
-            </if>
-
         </where>
     </sql>
 
@@ -512,6 +500,8 @@
                tms.staff_name                                    as "staffName",
                t.cus_id,
                tmc.cus_code                                      as "cusCode",
+               t.cus_name                                       as "cusName",
+               t.cus_phone                                      as "cusPhone",
                tmc.cus_from                                      as "cusFrom",
                tmdd.data_value                                   as "cusFromName",
                t.address_area,
@@ -1091,6 +1081,14 @@
         <if test="flgSource !=null and flgSource == true">
             AND toi.item_qty - toi.outing_qty -toi.out_qty + toi.return_qty > 0
         </if>
+        <if test="searchText !=null">
+            AND (  t.order_no LIKE concat('%', my_ex.likequery(#{searchText}), '%')
+            OR   t.cus_name LIKE concat('%', my_ex.likequery(#{searchText}), '%')
+            OR   t.cus_phone LIKE concat('%', my_ex.likequery(#{searchText}), '%')
+            OR   toi.sku_name LIKE concat('%', my_ex.likequery(#{searchText}), '%')
+            OR   toi.sku_model LIKE concat('%', my_ex.likequery(#{searchText}), '%')
+            )
+        </if>
         order by t.op_create_time desc
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
@@ -1102,7 +1100,22 @@
         SELECT
         count(1)
         FROM dkic_b.t_psi_order as t
+        left join dkic_b.t_mst_customer tmc on tmc.cus_id = t.cus_id
+        left join dkic_b.t_psi_order_item toi on toi.order_id  = t.order_id
+        left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id  = toi.sku_id
+        left join dkic_b.t_mst_goods_brand tmgb on tmgb.brand_id  = tmgs.brand_id
+        left join dkic_b.t_mst_org tmo on t.org_id = tmo.org_id
+        left join dkic_b.t_mst_sale_channel tmsc on t.sales_channel = tmsc.channel_id
+        left join dkic_b.t_mst_staff tms on t.staff_id = tms.staff_id
         <include refid="Condition"/>
+        <if test="searchText !=null">
+            AND (  t.order_no LIKE concat('%', my_ex.likequery(#{searchText}), '%')
+            OR   t.cus_name LIKE concat('%', my_ex.likequery(#{searchText}), '%')
+            OR   t.cus_phone LIKE concat('%', my_ex.likequery(#{searchText}), '%')
+            OR   toi.sku_name LIKE concat('%', my_ex.likequery(#{searchText}), '%')
+            OR   toi.sku_model LIKE concat('%', my_ex.likequery(#{searchText}), '%')
+            )
+        </if>
     </select>
 
     <!--修改退货信息 -->

src/main/java/com/dk/mdm/model/response/sale/OrderResponse.java

@@ -432,6 +432,9 @@ public class OrderResponse extends PageInfo<OrderResponse> implements Serializab
     @ApiModelProperty(value = "种类数")
     private BigDecimal categoryCount;
 
+    @ApiModelProperty(value = "最大的出库数")
+    private BigDecimal maxOutQty;
+
 
     private static final long serialVersionUID = 1L;