Merge remote-tracking branch 'origin/master'

sd-business/src/main/java/com/sd/business/controller/order/OrderPackageBomController.java

@@ -1,20 +0,0 @@
-package com.sd.business.controller.order;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-/**
- * <p>
- * 订单sku bom 关联 前端控制器
- * </p>
- *
- * @author
- * @since 2023-07-24
- */
-@RestController
-@RequestMapping("/orderPackageBom")
-public class OrderPackageBomController {
-
-
-}

sd-business/src/main/java/com/sd/business/controller/order/OrderSkuBomController.java

@@ -1,67 +0,0 @@
-package com.sd.business.controller.order;
-
-import com.sd.business.entity.order.dto.OrderSkuBomDto;
-import com.sd.business.service.order.OrderSkuBomService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-/**
- * <p>
- * 订单sku bom 关联 前端控制器
- * </p>
- *
- * @author
- * @since 2023-07-10
- */
-@RestController
-@RequestMapping("/orderSkuBom")
-public class OrderSkuBomController {
-
-    @Autowired
-    private OrderSkuBomService orderSkuBomService;
-
-    // /**
-    //  * 订单sku bom 关联分页
-    //  */
-    // @PostMapping("/page")
-    // public Page<OrderSkuBomVo> page(@RequestBody OrderSkuBomSelectDto dto) {
-    //     return orderSkuBomService.getPage(dto);
-    // }
-    //
-    // /**
-    //  * 订单sku bom 关联明细
-    //  */
-    // @PostMapping("/detail")
-    // public OrderSkuBomVo detail(@RequestBody BaseSelectDto dto) {
-    //     return orderSkuBomService.detail(dto.getId());
-    // }
-    //
-    // /**
-    //  * 订单sku bom 关联新增
-    //  */
-    // @PostMapping("/add")
-    // public void add(@RequestBody OrderSkuBomDto orderSkuBomDto) {
-    //     orderSkuBomService.add(orderSkuBomDto);
-    // }
-
-    /**
-     * 订单sku bom 关联编辑
-     */
-    @PostMapping("/edit")
-    public void edit(@RequestBody OrderSkuBomDto orderSkuBomDto) {
-        orderSkuBomService.edit(orderSkuBomDto);
-    }
-
-    // /**
-    //  * 订单sku bom 关联删除
-    //  */
-    // @PostMapping("/delete")
-    // public void delete(@RequestBody BaseSelectDto dto) {
-    //     orderSkuBomService.delete(dto.getId());
-    // }
-
-}

sd-business/src/main/java/com/sd/business/controller/order/OrderSkuController.java

@@ -1,7 +1,6 @@
 package com.sd.business.controller.order;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sd.business.entity.order.dto.OrderSkuDto;
 import com.sd.business.entity.order.dto.OrderSkuSelectDto;
 import com.sd.business.entity.order.vo.OrderSkuVo;
 import com.sd.business.service.order.OrderSkuService;
@@ -35,36 +34,4 @@ public class OrderSkuController {
         return orderSkuService.getPage(dto);
     }
 
-    // /**
-    //  * 订单sku明细
-    //  */
-    // @PostMapping("/detail")
-    // public OrderSkuVo detail(@RequestBody BaseSelectDto dto) {
-    //     return orderSkuService.detail(dto.getId());
-    // }
-    //
-    // /**
-    //  * 订单sku新增
-    //  */
-    // @PostMapping("/add")
-    // public void add(@RequestBody OrderSkuDto orderSkuDto) {
-    //     orderSkuService.add(orderSkuDto);
-    // }
-
-    /**
-     * 订单sku编辑
-     */
-    @PostMapping("/edit")
-    public void edit(@RequestBody OrderSkuDto orderSkuDto) {
-        orderSkuService.edit(orderSkuDto);
-    }
-
-    // /**
-    //  * 订单sku删除
-    //  */
-    // @PostMapping("/delete")
-    // public void delete(@RequestBody BaseSelectDto dto) {
-    //     orderSkuService.delete(dto.getId());
-    // }
-
 }

sd-business/src/main/java/com/sd/business/controller/statement/StatementOfAccountController.java

@@ -5,10 +5,7 @@ import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.sd.business.entity.statement.dto.FileUploadDto;
 import com.sd.business.entity.statement.dto.StatementOfAccountDto;
 import com.sd.business.entity.statement.dto.StatementOfAccountSelectDto;
-import com.sd.business.entity.statement.vo.DocumentByBomVo;
-import com.sd.business.entity.statement.vo.DocumentBySkuVo;
-import com.sd.business.entity.statement.vo.ReconciliationDetailVo;
-import com.sd.business.entity.statement.vo.StatementOfAccountVo;
+import com.sd.business.entity.statement.vo.*;
 import com.sd.business.service.statement.StatementOfAccountService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -107,4 +104,12 @@ public class StatementOfAccountController {
         return statementOfAccountService.getDocumentByBom(dto.getId());
     }
 
+    /**
+     * 订单对账
+     */
+    @PostMapping("/getDocumentByOrder")
+    public List<DocumentByOrderVo> getDocumentByOrder(@RequestBody BaseSelectDto dto) {
+        return statementOfAccountService.getDocumentByOrder(dto.getId());
+    }
+
 }

sd-business/src/main/java/com/sd/business/entity/order/dto/OrderSkuDto.java

@@ -19,11 +19,6 @@ import java.util.List;
 public class OrderSkuDto extends OrderSku {
 
     /**
-     * 更新类型
-     */
-    private Integer updateType;
-
-    /**
      * 订单号
      */
     private String orderCode;

sd-business/src/main/java/com/sd/business/entity/statement/vo/DocumentByOrderVo.java

@@ -0,0 +1,145 @@
+package com.sd.business.entity.statement.vo;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Getter
+@Setter
+@Builder
+public class DocumentByOrderVo {
+
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
+    /**
+     * 万里牛订单创建时间
+     */
+    private Date wlnCreateTime;
+
+    /**
+     * 订单号
+     */
+    private String code;
+
+    /**
+     * 万里牛订单号
+     */
+    private String wlnCode;
+
+    /**
+     * sku规格列表
+     */
+    private List<SkuSpec> skuSpecList;
+
+    @Getter
+    @Setter
+    @Builder
+    public static class SkuSpec {
+
+        /**
+         * sku规格id
+         */
+        private Long skuSpecId;
+
+        /**
+         * sku规格品号
+         */
+        private String skuSpecCode;
+
+        /**
+         * sku规格品名
+         */
+        private String skuSpecName;
+
+        /**
+         * 数量
+         */
+        private BigDecimal quantity;
+
+        /**
+         * sku单价
+         */
+        private BigDecimal unitPrice;
+
+        /**
+         * 小计
+         */
+        private BigDecimal subtotal;
+
+        /**
+         * 合计
+         */
+        private BigDecimal total;
+
+        /**
+         * bom规格列表
+         */
+        private List<BomSpec> bomSpecList;
+
+    }
+
+    @Getter
+    @Setter
+    @Builder
+    public static class BomSpec {
+
+        /**
+         * bom规格id
+         */
+        private Long bomSpecId;
+
+        /**
+         * bom规格品号
+         */
+        private String bomSpecCode;
+
+        /**
+         * bom规格品名
+         */
+        private String bomSpecName;
+
+        /**
+         * 数量
+         */
+        private BigDecimal quantity;
+
+        /**
+         * bom单价
+         */
+        private BigDecimal unitPrice;
+
+        /**
+         * 激光logo汇总
+         */
+        private BigDecimal laserLogoSummary;
+
+        /**
+         * 激光线粒体汇总
+         */
+        private BigDecimal laserMitochondrialSummary;
+
+        /**
+         * 代发费汇总
+         */
+        private BigDecimal lssueFeeSummary;
+
+        /**
+         * 快递包材费汇总
+         */
+        private BigDecimal deliveryMaterialsFeeSummary;
+
+        /**
+         * 包装人工费汇总
+         */
+        private BigDecimal packingLaborSummary;
+
+    }
+
+}

sd-business/src/main/java/com/sd/business/mapper/order/OrderSkuBomMapper.java

@@ -1,11 +1,7 @@
 package com.sd.business.mapper.order;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.sd.business.entity.order.po.OrderSkuBom;
-import com.sd.business.entity.order.vo.OrderSkuBomVo;
-import org.apache.ibatis.annotations.Param;
 
 
 /**
@@ -18,9 +14,4 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface OrderSkuBomMapper extends BaseMapper<OrderSkuBom> {
 
-    /**
-     * 订单sku bom 关联分页
-     */
-    Page<OrderSkuBomVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<OrderSkuBom> wrapper);
-
 }

sd-business/src/main/java/com/sd/business/service/department/impl/DepartmentServiceImpl.java

@@ -6,7 +6,6 @@ import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.ServiceException;
@@ -128,11 +127,9 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
             oldUser.setPassword(SecurityUtils.encryptPassword(departmentDto.getAdminPassword()));
             sysUserService.updateById(oldUser);
         } else if (ObjectUtil.notEqual(department.getAdminPassword(), departmentDto.getAdminPassword())) {
-            sysUserService.update(Wrappers.<SysUser>lambdaUpdate()
+            sysUserService.update(Wrappers.lambdaUpdate(SysUser.class)
                     .eq(SysUser::getUserName, departmentDto.getAdminUsername())
                     .set(SysUser::getPassword, SecurityUtils.encryptPassword(departmentDto.getAdminPassword()))
-                    .set(BaseEntity::getCreateBy, SecurityUtils.getUsername())
-                    .set(BaseEntity::getCreateTime, new Date())
             );
         }
 

sd-business/src/main/java/com/sd/business/service/order/OrderSkuBomService.java

@@ -1,11 +1,7 @@
 package com.sd.business.service.order;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.service.BaseService;
-import com.sd.business.entity.order.dto.OrderSkuBomDto;
-import com.sd.business.entity.order.dto.OrderSkuBomSelectDto;
 import com.sd.business.entity.order.po.OrderSkuBom;
-import com.sd.business.entity.order.vo.OrderSkuBomVo;
 
 
 /**
@@ -18,29 +14,4 @@ import com.sd.business.entity.order.vo.OrderSkuBomVo;
  */
 public interface OrderSkuBomService extends BaseService<OrderSkuBom> {
 
-    /**
-     * 订单sku bom 关联分页
-     */
-    Page<OrderSkuBomVo> getPage(OrderSkuBomSelectDto dto);
-
-    /**
-     * 订单sku bom 关联明细
-     */
-    OrderSkuBomVo detail(Long id);
-
-    /**
-     * 订单sku bom 关联新增
-     */
-    void add(OrderSkuBomDto orderSkuBomDto);
-
-    /**
-     * 订单sku bom 关联编辑
-     */
-    void edit(OrderSkuBomDto orderSkuBomDto);
-
-    /**
-     * 订单sku bom 关联删除
-     */
-    void delete(Long id);
-
 }

sd-business/src/main/java/com/sd/business/service/order/OrderSkuService.java

@@ -2,7 +2,6 @@ package com.sd.business.service.order;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.service.BaseService;
-import com.sd.business.entity.order.dto.OrderSkuDto;
 import com.sd.business.entity.order.dto.OrderSkuSelectDto;
 import com.sd.business.entity.order.po.OrderSku;
 import com.sd.business.entity.order.vo.OrderSkuVo;
@@ -23,24 +22,4 @@ public interface OrderSkuService extends BaseService<OrderSku> {
      */
     Page<OrderSkuVo> getPage(OrderSkuSelectDto dto);
 
-    /**
-     * 订单sku明细
-     */
-    OrderSkuVo detail(Long id);
-
-    /**
-     * 订单sku新增
-     */
-    void add(OrderSkuDto orderSkuDto);
-
-    /**
-     * 订单sku编辑
-     */
-    void edit(OrderSkuDto orderSkuDto);
-
-    /**
-     * 订单sku删除
-     */
-    void delete(Long id);
-
 }

sd-business/src/main/java/com/sd/business/service/order/impl/OrderServiceImpl.java

@@ -176,20 +176,22 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
                 .peek(item -> item.setStockPreparationStatus(StatusConstant.NO))
                 .map(item -> (OrderSku) item)
                 .collect(Collectors.toList());
-        orderSkuService.saveOrUpdateBatch(tempOrderSkuList);
+        orderSkuService.editLinked(tempOrderSkuList, OrderSku::getOrderId, orderDto.getId());
 
         List<OrderSkuBom> orderSkuBomList = orderSkuList.stream()
                 .flatMap(orderSku -> orderSku.getOrderSkuBomList().stream()
                         .peek(orderSkuBom -> orderSkuBom.setOrderId(orderDto.getId()))
                         .peek(orderSkuBom -> orderSkuBom.setOrderSkuId(orderSku.getId())))
                 .collect(Collectors.toList());
-        orderSkuBomService.saveOrUpdateBatch(orderSkuBomList);
-
-        OrderOperatingLog orderOperatingLog = new OrderOperatingLog();
-        orderOperatingLog.setType(orderDto.getUpdateType());
-        orderOperatingLog.setOrderId(orderDto.getId());
-        orderOperatingLog.setOrderCode(orderDto.getCode());
-        orderOperatingLogService.save(orderOperatingLog);
+        orderSkuBomService.editLinked(orderSkuBomList, OrderSkuBom::getOrderId, orderDto.getId());
+
+        if (orderDto.getUpdateType() != null) {
+            OrderOperatingLog orderOperatingLog = new OrderOperatingLog();
+            orderOperatingLog.setType(orderDto.getUpdateType());
+            orderOperatingLog.setOrderId(orderDto.getId());
+            orderOperatingLog.setOrderCode(orderDto.getCode());
+            orderOperatingLogService.save(orderOperatingLog);
+        }
     }
 
     @Transactional(rollbackFor = Exception.class)

sd-business/src/main/java/com/sd/business/service/order/impl/OrderSkuBomServiceImpl.java

@@ -1,20 +1,10 @@
 package com.sd.business.service.order.impl;
 
-import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.sd.business.entity.order.dto.OrderSkuBomDto;
-import com.sd.business.entity.order.dto.OrderSkuBomSelectDto;
-import com.sd.business.entity.order.po.OrderOperatingLog;
 import com.sd.business.entity.order.po.OrderSkuBom;
-import com.sd.business.entity.order.vo.OrderSkuBomVo;
 import com.sd.business.mapper.order.OrderSkuBomMapper;
-import com.sd.business.service.order.OrderOperatingLogService;
 import com.sd.business.service.order.OrderSkuBomService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 
 /**
@@ -28,43 +18,4 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class OrderSkuBomServiceImpl extends ServiceImpl<OrderSkuBomMapper, OrderSkuBom> implements OrderSkuBomService {
 
-    @Autowired
-    private OrderOperatingLogService orderOperatingLogService;
-
-    @Override
-    public Page<OrderSkuBomVo> getPage(OrderSkuBomSelectDto dto) {
-        IWrapper<OrderSkuBom> wrapper = getWrapper();
-        wrapper.orderByDesc("osb", OrderSkuBom::getId);
-        Page<OrderSkuBomVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
-        return page;
-    }
-
-    @Override
-    public OrderSkuBomVo detail(Long id) {
-        OrderSkuBom OrderSkuBom = this.getById(id);
-        OrderSkuBomVo result = BeanUtil.toBean(OrderSkuBom, OrderSkuBomVo.class);
-        return result;
-    }
-
-    @Override
-    public void add(OrderSkuBomDto orderSkuBomDto) {
-        this.save(orderSkuBomDto);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void edit(OrderSkuBomDto orderSkuBomDto) {
-        this.updateById(orderSkuBomDto);
-        OrderOperatingLog orderOperatingLog = new OrderOperatingLog();
-        orderOperatingLog.setType(orderSkuBomDto.getUpdateType());
-        orderOperatingLog.setOrderId(orderSkuBomDto.getOrderId());
-        orderOperatingLog.setOrderCode(orderOperatingLog.getOrderCode());
-        orderOperatingLogService.save(orderOperatingLog);
-    }
-
-    @Override
-    public void delete(Long id) {
-        this.removeById(id);
-    }
-
 }

sd-business/src/main/java/com/sd/business/service/order/impl/OrderSkuServiceImpl.java

@@ -1,24 +1,18 @@
 package com.sd.business.service.order.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.sd.business.entity.bom.po.BomSpec;
 import com.sd.business.entity.department.po.Department;
-import com.sd.business.entity.order.dto.OrderSkuDto;
 import com.sd.business.entity.order.dto.OrderSkuSelectDto;
 import com.sd.business.entity.order.po.OrderInfo;
-import com.sd.business.entity.order.po.OrderOperatingLog;
 import com.sd.business.entity.order.po.OrderSku;
 import com.sd.business.entity.order.vo.OrderSkuVo;
 import com.sd.business.entity.sku.po.SkuSpec;
 import com.sd.business.mapper.order.OrderSkuMapper;
-import com.sd.business.service.order.OrderOperatingLogService;
 import com.sd.business.service.order.OrderSkuService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 
 /**
@@ -32,9 +26,6 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class OrderSkuServiceImpl extends ServiceImpl<OrderSkuMapper, OrderSku> implements OrderSkuService {
 
-    @Autowired
-    private OrderOperatingLogService orderOperatingLogService;
-
     @Override
     public Page<OrderSkuVo> getPage(OrderSkuSelectDto dto) {
         IWrapper<OrderSku> wrapper = getWrapper();
@@ -57,32 +48,4 @@ public class OrderSkuServiceImpl extends ServiceImpl<OrderSkuMapper, OrderSku> i
         return page;
     }
 
-    @Override
-    public OrderSkuVo detail(Long id) {
-        OrderSku OrderSku = this.getById(id);
-        OrderSkuVo result = BeanUtil.toBean(OrderSku, OrderSkuVo.class);
-        return result;
-    }
-
-    @Override
-    public void add(OrderSkuDto orderSkuDto) {
-        this.save(orderSkuDto);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void edit(OrderSkuDto orderSkuDto) {
-        this.updateById(orderSkuDto);
-        OrderOperatingLog orderOperatingLog = new OrderOperatingLog();
-        orderOperatingLog.setType(orderSkuDto.getUpdateType());
-        orderOperatingLog.setOrderId(orderSkuDto.getOrderId());
-        orderOperatingLog.setOrderCode(orderSkuDto.getOrderCode());
-        orderOperatingLogService.save(orderOperatingLog);
-    }
-
-    @Override
-    public void delete(Long id) {
-        this.removeById(id);
-    }
-
 }

sd-business/src/main/java/com/sd/business/service/statement/StatementOfAccountService.java

@@ -6,10 +6,7 @@ import com.sd.business.entity.statement.dto.FileUploadDto;
 import com.sd.business.entity.statement.dto.StatementOfAccountDto;
 import com.sd.business.entity.statement.dto.StatementOfAccountSelectDto;
 import com.sd.business.entity.statement.po.StatementOfAccount;
-import com.sd.business.entity.statement.vo.DocumentByBomVo;
-import com.sd.business.entity.statement.vo.DocumentBySkuVo;
-import com.sd.business.entity.statement.vo.ReconciliationDetailVo;
-import com.sd.business.entity.statement.vo.StatementOfAccountVo;
+import com.sd.business.entity.statement.vo.*;
 
 import java.util.List;
 
@@ -64,4 +61,9 @@ public interface StatementOfAccountService extends BaseService<StatementOfAccoun
      */
     List<DocumentByBomVo> getDocumentByBom(Long statementOfAccountId);
 
+    /**
+     * 订单对账
+     */
+    List<DocumentByOrderVo> getDocumentByOrder(Long statementOfAccountId);
+
 }

sd-business/src/main/java/com/sd/business/service/statement/impl/StatementOfAccountServiceImpl.java

@@ -17,10 +17,7 @@ import com.sd.business.entity.statement.dto.FileUploadDto;
 import com.sd.business.entity.statement.dto.StatementOfAccountDto;
 import com.sd.business.entity.statement.dto.StatementOfAccountSelectDto;
 import com.sd.business.entity.statement.po.StatementOfAccount;
-import com.sd.business.entity.statement.vo.DocumentByBomVo;
-import com.sd.business.entity.statement.vo.DocumentBySkuVo;
-import com.sd.business.entity.statement.vo.ReconciliationDetailVo;
-import com.sd.business.entity.statement.vo.StatementOfAccountVo;
+import com.sd.business.entity.statement.vo.*;
 import com.sd.business.mapper.statement.StatementOfAccountMapper;
 import com.sd.business.service.bom.BomSpecService;
 import com.sd.business.service.department.DepartmentService;
@@ -212,14 +209,14 @@ public class StatementOfAccountServiceImpl extends ServiceImpl<StatementOfAccoun
     public List<DocumentBySkuVo> getDocumentBySku(Long statementOfAccountId) {
 
         // 获取订单id列表
-        List<Long> ordedrIdList = getOrderIdList(statementOfAccountId);
+        List<Long> orderIdList = getOrderIdList(statementOfAccountId);
 
-        if (ordedrIdList.size() == 0) {
+        if (orderIdList.size() == 0) {
             return Collections.emptyList();
         }
 
         // 获取订单sku
-        List<OrderSku> orderSkuList = orderSkuService.list(q -> q.in(OrderSku::getOrderId, ordedrIdList));
+        List<OrderSku> orderSkuList = orderSkuService.list(q -> q.in(OrderSku::getOrderId, orderIdList));
 
         // 生成结果集
         List<DocumentBySkuVo> documentBySkuVoList = orderSkuList.stream()
@@ -264,14 +261,14 @@ public class StatementOfAccountServiceImpl extends ServiceImpl<StatementOfAccoun
     public List<DocumentByBomVo> getDocumentByBom(Long statementOfAccountId) {
 
         // 获取订单id列表
-        List<Long> ordedrIdList = getOrderIdList(statementOfAccountId);
+        List<Long> orderIdList = getOrderIdList(statementOfAccountId);
 
-        if (ordedrIdList.size() == 0) {
+        if (orderIdList.size() == 0) {
             return Collections.emptyList();
         }
 
         // 获取订单sku
-        List<OrderSku> orderSkuList = orderSkuService.list(q -> q.in(OrderSku::getOrderId, ordedrIdList));
+        List<OrderSku> orderSkuList = orderSkuService.list(q -> q.in(OrderSku::getOrderId, orderIdList));
 
         // 主材bom
         List<DocumentByBomVo> result = orderSkuList.stream()
@@ -325,7 +322,7 @@ public class StatementOfAccountServiceImpl extends ServiceImpl<StatementOfAccoun
         result = new ArrayList<>(documentByBomVoCollection);
 
         // 包材bom
-        List<OrderSkuBom> orderSkuBomList = orderSkuBomService.list(q -> q.in(OrderSkuBom::getOrderId, ordedrIdList));
+        List<OrderSkuBom> orderSkuBomList = orderSkuBomService.list(q -> q.in(OrderSkuBom::getOrderId, orderIdList));
         List<DocumentByBomVo> bomVoList = orderSkuBomList.stream().map(item ->
                 DocumentByBomVo.builder()
                         .bomSpecId(item.getBomSpecId())
@@ -362,6 +359,40 @@ public class StatementOfAccountServiceImpl extends ServiceImpl<StatementOfAccoun
         return result;
     }
 
+    @Override
+    public List<DocumentByOrderVo> getDocumentByOrder(Long statementOfAccountId) {
+        Assert.notNull(statementOfAccountId, "对账单id不能为空");
+        List<OrderInfo> orderList = orderService.list(q -> q.eq(OrderInfo::getStatementOfAccountId, statementOfAccountId));
+
+        List<DocumentByOrderVo> result = orderList.stream().map(item ->
+                DocumentByOrderVo.builder()
+                        .orderId(item.getId())
+                        .wlnCreateTime(item.getWlnCreateTime())
+                        .code(item.getCode())
+                        .wlnCode(item.getWlnCode())
+                        .build()
+        ).collect(Collectors.toList());
+
+        List<Long> orderIdList = orderList.stream().map(BaseIdPo::getId).collect(Collectors.toList());
+
+        // 获取订单sku
+        List<OrderSku> orderSkuList = orderSkuService.list(q -> q.in(OrderSku::getOrderId, orderIdList));
+        List<DocumentByOrderVo.SkuSpec.SkuSpecBuilder> collect = orderSkuList.stream()
+                .map(item -> DocumentByOrderVo.SkuSpec.builder()
+                        .skuSpecId(item.getSkuSpecId())
+                        .quantity(item.getQuantity())
+                        .unitPrice(item.getUnitPrice()
+                                .add(item.getCustomProcessingFee())
+                                .add(item.getLssueFee())
+                                .add(item.getDeliveryMaterialsFee())
+                                .add(item.getPackingLabor())
+                                .add(item.getPackagingMaterialCost())
+                        )
+                ).collect(Collectors.toList());
+
+
+        return result;
+    }
 
     /**
      * 根据对账单id获取对账订单id列表

sd-business/src/main/resources/mapper/order/OrderSkuBomMapper.xml

@@ -1,19 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sd.business.mapper.order.OrderSkuBomMapper">
-    <select id="getPage" resultType="com.sd.business.entity.order.vo.OrderSkuBomVo">
-        select osb.id,
-               osb.order_id,
-               osb.order_sku_id,
-               osb.bom_spec_id,
-               osb.unit_price,
-               osb.quantity,
-               osb.create_user,
-               osb.create_time,
-               osb.update_user,
-               osb.update_time
-        from order_sku_bom osb
-            ${ew.customSqlSegment}
-    </select>
 
 </mapper>