供应商

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

@@ -52,6 +52,9 @@
     <!-- 通用条件列 -->
     <sql id="Condition">
         <where>
+            <if test="flgValid != null">
+                AND t.flg_valid = #{flgValid}
+            </if>
             <if test="receivableNo != null and receivableNo != ''">
                 AND t.receivable_no LIKE concat('%',my_ex.likequery(#{receivableNo}),'%')
             </if>

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

@@ -275,7 +275,7 @@
         SELECT
         <include refid="Base_Column_List_view"/>
         ,tmg.org_name as parent_name
-        FROM t_mst_org AS parent
+        FROM dkic_b.t_mst_org AS parent
         left join dkic_b.t_mst_org tmg on tmg.org_id=parent.parent_id
         WHERE parent.org_id = #{orgId}::uuid
     </select>

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

@@ -1643,7 +1643,7 @@
         <result column="sumShouldHandle" property="sumShouldHandle"/>
         <result column="sumUsePaymentResidue" property="sumUsePaymentResidue"/>
         <result column="sumWaiveAmt" property="sumWaiveAmt"/>
-
+        <result column="makeTime" property="makeTime" typeHandler="TimestampTypeHandler"/>
         <collection property="itemResponseList" resultMap="PurTrackingReportItemListMap" columnPrefix="list_"/>
     </resultMap>
 
@@ -1664,6 +1664,7 @@
         <result column="remarks" property="remarks"/>
         <result column="sumQuantity" property="sumQuantity"/>
         <result column="sumAmount" property="sumAmount"/>
+        <result column="no" property="no"/>
     </resultMap>
     
     <!--采购跟踪表 明细查询-->
@@ -1698,6 +1699,7 @@
              ,T."remarks"  AS list_remarks
              ,T."sumQuantity"  AS list_sumQuantity
              ,T."sumAmount"  AS list_sumAmount
+             ,T."no" AS list_no
         FROM
             (
                 SELECT
@@ -1706,7 +1708,6 @@
                      ,tpp.contact_name AS "contactName"
                      ,tpp.contact_phone AS "contactPhone"
                      ,tpp.wh_id AS "whId"
-                     ,tpp.make_time AS "makeTime"
                      ,tpp.pickup_date AS "pickupDate"
                      ,tpp.sum_quantity AS "sumQuantity"
                      ,tpp.sum_amount AS "sumAmount"
@@ -1728,6 +1729,7 @@
                      ,tppi.price_pur AS "pricePur"
                      ,tppi.item_qty AS "itemQty"
                      ,tppi.remarks AS "remarks"
+                     ,tpp.make_time AS  "makeTime"
                 FROM
                     dkic_b.t_psi_purchase_item tppi
                         LEFT JOIN dkic_b.t_psi_purchase tpp ON tpp.pur_id = tppi.pur_id
@@ -1742,7 +1744,6 @@
                         ,NULL AS "contactName"
                         ,NULL AS "contactPhone"
                         ,NULL AS "whId"
-                        ,NULL AS "makeTime"
                         ,NULL AS "pickupDate"
                         ,0.00 AS "sumQuantity"
                         ,0.00 AS "sumAmount"
@@ -1753,7 +1754,7 @@
                         ,0.00 AS "sumUsePaymentResidue"
                         ,0.00 AS "sumWaiveAmt"
                         ,tpii.item_id AS "itemId"
-                        ,'采购入库' AS "type"
+                        ,'入库信息' AS "type"
                         ,tpii.sku_id AS "skuId"
                         ,tmgs.sku_code AS "skuCode"
                         ,tmgs.sku_name AS "skuName"
@@ -1767,6 +1768,7 @@
                     ELSE tpii.into_qty
                     END AS "itemQty"
                         ,tpii.remarks AS "remarks"
+                        ,tpi.make_time AS  "makeTime"
                 FROM
                     dkic_b.t_psi_inbound_item tpii
                     LEFT JOIN dkic_b.t_psi_inbound tpi ON tpi.into_id = tpii.into_id
@@ -1782,7 +1784,6 @@
                         ,NULL AS "contactName"
                         ,NULL AS "contactPhone"
                         ,NULL AS "whId"
-                        ,NULL AS "makeTime"
                         ,NULL AS "pickupDate"
                         ,0.00 AS "sumQuantity"
                         ,0.00 AS "sumAmount"
@@ -1807,6 +1808,7 @@
                     ELSE tpii.into_qty
                     END AS "itemQty"
                         ,tpii.remarks AS "remarks"
+                        ,tpi.make_time AS  "makeTime"
                 FROM
                     dkic_b.t_psi_inbound_item tpii
                     LEFT JOIN dkic_b.t_psi_inbound tpi ON tpi.into_id = tpii.into_id
@@ -1822,7 +1824,6 @@
                         ,NULL AS "contactName"
                         ,NULL AS "contactPhone"
                         ,NULL AS "whId"
-                        ,NULL AS "makeTime"
                         ,NULL AS "pickupDate"
                         ,0.00 AS "sumQuantity"
                         ,0.00 AS "sumAmount"
@@ -1844,6 +1845,7 @@
                         ,Null AS "pricePur"
                         ,Null AS "itemQty"
                         ,Null AS "remarks"
+                        ,tmrp.make_time AS  "makeTime"
                 FROM
                     dkic_b.t_mac_rec_pay tmrp
 

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

@@ -58,7 +58,8 @@ public class OtherReceivableQuery extends PageInfo<OtherReceivableQuery> impleme
     @ApiModelProperty(value = "其它收入单号")
     private String receivableNo;
 
-
+    @ApiModelProperty(value = "模糊查询")
+    private String searchText;
     /**
      * 对象类型 (【系统字典】客户、供应商)
      */