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

# Conflicts:
#	src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleOrderService.java

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

@@ -4,7 +4,6 @@ import com.dk.common.controller.BaseController;
 import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.common.service.BaseService;
-import com.dk.mdm.model.query.wxapi.basic.WxCommonQuery;
 import com.dk.mdm.service.common.CommonService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -14,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Dictionary;
 import java.util.List;
 import java.util.Map;
 
@@ -321,9 +319,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取商品（采购订单开单用）
+     * @desc : 获取商品（采购订单开单用）
      * @author : 常皓宁
-     * @date   : 2024/3/9 10:08
+     * @date : 2024/3/9 10:08
      */
     @PostMapping("get_goods_for_purchase")
     public ResponseResultVO<List<Map<String, Object>>> getGoodsForPurchase(@RequestBody Map<String, Object> param) {
@@ -331,9 +329,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取商品（采购订单开单用）（分页）
+     * @desc : 获取商品（采购订单开单用）（分页）
      * @author : 常皓宁
-     * @date   : 2024/3/9 10:08
+     * @date : 2024/3/9 10:08
      */
     @PostMapping({"get_goods_for_purchase_by_page"})
     public ResponseResultVO<PageList<Map<String, Object>>> getGoodsForPurchaseByPage(@RequestBody Map<String, Object> param) {
@@ -458,6 +456,7 @@ public class CommonController extends BaseController<Map<String, Object>> {
     public ResponseResultVO<List<Map<String, Object>>> getGoodsBrandListNoPage(@RequestBody Map<String, Object> param) {
         return commonService.getGoodsBrandListNoPage(param);
     }
+
     /**
      * @desc :  商品种类查询
      * @author : 王英杰
@@ -550,8 +549,8 @@ public class CommonController extends BaseController<Map<String, Object>> {
 
 
     /**
-     * @desc   : 查询供应商与客户
-     * @date   : 2024/3/13 14:01
+     * @desc : 查询供应商与客户
+     * @date : 2024/3/13 14:01
      * @author : 寇珊珊
      */
     @PostMapping({"get_supplier_and_customer"})
@@ -560,8 +559,8 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取供应商和客户数据(分页)
-     * @date   : 2024/3/13 14:53
+     * @desc : 获取供应商和客户数据(分页)
+     * @date : 2024/3/13 14:53
      * @author : 寇珊珊
      */
     @ApiOperation(
@@ -574,8 +573,8 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取组织机构
-     * @date   : 2024/3/13 16:48
+     * @desc : 获取组织机构
+     * @date : 2024/3/13 16:48
      * @author : 寇珊珊
      */
     @ApiOperation(
@@ -589,8 +588,8 @@ public class CommonController extends BaseController<Map<String, Object>> {
 
 
     /**
-     * @desc   : 获取组织机构（分页）
-     * @date   : 2024/3/13 17:03
+     * @desc : 获取组织机构（分页）
+     * @date : 2024/3/13 17:03
      * @author : 寇珊珊
      */
     @ApiOperation(
@@ -642,9 +641,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取多业务部门
+     * @desc : 获取多业务部门
      * @author : 付斌
-     * @date   : 2024-03-20 16:54
+     * @date : 2024-03-20 16:54
      */
     @ApiOperation(
             value = "获取多业务部门",
@@ -656,9 +655,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取多业务员
+     * @desc : 获取多业务员
      * @author : 付斌
-     * @date   : 2024-03-20 16:54
+     * @date : 2024-03-20 16:54
      */
     @ApiOperation(
             value = "获取多业务员",
@@ -670,9 +669,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 组织仓库
+     * @desc : 组织仓库
      * @author : 宋扬
-     * @date   : 2024/3/22 15:47
+     * @date : 2024/3/22 15:47
      */
     @ApiOperation(
             value = "获取组织仓库",
@@ -684,9 +683,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 组织资金账户
+     * @desc : 组织资金账户
      * @author : 宋扬
-     * @date   : 2024/3/22 15:52
+     * @date : 2024/3/22 15:52
      */
     @ApiOperation(
             value = "获取资金账户",
@@ -698,9 +697,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取商品（采购订单开单用）
+     * @desc : 获取商品（采购订单开单用）
      * @author : 常皓宁
-     * @date   : 2024/3/9 10:08
+     * @date : 2024/3/9 10:08
      */
     @PostMapping("get_goods_for_purchase_return")
     public ResponseResultVO<List<Map<String, Object>>> getGoodsForPurchaseReturn(@RequestBody Map<String, Object> param) {
@@ -708,9 +707,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取商品（采购订单开单用）（分页）
+     * @desc : 获取商品（采购订单开单用）（分页）
      * @author : 常皓宁
-     * @date   : 2024/3/9 10:08
+     * @date : 2024/3/9 10:08
      */
     @PostMapping({"get_goods_for_purchase_return_by_page"})
     public ResponseResultVO<PageList<Map<String, Object>>> getGoodsForPurchaseReturnByPage(@RequestBody Map<String, Object> param) {
@@ -745,9 +744,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取组织仓库
+     * @desc : 获取组织仓库
      * @author : 付斌
-     * @date   : 2024-04-10 13:30
+     * @date : 2024-04-10 13:30
      */
     @ApiOperation(
             value = "获取组织仓库",
@@ -760,8 +759,8 @@ public class CommonController extends BaseController<Map<String, Object>> {
 
 
     /**
-     * @desc   : 获取商品（其他入库开单用）
-     * @date   : 2024/4/20 11:19
+     * @desc : 获取商品（其他入库开单用）
+     * @date : 2024/4/20 11:19
      * @author : 寇珊珊
      */
     @PostMapping("get_goods_for_into")
@@ -770,8 +769,8 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取商品（其他入库开单用）（分页）
-     * @date   : 2024/4/20 11:19
+     * @desc : 获取商品（其他入库开单用）（分页）
+     * @date : 2024/4/20 11:19
      * @author : 寇珊珊
      */
     @PostMapping({"get_goods_for_into_by_page"})
@@ -820,6 +819,17 @@ public class CommonController extends BaseController<Map<String, Object>> {
     public ResponseResultVO<Map<String, Object>> selectUserCount(@RequestBody Map<String, Object> param) {
         return commonService.selectUserCount(param);
     }
+
+    /**
+     * @desc : 查询首页实时数据
+     * @author : 付斌
+     * @date : 2024-06-19 11:06
+     */
+    @ApiOperation(value = "查询首页试试数据", notes = "查询首页试试数据")
+    @PostMapping({"get_real_time_data"})
+    public ResponseResultVO<Map<String, Object>> getRealTimeData(@RequestBody Map<String, Object> param) {
+        return commonService.getRealTimeData(param);
+    }
 }
 
 

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

@@ -1,7 +1,6 @@
 package com.dk.mdm.mapper.common;
 
 import com.dk.common.mapper.BaseMapper;
-import com.dk.mdm.model.query.mst.StaffQuery;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -58,7 +57,6 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
     List<Map<String, Object>> getDataKind(Map param);
 
 
-
     /**
      * @desc : 获取组织部门
      * @author : 姜宁
@@ -150,7 +148,8 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
      * @author : 姜宁
      * @date : 2023/2/7 14:45
      */
-    Map<String, Object> selectDictionaryData (Map param );
+    Map<String, Object> selectDictionaryData(Map param);
+
     /**
      * @desc : 获取用户隐藏列
      * @author : 周兴
@@ -211,30 +210,30 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
     Long getGoodsCountByPage(Map param);
 
     /**
-     * @desc   : 获取商品（销售订单开单用）
+     * @desc : 获取商品（销售订单开单用）
      * @author : 付斌
-     * @date   : 2024-03-09 9:57
+     * @date : 2024-03-09 9:57
      */
     List<Map<String, Object>> getGoodsForOrder(Map param);
 
     /**
-     * @desc   : 获取商品（销售订单开单用）(数量)
+     * @desc : 获取商品（销售订单开单用）(数量)
      * @author : 付斌
-     * @date   : 2024-03-09 9:57
+     * @date : 2024-03-09 9:57
      */
     Long getGoodsForOrderCountByPage(Map param);
 
     /**
-     * @desc   : 获取商品（采购订单开单用）
+     * @desc : 获取商品（采购订单开单用）
      * @author : 常皓宁
-     * @date   : 2024/3/9 10:08
+     * @date : 2024/3/9 10:08
      */
     List<Map<String, Object>> getGoodsForPurchase(Map param);
 
     /**
-     * @desc   : 获取商品（采购订单开单用）（分页）
+     * @desc : 获取商品（采购订单开单用）（分页）
      * @author : 常皓宁
-     * @date   : 2024/3/9 10:08
+     * @date : 2024/3/9 10:08
      */
     Long getGoodsForPurchaseCountByPage(Map param);
 
@@ -294,6 +293,7 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
      * @date : 2024/3/1 9:21
      */
     List<Map<String, Object>> getGoodsBrand(Map param);
+
     /**
      * @desc : 获取商品品牌 树形查询
      * @author : 王英杰
@@ -387,12 +387,14 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
     Long getInventoryCountByPage(Map param);
 
     List<Map<String, Object>> getSaleChannel(Map param);
+
     /**
      * @desc : 结算方式-小程序
      * @author : 姜永辉
      * @date : 2024-03-05 10:52
      */
     List<Map<String, Object>> getSettlement(Map param);
+
     /**
      * @desc : 渠道-小程序
      * @author : 姜永辉
@@ -402,66 +404,66 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
 
 
     /**
-     * @desc   : 获取供应商和客户数据
-     * @date   : 2024/3/13 14:03
+     * @desc : 获取供应商和客户数据
+     * @date : 2024/3/13 14:03
      * @author : 寇珊珊
      */
     List<Map<String, Object>> getSupplierAndCustomer(Map param);
 
     /**
-     * @desc   : 获取供应商和客户数据分页
-     * @date   : 2024/3/13 14:03
+     * @desc : 获取供应商和客户数据分页
+     * @date : 2024/3/13 14:03
      * @author : 寇珊珊
      */
-    List<Map<String,Object>> getSupplierAndCustomerByPage(Map param);
+    List<Map<String, Object>> getSupplierAndCustomerByPage(Map param);
 
     /**
-     * @desc   : 获取供应商和客户数据分页数量
-     * @date   : 2024/3/13 14:53
+     * @desc : 获取供应商和客户数据分页数量
+     * @date : 2024/3/13 14:53
      * @author : 寇珊珊
      */
     Long getSupplierAndCustomerByPageCount(Map param);
 
     /**
-     * @desc   : 获取员工
-     * @date   : 2024/3/13 16:24
+     * @desc : 获取员工
+     * @date : 2024/3/13 16:24
      * @author : 寇珊珊
      */
     List<Map<String, Object>> getStaff(Map param);
 
     /**
-     * @desc   : 获取员工-范围权限
-     * @date   : 2024/3/13 16:24
+     * @desc : 获取员工-范围权限
+     * @date : 2024/3/13 16:24
      * @author : 寇珊珊
      */
     List<Map<String, Object>> getStaffPurviewType(Map param);
 
 
     /**
-     * @desc   : 获取组织机构
-     * @date   : 2024/3/13 17:03
+     * @desc : 获取组织机构
+     * @date : 2024/3/13 17:03
      * @author : 寇珊珊
      */
     List<Map<String, Object>> getOrganization(Map param);
 
     /**
-     * @desc   : 获取组织机构分页
-     * @date   : 2024/3/13 17:03
+     * @desc : 获取组织机构分页
+     * @date : 2024/3/13 17:03
      * @author : 寇珊珊
      */
     List<Map<String, Object>> getOrganizationByPage(Map param);
 
     /**
-     * @desc   : 获取组织机构数量
-     * @date   : 2024/3/13 17:03
+     * @desc : 获取组织机构数量
+     * @date : 2024/3/13 17:03
      * @author : 寇珊珊
      */
     Long getOrganizationCount(Map<String, Object> param);
 
     /**
-     * @desc   : 获取资金账户（下拉）
+     * @desc : 获取资金账户（下拉）
      * @author : 付斌
-     * @date   : 2024-03-14 11:35
+     * @date : 2024-03-14 11:35
      */
     List<Map<String, Object>> getMac(Map param);
 
@@ -480,97 +482,126 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
     Long getMoneyAccountCountByPage(Map param);
 
     /**
-     * @desc   : 获取多业务部门
+     * @desc : 获取多业务部门
      * @author : 付斌
-     * @date   : 2024-03-20 16:52
+     * @date : 2024-03-20 16:52
      */
     List<Map<String, Object>> selectMultiOrg(Map param);
 
     /**
-     * @desc   : 获取多业务员
+     * @desc : 获取多业务员
      * @author : 付斌
-     * @date   : 2024-03-20 16:52
+     * @date : 2024-03-20 16:52
      */
     List<Map<String, Object>> selectMultiStaff(Map param);
 
     /**
-     * @desc   : 组织仓库
+     * @desc : 组织仓库
      * @author : 宋扬
-     * @date   : 2024/3/22 15:22
+     * @date : 2024/3/22 15:22
      */
     List<Map<String, Object>> selectMultiWarehouse(Map param);
 
     /**
-     * @desc   : 组织资金账户
+     * @desc : 组织资金账户
      * @author : 宋扬
-     * @date   : 2024/3/22 15:22
+     * @date : 2024/3/22 15:22
      */
     List<Map<String, Object>> selectMultiMoneyAccount(Map param);
 
     /**
-     * @desc   : 获取商品（采购订单开单用）
+     * @desc : 获取商品（采购订单开单用）
      * @author : 常皓宁
-     * @date   : 2024/3/9 10:08
+     * @date : 2024/3/9 10:08
      */
     List<Map<String, Object>> getGoodsForPurchaseReturn(Map param);
 
     /**
-     * @desc   : 获取商品（采购订单开单用）（分页）
+     * @desc : 获取商品（采购订单开单用）（分页）
      * @author : 常皓宁
-     * @date   : 2024/3/9 10:08
+     * @date : 2024/3/9 10:08
      */
     Long getGoodsForPurchaseReturnByPage(Map param);
 
     /**
-     * @desc   : 获取员工的范围权限类型
+     * @desc : 获取员工的范围权限类型
      * @author : 常皓宁
-     * @date   : 2024/4/2 10:15
+     * @date : 2024/4/2 10:15
      */
     List<Map<String, Object>> getPurviewType(Map param);
+
     List<Map<String, Object>> getInventoryByList(Map param);
 
-    List<Map<String,Object>> getLabelPrintItem(Map param);
+    List<Map<String, Object>> getLabelPrintItem(Map param);
 
     /**
-     * @desc   : 获取组织仓库
+     * @desc : 获取组织仓库
      * @author : 付斌
-     * @date   : 2024-04-10 13:31
+     * @date : 2024-04-10 13:31
      */
     List<Map<String, Object>> getOrgWh(Map param);
 
 
     /**
-     * @desc   :  获取商品（其他入库开单用）
-     * @date   : 2024/4/20 11:21
+     * @desc :  获取商品（其他入库开单用）
+     * @date : 2024/4/20 11:21
      * @author : 寇珊珊
      */
     List<Map<String, Object>> getGoodsForInto(Map param);
 
     /**
-     * @desc   : 获取商品（其他入库开单用）（数量）
-     * @date   : 2024/4/20 11:21
+     * @desc : 获取商品（其他入库开单用）（数量）
+     * @date : 2024/4/20 11:21
      * @author : 寇珊珊
      */
     Long getGoodsForIntoCountByPage(Map param);
 
     /**
-     * @desc   :  销售分析-我的 门店助手的 销售金额 收款金额 库存成本
-     * @date   : 2024/4/20 11:21
+     * @desc :  销售分析-我的 门店助手的 销售金额 收款金额 库存成本
+     * @date : 2024/4/20 11:21
      * @author : 姜永辉
      */
     Map<String, Object> getHomeOrderRecCost(Map param);
 
     /**
-     * @desc   : 查询用户授权数据
+     * @desc : 查询用户授权数据
      * @author : 周兴
-     * @date   : 2024/5/30 10:42
+     * @date : 2024/5/30 10:42
      */
-    Map<String,Object> selectUserCount(Map param);
+    Map<String, Object> selectUserCount(Map param);
 
     /**
-     * @desc   : 获取公司
+     * @desc : 获取公司
      * @author : 付斌
-     * @date   : 2024-06-19 9:59
+     * @date : 2024-06-19 9:59
      */
     List<Map<String, Object>> getCompany(Map param);
+
+    /**
+     * @desc : 查询首页实时数据1
+     * @author : 付斌
+     * @date : 2024-06-19 10:59
+     */
+    List<Map<String, Object>> getRealTimeData1(Map param);
+
+    /**
+     * @desc : 查询首页实时数据2
+     * @author : 付斌
+     * @date : 2024-06-19 10:59
+     */
+    List<Map<String, Object>> getRealTimeData2(Map param);
+
+    /**
+     * @desc : 查询首页实时数据3
+     * @author : 付斌
+     * @date : 2024-06-19 10:59
+     */
+    List<Map<String, Object>> getRealTimeData3(Map param);
+
+    /**
+     * @desc : 查询首页实时数据4
+     * @author : 付斌
+     * @date : 2024-06-19 10:59
+     */
+    List<Map<String, Object>> getRealTimeData4(Map param);
 }

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

@@ -1970,6 +1970,7 @@
             CURRENT_DATE as "currentDate"
     </select>
 
+    <!--查询公司-->
     <select id="getCompany" resultType="java.util.Map">
         select t.cp_id         as "cpId",
                t.cp_code       as "cpCode",
@@ -1985,4 +1986,48 @@
         from dkic_a.t_a_company as t
         where t.cp_id = #{cpId}
     </select>
+
+    <!--查询首页实时数据1-->
+    <select id="getRealTimeData1" resultType="java.util.Map">
+        select count(1) as "orderQty", coalesce(sum(t.sum_amount), 0) as "orderAmt"
+        from dkic_b.t_psi_order as t
+        where t.flg_valid
+          and t.cp_id = #{cpId}
+          and t.op_create_time <![CDATA[ >= ]]> #{createTimeStart}
+          and t.op_create_time <![CDATA[ < ]]> #{createTimeEnd}
+    </select>
+
+    <!--查询首页实时数据2-->
+    <select id="getRealTimeData2" resultType="java.util.Map">
+        select count(1) as "outQty", coalesce(sum(t.out_amt), 0) as "outAmt"
+        from dkic_b.t_psi_outbound as t
+        where t.flg_valid
+          and t.out_type = '出库类型-销售出库'
+          and t.cp_id = #{cpId}
+          and t.op_create_time <![CDATA[ >= ]]> #{createTimeStart}
+          and t.op_create_time <![CDATA[ < ]]> #{createTimeEnd}
+    </select>
+
+    <!--查询首页实时数据3-->
+    <select id="getRealTimeData3" resultType="java.util.Map">
+        select count(1) as "returnQty", -coalesce(sum(t.out_amt), 0) as "returnAmt"
+        from dkic_b.t_psi_outbound as t
+        where t.flg_valid
+          and t.out_type = '出库类型-销退回库'
+          and t.cp_id = #{cpId}
+          and t.op_create_time <![CDATA[ >= ]]> #{createTimeStart}
+          and t.op_create_time <![CDATA[ < ]]> #{createTimeEnd}
+    </select>
+
+    <!--查询首页实时数据4-->
+    <select id="getRealTimeData4" resultType="java.util.Map">
+        select count(1) as "cusQty", coalesce(sum(t.sum_amount), 0) as "cusAmt"
+        from (select sum(t.sum_amount) as sum_amount
+              from dkic_b.t_psi_order as t
+              where t.flg_valid
+                and t.cp_id = #{cpId}
+                and t.op_create_time <![CDATA[ >= ]]> #{createTimeStart}
+                and t.op_create_time <![CDATA[ < ]]> #{createTimeEnd}
+              group by t.cus_id) as t
+    </select>
 </mapper>

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

@@ -55,6 +55,7 @@
         <result column="fact_amt" property="factAmt"/>
         <result column="use_place" property="usePlace"/>
         <result column="discount" property="discount"/>
+        <result column="sup_id" property="supId"/>
     </resultMap>
 
     <!-- 通用查询映射结果 -->
@@ -96,6 +97,7 @@
         <result column="fact_amt" property="factAmt"/>
         <result column="use_place" property="usePlace"/>
         <result column="discount" property="discount"/>
+        <result column="sup_id" property="supId"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -341,8 +343,8 @@
                t.item_index,
                t.sku_id,
                tmgs.sku_code                              as "skuCode",
-               tmgs.sku_model                             as "skuModel",
-               tmgs.sku_name                              as "skuName",
+               t.sku_model                             as "skuModel",
+               t.sku_name                              as "skuName",
                tmgs.sku_images AS "skuImages",
                t.pack_box  ,
                sys.f_remove_zero(t.item_qty)              as "orderQty",

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

@@ -56,7 +56,6 @@
         <result column="discount" property="discount"/>
         <result column="flg_auto_handle" property="flgAutoHandle"/>
         <result column="flg_handle_setting" property="flgHandleSetting"/>
-        <result column="outbound_processing_flag" property="outboundProcessingFlag"/>
     </resultMap>
 
     <!-- 通用查询映射结果 -->
@@ -212,6 +211,7 @@
         <result column="flg_handle_setting" property="flgHandleSetting"/>
         <result column="channelName" property="channelName"/>
         <result column="outbound_processing_flag" property="outboundProcessingFlag"/>
+        <result column="categoryCount" property="categoryCount"/>
         <collection property="orderItemResponseList" resultMap="itemListMap" columnPrefix="list_"/>
 
     </resultMap>
@@ -1037,9 +1037,6 @@
             <if test=" et!=null and et.flgHandleSetting != null">
                 flg_handle_setting =#{et.flgHandleSetting,jdbcType=BOOLEAN},
             </if>
-            <if test=" et!=null and et.outboundProcessingFlag != null">
-                outbound_processing_flag =#{et.outboundProcessingFlag,jdbcType=BOOLEAN},
-            </if>
         </set>
         where order_id =#{et.orderId,typeHandler=UuidTypeHandler}
         and sum_quantity >= (out_qty + outing_qty)
@@ -1055,10 +1052,13 @@
         tmsc.channel_name as "channelName",
 
         <include refid="Base_Column_List_Item_Response_Detail_Join"/>
+        ,(select count(DISTINCT tmgss.category_id) from dkic_b.t_psi_order_item ti
+                LEFT  JOIN dkic_b.t_mst_goods_sku tmgss ON tmgss.sku_id = ti.sku_id
+                where ti.order_id = t.order_id and ti.flg_valid) as "categoryCount"
         FROM dkic_b.t_psi_order as t
         left join dkic_b.t_mst_customer tmc on tmc.cus_id = t.cus_id
         left join dkic_b.t_psi_order_item toi on toi.order_id  = t.order_id
-        inner join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id  = toi.sku_id
+        left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id  = toi.sku_id
         left join dkic_b.t_mst_goods_brand tmgb on tmgb.brand_id  = tmgs.brand_id
         left join dkic_b.t_mst_org tmo on t.org_id = tmo.org_id
         left join dkic_b.t_mst_sale_channel tmsc on t.sales_channel = tmsc.channel_id

src/main/java/com/dk/mdm/model/pojo/sale/OrderItem.java

@@ -280,6 +280,8 @@ public class OrderItem extends PageInfo<OrderItem> implements Serializable {
     @ApiModelProperty(value = "使用位置")
     private String usePlace;
 
+    @ApiModelProperty(value = "成本单价")
+    private BigDecimal costPrice;
     /**
      * 折扣
      */
@@ -287,6 +289,12 @@ public class OrderItem extends PageInfo<OrderItem> implements Serializable {
     @ApiModelProperty(value = "折扣")
     private BigDecimal discount;
 
+    /**
+     * 供应商Id
+     */
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String supId;
+
     private static final long serialVersionUID = 1L;
 
 }

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

@@ -411,6 +411,12 @@ public class OrderItemResponse extends PageInfo<OrderItemResponse> implements Se
     @ApiModelProperty(value = "折扣")
     private BigDecimal discount;
 
+    /**
+     * 供应商Id
+     */
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String supId;
+
     private static final long serialVersionUID = 1L;
 
 }

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

@@ -429,6 +429,9 @@ public class OrderResponse extends PageInfo<OrderResponse> implements Serializab
     @ApiModelProperty(value = "开单并出库办理标识")
     private Boolean outboundProcessingFlag;
 
+    @ApiModelProperty(value = "种类数")
+    private BigDecimal categoryCount;
+
 
     private static final long serialVersionUID = 1L;
 

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

@@ -295,7 +295,8 @@ public class OrderItemVO extends PageInfo<OrderItemVO> implements Serializable {
     @ApiModelProperty(value = "折扣")
     private BigDecimal discount;
 
-
+    @ApiModelProperty(value = "成本单价")
+    private BigDecimal costPrice;
 
     private static final long serialVersionUID = 1L;
 

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

@@ -13,14 +13,12 @@ import com.dk.common.service.BaseService;
 import com.dk.mdm.mapper.common.CommonMapper;
 import com.dk.mdm.infrastructure.util.AuthUtils;
 import com.dk.mdm.mapper.mst.StaffMapper;
-import com.dk.common.model.response.mst.StaffResponse;
-import com.dk.mdm.model.pojo.mst.Staff;
 import lombok.extern.slf4j.Slf4j;
 import org.postgresql.util.PGobject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.util.*;
 
 /**
@@ -136,8 +134,8 @@ public class CommonService extends BaseService<Map<String, Object>> {
             table = mode + "." + table;
             param.put("table", table);
             // 默认有效标识为true
-            if(param.get("noFlgValid") == null && param.get("flgValid") == null ){
-                param.put("flgValid",true);
+            if (param.get("noFlgValid") == null && param.get("flgValid") == null) {
+                param.put("flgValid", true);
             }
             // 获取最大序号
             Integer maxDisplayNo = commonMapper.getMaxDisplayNo(param);
@@ -177,6 +175,7 @@ public class CommonService extends BaseService<Map<String, Object>> {
         List<Map<String, Object>> list = commonMapper.getOrg(param);
         return ResponseResultUtil.success(list);
     }
+
     /**
      * @desc : 只获取二级部门 按照level_code 排序
      * @author : 王英杰
@@ -187,6 +186,7 @@ public class CommonService extends BaseService<Map<String, Object>> {
         List<Map<String, Object>> list = commonMapper.getProcureOrg(param);
         return ResponseResultUtil.success(list);
     }
+
     /**
      * @desc : 获取部门
      * @author : 姜宁
@@ -289,10 +289,10 @@ public class CommonService extends BaseService<Map<String, Object>> {
         StaffEntity staff = authUtils.getStaff();
         param.put("cpId", staff.getCpId());
         // 选择对象的时候用
-        if (param.get("supplier-customerList")!=null
-                && param.get("supplier-customerList")!=""
-                && !(param.get("supplier-customerList") + "").contains(",") ){
-            param.put("objType", Integer.parseInt(param.get("supplier-customerList").toString())   );
+        if (param.get("supplier-customerList") != null
+                && param.get("supplier-customerList") != ""
+                && !(param.get("supplier-customerList") + "").contains(",")) {
+            param.put("objType", Integer.parseInt(param.get("supplier-customerList").toString()));
         }
         return param;
     }
@@ -390,9 +390,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取商品（销售订单开单用）
+     * @desc : 获取商品（销售订单开单用）
      * @author : 付斌
-     * @date   : 2024-03-09 9:57
+     * @date : 2024-03-09 9:57
      */
     public ResponseResultVO<List<Map<String, Object>>> getGoodsForOrder(Map<String, Object> param) {
         // 获取系统基础数据
@@ -401,9 +401,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取商品（销售订单开单用）（分页）
+     * @desc : 获取商品（销售订单开单用）（分页）
      * @author : 付斌
-     * @date   : 2024-03-09 9:57
+     * @date : 2024-03-09 9:57
      */
     public ResponseResultVO<PageList<Map<String, Object>>> getGoodsForOrderByPage(Map<String, Object> param) {
         // 校验分页参数
@@ -418,9 +418,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
 
 
     /**
-     * @desc   : 获取商品（采购订单开单用）
+     * @desc : 获取商品（采购订单开单用）
      * @author : 常皓宁
-     * @date   : 2024/3/9 10:08
+     * @date : 2024/3/9 10:08
      */
     public ResponseResultVO<List<Map<String, Object>>> getGoodsForPurchase(Map<String, Object> param) {
         // 获取系统基础数据
@@ -429,9 +429,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取商品（采购订单开单用）（分页）
+     * @desc : 获取商品（采购订单开单用）（分页）
      * @author : 常皓宁
-     * @date   : 2024/3/9 10:08
+     * @date : 2024/3/9 10:08
      */
     public ResponseResultVO<PageList<Map<String, Object>>> getGoodsForPurchaseByPage(Map<String, Object> param) {
         // 校验分页参数
@@ -547,7 +547,7 @@ public class CommonService extends BaseService<Map<String, Object>> {
      */
     public ResponseResultVO<List<Map<String, Object>>> getGoodsBrandListNoPage(Map<String, Object> param) {
         // 有效的品牌 230529
-        param.put("flgValid",true);
+        param.put("flgValid", true);
         List<Map<String, Object>> list = commonMapper.getGoodsBrand(param);
         return ResponseResultUtil.success(list);
     }
@@ -689,7 +689,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
     public ResponseResultVO<List<Map<String, Object>>> getGoodsCategoryNoPage(Map<String, Object> param) {
         List<Map<String, Object>> list = commonMapper.getGoodsCategory(param);
         return ResponseResultUtil.success(list);
-    }    /**
+    }
+
+    /**
      * @desc :  商品种类查询  树形
      * @author : 王英杰
      * @date : 2024/2/26 10:36
@@ -706,7 +708,7 @@ public class CommonService extends BaseService<Map<String, Object>> {
      */
     public ResponseResultVO<List<Map<String, Object>>> getInitData(Map<String, Object> param) {
         //判断前台是否传 dataSourceCode
-        if (!param.containsKey("dataSourceCode") &&  param.get("dataSourceCode") == null) {
+        if (!param.containsKey("dataSourceCode") && param.get("dataSourceCode") == null) {
             return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.DATASOURCECODE_NOT.getMessage());
         }
         String dataSourceCode = param.get("dataSourceCode").toString();
@@ -714,18 +716,18 @@ public class CommonService extends BaseService<Map<String, Object>> {
 
         List<Map<String, Object>> list = null;
         Map<String, Object> map = new HashMap<>();
-        if(param.containsKey("searchText") && param.get("searchText") != null){
-            map.put("searchText",param.get("searchText").toString());
+        if (param.containsKey("searchText") && param.get("searchText") != null) {
+            map.put("searchText", param.get("searchText").toString());
         }
         //客户来源
         if (dataSourceCode.equals("customerFrom")) {
-            map.put("dictCode","基础资料-来源");
+            map.put("dictCode", "基础资料-来源");
             list = commonMapper.getDictionaryData(map);
         }
         // 基础资料的信息  入库原因
         if (dataSourceCode.equals("baseData")) {
-            map.put("dictCode",param.get("dictCode").toString()); // 需要前台传过dictCode
-            if (!param.containsKey("dictCode") &&  param.get("dictCode") == null) {
+            map.put("dictCode", param.get("dictCode").toString()); // 需要前台传过dictCode
+            if (!param.containsKey("dictCode") && param.get("dictCode") == null) {
                 return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.DATASOURCECODE_NOT.getMessage());
             }
             list = commonMapper.getDictionaryData(map);
@@ -768,32 +770,32 @@ public class CommonService extends BaseService<Map<String, Object>> {
         }
         //客户意向
         if (dataSourceCode.equals("customerIntention")) {
-            map.put("kindType","客户意向");
+            map.put("kindType", "客户意向");
             list = commonMapper.getDataKind(map);
         }
         //留店时长
         if (dataSourceCode.equals("storeRetentionTime")) {
-            map.put("kindType","留店时长");
+            map.put("kindType", "留店时长");
             list = commonMapper.getDataKind(map);
         }
         //邀约结果
         if (dataSourceCode.equals("inviteResult")) {
-            map.put("kindType","邀约结果");
+            map.put("kindType", "邀约结果");
             list = commonMapper.getDataKind(map);
         }
         //量尺状态
         if (dataSourceCode.equals("scaleStatus")) {
-            map.put("kindType","量尺状态");
+            map.put("kindType", "量尺状态");
             list = commonMapper.getDataKind(map);
         }
         //跟进方式
         if (dataSourceCode.equals("followType")) {
-            map.put("kindType","跟进方式");
+            map.put("kindType", "跟进方式");
             list = commonMapper.getDataKind(map);
         }
         //供应商类别
         if (dataSourceCode.equals("supType")) {
-            map.put("kindType","供应商类别");
+            map.put("kindType", "供应商类别");
             list = commonMapper.getDataKind(map);
         }
         // 初始款项
@@ -811,11 +813,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
 
-
-
     /**
-     * @desc   : 获取供应商和客户数据
-     * @date   : 2024/3/13 15:09
+     * @desc : 获取供应商和客户数据
+     * @date : 2024/3/13 15:09
      * @author : 寇珊珊
      */
     public ResponseResultVO<List<Map<String, Object>>> getSupplierAndCustomer(Map<String, Object> param) {
@@ -824,11 +824,11 @@ public class CommonService extends BaseService<Map<String, Object>> {
         return ResponseResultUtil.success(list);
 
     }
-    
-    
+
+
     /**
-     * @desc   : 获取供应商和客户数据(分页)
-     * @date   : 2024/3/13 14:02
+     * @desc : 获取供应商和客户数据(分页)
+     * @date : 2024/3/13 14:02
      * @author : 寇珊珊
      */
     public ResponseResultVO<PageList<Map<String, Object>>> getSupplierAndCustomerByPage(Map<String, Object> param) {
@@ -852,8 +852,8 @@ public class CommonService extends BaseService<Map<String, Object>> {
 
 
     /**
-     * @desc   : 获取组织机构
-     * @date   : 2024/3/13 17:01
+     * @desc : 获取组织机构
+     * @date : 2024/3/13 17:01
      * @author : 寇珊珊
      */
     public ResponseResultVO<List<Map<String, Object>>> getOrganization(Map<String, Object> param) {
@@ -864,8 +864,8 @@ public class CommonService extends BaseService<Map<String, Object>> {
 
 
     /**
-     * @desc   : 获取组织机构（分页）
-     * @date   : 2024/3/13 17:01
+     * @desc : 获取组织机构（分页）
+     * @date : 2024/3/13 17:01
      * @author : 寇珊珊
      */
     public ResponseResultVO<PageList<Map<String, Object>>> getOrganizationByPage(Map<String, Object> param) {
@@ -887,9 +887,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取资金账户（下拉）
+     * @desc : 获取资金账户（下拉）
      * @author : 付斌
-     * @date   : 2024-03-14 11:34
+     * @date : 2024-03-14 11:34
      */
     public ResponseResultVO<List<Map<String, Object>>> getMac(Map<String, Object> param) {
         // 获取组织机构
@@ -925,9 +925,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取多业务部门
+     * @desc : 获取多业务部门
      * @author : 付斌
-     * @date   : 2024-03-20 16:54
+     * @date : 2024-03-20 16:54
      */
     public ResponseResultVO<List<Map<String, Object>>> selectMultiOrg(Map<String, Object> param) {
         List<Map<String, Object>> list = commonMapper.selectMultiOrg(param);
@@ -935,9 +935,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取多业务员
+     * @desc : 获取多业务员
      * @author : 付斌
-     * @date   : 2024-03-20 16:54
+     * @date : 2024-03-20 16:54
      */
     public ResponseResultVO<List<Map<String, Object>>> selectMultiStaff(Map<String, Object> param) {
         List<Map<String, Object>> list = commonMapper.selectMultiStaff(param);
@@ -945,9 +945,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 组织仓库
+     * @desc : 组织仓库
      * @author : 宋扬
-     * @date   : 2024/3/22 15:47
+     * @date : 2024/3/22 15:47
      */
     public ResponseResultVO<List<Map<String, Object>>> selectMultiWarehouse(Map<String, Object> param) {
         List<Map<String, Object>> list = commonMapper.selectMultiWarehouse(param);
@@ -955,9 +955,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 组织资金账户
+     * @desc : 组织资金账户
      * @author : 宋扬
-     * @date   : 2024/3/22 15:54
+     * @date : 2024/3/22 15:54
      */
     public ResponseResultVO<List<Map<String, Object>>> selectMultiMoneyAccount(Map<String, Object> param) {
         List<Map<String, Object>> list = commonMapper.selectMultiMoneyAccount(param);
@@ -965,9 +965,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取商品（采购订单开单用）
+     * @desc : 获取商品（采购订单开单用）
      * @author : 常皓宁
-     * @date   : 2024/3/9 10:08
+     * @date : 2024/3/9 10:08
      */
     public ResponseResultVO<List<Map<String, Object>>> getGoodsForPurchaseReturn(Map<String, Object> param) {
         // 获取系统基础数据
@@ -976,9 +976,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取商品（采购订单开单用）（分页）
+     * @desc : 获取商品（采购订单开单用）（分页）
      * @author : 常皓宁
-     * @date   : 2024/3/9 10:08
+     * @date : 2024/3/9 10:08
      */
     public ResponseResultVO<PageList<Map<String, Object>>> getGoodsForPurchaseReturnByPage(Map<String, Object> param) {
         // 校验分页参数
@@ -992,9 +992,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取员工的范围权限类型
+     * @desc : 获取员工的范围权限类型
      * @author : 常皓宁
-     * @date   : 2024/4/2 10:06
+     * @date : 2024/4/2 10:06
      */
     public ResponseResultVO<List<Map<String, Object>>> getPurviewType(Map<String, Object> param) {
         // 获取供应商和客户
@@ -1003,9 +1003,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取组织仓库
+     * @desc : 获取组织仓库
      * @author : 付斌
-     * @date   : 2024-04-10 13:30
+     * @date : 2024-04-10 13:30
      */
     public ResponseResultVO<List<Map<String, Object>>> getOrgWh(Map<String, Object> param) {
         List<Map<String, Object>> list = commonMapper.getOrgWh(param);
@@ -1018,8 +1018,8 @@ public class CommonService extends BaseService<Map<String, Object>> {
 
 
     /**
-     * @desc   : 获取商品（其他入库开单用）
-     * @date   : 2024/4/20 11:21
+     * @desc : 获取商品（其他入库开单用）
+     * @date : 2024/4/20 11:21
      * @author : 寇珊珊
      */
     public ResponseResultVO<List<Map<String, Object>>> getGoodsForInto(Map<String, Object> param) {
@@ -1029,8 +1029,8 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取商品（其他入库开单用）（分页）
-     * @date   : 2024/4/20 11:21
+     * @desc : 获取商品（其他入库开单用）（分页）
+     * @date : 2024/4/20 11:21
      * @author : 寇珊珊
      */
     public ResponseResultVO<PageList<Map<String, Object>>> getGoodsForIntoByPage(Map<String, Object> param) {
@@ -1045,8 +1045,8 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 销售分析-我的 门店助手的 销售金额 收款金额 库存成本
-     * @date   : 2024/4/20 11:21
+     * @desc : 销售分析-我的 门店助手的 销售金额 收款金额 库存成本
+     * @date : 2024/4/20 11:21
      * @author : 姜永辉
      */
     public ResponseResultVO<Map<String, Object>> getHomeOrderRecCost(Map<String, Object> param) {
@@ -1054,6 +1054,7 @@ public class CommonService extends BaseService<Map<String, Object>> {
         JSONObject jObject = JSONObject.parseObject(m.get("f_get_home_order_rec_cost").toString());
         return ResponseResultUtil.success(jObject);
     }
+
     /**
      * @desc :  获取商品系列不分页
      * @author : 刘尧
@@ -1085,12 +1086,43 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取公司
+     * @desc : 获取公司
      * @author : 付斌
-     * @date   : 2024-06-19 10:00
+     * @date : 2024-06-19 10:00
      */
     public ResponseResultVO<List<Map<String, Object>>> getCompany(Map<String, Object> param) {
         List<Map<String, Object>> list = commonMapper.getCompany(param);
         return ResponseResultUtil.success(list);
     }
+
+    /**
+     * @desc : 查询首页试试数据
+     * @author : 付斌
+     * @date : 2024-06-19 11:02
+     */
+    public ResponseResultVO<Map<String, Object>> getRealTimeData(Map<String, Object> param) {
+        String realTimeDataType = param.get("realTimeDataType").toString();
+        if ("经营日报".equals(realTimeDataType)) {
+            param.put("createTimeStart", LocalDate.now());
+            param.put("createTimeEnd", LocalDate.now().plusDays(1));
+        } else if ("经营月报".equals(realTimeDataType)) {
+            param.put("createTimeStart", LocalDate.now().withDayOfMonth(1));
+            param.put("createTimeEnd", LocalDate.now().plusMonths(1).withDayOfMonth(1));
+        }
+        List<Map<String, Object>> list1 = commonMapper.getRealTimeData1(param);
+        List<Map<String, Object>> list2 = commonMapper.getRealTimeData2(param);
+        List<Map<String, Object>> list3 = commonMapper.getRealTimeData3(param);
+        List<Map<String, Object>> list4 = commonMapper.getRealTimeData4(param);
+
+        Map<String, Object> res = new HashMap<>();
+        res.put("orderQty", list1.get(0).get("orderQty"));
+        res.put("orderAmt", list1.get(0).get("orderAmt"));
+        res.put("outQty", list2.get(0).get("outQty"));
+        res.put("outAmt", list2.get(0).get("outAmt"));
+        res.put("returnQty", list3.get(0).get("returnQty"));
+        res.put("returnAmt", list3.get(0).get("returnAmt"));
+        res.put("cusQty", list4.get(0).get("cusQty"));
+        res.put("cusAmt", list4.get(0).get("cusAmt"));
+        return ResponseResultUtil.success(res);
+    }
 }

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleOrderService.java

@@ -301,6 +301,9 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                 inboundVO.setMakeStaff(outboundVO.getMakeStaff());
                 //公司
                 inboundVO.setCpId(outboundVO.getCpId());
+                // 来源Id
+                inboundVO.setFromId(outboundVO.getFromId());
+                inboundVO.setFromNo(outboundVO.getFromNo());
                 //实体转换
                 Inbound inbound = inboundConvert.convertToPo(inboundVO);
                 inboundMapper.insert(inbound);
@@ -315,14 +318,18 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                     //入库类型
                     inboundItemVO.setIntoType(inboundVO.getIntoType());
                     //入库状态等于已入库 更新合计入库数量/金额 = 入库中数量/入库中金额
+                    BigDecimal costAmount = outboundItemVO.getOutQty().multiply(outboundItemVO.getPriceOut()).setScale(2, BigDecimal.ROUND_HALF_UP);
                     inboundItemVO
+                            .setFromId(outboundItemVO.getFromId())
+                            .setFromItemId(outboundItemVO.getFromItemId())
                             .setPriceInto(outboundItemVO.getPriceOut())
                             .setIntoQty(outboundItemVO.getOutQty())
                             .setIntoAmt(outboundItemVO.getOutAmt())
+                            .setIntoAmt(costAmount)
                             .setIntoingQty(BigDecimal.ZERO)
                             .setIntoingAmt(BigDecimal.ZERO)
                             .setCostPrice(outboundItemVO.getPriceOut())
-                            .setCostAmt(outboundItemVO.getOutQty().multiply(outboundItemVO.getPriceOut()).setScale(2, BigDecimal.ROUND_HALF_UP))
+                            .setCostAmt(costAmount)
                     ;
                     //入库状态
                     inboundItemVO.setIntoStatus(inboundVO.getIntoStatus());
@@ -343,6 +350,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                     // 商品
                     inboundItemVO.setSkuModel(outboundItemVO.getSkuModel());
                     inboundItemVO.setSkuName(outboundItemVO.getSkuName());
+                    // 来源Id
                     //实体转换
                     InboundItem inboundItem = inboundItemConvert.convertToPo(inboundItemVO);
                     inboundItemMapper.insert(inboundItem);
@@ -466,7 +474,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                     ErrorCodeEnum.OUTBOUND_ITEM_NOT_EXIST.getMessage());
         }
         for (OutboundItemVO outboundItemVO : outboundVO.getItemList()) {
-
+            outboundItemVO.setItemId(null );
             //region 将库存需要的参数赋值
             outboundItemVO.setInventoryType(Constant.InventoryType.OUTBOUND.getName());
             outboundItemVO.setInventoryDocCode(Constant.InventoryDocCode.SALE_ORDER.getValue());

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

@@ -297,7 +297,9 @@ public class OrderService extends BaseService<Order> {
             for (OrderItemVO orderItemVO : orderVO.getItemList()) {
                 OrderItem orderItem = orderItemConvert.convertToPo(orderItemVO);
                 orderItem.setOrderId(order.getOrderId()).setCpId(order.getCpId()).setOutStatus(Constant.OutStatus.DAICHUKU.getName());
+                orderItem.setItemId(UUID.randomUUID().toString());
                 orderItemMapper.insert(orderItem);
+                orderItemVO.setItemId(orderItem.getItemId());
             }
         }
 
@@ -446,14 +448,16 @@ public class OrderService extends BaseService<Order> {
                 orderItemVO.setOutingAmt(orderItemVO.getItemAmt());
                 orderItemVO.setPriceOut(orderItemVO.getPriceSale());
                 orderItemVO.setFromId(orderVO.getOrderId());
-                orderItemVO.setFromItemId(orderItemVO.getFromItemId());
+                orderItemVO.setFromItemId(orderItemVO.getItemId());
             }
             OutboundVO outboundVO = outBoundDtoConvert.convertToPo(orderVO);
             outboundVO.setOutDate(LocalDate.now());
             outboundVO.setOutingQty(orderVO.getSumQuantity());
-            outboundVO.setOutingAmt(orderVO.getSumAmount());
+            outboundVO.setOutingAmt(orderVO.getFactAmt());
             outboundVO.setFlgAutoHandle(orderVO.getFlgAutoHandle());
             outboundVO.setFlgHandleSetting(orderVO.getFlgHandleSetting());
+            outboundVO.setFromId(order.getOrderId());
+            outboundVO.setFromNo(order.getOrderNo());
             outboundSaleOrderService.inventoryOUtBond(outboundVO);
         }