供应商

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

@@ -387,4 +387,6 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
 
     List<Map<String, Object>> getSaleChannel(Map param);
     List<Map<String, Object>> getStaff(Map param);
+
+
 }

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

@@ -296,6 +296,7 @@
     <!-- 获取仓库 -->
     <select id="getWarehouse" resultType="java.util.Map">
         SELECT tmw.wh_id as "whId"
+        ,tmw.wh_id AS "id"
         ,tmw.wh_name as "whName"
         ,tmw.wh_code as "whCode"
         ,tmw.flg_default as "flgDefault"
@@ -921,4 +922,6 @@
             </if>
         </where>
     </select>
+    <!--获取仓库档案-->
+
 </mapper>

src/main/java/com/dk/mdm/mapper/ivt/InboundMapper.xml

@@ -285,7 +285,7 @@
         Left join dkic_b.t_mst_staff makestaff on makestaff.staff_id = tpi.make_staff
         LEFT JOIN sys.t_data_kind tdk   ON tdk.kind_code = tpi.into_status
         Left join dkic_b.t_mst_warehouse tmw on tmw.wh_id = tpi.wh_id
-        left join dkic_b.t_mst_customer tmc on t.cus_id = tmc.cus_id
+        left join dkic_b.t_mst_customer tmc on tpi.cus_id = tmc.cus_id
     </sql>
 
 

src/main/java/com/dk/mdm/mapper/pur/PurchaseItemMapper.xml

@@ -95,6 +95,13 @@
         <result column="remarks" property="remarks"/>
         <result column="flg_valid" property="flgValid"/>
         <result column="cp_id" property="cpId"/>
+        <result column="op_create_time" property="opCreateTime" typeHandler="TimestampTypeHandler"/>
+        <result column="op_create_user_id" property="opCreateUserId" typeHandler="UuidTypeHandler"/>
+        <result column="op_update_time" property="opUpdateTime" typeHandler="TimestampTypeHandler"/>
+        <result column="op_update_user_id" property="opUpdateUserId" typeHandler="UuidTypeHandler"/>
+        <result column="op_app_code" property="opAppCode"/>
+        <result column="op_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
+        <result column="op_db_user" property="opDbUser"/>
     </resultMap>
 
 

src/main/java/com/dk/mdm/service/common/CommonService.java

@@ -705,6 +705,11 @@ public class CommonService extends BaseService<Map<String, Object>> {
         if (dataSourceCode.equals("staff")) {
             list = commonMapper.getStaff(map);
         }
+        //仓库
+        if (dataSourceCode.equals("warehouse")) {
+            list = commonMapper.getWarehouse(map);
+        }
+
         return ResponseResultUtil.success(list);
     }
 }