楚江erp: 发货明细表相关接口开发

@@ -29,6 +29,12 @@ public class GetShipmentsOrderInfoBo extends BaseBo<ShipmentsOrderInfo> {
     private String id;
 
     /**
+     * 发货单编号
+     */
+    @ApiModelProperty("发货单编号")
+    private String code;
+
+    /**
      * 发货计划ID
      */
     @ApiModelProperty("发货计划ID")

@@ -26,6 +26,12 @@ public class QueryShipmentsOrderInfoBo extends BaseBo<ShipmentsOrderInfo> {
     private String id;
 
     /**
+     * 发货单编号
+     */
+    @ApiModelProperty("发货单编号")
+    private String code;
+
+    /**
      * 发货计划ID
      */
     @ApiModelProperty("发货计划ID")

+package com.lframework.xingyun.sc.bo.statistics.shipmentDetail;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.xingyun.sc.entity.ShipmentDetailStatistics;
+import java.math.BigDecimal;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.bo.BaseBo;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Data;
+
+/**
+ * <p>
+ * 发货明细统计 QueryBo
+ * </p>
+ *
+ */
+@Data
+public class QueryShipmentDetailStatisticsBo extends BaseBo<ShipmentDetailStatistics> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 发货单编号
+     */
+    @ApiModelProperty("发货单编号")
+    private String shipmentOrderNo;
+
+    /**
+     * 生产厂
+     */
+    @ApiModelProperty("生产厂")
+    private String workshopName;
+
+    /**
+     * 办事处
+     */
+    @ApiModelProperty("办事处")
+    private String deptName;
+
+    /**
+     * 区域
+     */
+    @ApiModelProperty("区域")
+    private String regionName;
+
+    /**
+     * 订货单名称
+     */
+    @ApiModelProperty("订货单名称")
+    private String orderingUnitName;
+
+    /**
+     * 牌号
+     */
+    @ApiModelProperty("牌号")
+    private String brand;
+
+    /**
+     * 厚度
+     */
+    @ApiModelProperty("厚度")
+    private Double thickness;
+
+    /**
+     * 宽度
+     */
+    @ApiModelProperty("宽度")
+    private Double width;
+
+    /**
+     * 长度
+     */
+    @ApiModelProperty("长度")
+    private Double length;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    private String status;
+
+    /**
+     * 应发数
+     */
+    @ApiModelProperty("应发数")
+    private Double quantity;
+
+    /**
+     * 实发数
+     */
+    @ApiModelProperty("实发数")
+    private Double actualShipmentQuantity;
+
+    /**
+     * 单价
+     */
+    @ApiModelProperty("单价")
+    private BigDecimal salesPrice;
+
+    /**
+     * 厚度公差正
+     */
+    @ApiModelProperty("厚度公差正")
+    private Double thicknessTolPos;
+
+    /**
+     * 厚度公差负
+     */
+    @ApiModelProperty("厚度公差负")
+    private Double thicknessTolNeg;
+
+    /**
+     * 宽度公差正
+     */
+    @ApiModelProperty("宽度公差正")
+    private Double widthTolPos;
+
+    /**
+     * 宽度公差负
+     */
+    @ApiModelProperty("宽度公差负")
+    private Double widthTolNeg;
+
+    /**
+     * 长度公差正
+     */
+    @ApiModelProperty("长度公差正")
+    private Double lengthTolPos;
+
+    /**
+     * 长度公差负
+     */
+    @ApiModelProperty("长度公差负")
+    private Double lengthTolNeg;
+
+    /**
+     * 超协价
+     */
+    @ApiModelProperty("超协价")
+    private String assessmentExceedsAgreement;
+
+    /**
+     * 运费
+     */
+    @ApiModelProperty("运费")
+    private String shippingCost;
+
+    /**
+     * 回程运费
+     */
+    @ApiModelProperty("回程运费")
+    private String returnFreight;
+
+    /**
+     * 行业
+     */
+    @ApiModelProperty("行业")
+    private String industry;
+
+    /**
+     * 备货单位名称
+     */
+    @ApiModelProperty("备货单位名称")
+    private String stockUpCompanyName;
+
+    /**
+     * 订货单编号
+     */
+    @ApiModelProperty("订货单编号")
+    private String orderNo;
+
+    /**
+     * 生产批号
+     */
+    @ApiModelProperty("生产批号")
+    private String yieldBatchNo;
+
+    /**
+     * 开票情况
+     */
+    @ApiModelProperty("开票情况")
+    private String invoicingStatus;
+
+    /**
+     * 订货日期
+     */
+    @ApiModelProperty("订货日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate orderDate;
+
+    /**
+     * 包装费
+     */
+    @ApiModelProperty("包装费")
+    private BigDecimal packagingFee;
+
+    /**
+     * 品质
+     */
+    @ApiModelProperty("品质")
+    private String quality;
+
+    /**
+     * 件数
+     */
+    @ApiModelProperty("件数")
+    private Double num;
+
+    /**
+     * 结算方式
+     */
+    @ApiModelProperty("结算方式")
+    private String settlementTerms;
+
+    /**
+     * 加工、经销
+     */
+    @ApiModelProperty("加工、经销")
+    private String processingOrDistribution;
+
+    /**
+     * 包装要求
+     */
+    @ApiModelProperty("包装要求")
+    private String packagingRequirements;
+
+    /**
+     * 发货日期
+     */
+    @ApiModelProperty("发货日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate shipmentDate;
+
+    /**
+     * 发货公司
+     */
+    @ApiModelProperty("发货公司")
+    private String supplier;
+
+    /**
+     * 客户简称
+     */
+    @ApiModelProperty("客户简称")
+    private String customerShortName;
+
+    /**
+     * 客户类型
+     */
+    @ApiModelProperty("客户类型")
+    private String customerType;
+
+    /**
+     * 创建人ID
+     */
+    @ApiModelProperty("创建人ID")
+    private String createById;
+
+    /**
+     * 更新人ID
+     */
+    @ApiModelProperty("更新人ID")
+    private String updateById;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
+    private LocalDateTime updateTime;
+
+    public QueryShipmentDetailStatisticsBo() {
+
+    }
+
+    public QueryShipmentDetailStatisticsBo(ShipmentDetailStatistics dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<ShipmentDetailStatistics> convert(ShipmentDetailStatistics dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(ShipmentDetailStatistics dto) {
+
+    }
+}

+package com.lframework.xingyun.sc.controller.statistics;
+
+import com.lframework.xingyun.sc.bo.statistics.shipmentDetail.QueryShipmentDetailStatisticsBo;
+import com.lframework.xingyun.sc.vo.statistics.shipmentDetail.QueryShipmentDetailStatisticsVo;
+import com.lframework.xingyun.sc.service.statistics.ShipmentDetailStatisticsService;
+import com.lframework.xingyun.sc.vo.statistics.shipmentDetail.CreateShipmentDetailStatisticsVo;
+import com.lframework.xingyun.sc.vo.statistics.shipmentDetail.UpdateShipmentDetailStatisticsVo;
+import com.lframework.xingyun.sc.entity.ShipmentDetailStatistics;
+import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.components.resp.InvokeResult;
+import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
+import io.swagger.annotations.ApiOperation;
+import com.lframework.starter.common.utils.CollectionUtil;
+import io.swagger.annotations.Api;
+import com.lframework.starter.web.core.controller.DefaultBaseController;
+import com.lframework.starter.web.core.annotations.security.HasPermission;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 发货明细统计 Controller
+ *
+ */
+@Api(tags = "发货明细统计")
+@Validated
+@RestController
+@RequestMapping("/statistics/shipmentDetail")
+public class ShipmentDetailStatisticsController extends DefaultBaseController {
+
+    @Resource
+    private ShipmentDetailStatisticsService shipmentDetailStatisticsService;
+
+
+    /**
+     * 查询列表
+     */
+    @ApiOperation("查询列表")
+    @HasPermission({"statistics:shipmentDetail:query"})
+    @GetMapping("/query")
+    public InvokeResult<PageResult<QueryShipmentDetailStatisticsBo>> query(@Valid QueryShipmentDetailStatisticsVo vo) {
+
+        PageResult<ShipmentDetailStatistics> pageResult = shipmentDetailStatisticsService.query(getPageIndex(vo), getPageSize(vo), vo);
+
+        List<ShipmentDetailStatistics> dataList = pageResult.getDatas();
+        List<QueryShipmentDetailStatisticsBo> results = null;
+        if (!CollectionUtil.isEmpty(dataList)) {
+            results = dataList.stream().map(QueryShipmentDetailStatisticsBo::new).collect(Collectors.toList());
+        }
+        return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
+    }
+
+    /**
+     * 新增
+     */
+    @ApiOperation("新增")
+    @HasPermission({"statistics:shipmentDetail:add"})
+    @PostMapping
+    public InvokeResult<Void> create(@Valid CreateShipmentDetailStatisticsVo vo) {
+
+        shipmentDetailStatisticsService.create(vo);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation("修改")
+    @HasPermission({"statistics:shipmentDetail:modify"})
+    @PutMapping
+    public InvokeResult<Void> update(@Valid UpdateShipmentDetailStatisticsVo vo) {
+
+        shipmentDetailStatisticsService.update(vo);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 根据发货单ID获取发货明细数据
+     */
+    @ApiOperation("根据发货单ID获取发货明细数据")
+    @HasPermission({"statistics:shipmentDetail:modify"})
+    @GetMapping("/getByShipmentOrderId")
+    public InvokeResult<List<ShipmentDetailStatistics>> getByShipmentOrderId(@NotBlank(message = "id不能为空！") String shipmentOrderId) {
+        return InvokeResultBuilder.success(shipmentDetailStatisticsService.getShipmentDetailInfo(shipmentOrderId));
+    }
+}

+package com.lframework.xingyun.sc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.math.BigDecimal;
+import com.lframework.starter.web.core.dto.BaseDto;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.lframework.starter.web.core.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+/**
+ * <p>
+ * 发货明细统计
+ * </p>
+ *
+ */
+@Data
+@TableName("shipments_detail_statistics")
+public class ShipmentDetailStatistics extends BaseEntity implements BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String CACHE_NAME = "ShipmentDetailStatistics";
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 发货单编号
+     */
+    private String shipmentOrderNo;
+
+    /**
+     * 生产厂
+     */
+    private String workshopName;
+
+    /**
+     * 办事处ID
+     */
+    @TableField(exist = false)
+    private String deptId;
+
+    /**
+     * 办事处
+     */
+    private String deptName;
+
+    /**
+     * 区域ID
+     */
+    @TableField(exist = false)
+    private String region;
+
+    /**
+     * 区域
+     */
+    private String regionName;
+
+    /**
+     * 订货单位ID
+     */
+    @TableField(exist = false)
+    private String orderingUnit;
+
+    /**
+     * 订货单位名称
+     */
+    private String orderingUnitName;
+
+    /**
+     * 牌号
+     */
+    private String brand;
+
+    /**
+     * 厚度
+     */
+    private Double thickness;
+
+    /**
+     * 宽度
+     */
+    private Double width;
+
+    /**
+     * 长度
+     */
+    private Double length;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 应发数
+     */
+    private Double quantity;
+
+    /**
+     * 实发数
+     */
+    private Double actualShipmentQuantity;
+
+    /**
+     * 单价
+     */
+    private BigDecimal salesPrice;
+
+    /**
+     * 厚度公差正
+     */
+    private Double thicknessTolPos;
+
+    /**
+     * 厚度公差负
+     */
+    private Double thicknessTolNeg;
+
+    /**
+     * 宽度公差正
+     */
+    private Double widthTolPos;
+
+    /**
+     * 宽度公差负
+     */
+    private Double widthTolNeg;
+
+    /**
+     * 长度公差正
+     */
+    private Double lengthTolPos;
+
+    /**
+     * 长度公差负
+     */
+    private Double lengthTolNeg;
+
+    /**
+     * 超协价
+     */
+    private String assessmentExceedsAgreement;
+
+    /**
+     * 运费
+     */
+    private String shippingCost;
+
+    /**
+     * 回程运费
+     */
+    private String returnFreight;
+
+    /**
+     * 行业
+     */
+    private String industry;
+
+    /**
+     * 备货单位ID
+     */
+    @TableField(exist = false)
+    private String stockUpCompany;
+
+    /**
+     * 备货单位名称
+     */
+    private String stockUpCompanyName;
+
+    /**
+     * 订货单编号
+     */
+    private String orderNo;
+
+    /**
+     * 生产批号
+     */
+    private String yieldBatchNo;
+
+    /**
+     * 开票情况
+     */
+    private String invoicingStatus;
+
+    /**
+     * 订货日期
+     */
+    private LocalDate orderDate;
+
+    /**
+     * 包装费
+     */
+    private BigDecimal packagingFee;
+
+    /**
+     * 品质
+     */
+    private String quality;
+
+    /**
+     * 件数
+     */
+    private Double num;
+
+    /**
+     * 结算方式
+     */
+    private String settlementTerms;
+
+    /**
+     * 加工、经销
+     */
+    private String processingOrDistribution;
+
+    /**
+     * 包装要求
+     */
+    private String packagingRequirements;
+
+    /**
+     * 发货日期
+     */
+    private LocalDate shipmentDate;
+
+    /**
+     * 发货公司
+     */
+    private String supplier;
+
+    /**
+     * 客户简称
+     */
+    private String customerShortName;
+
+    /**
+     * 客户类型
+     */
+    private String customerType;
+
+    /**
+     * 创建人ID
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createById;
+
+    /**
+     * 更新人ID
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateById;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+    /**
+     * 运输方式
+     */
+    private String deliveryMethod;
+
+}

@@ -31,6 +31,11 @@ public class ShipmentsOrderInfo extends BaseEntity implements BaseDto {
     private String id;
 
     /**
+     * 发货单编号
+     */
+    private String code;
+
+    /**
      * 发货计划ID
      */
     private String planId;

+package com.lframework.xingyun.sc.impl.statistics;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageInfo;
+import com.lframework.starter.web.inner.entity.SysDept;
+import com.lframework.starter.web.inner.service.system.SysDeptService;
+import com.lframework.xingyun.basedata.entity.Customer;
+import com.lframework.xingyun.basedata.service.customer.CustomerService;
+import com.lframework.xingyun.sc.entity.ShipmentDetailStatistics;
+import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
+import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.utils.OpLogUtil;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import com.lframework.starter.web.core.utils.IdUtil;
+import com.lframework.starter.common.utils.ObjectUtil;
+import com.lframework.starter.web.core.annotations.oplog.OpLog;
+import com.lframework.starter.web.core.utils.PageHelperUtil;
+import com.lframework.starter.common.utils.Assert;
+import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.sc.mappers.ShipmentDetailStatisticsMapper;
+import com.lframework.xingyun.sc.service.statistics.ShipmentDetailStatisticsService;
+import com.lframework.xingyun.sc.vo.statistics.shipmentDetail.CreateShipmentDetailStatisticsVo;
+import com.lframework.xingyun.sc.vo.statistics.shipmentDetail.QueryShipmentDetailStatisticsVo;
+import com.lframework.xingyun.sc.vo.statistics.shipmentDetail.UpdateShipmentDetailStatisticsVo;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+@Service
+public class ShipmentDetailStatisticsServiceImpl extends BaseMpServiceImpl<ShipmentDetailStatisticsMapper, ShipmentDetailStatistics> implements ShipmentDetailStatisticsService {
+
+    @Resource
+    private SysDeptService sysDeptService;
+    @Resource
+    private CustomerService customerService;
+
+
+    @Override
+    public PageResult<ShipmentDetailStatistics> query(Integer pageIndex, Integer pageSize, QueryShipmentDetailStatisticsVo vo) {
+
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<ShipmentDetailStatistics> dataList = this.query(vo);
+
+        return PageResultUtil.convert(new PageInfo<>(dataList));
+    }
+
+    @Override
+    public List<ShipmentDetailStatistics> query(QueryShipmentDetailStatisticsVo vo) {
+
+        return getBaseMapper().query(vo);
+    }
+
+    @Override
+    public ShipmentDetailStatistics findById(String id) {
+
+        return getBaseMapper().selectById(id);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "新增发货明细统计，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public String create(CreateShipmentDetailStatisticsVo vo) {
+
+        ShipmentDetailStatistics data = new ShipmentDetailStatistics();
+        data.setId(IdUtil.getUUID());
+        data.setShipmentOrderNo(vo.getShipmentOrderNo());
+        data.setWorkshopName(vo.getWorkshopName());
+        data.setDeptName(vo.getDeptName());
+        data.setRegionName(vo.getRegionName());
+        data.setOrderingUnitName(vo.getOrderingUnitName());
+        data.setBrand(vo.getBrand());
+        data.setThickness(vo.getThickness());
+        data.setWidth(vo.getWidth());
+        data.setLength(vo.getLength());
+        data.setStatus(vo.getStatus());
+        data.setQuantity(vo.getQuantity());
+        data.setActualShipmentQuantity(vo.getActualShipmentQuantity());
+        data.setSalesPrice(vo.getSalesPrice());
+        data.setThicknessTolPos(vo.getThicknessTolPos());
+        data.setThicknessTolNeg(vo.getThicknessTolNeg());
+        data.setWidthTolPos(vo.getWidthTolPos());
+        data.setWidthTolNeg(vo.getWidthTolNeg());
+        data.setLengthTolPos(vo.getLengthTolPos());
+        data.setLengthTolNeg(vo.getLengthTolNeg());
+        data.setAssessmentExceedsAgreement(vo.getAssessmentExceedsAgreement());
+        data.setShippingCost(vo.getShippingCost());
+        data.setReturnFreight(vo.getReturnFreight());
+        data.setIndustry(vo.getIndustry());
+        data.setStockUpCompanyName(vo.getStockUpCompanyName());
+        data.setOrderNo(vo.getOrderNo());
+        data.setYieldBatchNo(vo.getYieldBatchNo());
+        data.setInvoicingStatus(vo.getInvoicingStatus());
+        data.setOrderDate(vo.getOrderDate());
+        data.setPackagingFee(vo.getPackagingFee());
+        data.setQuality(vo.getQuality());
+        data.setNum(vo.getNum());
+        data.setSettlementTerms(vo.getSettlementTerms());
+        data.setProcessingOrDistribution(vo.getProcessingOrDistribution());
+        data.setPackagingRequirements(vo.getPackagingRequirements());
+        data.setShipmentDate(vo.getShipmentDate());
+        data.setSupplier(vo.getSupplier());
+        data.setCustomerShortName(vo.getCustomerShortName());
+        data.setCustomerType(vo.getCustomerType());
+
+        getBaseMapper().insert(data);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+
+        return data.getId();
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "修改发货明细统计，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void update(UpdateShipmentDetailStatisticsVo vo) {
+
+        ShipmentDetailStatistics data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("发货明细统计不存在！");
+        }
+
+        LambdaUpdateWrapper<ShipmentDetailStatistics> updateWrapper = Wrappers.lambdaUpdate(ShipmentDetailStatistics.class)
+                .set(ShipmentDetailStatistics::getActualShipmentQuantity, vo.getActualShipmentQuantity())
+                .eq(ShipmentDetailStatistics::getId, vo.getId());
+
+        getBaseMapper().update(updateWrapper);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+    }
+
+    @Override
+    public List<ShipmentDetailStatistics> getShipmentDetailInfo(String shipmentOrderId) {
+        if (StringUtils.isBlank(shipmentOrderId)) {
+            return Collections.emptyList();
+        }
+        List<ShipmentDetailStatistics> shipmentDetailInfo = getBaseMapper().getShipmentDetailInfo(shipmentOrderId);
+        if (CollectionUtils.isEmpty(shipmentDetailInfo)) {
+            return Collections.emptyList();
+        }
+        List<String> deptIds = new ArrayList<>();
+        List<String> customerIds = new ArrayList<>();
+        for (ShipmentDetailStatistics detail : shipmentDetailInfo) {
+            if (StringUtils.isNotBlank(detail.getDeptId()) && !deptIds.contains(detail.getDeptId())) {
+                deptIds.add(detail.getDeptId());
+            }
+            if (StringUtils.isNotBlank(detail.getRegion()) && !deptIds.contains(detail.getRegion())) {
+                deptIds.add(detail.getRegion());
+            }
+            if (StringUtils.isNotBlank(detail.getOrderingUnit()) && !customerIds.contains(detail.getOrderingUnit())) {
+                customerIds.add(detail.getOrderingUnit());
+            }
+            if (StringUtils.isNotBlank(detail.getStockUpCompany()) && !customerIds.contains(detail.getStockUpCompany())) {
+                customerIds.add(detail.getStockUpCompany());
+            }
+        }
+        Map<String, SysDept> deptMap = new HashMap<>();
+        // 获取部门数据
+        List<SysDept> deptList = sysDeptService.listByIds(deptIds);
+        if (CollectionUtils.isNotEmpty(deptList)) {
+            deptMap = deptList.stream().collect(Collectors.toMap(SysDept::getId, Function.identity()));
+        }
+        Map<String, Customer> customerMap = new HashMap<>();
+        // 获取公司数据
+        List<Customer> customerList = customerService.listByIds(customerIds);
+        if (CollectionUtils.isNotEmpty(customerList)) {
+            customerMap = customerList.stream().collect(Collectors.toMap(Customer::getId, Function.identity()));
+        }
+        for (ShipmentDetailStatistics detail : shipmentDetailInfo) {
+            SysDept sysDept = deptMap.get(detail.getDeptId());
+            if (sysDept != null) {
+                detail.setDeptName(sysDept.getName());
+            }
+            SysDept region = deptMap.get(detail.getRegion());
+            if (region != null) {
+                detail.setRegionName(region.getName());
+            }
+            Customer orderingUnit = customerMap.get(detail.getOrderingUnit());
+            if (orderingUnit != null) {
+                detail.setOrderingUnitName(orderingUnit.getName());
+            }
+            Customer stockUpCompany = customerMap.get(detail.getStockUpCompany());
+            if (stockUpCompany != null) {
+                detail.setStockUpCompanyName(stockUpCompany.getName());
+            }
+        }
+        return shipmentDetailInfo;
+    }
+}

+package com.lframework.xingyun.sc.mappers;
+
+import com.lframework.xingyun.sc.entity.ShipmentDetailStatistics;
+import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.xingyun.sc.vo.statistics.shipmentDetail.QueryShipmentDetailStatisticsVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 发货明细统计 Mapper 接口
+ * </p>
+ *
+ */
+public interface ShipmentDetailStatisticsMapper extends BaseMapper<ShipmentDetailStatistics> {
+
+	/**
+     * 查询列表
+     * @param vo    查询条件
+     * @return      List<ShipmentDetailStatistics>
+     */
+    List<ShipmentDetailStatistics> query(@Param("vo") QueryShipmentDetailStatisticsVo vo);
+
+    /**
+     * 获取发货明细数据
+     *
+     * @param shipmentOrderId   发货单ID
+     * @return                  List<ShipmentDetailStatistics>
+     */
+    List<ShipmentDetailStatistics> getShipmentDetailInfo(String shipmentOrderId);
+}

+package com.lframework.xingyun.sc.service.statistics;
+
+import com.lframework.xingyun.sc.vo.statistics.shipmentDetail.CreateShipmentDetailStatisticsVo;
+import com.lframework.xingyun.sc.vo.statistics.shipmentDetail.QueryShipmentDetailStatisticsVo;
+import com.lframework.xingyun.sc.vo.statistics.shipmentDetail.UpdateShipmentDetailStatisticsVo;
+import com.lframework.xingyun.sc.entity.ShipmentDetailStatistics;
+import com.lframework.starter.web.core.service.BaseMpService;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import java.util.List;
+
+/**
+ * 发货明细统计 Service
+ */
+public interface ShipmentDetailStatisticsService extends BaseMpService<ShipmentDetailStatistics> {
+
+    /**
+     * 查询列表
+     *
+     * @return  PageResult<ShipmentDetailStatistics>
+     */
+    PageResult<ShipmentDetailStatistics> query(Integer pageIndex, Integer pageSize, QueryShipmentDetailStatisticsVo vo);
+
+    /**
+     * 查询列表
+     *
+     * @param vo    查询条件
+     * @return      List<ShipmentDetailStatistics>
+     */
+    List<ShipmentDetailStatistics> query(QueryShipmentDetailStatisticsVo vo);
+
+    /**
+     * 根据ID查询
+     *
+     * @param id    主键ID
+     * @return      ShipmentDetailStatistics
+     */
+    ShipmentDetailStatistics findById(String id);
+
+    /**
+     * 创建
+     *
+     * @param vo    数据实体
+     * @return      String
+     */
+    String create(CreateShipmentDetailStatisticsVo vo);
+
+    /**
+     * 修改
+     *
+     * @param vo    数据实体
+     */
+    void update(UpdateShipmentDetailStatisticsVo vo);
+
+    /**
+     * 获取发货明细数据
+     *
+     * @param shipmentOrderId   发货单ID
+     * @return                  List<ShipmentDetailStatistics>
+     */
+    List<ShipmentDetailStatistics> getShipmentDetailInfo(String shipmentOrderId);
+}

@@ -15,6 +15,12 @@ public class QueryShipmentsOrderInfoVo extends PageVo implements BaseVo, Seriali
     private static final long serialVersionUID = 1L;
 
     /**
+     * 发货单编号
+     */
+    @ApiModelProperty("发货单编号")
+    private String code;
+
+    /**
      * 购货单位名称
      */
     @ApiModelProperty("购货单位名称")

+package com.lframework.xingyun.sc.vo.statistics.shipmentDetail;
+
+import com.lframework.starter.web.core.components.validation.IsNumberPrecision;
+import java.math.BigDecimal;
+import javax.validation.constraints.NotBlank;
+import java.time.LocalDate;
+import com.lframework.starter.web.core.vo.BaseVo;
+import javax.validation.constraints.NotNull;
+import io.swagger.annotations.ApiModelProperty;
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import org.hibernate.validator.constraints.Length;
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class CreateShipmentDetailStatisticsVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 发货单编号
+     */
+    @ApiModelProperty(value = "发货单编号", required = true)
+    @NotBlank(message = "请输入发货单编号！")
+    @Length(message = "发货单编号最多允许50个字符！")
+    private String shipmentOrderNo;
+
+    /**
+     * 生产厂
+     */
+    @ApiModelProperty(value = "生产厂", required = true)
+    @NotBlank(message = "请输入生产厂！")
+    @Length(message = "生产厂最多允许50个字符！")
+    private String workshopName;
+
+    /**
+     * 办事处
+     */
+    @ApiModelProperty(value = "办事处", required = true)
+    @NotBlank(message = "请输入办事处！")
+    @Length(message = "办事处最多允许50个字符！")
+    private String deptName;
+
+    /**
+     * 区域
+     */
+    @ApiModelProperty(value = "区域", required = true)
+    @NotBlank(message = "请输入区域！")
+    @Length(message = "区域最多允许50个字符！")
+    private String regionName;
+
+    /**
+     * 订货单名称
+     */
+    @ApiModelProperty(value = "订货单名称", required = true)
+    @NotBlank(message = "请输入订货单名称！")
+    @Length(message = "订货单名称最多允许50个字符！")
+    private String orderingUnitName;
+
+    /**
+     * 牌号
+     */
+    @ApiModelProperty(value = "牌号", required = true)
+    @NotBlank(message = "请输入牌号！")
+    @Length(message = "牌号最多允许50个字符！")
+    private String brand;
+
+    /**
+     * 厚度
+     */
+    @ApiModelProperty(value = "厚度", required = true)
+    @NotNull(message = "请输入厚度！")
+    @TypeMismatch(message = "厚度格式有误！")
+    private Double thickness;
+
+    /**
+     * 宽度
+     */
+    @ApiModelProperty(value = "宽度", required = true)
+    @NotNull(message = "请输入宽度！")
+    @TypeMismatch(message = "宽度格式有误！")
+    private Double width;
+
+    /**
+     * 长度
+     */
+    @ApiModelProperty(value = "长度", required = true)
+    @NotNull(message = "请输入长度！")
+    @TypeMismatch(message = "长度格式有误！")
+    private Double length;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty(value = "状态", required = true)
+    @NotBlank(message = "请输入状态！")
+    @Length(message = "状态最多允许50个字符！")
+    private String status;
+
+    /**
+     * 应发数
+     */
+    @ApiModelProperty(value = "应发数", required = true)
+    @NotNull(message = "请输入应发数！")
+    @TypeMismatch(message = "应发数格式有误！")
+    private Double quantity;
+
+    /**
+     * 实发数
+     */
+    @ApiModelProperty(value = "实发数", required = true)
+    @NotNull(message = "请输入实发数！")
+    @TypeMismatch(message = "实发数格式有误！")
+    private Double actualShipmentQuantity;
+
+    /**
+     * 单价
+     */
+    @ApiModelProperty(value = "单价", required = true)
+    @NotNull(message = "请输入单价！")
+    @TypeMismatch(message = "单价格式有误！")
+    @IsNumberPrecision(message = "单价最多允许4位小数！", value = 4)
+    private BigDecimal salesPrice;
+
+    /**
+     * 厚度公差正
+     */
+    @ApiModelProperty(value = "厚度公差正", required = true)
+    @NotNull(message = "请输入厚度公差正！")
+    @TypeMismatch(message = "厚度公差正格式有误！")
+    private Double thicknessTolPos;
+
+    /**
+     * 厚度公差负
+     */
+    @ApiModelProperty(value = "厚度公差负", required = true)
+    @NotNull(message = "请输入厚度公差负！")
+    @TypeMismatch(message = "厚度公差负格式有误！")
+    private Double thicknessTolNeg;
+
+    /**
+     * 宽度公差正
+     */
+    @ApiModelProperty(value = "宽度公差正", required = true)
+    @NotNull(message = "请输入宽度公差正！")
+    @TypeMismatch(message = "宽度公差正格式有误！")
+    private Double widthTolPos;
+
+    /**
+     * 宽度公差负
+     */
+    @ApiModelProperty(value = "宽度公差负", required = true)
+    @NotNull(message = "请输入宽度公差负！")
+    @TypeMismatch(message = "宽度公差负格式有误！")
+    private Double widthTolNeg;
+
+    /**
+     * 长度公差正
+     */
+    @ApiModelProperty(value = "长度公差正", required = true)
+    @NotNull(message = "请输入长度公差正！")
+    @TypeMismatch(message = "长度公差正格式有误！")
+    private Double lengthTolPos;
+
+    /**
+     * 长度公差负
+     */
+    @ApiModelProperty(value = "长度公差负", required = true)
+    @NotNull(message = "请输入长度公差负！")
+    @TypeMismatch(message = "长度公差负格式有误！")
+    private Double lengthTolNeg;
+
+    /**
+     * 超协价
+     */
+    @ApiModelProperty(value = "超协价", required = true)
+    @NotBlank(message = "请输入超协价！")
+    @Length(message = "超协价最多允许20个字符！")
+    private String assessmentExceedsAgreement;
+
+    /**
+     * 运费
+     */
+    @ApiModelProperty(value = "运费", required = true)
+    @NotBlank(message = "请输入运费！")
+    @Length(message = "运费最多允许20个字符！")
+    private String shippingCost;
+
+    /**
+     * 回程运费
+     */
+    @ApiModelProperty(value = "回程运费", required = true)
+    @NotBlank(message = "请输入回程运费！")
+    @Length(message = "回程运费最多允许20个字符！")
+    private String returnFreight;
+
+    /**
+     * 行业
+     */
+    @ApiModelProperty(value = "行业", required = true)
+    @NotBlank(message = "请输入行业！")
+    @Length(message = "行业最多允许50个字符！")
+    private String industry;
+
+    /**
+     * 备货单位名称
+     */
+    @ApiModelProperty(value = "备货单位名称", required = true)
+    @NotBlank(message = "请输入备货单位名称！")
+    @Length(message = "备货单位名称最多允许50个字符！")
+    private String stockUpCompanyName;
+
+    /**
+     * 订货单编号
+     */
+    @ApiModelProperty(value = "订货单编号", required = true)
+    @NotBlank(message = "请输入订货单编号！")
+    @Length(message = "订货单编号最多允许50个字符！")
+    private String orderNo;
+
+    /**
+     * 生产批号
+     */
+    @ApiModelProperty(value = "生产批号", required = true)
+    @NotBlank(message = "请输入生产批号！")
+    @Length(message = "生产批号最多允许50个字符！")
+    private String yieldBatchNo;
+
+    /**
+     * 开票情况
+     */
+    @ApiModelProperty(value = "开票情况", required = true)
+    @NotBlank(message = "请输入开票情况！")
+    @Length(message = "开票情况最多允许50个字符！")
+    private String invoicingStatus;
+
+    /**
+     * 订货日期
+     */
+    @ApiModelProperty(value = "订货日期", required = true)
+    @NotNull(message = "请输入订货日期！")
+    @TypeMismatch(message = "订货日期格式有误！")
+    private LocalDate orderDate;
+
+    /**
+     * 包装费
+     */
+    @ApiModelProperty(value = "包装费", required = true)
+    @NotNull(message = "请输入包装费！")
+    @TypeMismatch(message = "包装费格式有误！")
+    @IsNumberPrecision(message = "包装费最多允许4位小数！", value = 4)
+    private BigDecimal packagingFee;
+
+    /**
+     * 品质
+     */
+    @ApiModelProperty(value = "品质", required = true)
+    @NotBlank(message = "请输入品质！")
+    @Length(message = "品质最多允许50个字符！")
+    private String quality;
+
+    /**
+     * 件数
+     */
+    @ApiModelProperty(value = "件数", required = true)
+    @NotNull(message = "请输入件数！")
+    @TypeMismatch(message = "件数格式有误！")
+    private Double num;
+
+    /**
+     * 结算方式
+     */
+    @ApiModelProperty(value = "结算方式", required = true)
+    @NotBlank(message = "请输入结算方式！")
+    @Length(message = "结算方式最多允许50个字符！")
+    private String settlementTerms;
+
+    /**
+     * 加工、经销
+     */
+    @ApiModelProperty(value = "加工、经销", required = true)
+    @NotBlank(message = "请输入加工、经销！")
+    @Length(message = "加工、经销最多允许20个字符！")
+    private String processingOrDistribution;
+
+    /**
+     * 包装要求
+     */
+    @ApiModelProperty(value = "包装要求", required = true)
+    @NotBlank(message = "请输入包装要求！")
+    @Length(message = "包装要求最多允许200个字符！")
+    private String packagingRequirements;
+
+    /**
+     * 发货日期
+     */
+    @ApiModelProperty(value = "发货日期", required = true)
+    @NotNull(message = "请输入发货日期！")
+    @TypeMismatch(message = "发货日期格式有误！")
+    private LocalDate shipmentDate;
+
+    /**
+     * 发货公司
+     */
+    @ApiModelProperty(value = "发货公司", required = true)
+    @NotBlank(message = "请输入发货公司！")
+    @Length(message = "发货公司最多允许20个字符！")
+    private String supplier;
+
+    /**
+     * 客户简称
+     */
+    @ApiModelProperty(value = "客户简称", required = true)
+    @NotBlank(message = "请输入客户简称！")
+    @Length(message = "客户简称最多允许50个字符！")
+    private String customerShortName;
+
+    /**
+     * 客户类型
+     */
+    @ApiModelProperty(value = "客户类型", required = true)
+    @NotBlank(message = "请输入客户类型！")
+    @Length(message = "客户类型最多允许20个字符！")
+    private String customerType;
+
+}

+package com.lframework.xingyun.sc.vo.statistics.shipmentDetail;
+
+import lombok.Data;
+import com.lframework.starter.web.core.vo.PageVo;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+
+@Data
+public class QueryShipmentDetailStatisticsVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 生产厂
+     */
+    @ApiModelProperty("生产厂")
+    private String workshopName;
+
+    /**
+     * 办事处
+     */
+    @ApiModelProperty("办事处")
+    private String deptName;
+
+    /**
+     * 订货单名称
+     */
+    @ApiModelProperty("订货单名称")
+    private String orderingUnitName;
+
+}

+package com.lframework.xingyun.sc.vo.statistics.shipmentDetail;
+
+import lombok.Data;
+import javax.validation.constraints.NotBlank;
+import com.lframework.starter.web.core.vo.BaseVo;
+import javax.validation.constraints.NotNull;
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+
+@Data
+public class UpdateShipmentDetailStatisticsVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value = "ID", required = true)
+    @NotBlank(message = "id不能为空！")
+    private String id;
+
+    /**
+     * 实发数
+     */
+    @ApiModelProperty(value = "实发数", required = true)
+    @TypeMismatch(message = "实发数格式有误！")
+    @NotNull(message = "请输入实发数！")
+    private Double actualShipmentQuantity;
+
+}

@@ -24,6 +24,7 @@
     <sql id="ShipmentsOrderInfo_sql">
         SELECT
             tb.id,
+            tb.code,
             tb.plan_id,
             tb.customer_id,
             c.name AS customer_name,
@@ -72,6 +73,9 @@
             <if test="vo.customerName != null and vo.customerName != ''">
                 AND c.name like concat('%', #{vo.customerName}, '%')
             </if>
+            <if test="vo.code != null and vo.code != ''">
+                AND tb.code like concat('%', #{vo.code}, '%')
+            </if>
         </where>
         ORDER BY tb.create_time DESC
     </select>

+<?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.lframework.xingyun.sc.mappers.ShipmentDetailStatisticsMapper">
+
+    <resultMap id="ShipmentDetailStatistics" type="com.lframework.xingyun.sc.entity.ShipmentDetailStatistics">
+        <id column="id" property="id"/>
+        <result column="shipment_order_no" property="shipmentOrderNo"/>
+        <result column="workshop_name" property="workshopName"/>
+        <result column="dept_name" property="deptName"/>
+        <result column="region_name" property="regionName"/>
+        <result column="ordering_unit_name" property="orderingUnitName"/>
+        <result column="brand" property="brand"/>
+        <result column="thickness" property="thickness"/>
+        <result column="width" property="width"/>
+        <result column="length" property="length"/>
+        <result column="status" property="status"/>
+        <result column="quantity" property="quantity"/>
+        <result column="actual_shipment_quantity" property="actualShipmentQuantity"/>
+        <result column="sales_price" property="salesPrice"/>
+        <result column="thickness_tol_pos" property="thicknessTolPos"/>
+        <result column="thickness_tol_neg" property="thicknessTolNeg"/>
+        <result column="width_tol_pos" property="widthTolPos"/>
+        <result column="width_tol_neg" property="widthTolNeg"/>
+        <result column="length_tol_pos" property="lengthTolPos"/>
+        <result column="length_tol_neg" property="lengthTolNeg"/>
+        <result column="assessment_exceeds_agreement" property="assessmentExceedsAgreement"/>
+        <result column="shipping_cost" property="shippingCost"/>
+        <result column="return_freight" property="returnFreight"/>
+        <result column="industry" property="industry"/>
+        <result column="stock_up_company_name" property="stockUpCompanyName"/>
+        <result column="order_no" property="orderNo"/>
+        <result column="yield_batch_no" property="yieldBatchNo"/>
+        <result column="invoicing_status" property="invoicingStatus"/>
+        <result column="order_date" property="orderDate"/>
+        <result column="packaging_fee" property="packagingFee"/>
+        <result column="quality" property="quality"/>
+        <result column="num" property="num"/>
+        <result column="settlement_terms" property="settlementTerms"/>
+        <result column="processing_or_distribution" property="processingOrDistribution"/>
+        <result column="packaging_requirements" property="packagingRequirements"/>
+        <result column="shipment_date" property="shipmentDate"/>
+        <result column="supplier" property="supplier"/>
+        <result column="customer_short_name" property="customerShortName"/>
+        <result column="customer_type" property="customerType"/>
+        <result column="create_by_id" property="createById"/>
+        <result column="update_by_id" property="updateById"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="delivery_method" property="deliveryMethod"/>
+    </resultMap>
+
+    <sql id="ShipmentDetailStatistics_sql">
+        SELECT
+            tb.id,
+            tb.shipment_order_no,
+            tb.workshop_name,
+            tb.dept_name,
+            tb.region_name,
+            tb.ordering_unit_name,
+            tb.brand,
+            tb.thickness,
+            tb.width,
+            tb.length,
+            tb.status,
+            tb.quantity,
+            tb.actual_shipment_quantity,
+            tb.sales_price,
+            tb.thickness_tol_pos,
+            tb.thickness_tol_neg,
+            tb.width_tol_pos,
+            tb.width_tol_neg,
+            tb.length_tol_pos,
+            tb.length_tol_neg,
+            tb.assessment_exceeds_agreement,
+            tb.shipping_cost,
+            tb.return_freight,
+            tb.industry,
+            tb.stock_up_company_name,
+            tb.order_no,
+            tb.yield_batch_no,
+            tb.invoicing_status,
+            tb.order_date,
+            tb.packaging_fee,
+            tb.quality,
+            tb.num,
+            tb.settlement_terms,
+            tb.processing_or_distribution,
+            tb.packaging_requirements,
+            tb.shipment_date,
+            tb.supplier,
+            tb.customer_short_name,
+            tb.customer_type,
+            tb.create_by_id,
+            tb.update_by_id,
+            tb.create_time,
+            tb.update_time,
+            tb.delivery_method
+        FROM shipments_detail_statistics AS tb
+    </sql>
+
+    <select id="query" resultMap="ShipmentDetailStatistics">
+        <include refid="ShipmentDetailStatistics_sql"/>
+        <where>
+            <if test="vo.workshopName != null and vo.workshopName != ''">
+             AND tb.workshop_name LIKE CONCAT('%', #{vo.workshopName}, '%')
+            </if>
+            <if test="vo.deptName != null and vo.deptName != ''">
+             AND tb.dept_name LIKE CONCAT('%', #{vo.deptName}, '%')
+            </if>
+            <if test="vo.orderingUnitName != null and vo.orderingUnitName != ''">
+             AND tb.ordering_unit_name LIKE CONCAT('%', #{vo.orderingUnitName}, '%')
+            </if>
+        </where>
+    </select>
+
+    <select id="getShipmentDetailInfo" resultType="com.lframework.xingyun.sc.entity.ShipmentDetailStatistics">
+        select ol.*, o.*,w.name as workshop_name,sd.actual_shipment_quantity,sd.yield_batch_no
+        from shipments_plan_detail sd
+                 left join tbl_purchase_order_line ol on sd.order_spec_id = ol.id
+                 left join purchase_order_info o on ol.purchase_order_id = o.id
+                 left join base_data_workshop w on o.workshop_id = w.id
+        where sd.shipment_order_id = #{shipmentOrderId}
+    </select>
+</mapper>