Merge remote-tracking branch 'origin/master'

src/main/java/com/dk/mdm/controller/ivt/inbound/InboundOtherController.java

@@ -48,6 +48,16 @@ public class InboundOtherController {
     }
 
     /**
+     * @desc : 查看来源单据,总单加明细  采购入库用
+     * @author : 姜永辉
+     * @date : 2024/3/6 10:36
+     */
+    @PostMapping({"/{id}"})
+    public ResponseResultVO selectById(@PathVariable String id) {
+        return inboundService.selectById(id);
+    }
+
+    /**
      * @desc   : 查询明细信息
      * @date   : 2024/3/9 15:45
      * @author : 寇珊珊

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -1181,7 +1181,7 @@
         from dkic_b.t_mst_supplier tms
         <where>
         <if test="flgValid">
-            AND tms.flgValid
+            AND tms.flg_valid
         </if>
         <if test="objCode != null and objCode != ''">
             AND tms.sup_code LIKE concat('%',my_ex.likequery(#{objCode}),'%')
@@ -1202,7 +1202,7 @@
         from dkic_b.t_mst_customer cus
         <where>
             <if test="flgValid">
-                AND cus.flgValid
+                AND cus.flg_valid
             </if>
             <if test="objCode != null and objCode != ''">
                 AND cus.cus_code LIKE concat('%',my_ex.likequery(#{objCode}),'%')
@@ -1227,7 +1227,7 @@
         <where >
              tms.sup_type = '供应商类别-采购'
             <if test="flgValid">
-                AND tms.flgValid
+                AND tms.flg_valid
             </if>
 
             <if test="objCode != null and objCode != ''">
@@ -1256,7 +1256,7 @@
         from dkic_b.t_mst_customer cus
         <where>
             <if test="flgValid">
-                AND cus.flgValid
+                AND cus.flg_valid
             </if>
             <if test="objCode != null and objCode != ''">
                 AND cus.cus_code LIKE concat('%',my_ex.likequery(#{objCode}),'%')
@@ -1296,7 +1296,7 @@
         <where>
             tms.sup_type = '供应商类别-采购'
             <if test="flgValid">
-                AND tms.flgValid
+                AND tms.flg_valid
             </if>
             <if test="objCode != null and objCode != ''">
                 AND tms.sup_code LIKE concat('%',my_ex.likequery(#{objCode}),'%')
@@ -1324,7 +1324,7 @@
         from dkic_b.t_mst_customer cus
         <where>
             <if test="flgValid">
-                AND cus.flgValid
+                AND cus.flg_valid
             </if>
             <if test="objCode != null and objCode != ''">
                 AND cus.cus_code LIKE concat('%',my_ex.likequery(#{objCode}),'%')