Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/controller/ivt/outBound/OutboundOtherController.java

@@ -51,6 +51,16 @@ public class OutboundOtherController {
     }
 
     /**
+     * @desc : 查询出库明细（货物、附件）
+     * @author : 付斌
+     * @date : 2024/3/6 10:36
+     */
+    @PostMapping({"/{id}"})
+    public ResponseResultVO selectById(@PathVariable String id) {
+        return outboundService.selectById(id);
+    }
+
+    /**
      * @desc   : 查询明细信息
      * @date   : 2024/3/9 15:45
      * @author : 寇珊珊

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

@@ -751,7 +751,9 @@
         tpi.make_time,
         tpi.wh_id,
         tpi.into_reason,
-        tpi.flg_valid
+        tpi.flg_valid,
+        tpi.flg_auto_handle,
+        tpi.flg_handle_setting
     </sql>
     <sql id="Base_Column_List_Response_Out">
         tpo.out_id  as into_id,
@@ -777,7 +779,9 @@
         tpo.make_time,
         null as wh_id,
         tpo.out_reason as into_reason,
-        tpo.flg_valid
+        tpo.flg_valid,
+        tpo.flg_auto_handle,
+        tpo.flg_handle_setting
     </sql>
     <!-- 条件查询 web端入库办理用,-->
     <select id="selectInbound" resultMap="BaseResultMapResponse">

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

@@ -689,7 +689,9 @@
         tpo.make_staff,
         tpo.make_time,
         tpo.out_reason,
-        tpo.flg_valid
+        tpo.flg_valid,
+        tpo.flg_auto_handle,
+        tpo.flg_handle_setting
     </sql>
     <sql id="Base_Column_List_Response_Into">
         tpi.into_id as out_id,
@@ -714,7 +716,9 @@
         tpi.make_staff,
         tpi.make_time,
         tpi.into_reason as out_reason,
-        tpi.flg_valid
+        tpi.flg_valid,
+        tpi.flg_auto_handle,
+        tpi.flg_handle_setting
     </sql>
     <!-- 条件查询 web端入库办理用,-->
     <select id="selectOutbound" resultMap="BaseResultMapResponse">