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

src/main/java/com/dk/mdm/controller/common/CommonController.java

@@ -1533,6 +1533,28 @@ public class CommonController extends BaseController<Map<String, Object>> {
     public ResponseResultVO<PageList<Map<String, Object>>> getInventoryByPage(@RequestBody Map<String, Object> param) {
         return commonService.getInventoryByPage(param);
     }
+
+    /**
+     * @desc   : 供应商类别
+     * @author : 宋扬
+     * @date   : 2024/3/6 10:28
+     */
+    @ApiOperation(value = "获取供应商类别", notes = "获取供应商类别")
+    @PostMapping({"get_supType"})
+    public ResponseResultVO<List<Map<String, Object>>> getSupType(@RequestBody Map<String, Object> param) {
+        return commonService.getSupType(param);
+    }
+
+    /**
+     * @desc   : 供应商服务类别
+     * @author : 宋扬
+     * @date   : 2024/3/6 10:29
+     */
+    @ApiOperation(value = "获取供应商服务类别", notes = "获取供应商服务类别")
+    @PostMapping({"get_serviceCategories"})
+    public ResponseResultVO<List<Map<String, Object>>> getServiceCategories(@RequestBody Map<String, Object> param) {
+        return commonService.getServiceCategories(param);
+    }
 }
 
 

src/main/java/com/dk/mdm/controller/ivt/InboundController.java

@@ -1,14 +1,23 @@
 package com.dk.mdm.controller.ivt;
 
+
+import com.dk.common.model.pojo.PageList;
+import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.model.pojo.ivt.Inbound;
-import com.dk.common.controller.BaseController;
 import com.dk.common.service.BaseService;
+import com.dk.mdm.model.query.ivt.InboundQuery;
+import com.dk.mdm.model.response.ivt.InboundResponse;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
 import io.swagger.annotations.Api;
 import com.dk.mdm.service.ivt.InboundService;
 
+
 @Api(tags = "入库单API接口")
 @RestController
 @RequestMapping("/ivt/inbound")
@@ -21,4 +30,17 @@ public class InboundController{
     @Autowired
     private InboundService inboundService;
 
+
+
+
+    /**
+     * @desc : 查看来源单据,总单加明细  采购退货用
+     * @author : 于继渤
+     * @date : 2024/3/6 10:36
+     */
+    @ApiOperation(value = "条件查询", notes = "条件查询")
+    @PostMapping({"select_inbound_and_item"})
+    public ResponseResultVO<PageList<InboundResponse>> selectInboundAndItem(@RequestBody InboundQuery inboundQuery) {
+        return inboundService.selectInboundAndItem(inboundQuery);
+    }
 }

src/main/java/com/dk/mdm/controller/ivt/InboundItemController.java

@@ -11,7 +11,7 @@ import com.dk.mdm.service.ivt.InboundItemService;
 
 @Api(tags = "入库明细API接口")
 @RestController
-@RequestMapping("/ivt/inboundItem")
+@RequestMapping("/inboundItem")
 public class InboundItemController{
 
     public BaseService<InboundItem> getService() {

src/main/java/com/dk/mdm/controller/mst/MoneyAccountController.java

@@ -27,7 +27,7 @@ public class MoneyAccountController{
 
     /**
      * @desc : 条件查询
-     * @author : songy
+     * @author : 宋扬
      * @date : 2023/2/29 10:36
      */
     @ApiOperation(value = "分页、关联、条件查询", notes = "分页、关联、条件查询")
@@ -38,7 +38,7 @@ public class MoneyAccountController{
 
     /**
      * @desc   : 通过ID查询
-     * @author : songy
+     * @author : 宋扬
      * @date   : 2024/3/1 16:01
      */
     @PostMapping({"/{id}"})
@@ -49,7 +49,7 @@ public class MoneyAccountController{
 
     /**
      * @desc : 新建资金账户
-     * @author : songy
+     * @author : 宋扬
      * @date : 2023/2/29 10:48
      */
     @ApiOperation(value = "新建资金账户", notes = "新建资金账户")
@@ -60,7 +60,7 @@ public class MoneyAccountController{
 
     /**
      * @desc : 编辑员工
-     * @author : songy
+     * @author : 宋扬
      * @date : 2023/2/29 10:49
      */
     @ApiOperation(value = "编辑资金账户", notes = "编辑资金账户")
@@ -70,10 +70,9 @@ public class MoneyAccountController{
     }
 
 
-
     /**
      * @desc : 停用
-     * @author : songy
+     * @author : 宋扬
      * @date : 2023/2/29 10:34
      */
     @ApiOperation(value = "停用", notes = "停用")
@@ -84,7 +83,7 @@ public class MoneyAccountController{
 
     /**
      * @desc : 启用
-     * @author : songy
+     * @author : 宋扬
      * @date : 2023/2/29 10:34
      */
     @ApiOperation(value = "启用", notes = "启用")
@@ -93,4 +92,5 @@ public class MoneyAccountController{
         return this.getService().enable(id);
     }
 
+
 }

src/main/java/com/dk/mdm/controller/mst/SupplierController.java

@@ -73,6 +73,28 @@ public class SupplierController{
     }
 
     /**
+     * @desc : 停用
+     * @author : songy
+     * @date : 2023/2/29 10:34
+     */
+    @ApiOperation(value = "停用", notes = "停用")
+    @PostMapping("disable/{id}")
+    public ResponseResultVO<Boolean> disable(@PathVariable String id) {
+        return this.getService().disable(id);
+    }
+
+    /**
+     * @desc : 启用
+     * @author : songy
+     * @date : 2023/2/29 10:34
+     */
+    @ApiOperation(value = "启用", notes = "启用")
+    @PostMapping("enable/{id}")
+    public ResponseResultVO<Boolean> enable(@PathVariable String id) {
+        return this.getService().enable(id);
+    }
+
+    /**
      * @desc : 通过ID查询
      * @author : 王英杰
      * @date : 2023/1/9 10:41

src/main/java/com/dk/mdm/controller/sale/OrderController.java

@@ -75,7 +75,7 @@ public class OrderController {
      * @author : 付斌
      * @date   : 2024-03-03 9:28
      */
-    @ApiOperation(value = "编辑订单", notes = "编辑订单")
+    @ApiOperation(value = "获取订单信息（编辑用）", notes = "获取订单信息（编辑用）")
     @PostMapping({"get_order_for_update/{id}"})
     public ResponseResultVO<?> getOrderForUpdate(@PathVariable String id) {
         return orderService.getOrderForUpdate(id);
@@ -91,4 +91,15 @@ public class OrderController {
     public ResponseResultVO<Boolean> update(@RequestBody OrderVO orderVO) {
         return orderService.update(orderVO);
     }
+
+    /**
+     * @desc   : 获取订单信息（出库用）
+     * @author : 付斌
+     * @date   : 2024-03-06 12:58
+     */
+    @ApiOperation(value = "获取订单信息（出库用）", notes = "获取订单信息（出库用）")
+    @PostMapping({"get_order_for_out/{id}"})
+    public ResponseResultVO<?> getOrderForOut(@PathVariable String id) {
+        return orderService.getOrderForOut(id);
+    }
 }

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

@@ -1067,4 +1067,18 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
      * @date : 2024-03-05 10:52
      */
     Long getInventoryCountByPage(Map param);
+
+    /**
+     * @desc   : 供应商类别
+     * @author : 宋扬
+     * @date   : 2024/3/6 10:45
+     */
+    List<Map<String, Object>> getSupType(Map param);
+
+    /**
+     * @desc   : 供应商服务类别
+     * @author : 宋扬
+     * @date   : 2024/3/6 10:45
+     */
+    List<Map<String, Object>> getServiceCategories(Map param);
 }

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

@@ -3253,4 +3253,23 @@
             AND tmgs.wh_name = #{whName}
         </if>
     </select>
+
+    <!--供应商类别 -->
+    <select id="getSupType" resultType="java.util.Map">
+        select sys.f_get_name_i18n(tdk.kind_name_i18n,'zh_CN' )AS name, tdk.kind_code as code
+        from sys.t_data_kind tdk
+        where tdk.flg_valid
+          and tdk.kind_type = '供应商类别'
+        order by tdk.display_no
+    </select>
+
+    <!--供应商服务类别 -->
+    <select id="getServiceCategories" resultType="java.util.Map">
+        select sys.f_get_name_i18n(tdk.kind_name_i18n,'zh_CN' ) AS name, tdk.kind_code as code
+        from sys.t_data_kind tdk
+        where tdk.flg_valid
+          and tdk.kind_type = '服务类别'
+        order by tdk.display_no
+    </select>
+
 </mapper>

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

@@ -9,7 +9,7 @@
     </sql>
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.dk.mdm.model.response.ivt.InboundItemResponse">
+    <resultMap id="BaseResultMap" type="com.dk.mdm.model.pojo.ivt.InboundItem">
         <id column="item_id" property="itemId"/>
                 <result column="into_id" property="intoId" typeHandler="UuidTypeHandler"/>
                 <result column="into_type" property="intoType"/>

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

@@ -2,13 +2,33 @@ package com.dk.mdm.mapper.ivt;
 
 import com.dk.mdm.model.pojo.ivt.Inbound;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.query.ivt.InboundQuery;
+import com.dk.mdm.model.response.mst.DictionaryDataResponse;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
 *  入库单 Mapper
 */
 @Repository
 public interface InboundMapper extends BaseMapper<Inbound>{
+
+
+
+    /**
+     * @desc   : 根据条件进行查询
+     * @author : 于继渤
+     * @date : 2024/2/26 10:36
+     */
+    List<DictionaryDataResponse> selectInboundAndItem(InboundQuery inboundQuery);
+
+    /**
+     * @desc   : 根据条件进行查询（数量）
+     * @author : 于继渤
+     * @date : 2024/2/26 10:36
+     */
+    Long selectInboundAndItemCountByCond(InboundQuery inboundQuery);
 	
 }
 

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

@@ -5,45 +5,122 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        into_id, into_no, into_type, from_id, from_no, org_id, staff_id, cus_id, sup_id, into_status, intoing_qty, intoing_amt, into_qty, into_amt, return_qty, return_amt, into_date, remarks, annex_paths, make_staff, make_time, receivable_id, payable_id, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
+        into_id
+        , into_no, into_type, from_id, from_no, org_id, staff_id, cus_id, sup_id, into_status, intoing_qty, intoing_amt, into_qty, into_amt, return_qty, return_amt, into_date, remarks, annex_paths, make_staff, make_time, receivable_id, payable_id, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
     </sql>
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.dk.mdm.model.response.ivt.InboundResponse">
         <id column="into_id" property="intoId"/>
-                <result column="into_no" property="intoNo"/>
-                <result column="into_type" property="intoType"/>
-                <result column="from_id" property="fromId" typeHandler="UuidTypeHandler"/>
-                <result column="from_no" property="fromNo"/>
-                <result column="org_id" property="orgId" typeHandler="UuidTypeHandler"/>
-                <result column="staff_id" property="staffId" typeHandler="UuidTypeHandler"/>
-                <result column="cus_id" property="cusId" typeHandler="UuidTypeHandler"/>
-                <result column="sup_id" property="supId" typeHandler="UuidTypeHandler"/>
-                <result column="into_status" property="intoStatus"/>
-                <result column="intoing_qty" property="intoingQty"/>
-                <result column="intoing_amt" property="intoingAmt"/>
-                <result column="into_qty" property="intoQty"/>
-                <result column="into_amt" property="intoAmt"/>
-                <result column="return_qty" property="returnQty"/>
-                <result column="return_amt" property="returnAmt"/>
-            <result column="into_date" property="intoDate" typeHandler="TimestampTypeHandler"/>
-                <result column="remarks" property="remarks"/>
-                <result column="annex_paths" property="annexPaths" typeHandler="JsonTypeHandler"/>
-                <result column="make_staff" property="makeStaff" typeHandler="UuidTypeHandler"/>
-            <result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
-                <result column="receivable_id" property="receivableId" typeHandler="UuidTypeHandler"/>
-                <result column="payable_id" property="payableId" typeHandler="UuidTypeHandler"/>
-                <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"/>
+        <result column="into_no" property="intoNo"/>
+        <result column="into_type" property="intoType"/>
+        <result column="from_id" property="fromId" typeHandler="UuidTypeHandler"/>
+        <result column="from_no" property="fromNo"/>
+        <result column="org_id" property="orgId" typeHandler="UuidTypeHandler"/>
+        <result column="staff_id" property="staffId" typeHandler="UuidTypeHandler"/>
+        <result column="cus_id" property="cusId" typeHandler="UuidTypeHandler"/>
+        <result column="sup_id" property="supId" typeHandler="UuidTypeHandler"/>
+        <result column="into_status" property="intoStatus"/>
+        <result column="intoing_qty" property="intoingQty"/>
+        <result column="intoing_amt" property="intoingAmt"/>
+        <result column="into_qty" property="intoQty"/>
+        <result column="into_amt" property="intoAmt"/>
+        <result column="return_qty" property="returnQty"/>
+        <result column="return_amt" property="returnAmt"/>
+        <result column="into_date" property="intoDate" typeHandler="TimestampTypeHandler"/>
+        <result column="remarks" property="remarks"/>
+        <result column="annex_paths" property="annexPaths" typeHandler="JsonTypeHandler"/>
+        <result column="make_staff" property="makeStaff" typeHandler="UuidTypeHandler"/>
+        <result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
+        <result column="receivable_id" property="receivableId" typeHandler="UuidTypeHandler"/>
+        <result column="payable_id" property="payableId" typeHandler="UuidTypeHandler"/>
+        <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>
 
+
+
+
+    <sql id="Base_Column_List_Item_Response">
+        tpi.into_id
+        , tpi.into_no, tpi.into_type, tpi.from_id, tpi.from_no, tpi.org_id, tpi.staff_id, tpi.cus_id, tpi.sup_id, tpi.into_status, tpi.intoing_qty, tpi.intoing_amt,
+        tpi.into_qty, tpi.into_amt, tpi.return_qty, tpi.return_amt, tpi.into_date, tpi.remarks, tpi.annex_paths, tpi.make_staff, tpi.make_time,
+        tpi.receivable_id, tpi.payable_id, tpi.flg_valid, tpi.cp_id
+    </sql>
+    <!--    关联明细映射-->
+    <resultMap id="BaseResultMapItemResponse" type="com.dk.mdm.model.response.ivt.InboundResponse">
+        <id column="into_id" property="intoId"/>
+        <result column="into_no" property="intoNo"/>
+        <result column="into_type" property="intoType"/>
+        <result column="from_id" property="fromId" typeHandler="UuidTypeHandler"/>
+        <result column="from_no" property="fromNo"/>
+        <result column="org_id" property="orgId" typeHandler="UuidTypeHandler"/>
+        <result column="staff_id" property="staffId" typeHandler="UuidTypeHandler"/>
+        <result column="cus_id" property="cusId" typeHandler="UuidTypeHandler"/>
+        <result column="sup_id" property="supId" typeHandler="UuidTypeHandler"/>
+        <result column="into_status" property="intoStatus"/>
+        <result column="intoing_qty" property="intoingQty"/>
+        <result column="intoing_amt" property="intoingAmt"/>
+        <result column="into_qty" property="intoQty"/>
+        <result column="into_amt" property="intoAmt"/>
+        <result column="return_qty" property="returnQty"/>
+        <result column="return_amt" property="returnAmt"/>
+        <result column="into_date" property="intoDate" typeHandler="TimestampTypeHandler"/>
+        <result column="remarks" property="remarks"/>
+        <result column="annex_paths" property="annexPaths" typeHandler="JsonTypeHandler"/>
+        <result column="make_staff" property="makeStaff" typeHandler="UuidTypeHandler"/>
+        <result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
+        <result column="receivable_id" property="receivableId" typeHandler="UuidTypeHandler"/>
+        <result column="payable_id" property="payableId" typeHandler="UuidTypeHandler"/>
+        <result column="flg_valid" property="flgValid"/>
+        <result column="cp_id" property="cpId"/>
+        <collection property="inboundItemList" resultMap="inboundItemListMap" columnPrefix="list_"/>
+    </resultMap>
+
+    <!--    关联映射-->
+    <resultMap id="inboundItemListMap" type="java.util.Map">
+        <result column="item_id" property="itemId" typeHandler="UuidTypeHandler"/>
+        <result column="into_id" property="intoId" typeHandler="UuidTypeHandler"/>
+        <result column="into_type" property="intoType"/>
+        <result column="from_id" property="fromId" typeHandler="UuidTypeHandler"/>
+        <result column="from_item_id" property="fromItemId" typeHandler="UuidTypeHandler"/>
+        <result column="item_index" property="itemIndex"/>
+        <result column="sku_id" property="skuId" typeHandler="UuidTypeHandler"/>
+        <result column="item_qty" property="itemQty"/>
+        <result column="price_into" property="priceInto"/>
+        <result column="item_amt" property="itemAmt"/>
+        <result column="non_std_code" property="nonStdCode"/>
+        <result column="into_status" property="intoStatus"/>
+        <result column="intoing_qty" property="intoingQty"/>
+        <result column="intoing_amt" property="intoingAmt"/>
+        <result column="into_qty" property="intoQty"/>
+        <result column="into_amt" property="intoAmt"/>
+        <result column="return_qty" property="returnQty"/>
+        <result column="return_amt" property="returnAmt"/>
+        <result column="remarks" property="remarks"/>
+        <result column="inv_id" property="invId" typeHandler="UuidTypeHandler"/>
+        <result column="cost_price" property="costPrice"/>
+        <result column="cost_amt" property="costAmt"/>
+        <result column="out_qty" property="outQty"/>
+        <result column="inv_qty" property="invQty"/>
+        <result column="flg_valid" property="flgValid"/>
+        <result column="cp_id" property="cpId"/>
+        <result column="sku_code" property="skuCode"/>
+        <result column="sku_name" property="skuName"/>
+        <result column="sku_model" property="skuModel"/>
+        <result column="price_purchase" property="pricePurchase"/>
+        <result column="reject_qty" property="rejectQty"/>
+        <result column="sku_images" property="skuImages"  typeHandler="JsonTypeHandler"/>
+    </resultMap>
+
+
     <!-- 通用条件列 -->
     <sql id="Condition">
         <where>
@@ -143,6 +220,85 @@
         </where>
     </sql>
 
+
+    <sql id="Condition_Join">
+        <where>
+            <if test="intoNo != null and intoNo != ''">
+                AND tpi.into_no = #{intoNo}
+            </if>
+            <if test="intoType != null and intoType != ''">
+                AND tpi.into_type = #{intoType}
+            </if>
+            <if test="fromId != null and fromId != ''">
+                AND tpi.from_id = #{fromId}::uuid
+            </if>
+            <if test="fromNo != null and fromNo != ''">
+                AND tpi.from_no = #{fromNo}
+            </if>
+            <if test="orgId != null and orgId != ''">
+                AND tpi.org_id = #{orgId}::uuid
+            </if>
+            <if test="staffId != null and staffId != ''">
+                AND tpi.staff_id = #{staffId}::uuid
+            </if>
+            <if test="cusId != null and cusId != ''">
+                AND tpi.cus_id = #{cusId}::uuid
+            </if>
+            <if test="supId != null and supId != ''">
+                AND tpi.sup_id = #{supId}::uuid
+            </if>
+            <if test="intoStatus != null and intoStatus != ''">
+                AND tpi.into_status = #{intoStatus}
+            </if>
+            <if test="intoingQty != null">
+                AND tpi.intoing_qty = #{intoingQty}
+            </if>
+            <if test="intoingAmt != null">
+                AND tpi.intoing_amt = #{intoingAmt}
+            </if>
+            <if test="intoQty != null">
+                AND tpi.into_qty = #{intoQty}
+            </if>
+            <if test="intoAmt != null">
+                AND tpi.into_amt = #{intoAmt}
+            </if>
+            <if test="returnQty != null">
+                AND tpi.return_qty = #{returnQty}
+            </if>
+            <if test="returnAmt != null">
+                AND tpi.return_amt = #{returnAmt}
+            </if>
+            <if test="intoDate != null">
+                AND tpi.into_date = #{intoDate}
+            </if>
+            <if test="remarks != null and remarks != ''">
+                AND tpi.remarks = #{remarks}
+            </if>
+            <if test="annexPaths != null and annexPaths != ''">
+                AND tpi.annex_paths = #{annexPaths}
+            </if>
+            <if test="makeStaff != null and makeStaff != ''">
+                AND tpi.make_staff = #{makeStaff}
+            </if>
+            <if test="makeTime != null">
+                AND tpi.make_time = #{makeTime}
+            </if>
+            <if test="receivableId != null and receivableId != ''">
+                AND tpi.receivable_id = #{receivableId}
+            </if>
+            <if test="payableId != null and payableId != ''">
+                AND tpi.payable_id = #{payableId}
+            </if>
+            <if test="flgValid != null">
+                AND tpi.flg_valid = #{flgValid}
+            </if>
+            <if test="cpId != null">
+                AND tpi.cp_id = #{cpId}
+            </if>
+
+        </where>
+    </sql>
+
     <sql id="idsForeach">
         <!-- 根据主键intoId批量操作 -->
         WHERE into_id in
@@ -155,7 +311,7 @@
     <select id="selectByCond" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_psi_inbound
+        FROM dkic_b.t_psi_inbound
         <include refid="Condition"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
@@ -166,7 +322,7 @@
     <select id="countByCond" resultType="Long">
         SELECT
         count(1)
-        FROM t_psi_inbound
+        FROM dkic_b.t_psi_inbound
         <include refid="Condition"/>
     </select>
 
@@ -174,7 +330,7 @@
     <select id="selectById" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_psi_inbound
+        FROM dkic_b.t_psi_inbound
         WHERE into_id = #{intoId}::uuid
     </select>
 
@@ -182,7 +338,7 @@
     <select id="selectByIdForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_psi_inbound
+        FROM dkic_b.t_psi_inbound
         WHERE into_id = #{intoId}
         for update
     </select>
@@ -191,13 +347,13 @@
     <select id="selectByIdsForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_psi_inbound
+        FROM dkic_b.t_psi_inbound
         <include refid="idsForeach"/>
         for update
     </select>
 
     <insert id="insertBatch">
-        insert into t_psi_inbound
+        insert into dkic_b.t_psi_inbound
         (
         <trim suffixOverrides=",">
             into_no,
@@ -258,4 +414,67 @@
             )
         </foreach>
     </insert>
+
+
+    <sql id="Base_Column_List_Item_Response_Join">
+        tpii
+        .
+        item_id
+        AS list_item_id,
+        tpii.into_id AS list_into_id,
+        tpii.into_type AS list_into_type,
+        tpii.from_id AS list_from_id,
+        tpii.from_item_id AS list_from_item_id,
+        tpii.item_index AS list_item_index,
+        tpii.sku_id AS list_sku_id,
+        tpii.item_qty AS list_item_qty,
+        tpii.price_into AS list_price_into,
+        tpii.item_amt AS list_item_amt,
+        tpii.non_std_code AS list_non_std_code,
+        tpii.into_status AS list_into_status,
+        tpii.intoing_qty AS list_intoing_qty,
+        tpii.intoing_amt AS list_intoing_amt,
+        tpii.into_qty AS list_into_qty,
+        tpii.into_amt AS list_into_amt,
+        tpii.return_qty AS list_return_qty,
+        tpii.return_amt AS list_return_amt,
+        tpii.remarks AS list_remarks,
+        tpii.inv_id AS list_inv_id,
+        tpii.cost_price AS list_cost_price,
+        tpii.cost_amt AS list_cost_amt,
+        tpii.out_qty AS list_out_qty,
+        tpii.inv_qty AS list_inv_qty,
+        tpii.flg_valid AS list_flg_valids,
+        tpii.cp_id AS list_cp_id,
+        tmgs.sku_code AS  list_sku_code,
+        tmgs.sku_name AS  list_sku_name,
+        tmgs.sku_model AS  list_sku_model,
+        tmgs.price_purchase AS  list_price_purchase,
+        tmgs.sku_images AS  list_sku_images,
+
+        ( tpii.into_qty - tpii.return_qty)  AS list_reject_qty
+    </sql>
+
+
+    <!-- 查询表t_psi_inbound，（条件查询+分页）列表 -->
+    <select id="selectInboundAndItem" resultMap="BaseResultMapItemResponse">
+        SELECT
+        <include refid="Base_Column_List_Item_Response"/>,
+        <include refid="Base_Column_List_Item_Response_Join"/>
+        FROM dkic_b.t_psi_inbound  tpi
+        left join dkic_b.t_psi_inbound_item tpii  on tpi.into_id = tpii.into_id
+        left join  dkic_b.t_mst_goods_sku  tmgs on tmgs.sku_id = tpii.sku_id
+        <include refid="Condition_Join"/>
+        <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
+            limit #{end} offset #{start}
+        </if>
+    </select>
+
+    <!-- 查询表t_psi_inbound，（条件查询）个数 -->
+    <select id="selectInboundAndItemCountByCond" resultType="Long">
+        SELECT
+        count(1)
+        FROM dkic_b.t_psi_inbound tpi
+        <include refid="Condition_Join"/>
+    </select>
 </mapper>

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

@@ -122,7 +122,16 @@
             <if test="cpId != null">
                 AND tmgs.cp_id = #{cpId}
             </if>
-
+            <if test="brandIds != null">
+                AND   EXISTS (
+                SELECT 1
+                FROM unnest(string_to_array(#{brandIds}, ',')) AS brand_uuid
+                WHERE brand_uuid::uuid = tmgs.brand_id
+                )
+            </if>
+            <if test="searchText !=null">
+                AND ( tmgs.sku_name LIKE concat('%', #{searchText}, '%')
+            </if>
         </where>
     </sql>
 
@@ -138,11 +147,20 @@
     <select id="selectByCond" resultMap="BaseResultMapResponse">
         SELECT
         <include refid="Base_Column_List_JOIN"/>
-        ,tmgb.brand_name AS "brandName",tmgsr.series_name AS "seriesName"
+        ,tmgb.brand_name AS "brandName",tmgsr.series_name AS "seriesName",tpi.usable_qty AS "usableQty"
         FROM dkic_b.t_mst_goods_sku  tmgs
         LEFT JOIN dkic_b.t_mst_goods_brand tmgb ON tmgb.brand_id = tmgs.brand_id
         LEFT JOIN dkic_b.t_mst_goods_series tmgsr ON tmgsr.series_id = tmgs.series_id
+        LEFT JOIN dkic_b.t_psi_inventory tpi ON tpi.sku_id = tmgs.sku_id
         <include refid="Condition"/>
+        ORDER BY CASE
+        WHEN #{sort}  = 2 THEN tpi.usable_qty
+        ELSE NULL
+        END ASC,
+        CASE
+        WHEN #{sort} != 2 THEN tpi.usable_qty
+        ELSE NULL
+        END DESC
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
         </if>

src/main/java/com/dk/mdm/mapper/mst/MoneyAccountMapper.java

@@ -16,28 +16,28 @@ import java.util.List;
 public interface MoneyAccountMapper extends BaseMapper<MoneyAccount>{
     /**
      * @desc   : 根据条件进行查询
-     * @author : songy
+     * @author : 宋扬
      * @date   : 2024/3/1 10:42
      */
     List<MoneyAccountResponse> selectByCond(MoneyAccountQuery moneyAccountQuery);
 
     /**
      * @desc   : 根据条件进行查询（数量）
-     * @author : songy
+     * @author : 宋扬
      * @date   : 2024/3/1 10:42
      */
     Long countByCond(MoneyAccountQuery moneyAccountQuery);
 
    /**
     * @desc   : 查询
-    * @author : songy
+    * @author : 宋扬
     * @date   : 2024/3/2 16:19
     */
     Integer selectDisplayNo(MoneyAccountQuery moneyAccountQuery);
 
     /**
      * @desc   : 根据Id进行查询
-     * @author : songy
+     * @author : 宋扬
      * @date   : 2024-03-03 9:25
      */
     MoneyAccountResponse selectById(String id);

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

@@ -34,29 +34,17 @@
     <sql id="Condition">
         <where>
             <if test="macCode != null and macCode != ''">
-                AND ma.mac_code = #{macCode}
+                AND ma.mac_code LIKE concat('%',my_ex.likequery(#{macCode}),'%')
             </if>
             <if test="macName != null and macName != ''">
-                AND ma.mac_name = #{macName}
+                AND ma.mac_name LIKE concat('%',my_ex.likequery(#{macName}),'%')
             </if>
             <if test="remarks != null and remarks != ''">
-                AND ma.remarks = #{remarks}
+                AND ma.remarks = LIKE concat('%',my_ex.likequery(#{remarks}),'%')
             </if>
             <if test="cpId != null">
                 AND ma.cp_id = #{cpId}
             </if>
-            <if test="opCreateTime != null">
-                AND ma.op_create_time = #{opCreateTime}
-            </if>
-            <if test="opCreateUserId != null and opCreateUserId != ''">
-                AND ma.op_create_user_id = #{opCreateUserId}
-            </if>
-            <if test="opUpdateTime != null">
-                AND ma.op_update_time = #{opUpdateTime}
-            </if>
-            <if test="opUpdateUserId != null and opUpdateUserId != ''">
-                AND ma.op_update_user_id = #{opUpdateUserId}
-            </if>
             <if test="opTimestamp != null">
                 AND ma.op_timestamp = #{opTimestamp}
             </if>
@@ -69,14 +57,6 @@
         </where>
     </sql>
 
-    <sql id="idsForeach">
-        <!-- 根据主键macId批量操作 -->
-        WHERE mac_id in
-        <foreach collection="ids" index="index" item="item" separator="," open="(" close=")">
-            #{item}
-        </foreach>
-    </sql>
-
     <!-- 查询表t_mst_money_account，（条件查询+分页）列表 -->
     <select id="selectByCond" resultMap="BaseResultMap">
         SELECT ma.mac_Type,ma.mac_code,ma.mac_name,ma.remarks
@@ -86,9 +66,6 @@
         FROM dkic_b.t_mst_money_account ma
         left join dkic_b.t_mst_dictionary_data dd on ma.mac_type=dd.data_id
         <include refid="Condition"/>
-        <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
-            limit #{end} offset #{start}
-        </if>
     </select>
 
     <!-- 查询表t_mst_money_account，（条件查询）个数 -->
@@ -103,7 +80,7 @@
     <select id="selectById" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mst_money_account
+        FROM dkic_b.t_mst_money_account
         WHERE mac_id = #{macId}::uuid
     </select>
 

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

@@ -178,7 +178,7 @@
     <select id="selectByCond" resultMap="BaseResultMap">
         SELECT
         <include refid="msl_Base_Column_List"/>
-        ,tms.staff_name,sys.f_get_name_i18n(tdk.kind_name_i18n,'zh_CN' )AS  "supTypeName"
+        ,tms.staff_name,sys.f_get_name_i18n(tdk.kind_name_i18n,'zh_CN' ) AS  "supTypeName"
           ,
         (
         SELECT
@@ -197,6 +197,7 @@
         tsmb.sup_id = msl.sup_id
         ) AS "brandName"
         ,tmo.org_name
+        ,tmo.org_code
         FROM dkic_b.t_mst_supplier msl
         LEFT JOIN dkic_b.t_mst_staff  tms   ON tms.staff_id = msl.staff_id
         LEFT JOIN dkic_b.t_mst_org  tmo   ON tmo.org_id = msl.org_id

src/main/java/com/dk/mdm/mapper/sale/OrderItemMapper.java

@@ -34,5 +34,12 @@ public interface OrderItemMapper extends BaseMapper<OrderItem>{
      * @date   : 2024-03-03 14:17
      */
     int deleteById(@Param("id") String id);
+
+    /**
+     * @desc   : 根据条件进行查询（出库用）
+     * @author : 付斌
+     * @date   : 2024-03-06 12:59
+     */
+    List<OrderItemResponse> selectByCondForOut(OrderItemQuery orderQuery);
 }
 

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

@@ -5,7 +5,8 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        item_id , order_id, item_index, sku_id, item_qty, price_std, amt_std, price_sale, item_amt, price_discount, non_std_code, out_status, outing_qty, outing_amt, out_qty, out_amt, return_qty, return_amt, remarks, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
+        item_id
+        , order_id, item_index, sku_id, item_qty, price_std, amt_std, price_sale, item_amt, price_discount, non_std_code, out_status, outing_qty, outing_amt, out_qty, out_amt, return_qty, return_amt, remarks, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -237,7 +238,39 @@
     </insert>
 
     <delete id="deleteById">
-        DELETE FROM dkic_b.t_psi_order_item
+        DELETE
+        FROM dkic_b.t_psi_order_item
         WHERE item_id = #{id}::UUID;
     </delete>
+
+    <!-- 根据条件进行查询（出库用） -->
+    <select id="selectByCondForOut" resultMap="BaseResultMap">
+        SELECT tpoi.item_id,
+               tpoi.order_id,
+               tpoi.item_index,
+               tpoi.sku_id,
+               tmgs.sku_code                                      as "skuCode",
+               tmgs.sku_model                                     as "skuModel",
+               tmgs.sku_name                                      as "skuName",
+               tpoi.item_qty                                      as "orderQty",
+               tpoi.item_qty - tpoi.outing_qty                    as "canOutingQty",
+               tpoi.item_qty - tpoi.outing_qty                    as outing_qty,
+               tpoi.price_std * (tpoi.item_qty - tpoi.outing_qty) as item_amt,
+               tpoi.price_sale as "price_out",
+               tpoi.non_std_code,
+               tpoi.remarks,
+               tpi.inv_id                                         as "invId",
+               tpi.wh_id                                          as "whId",
+               tpi.inv_qty                                        as "invQty",
+               tpi.usable_qty                                     as "usableQty",
+               tmw.wh_name                                        as "whName"
+        FROM dkic_b.t_psi_order_item as tpoi
+                 inner join dkic_b.t_mst_goods_sku tmgs on tpoi.sku_id = tmgs.sku_id
+                 left join dkic_b.t_psi_inventory as tpi
+                           on tpi.sku_id = tpoi.sku_id and tpi.non_std_code = tpoi.non_std_code and
+                              tpi.cp_id = tpoi.cp_id
+                 left join dkic_b.t_mst_warehouse as tmw on tmw.wh_id = tpi.wh_id
+        where tpoi.order_id = #{orderId}::uuid
+        order by tpoi.item_index
+    </select>
 </mapper>

src/main/java/com/dk/mdm/model/pojo/ivt/Inbound.java

@@ -18,6 +18,7 @@ import io.swagger.annotations.ApiModelProperty;
 import com.alibaba.fastjson.JSONObject;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.List;
 import java.time.LocalDateTime;
 
@@ -41,7 +42,6 @@ public class Inbound extends PageInfo<Inbound> implements Serializable {
     /**
      * 入库单ID
      */
-    @TableId(value = "into_id", type = IdType.AUTO)
     @ApiModelProperty(value = "入库单ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String intoId;
@@ -177,9 +177,9 @@ public class Inbound extends PageInfo<Inbound> implements Serializable {
      */
     @Excel(name = "入库日期")
     @ApiModelProperty(value = "入库日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime intoDate;
+    private LocalDate intoDate;
 
 
     /**

src/main/java/com/dk/mdm/model/pojo/ivt/InboundItem.java

@@ -41,7 +41,6 @@ public class InboundItem extends PageInfo<InboundItem> implements Serializable {
     /**
      * 明细ID
      */
-
     @ApiModelProperty(value = "明细ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String itemId;

src/main/java/com/dk/mdm/model/pojo/ivt/Outbound.java

@@ -18,6 +18,7 @@ import io.swagger.annotations.ApiModelProperty;
 import com.alibaba.fastjson.JSONObject;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.List;
 import java.time.LocalDateTime;
 
@@ -177,9 +178,9 @@ public class Outbound extends PageInfo<Outbound> implements Serializable {
      */
     @Excel(name = "出库日期")
     @ApiModelProperty(value = "出库日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime outDate;
+    private LocalDate outDate;
 
 
     /**

src/main/java/com/dk/mdm/model/query/ivt/InboundItemQuery.java

@@ -1,9 +1,7 @@
 package com.dk.mdm.model.query.ivt;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
@@ -42,7 +40,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 明细ID
      */
-    @TableId(value = "item_id", type = IdType.AUTO)
     @ApiModelProperty(value = "明细ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String itemId;

src/main/java/com/dk/mdm/model/query/ivt/InboundQuery.java

@@ -22,6 +22,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -180,9 +181,9 @@ public class InboundQuery extends PageInfo<InboundQuery> implements Serializable
      */
     @Excel(name = "入库日期")
     @ApiModelProperty(value = "入库日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime intoDate;
+    private LocalDate intoDate;
 
 
     /**

src/main/java/com/dk/mdm/model/query/ivt/OutboundQuery.java

@@ -20,6 +20,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -178,9 +179,9 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
      */
     @Excel(name = "出库日期")
     @ApiModelProperty(value = "出库日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime outDate;
+    private LocalDate outDate;
 
 
     /**

src/main/java/com/dk/mdm/model/query/mst/GoodsSkuQuery.java

@@ -91,7 +91,7 @@ public class GoodsSkuQuery extends PageInfo<GoodsSku> implements Serializable {
     @TableField(typeHandler = UuidTypeHandler.class)
     private String categoryId;
 
-
+    private String searchText;
     /**
      * 计量单位
      */
@@ -263,6 +263,15 @@ public class GoodsSkuQuery extends PageInfo<GoodsSku> implements Serializable {
     @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
     private String opDbUser;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "品牌")
+    private String brandIds;
+
+
 
     /*
      * 相关属性

src/main/java/com/dk/mdm/model/query/mst/MoneyAccountQuery.java

@@ -196,7 +196,7 @@ public class MoneyAccountQuery extends PageInfo<MoneyAccountQuery> implements Se
 
     /**
      * @desc   : 有效标识List
-     * @author : songy
+     * @author : 宋扬
      * @date   : 2024/3/2 9:31
      */
     @Excel(name = "有效标识 (1：正常 0：停用)")
@@ -206,7 +206,7 @@ public class MoneyAccountQuery extends PageInfo<MoneyAccountQuery> implements Se
 
     /**
      * @desc   : 账户类别list
-     * @author : songy
+     * @author : 宋扬
      * @date   : 2024/3/2 9:27
      */
     @Excel(name = "账户类别 (【数据字典】)")

src/main/java/com/dk/mdm/model/query/mst/SupplierQuery.java

@@ -116,6 +116,15 @@ import java.time.LocalDateTime;
 
 
         /**
+         * @desc   : 有效标识List
+         * @author : songy
+         * @date   : 2024/3/2 9:31
+         */
+        @Excel(name = "有效标识 (1：正常 0：停用)")
+        @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+        private List<Boolean> flgValidList;
+
+        /**
          * 备注
          */
         @Excel(name = "备注")

src/main/java/com/dk/mdm/model/response/ivt/InboundItemResponse.java

@@ -1,9 +1,7 @@
 package com.dk.mdm.model.response.ivt;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
@@ -42,7 +40,6 @@ public class InboundItemResponse extends PageInfo<InboundItemResponse> implement
     /**
      * 明细ID
      */
-    @TableId(value = "item_id", type = IdType.AUTO)
     @ApiModelProperty(value = "明细ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String itemId;

src/main/java/com/dk/mdm/model/response/ivt/InboundResponse.java

@@ -22,7 +22,9 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  *  入库单
@@ -180,9 +182,9 @@ public class InboundResponse extends PageInfo<InboundResponse> implements Serial
      */
     @Excel(name = "入库日期")
     @ApiModelProperty(value = "入库日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime intoDate;
+    private LocalDate intoDate;
 
 
     /**
@@ -328,7 +330,7 @@ public class InboundResponse extends PageInfo<InboundResponse> implements Serial
      * 关联属性 + 查询条件
      * @TableField(exist = false)
      */
-
+    private List<InboundItemResponse> inboundItemList;
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/model/response/ivt/IntoReturnItemResponse.java

@@ -44,13 +44,14 @@ public class IntoReturnItemResponse  implements Serializable {
     private String itemId;
 
 
-    /**
-     * 退货单ID
-     */
-    @Excel(name = "退货单ID")
-    @ApiModelProperty(value = "退货单ID")
+
+    private String fromId;
+
+    private String intoType;
+
+
     @TableField(typeHandler = UuidTypeHandler.class)
-    private String returnId;
+    private String fromItemId;
 
 
     /**

src/main/java/com/dk/mdm/model/response/ivt/OutboundResponse.java

@@ -20,6 +20,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -178,9 +179,9 @@ public class OutboundResponse extends PageInfo<OutboundResponse> implements Seri
      */
     @Excel(name = "出库日期")
     @ApiModelProperty(value = "出库日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime outDate;
+    private LocalDate outDate;
 
 
     /**

src/main/java/com/dk/mdm/model/response/mst/GoodsSkuResponse.java

@@ -279,6 +279,12 @@ public class GoodsSkuResponse implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "辅助单位")
     private String subUnitName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "可售量")
+    private Integer usableQty;
+
+
     /*
      * 相关属性
      * @TableField(exist = false)

src/main/java/com/dk/mdm/model/response/mst/SpplierResponse.java

@@ -73,7 +73,6 @@ public class SpplierResponse extends PageInfo<SpplierResponse> implements Serial
     @ApiModelProperty(value = "供应商类别 (【系统字典】)")
     private String supType;
 
-
     /**
      * 联系人
      */
@@ -113,8 +112,9 @@ public class SpplierResponse extends PageInfo<SpplierResponse> implements Serial
     @ApiModelProperty(value = "业务员")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String staffName;
+
     /**
-     * 业务员
+     * 组织机构
      */
     @Excel(name = "组织机构")
     @ApiModelProperty(value = "组织机构")
@@ -122,6 +122,14 @@ public class SpplierResponse extends PageInfo<SpplierResponse> implements Serial
     private String orgName;
 
     /**
+     * 组织机构编码
+     */
+    @Excel(name = "组织机构")
+    @ApiModelProperty(value = "组织机构")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String orgCode;
+
+    /**
      * 服务类别 (【系统字典】)
      */
     @Excel(name = "服务类别 (【系统字典】)")
@@ -130,7 +138,6 @@ public class SpplierResponse extends PageInfo<SpplierResponse> implements Serial
     private List<String> serviceCategories;
 
 
-
     /**
      * 备注
      */

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

@@ -281,6 +281,27 @@ public class OrderItemResponse extends PageInfo<OrderItemResponse> implements Se
 
     @ApiModelProperty(value = "商品名称")
     private String skuName;
+
+    @ApiModelProperty(value = "订单数量")
+    private BigDecimal orderQty;
+
+    @ApiModelProperty(value = "可出库数量")
+    private BigDecimal canOutingQty;
+
+    @ApiModelProperty(value = "库存ID")
+    private String invId;
+
+    @ApiModelProperty(value = "仓库ID")
+    private String whId;
+
+    @ApiModelProperty(value = "库存数量")
+    private BigDecimal invQty;
+
+    @ApiModelProperty(value = "可用量")
+    private BigDecimal usableQty;
+
+    @ApiModelProperty(value = "仓库名称")
+    private String whName;
     /*
      * 相关属性
      * @TableField(exist = false)

src/main/java/com/dk/mdm/model/vo/ivt/InboundItemVO.java

@@ -1,9 +1,7 @@
 package com.dk.mdm.model.vo.ivt;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
@@ -42,7 +40,6 @@ public class InboundItemVO extends PageInfo<InboundItemVO> implements Serializab
     /**
      * 明细ID
      */
-    @TableId(value = "item_id", type = IdType.AUTO)
     @ApiModelProperty(value = "明细ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String itemId;

src/main/java/com/dk/mdm/model/vo/ivt/InboundVO.java

@@ -22,6 +22,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -180,9 +181,9 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
      */
     @Excel(name = "入库日期")
     @ApiModelProperty(value = "入库日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime intoDate;
+    private LocalDate intoDate;
 
 
     /**

src/main/java/com/dk/mdm/model/vo/ivt/OutboundVO.java

@@ -20,6 +20,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -179,9 +180,9 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
      */
     @Excel(name = "出库日期")
     @ApiModelProperty(value = "出库日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime outDate;
+    private LocalDate outDate;
 
 
     /**
@@ -317,8 +318,8 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
     private String opDbUser;
 
-    @ApiModelProperty(value = "出库明细")
-    private List<OutboundItemVO> outboundItemList;
+    @ApiModelProperty(value = "明细")
+    private List<OutboundItemVO> itemList;
 
     @ApiModelProperty(value = "删除明细")
     private List<OutboundItemVO> deleteItemList;

src/main/java/com/dk/mdm/model/vo/sale/OrderVO.java

@@ -407,8 +407,8 @@ public class OrderVO extends PageInfo<OrderVO> implements Serializable {
     @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
     private String opDbUser;
 
-    @ApiModelProperty(value = "订单明细")
-    private List<OrderItemVO> orderItemList;
+    @ApiModelProperty(value = "明细")
+    private List<OrderItemVO> itemList;
 
     @ApiModelProperty(value = "删除明细")
     private List<OrderItemVO> deleteItemList;

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

@@ -1540,4 +1540,26 @@ public class CommonService extends BaseService<Map<String, Object>> {
         return super.mergeListWithCount(param, commonMapper.getInventory(param),
                 commonMapper.getInventoryCountByPage(param));
     }
+
+    /**
+     * @desc   : 供应商类别
+     * @author : 宋扬
+     * @date   : 2024/3/6 10:41
+     */
+    public ResponseResultVO<List<Map<String, Object>>> getSupType(Map<String, Object> param) {
+        // 获取系统基础数据
+        List<Map<String, Object>> list = commonMapper.getSupType(param);
+        return ResponseResultUtil.success(list);
+    }
+
+    /**
+     * @desc   : 供应商服务类别
+     * @author : 宋扬
+     * @date   : 2024/3/6 10:43
+     */
+    public ResponseResultVO<List<Map<String, Object>>> getServiceCategories(Map<String, Object> param) {
+        // 获取系统基础数据
+        List<Map<String, Object>> list = commonMapper.getServiceCategories(param);
+        return ResponseResultUtil.success(list);
+    }
 }

src/main/java/com/dk/mdm/service/ivt/InboundService.java

@@ -1,13 +1,20 @@
 package com.dk.mdm.service.ivt;
 
+import com.dk.common.infrastructure.annotaiton.Pagination;
+import com.dk.common.model.pojo.PageList;
+import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.model.pojo.ivt.Inbound;
 import com.dk.mdm.mapper.ivt.InboundMapper;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.query.ivt.InboundQuery;
+import com.dk.mdm.model.response.ivt.InboundResponse;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
+
+
 @Service
 @Transactional
 public class InboundService extends BaseService<Inbound> {
@@ -20,4 +27,18 @@ public class InboundService extends BaseService<Inbound> {
 	@Autowired
 	private InboundMapper inboundMapper;
 
+
+
+
+	/**
+	 * @desc : 查看来源单据,总单加明细  采购退货用
+	 * @author : 于继渤
+	 * @date : 2024/3/6 10:36
+	 */
+	@Pagination
+	public ResponseResultVO<PageList<InboundResponse>> selectInboundAndItem(InboundQuery inboundQuery) {
+		return super.mergeListWithCount(inboundQuery, inboundMapper.selectInboundAndItem(inboundQuery),
+				inboundMapper.selectInboundAndItemCountByCond(inboundQuery));
+	}
+
 }

src/main/java/com/dk/mdm/service/ivt/OutboundItemService.java

@@ -13,6 +13,11 @@ import org.springframework.transaction.annotation.Transactional;
 public class OutboundItemService extends BaseService<OutboundItem> {
 
 	@Override
+	public String getPrimaryKey() {
+		return "item_id";
+	}
+
+	@Override
 	public BaseMapper<OutboundItem> getRepository() {
 		return outboundItemMapper;
 	}

src/main/java/com/dk/mdm/service/ivt/OutboundService.java

@@ -36,6 +36,11 @@ import java.util.stream.Collectors;
 public class OutboundService extends BaseService<Outbound> {
 
 	@Override
+	public String getPrimaryKey() {
+		return "out_id";
+	}
+
+	@Override
 	public BaseMapper<Outbound> getRepository() {
 		return outboundMapper;
 	}
@@ -70,17 +75,19 @@ public class OutboundService extends BaseService<Outbound> {
 
 		// 获取单号
 		Map<String , Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.OUTBOUND.getName(),false);
-		outboundVO.setOutId(codeMap.get("outId").toString()).setOutNo(codeMap.get("outNote").toString()).setOutType(Constant.OutType.SALE.getName());
+		outboundVO.setOutId(codeMap.get("outId").toString()).setOutNo(codeMap.get("outNote").toString())
+				.setOutType(Constant.OutType.SALE.getName());
 		// 转化实体
 		Outbound outbound = outboundConvert.convertToPo(outboundVO);
 		// 总单保存
 		super.insert(outbound);
 
 		// 明细保存
-		if (outboundVO.getOutboundItemList() != null && outboundVO.getOutboundItemList().size() > 0) {
-			for (OutboundItemVO outboundItemVO : outboundVO.getOutboundItemList()) {
+		if (outboundVO.getItemList() != null && outboundVO.getItemList().size() > 0) {
+			for (OutboundItemVO outboundItemVO : outboundVO.getItemList()) {
 				OutboundItem outboundItem = outboundItemConvert.convertToPo(outboundItemVO);
-				outboundItem.setOutId(outbound.getOutId()).setCpId(outbound.getCpId()).setOutStatus(Constant.OutStatus.CHUKUZHONG.getName());
+				outboundItem.setOutId(outbound.getOutId()).setCpId(outbound.getCpId()).setOutStatus(Constant.OutStatus.CHUKUZHONG.getName())
+					.setOutType(Constant.OutType.SALE.getName());
 				outboundItemMapper.insert(outboundItem);
 			}
 		}
@@ -116,7 +123,7 @@ public class OutboundService extends BaseService<Outbound> {
 		Outbound outbound = outboundConvert.convertToPo(outboundVO);
 
 		// 编辑的
-		List<OutboundItemVO> editOutboundItemVOList = outboundVO.getOutboundItemList().stream().filter(it -> it.getItemId() != null).collect(Collectors.toList());
+		List<OutboundItemVO> editOutboundItemVOList = outboundVO.getItemList().stream().filter(it -> it.getItemId() != null).collect(Collectors.toList());
 		for (OutboundItemVO outboundItemVO : editOutboundItemVOList) {
 			// 商品数量不能小于出库中数量
 			if(outboundItemVO.getItemQty().compareTo(outboundItemVO.getOutingQty()) == -1){

src/main/java/com/dk/mdm/service/mst/MoneyAccountService.java

@@ -42,7 +42,7 @@ public class MoneyAccountService extends BaseService<MoneyAccount> {
 
 	/**
 	 * @desc   : 重写主键
-	 * @author : songy
+	 * @author : 宋扬
 	 * @date   : 2023/1/9 10:39
 	 */
 	@Override
@@ -53,7 +53,7 @@ public class MoneyAccountService extends BaseService<MoneyAccount> {
 
 	/**
 	 * @desc   : 条件查询
-	 * @author : songy
+	 * @author : 宋扬
 	 * @date   : 2023/2/29 10:40
 	 */
 	@Pagination
@@ -65,7 +65,7 @@ public class MoneyAccountService extends BaseService<MoneyAccount> {
 
 	/**
 	 * @desc : 保存方法
-	 * @author : songy
+	 * @author : 宋扬
 	 * @date : 2023/2/29 10:49
 	 */
 	@Transactional(
@@ -90,7 +90,7 @@ public class MoneyAccountService extends BaseService<MoneyAccount> {
 
 	/**
 	 * @desc : 编辑方法
-	 * @author : songy
+	 * @author : 宋扬
 	 * @date : 2023/2/29 10:49
 	 */
 	@Transactional(

src/main/java/com/dk/mdm/service/sale/OrderItemService.java

@@ -13,6 +13,11 @@ import org.springframework.transaction.annotation.Transactional;
 public class OrderItemService extends BaseService<OrderItem> {
 
 	@Override
+	public String getPrimaryKey() {
+		return "item_id";
+	}
+
+	@Override
 	public BaseMapper<OrderItem> getRepository() {
 		return orderItemMapper;
 	}

src/main/java/com/dk/mdm/service/sale/OrderService.java

@@ -38,18 +38,13 @@ import java.util.stream.Collectors;
 public class OrderService extends BaseService<Order> {
 
     @Override
-    public BaseMapper<Order> getRepository() {
-        return orderMapper;
+    public String getPrimaryKey() {
+        return "order_id";
     }
 
-    /**
-     * @desc : 重写主键
-     * @author : 付斌
-     * @date : 2023/1/9 10:39
-     */
     @Override
-    public String getPrimaryKey() {
-        return "order_id";
+    public BaseMapper<Order> getRepository() {
+        return orderMapper;
     }
 
     @Autowired
@@ -149,8 +144,8 @@ public class OrderService extends BaseService<Order> {
 //                UUID.fromString(updateOrder.getOrderId())));
 
         // 订单明细保存
-        if (orderVO.getOrderItemList() != null && orderVO.getOrderItemList().size() > 0) {
-            for (OrderItemVO orderItemVO : orderVO.getOrderItemList()) {
+        if (orderVO.getItemList() != null && orderVO.getItemList().size() > 0) {
+            for (OrderItemVO orderItemVO : orderVO.getItemList()) {
                 OrderItem orderItem = orderItemConvert.convertToPo(orderItemVO);
                 orderItem.setOrderId(order.getOrderId()).setCpId(order.getCpId()).setOutStatus(Constant.OutStatus.DAICHUKU.getName());
                 orderItemMapper.insert(orderItem);
@@ -200,14 +195,14 @@ public class OrderService extends BaseService<Order> {
         }
         // 编辑的（包括新增的）
         // 新增的
-        List<OrderItemVO> insertOrderItemVOList = orderVO.getOrderItemList().stream().filter(it -> it.getItemId() == null).collect(Collectors.toList());
+        List<OrderItemVO> insertOrderItemVOList = orderVO.getItemList().stream().filter(it -> it.getItemId() == null).collect(Collectors.toList());
         for (OrderItemVO orderItemVO : insertOrderItemVOList) {
             OrderItem orderItem = orderItemConvert.convertToPo(orderItemVO);
             orderItem.setOrderId(order.getOrderId()).setCpId(order.getCpId()).setOutStatus(Constant.OutStatus.DAICHUKU.getName());
             orderItemMapper.insert(orderItem);
         }
         // 编辑的
-        List<OrderItemVO> editOrderItemVOList = orderVO.getOrderItemList().stream().filter(it -> it.getItemId() != null).collect(Collectors.toList());
+        List<OrderItemVO> editOrderItemVOList = orderVO.getItemList().stream().filter(it -> it.getItemId() != null).collect(Collectors.toList());
         for (OrderItemVO orderItemVO : editOrderItemVOList) {
             // 商品数量不能小于出库中数量
             if(orderItemVO.getItemQty().compareTo(orderItemVO.getOutingQty()) == -1){
@@ -221,4 +216,20 @@ public class OrderService extends BaseService<Order> {
         return ResponseResultUtil.success(super.update(order, new UpdateWrapper<Order>().lambda().eq(Order::getOrderId,
                 UUID.fromString(order.getOrderId()))));
     }
+
+    /**
+     * @desc   : 获取订单信息（编辑用）
+     * @author : 付斌
+     * @date   : 2024-03-02 17:27
+     */
+    public ResponseResultVO<?> getOrderForOut(String id) {
+        Map<String, Object> orderInfo = new HashMap<>();
+        OrderResponse orderResponse = orderMapper.selectById(id);
+        orderInfo.put("order", orderResponse);
+
+        // 商品明细
+        List<OrderItemResponse> orderItem = orderItemMapper.selectByCondForOut(new OrderItemQuery().setOrderId(id));
+        orderInfo.put("orderItem", orderItem);
+        return ResponseResultUtil.success(orderInfo);
+    }
 }

src/main/java/com/dk/mdm/service/sale/OutReturnItemService.java

@@ -13,6 +13,11 @@ import org.springframework.transaction.annotation.Transactional;
 public class OutReturnItemService extends BaseService<OutReturnItem> {
 
 	@Override
+	public String getPrimaryKey() {
+		return "item_id";
+	}
+
+	@Override
 	public BaseMapper<OutReturnItem> getRepository() {
 		return outReturnItemMapper;
 	}

src/main/java/com/dk/mdm/service/sale/OutReturnService.java

@@ -13,6 +13,11 @@ import org.springframework.transaction.annotation.Transactional;
 public class OutReturnService extends BaseService<OutReturn> {
 
 	@Override
+	public String getPrimaryKey() {
+		return "return_id";
+	}
+
+	@Override
 	public BaseMapper<OutReturn> getRepository() {
 		return outReturnMapper;
 	}