楚江erp: 发货明细表导出接口开发

 package com.lframework.xingyun.sc.controller.statistics;
 
+import com.lframework.starter.mq.core.utils.ExportTaskUtil;
 import com.lframework.xingyun.sc.bo.statistics.shipmentDetail.QueryShipmentDetailStatisticsBo;
+import com.lframework.xingyun.sc.enums.ExportType;
+import com.lframework.xingyun.sc.excel.statistics.ShipmentDetailReportExportTaskWorker;
+import com.lframework.xingyun.sc.vo.ledger.receipt.ReceiptLedgerReportVo;
 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;
@@ -20,7 +24,6 @@ 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;
 
@@ -62,7 +65,7 @@ public class ShipmentDetailStatisticsController extends DefaultBaseController {
     @ApiOperation("新增")
     @HasPermission({"statistics:shipmentDetail:add"})
     @PostMapping
-    public InvokeResult<Void> create(@Valid CreateShipmentDetailStatisticsVo vo) {
+    public InvokeResult<Void> create(@RequestBody CreateShipmentDetailStatisticsVo vo) {
 
         shipmentDetailStatisticsService.create(vo);
 
@@ -91,4 +94,16 @@ public class ShipmentDetailStatisticsController extends DefaultBaseController {
     public InvokeResult<PageResult<ShipmentDetailStatistics>> queryShipmentDetail(QueryShipmentDetailStatisticsVo vo) {
         return InvokeResultBuilder.success(shipmentDetailStatisticsService.pageShipmentDetail(getPageIndex(vo), getPageSize(vo), vo));
     }
+
+    /**
+     * 发货明细导出
+     */
+    @ApiOperation("发货明细导出")
+    @HasPermission({"statistics:shipmentDetail:export"})
+    @GetMapping("/export")
+    public InvokeResult<Void> export(@Valid ReceiptLedgerReportVo vo) {
+        vo.setExportType(ExportType.SHIPMENT_DETAIL_REPORT.getCode());
+        ExportTaskUtil.exportTask("发货明细报表", ShipmentDetailReportExportTaskWorker.class, vo);
+        return InvokeResultBuilder.success();
+    }
 }

@@ -2,6 +2,8 @@ package com.lframework.xingyun.sc.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.math.BigDecimal;
+
+import com.lframework.starter.web.core.components.excel.ExcelModel;
 import com.lframework.starter.web.core.dto.BaseDto;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -18,7 +20,7 @@ import lombok.Data;
  */
 @Data
 @TableName("shipments_detail_statistics")
-public class ShipmentDetailStatistics extends BaseEntity implements BaseDto {
+public class ShipmentDetailStatistics extends BaseEntity implements BaseDto, ExcelModel {
 
     private static final long serialVersionUID = 1L;
 
@@ -184,7 +186,7 @@ public class ShipmentDetailStatistics extends BaseEntity implements BaseDto {
      * 备货单位ID
      */
     @TableField(exist = false)
-    private String stockUpCompany;
+    private String stockUpCompanyId;
 
     /**
      * 备货单位名称

@@ -10,6 +10,7 @@ public enum ExportType implements BaseEnum<String> {
     CUSTOMER_CREDIT("CUSTOMER_CREDIT", "客户资信"),
     CONTRACT_FRAMEWORK("CONTRACT_FRAMEWORK", "合同框架"),
     RECEIVABLE_LEDGER_REPORT("RECEIVABLE_LEDGER_REPORT", "应收款台账报表"),
+    SHIPMENT_DETAIL_REPORT("SHIPMENT_DETAIL_REPORT", "发货明细报表"),
 
 
     ;

+package com.lframework.xingyun.sc.excel.statistics;
+
+import com.lframework.starter.common.utils.CollectionUtil;
+import com.lframework.starter.mq.core.components.export.ExportTaskWorker;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.utils.ApplicationUtil;
+import com.lframework.starter.web.core.utils.JsonUtil;
+import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.xingyun.sc.bo.statistics.shipmentDetail.QueryShipmentDetailStatisticsBo;
+import com.lframework.xingyun.sc.entity.ShipmentDetailStatistics;
+import com.lframework.xingyun.sc.service.statistics.ShipmentDetailStatisticsService;
+import com.lframework.xingyun.sc.utils.CommonUtil;
+import com.lframework.xingyun.sc.vo.statistics.shipmentDetail.QueryShipmentDetailStatisticsVo;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+public class ShipmentDetailReportExportTaskWorker implements
+        ExportTaskWorker<QueryShipmentDetailStatisticsVo, QueryShipmentDetailStatisticsBo, ShipmentDetailStatisticsModel> {
+
+
+    @Override
+    public QueryShipmentDetailStatisticsVo parseParams(String json) {
+        return JsonUtil.parseObject(json, QueryShipmentDetailStatisticsVo.class);
+    }
+
+    @Override
+    public PageResult<QueryShipmentDetailStatisticsBo> getDataList(int pageIndex, int pageSize, QueryShipmentDetailStatisticsVo params) {
+        ShipmentDetailStatisticsService shipmentDetailStatisticsService = ApplicationUtil.getBean(ShipmentDetailStatisticsService.class);
+        PageResult<ShipmentDetailStatistics> pageResult = shipmentDetailStatisticsService.query(pageIndex, pageSize, params);
+        List<QueryShipmentDetailStatisticsBo> results = null;
+        if (!CollectionUtil.isEmpty(pageResult.getDatas())) {
+            results = pageResult.getDatas().stream().map(QueryShipmentDetailStatisticsBo::new).collect(Collectors.toList());
+        }
+        return PageResultUtil.rebuild(pageResult, results);
+    }
+
+    @Override
+    public ShipmentDetailStatisticsModel exportData(QueryShipmentDetailStatisticsBo data) {
+        // 公差数据处理
+        String thicknessTol = CommonUtil.handleTolData(data.getThicknessTolPos(), data.getThicknessTolNeg());
+        String widthTol = CommonUtil.handleTolData(data.getWidthTolPos(), data.getWidthTolNeg());
+        String lengthTol = CommonUtil.handleTolData(data.getLengthTolPos(), data.getLengthTolNeg());
+
+        ShipmentDetailStatisticsModel model = JsonUtil.parseObject(JsonUtil.toJsonString(data), ShipmentDetailStatisticsModel.class);
+        model.setThicknessTol(thicknessTol);
+        model.setWidthTol(widthTol);
+        model.setLengthTol(lengthTol);
+        return model;
+    }
+
+    @Override
+    public Class<ShipmentDetailStatisticsModel> getModelClass() {
+        return ShipmentDetailStatisticsModel.class;
+    }
+}

+package com.lframework.xingyun.sc.excel.statistics;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.lframework.starter.web.core.components.excel.ExcelModel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 发货明细Excel Model
+ * </p>
+ *
+ */
+@Data
+public class ShipmentDetailStatisticsModel implements ExcelModel {
+
+    /**
+     * 金额
+     */
+    @ExcelProperty("金额")
+    private String amount;
+
+    /**
+     * 转换日期
+     */
+    @ExcelProperty("转换日期")
+    private String changeDate;
+
+    /**
+     * 发货单编号
+     */
+    @ExcelProperty("发货单编号")
+    private String shipmentOrderNo;
+
+    /**
+     * 生产厂
+     */
+    @ExcelProperty("生产厂")
+    private String workshopName;
+
+    /**
+     * 办事处
+     */
+    @ExcelProperty("办事处")
+    private String deptName;
+
+    /**
+     * 区域
+     */
+    @ExcelProperty("区域")
+    private String regionName;
+
+    /**
+     * 订货单位名称
+     */
+    @ExcelProperty("订货单位名称")
+    private String orderingUnitName;
+
+    /**
+     * 牌号
+     */
+    @ExcelProperty("牌号")
+    private String brand;
+
+    /**
+     * 厚度
+     */
+    @ExcelProperty("厚度")
+    private Double thickness;
+
+    /**
+     * 宽度
+     */
+    @ExcelProperty("宽度")
+    private Double width;
+
+    /**
+     * 长度
+     */
+    @ExcelProperty("长度")
+    private Double length;
+
+    /**
+     * 状态
+     */
+    @ExcelProperty("状态")
+    private String status;
+
+    /**
+     * 应发数
+     */
+    @ExcelProperty("应发数")
+    private Double quantity;
+
+    /**
+     * 实发数
+     */
+    @ExcelProperty("实发数")
+    private Double actualShipmentQuantity;
+
+    /**
+     * 单价
+     */
+    @ExcelProperty("单价")
+    private BigDecimal salesPrice;
+
+    /**
+     * 厚度公差
+     */
+    @ExcelProperty("厚度公差")
+    private String thicknessTol;
+
+    /**
+     * 宽度公差
+     */
+    @ExcelProperty("宽度公差")
+    private String widthTol;
+
+    /**
+     * 长度公差
+     */
+    @ExcelProperty("长度公差")
+    private String lengthTol;
+
+    /**
+     * 超协价
+     */
+    @ExcelProperty("超协价")
+    private String assessmentExceedsAgreement;
+
+    /**
+     * 运费
+     */
+    @ExcelProperty("运费")
+    private String shippingCost;
+
+    /**
+     * 回程运费
+     */
+    @ExcelProperty("回程运费")
+    private String returnFreight;
+
+    /**
+     * 运输方式
+     */
+    @ExcelProperty("运输方式")
+    private String deliveryMethod;
+
+    /**
+     * 行业
+     */
+    @ExcelProperty("行业")
+    private String industry;
+
+    /**
+     * 备货单位名称
+     */
+    @ExcelProperty("备货单位名称")
+    private String stockUpCompanyName;
+
+    /**
+     * 订货单编号
+     */
+    @ExcelProperty("订货单编号")
+    private String orderNo;
+
+    /**
+     * 生产批号
+     */
+    @ExcelProperty("生产批号")
+    private String yieldBatchNo;
+
+    /**
+     * 开票情况
+     */
+    @ExcelProperty("开票情况")
+    private String invoicingStatus;
+
+    /**
+     * 订货日期
+     */
+    @ExcelProperty("订货日期")
+    private LocalDate orderDate;
+
+    /**
+     * 包装费
+     */
+    @ExcelProperty("包装费")
+    private BigDecimal packagingFee;
+
+    /**
+     * 品质
+     */
+    @ExcelProperty("品质")
+    private String quality;
+
+    /**
+     * 质保书
+     */
+    @ExcelProperty("质保书")
+    private String warranty;
+
+    /**
+     * 件数
+     */
+    @ExcelProperty("件数")
+    private Double num;
+
+    /**
+     * 备注说明
+     */
+    @ExcelProperty("备注说明")
+    private String remark;
+
+    /**
+     * 结算方式
+     */
+    @ExcelProperty("结算方式")
+    private String settlementTerms;
+
+    /**
+     * 加工、经销
+     */
+    @ExcelProperty("加工、经销")
+    private String processingOrDistribution;
+
+    /**
+     * 开票要求
+     */
+    @ExcelProperty("开票要求")
+    private String invoiceRequirements;
+
+    /**
+     * 包装要求
+     */
+    @ExcelProperty("包装要求")
+    private String packagingRequirements;
+
+    /**
+     * 发货日期
+     */
+    @ExcelProperty("发货日期")
+    private LocalDate shipmentDate;
+
+    /**
+     * 发货行业
+     */
+    @ExcelProperty("发货行业")
+    private String shipmentIndustry;
+
+    /**
+     * 木托
+     */
+    @ExcelProperty("木托")
+    private String woodenPallet;
+
+    /**
+     * 塑片
+     */
+    @ExcelProperty("塑片")
+    private String photographicFilm;
+
+    /**
+     * 发货公司
+     */
+    @ExcelProperty("发货公司")
+    private String supplier;
+
+    /**
+     * 塑纸
+     */
+    @ExcelProperty("塑纸")
+    private String plasticPaper;
+
+    /**
+     * 防雨
+     */
+    @ExcelProperty("防雨")
+    private String rainproof;
+
+    /**
+     * 品种
+     */
+    @ExcelProperty("品种")
+    private String variety;
+
+    /**
+     * 客户简称
+     */
+    @ExcelProperty("客户简称")
+    private String customerShortName;
+
+    /**
+     * 客户类型
+     */
+    @ExcelProperty("客户类型")
+    private String customerType;
+}

@@ -191,8 +191,8 @@ public class ShipmentDetailStatisticsServiceImpl extends BaseMpServiceImpl<Shipm
             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());
+            if (StringUtils.isNotBlank(detail.getStockUpCompanyId()) && !customerIds.contains(detail.getStockUpCompanyId())) {
+                customerIds.add(detail.getStockUpCompanyId());
             }
             if (StringUtils.isNotBlank(detail.getContractId()) && !contractIds.contains(detail.getContractId())) {
                 contractIds.add(detail.getContractId());
@@ -226,6 +226,10 @@ public class ShipmentDetailStatisticsServiceImpl extends BaseMpServiceImpl<Shipm
         List<SysDataDicItem> materialAndQuantityRatioList = sysDataDicItemService.findByDicCode("RAW_TO_PROD_RATIO");
         Map<String, String> materialAndQuantityRatioMap = materialAndQuantityRatioList.stream()
                 .collect(Collectors.toMap(SysDataDicItem::getCode, SysDataDicItem::getName, (v1, v2) -> v1));
+        // 发货公司
+        List<SysDataDicItem> supplierList = sysDataDicItemService.findByDicCode("SUPPLIER");
+        Map<String, String> supplierMap = supplierList.stream()
+                .collect(Collectors.toMap(SysDataDicItem::getCode, SysDataDicItem::getName, (v1, v2) -> v1));
         for (ShipmentDetailStatistics detail : shipmentDetailInfo) {
             // 厂房
             String workshopName = workshopMap.get(detail.getWorkshopId());
@@ -251,7 +255,7 @@ public class ShipmentDetailStatisticsServiceImpl extends BaseMpServiceImpl<Shipm
                 }
             }
             // 备货单位
-            Customer stockUpCompany = customerMap.get(detail.getStockUpCompany());
+            Customer stockUpCompany = customerMap.get(detail.getStockUpCompanyId());
             if (stockUpCompany != null) {
                 detail.setStockUpCompanyName(stockUpCompany.getName());
             }
@@ -274,7 +278,12 @@ public class ShipmentDetailStatisticsServiceImpl extends BaseMpServiceImpl<Shipm
                 } else {
                     detail.setProcessingOrDistribution(detail.getMaterialProductRatioRemarks() + "加工");
                 }
+            } else {
+                detail.setProcessingOrDistribution("经销");
             }
+            // 发货公司
+            String supplier = supplierMap.get(detail.getSupplier());
+            detail.setSupplier(supplier);
         }
         return shipmentDetailInfo;
     }

@@ -108,4 +108,65 @@ public class CommonUtil {
         // 格式化为字符串
         return dateTime.format(FORMATTER);
     }
+
+
+    /**
+     * 公差数据拼接
+     *
+     * @param data1 正公差
+     * @param data2 负公差
+     * @return      String
+     */
+    public static String handleTolData(Double data1, Double data2) {
+        // 两个都为 null 的情况
+        if (data1 == null && data2 == null) {
+            return "";
+        }
+        // 两个都有值的情况
+        if (data1 != null && data2 != null) {
+            // 比较绝对值是否相等（考虑浮点数精度）
+            if (Math.abs(Math.abs(data1) - Math.abs(data2)) < 0.000001) {
+                // 绝对值相等，使用±格式
+                return "±" + formatNumberOriginal(Math.abs(data1));
+            } else {
+                // 绝对值不相等，分别显示
+                return formatNumberWithSign(data1) + formatNumberWithSign(data2);
+            }
+        }
+        // 只有一个有值，显示单个带符号的数字
+        if (data1 != null) {
+            return formatNumberWithSign(data1);
+        } else {
+            return formatNumberWithSign(data2);
+        }
+    }
+
+    /**
+     * 格式化带符号的数字
+     *
+     * @param num   数值
+     * @return      String
+     */
+    public static String formatNumberWithSign(double num) {
+        String formatted = formatNumberOriginal(num);
+        if (num >= 0) {
+            return "+" + formatted;
+        } else {
+            // 负数已经有负号
+            return formatted;
+        }
+    }
+
+    /**
+     * 保留原始显示，不处理前导0
+     *
+     * @param num   数值
+     * @return      String
+     */
+    public static String formatNumberOriginal(double num) {
+        if (Math.abs(num) < 0.000001) {
+            return "0";
+        }
+        return String.valueOf(num);
+    }
 }

@@ -91,7 +91,6 @@ public class CreateShipmentDetailStatisticsVo implements BaseVo, Serializable {
      * 长度
      */
     @ApiModelProperty(value = "长度")
-    @NotNull(message = "请输入长度！")
     @TypeMismatch(message = "长度格式有误！")
     private Double length;
 
@@ -99,7 +98,6 @@ public class CreateShipmentDetailStatisticsVo implements BaseVo, Serializable {
      * 状态
      */
     @ApiModelProperty(value = "状态")
-    @NotBlank(message = "请输入状态！")
     @Length(message = "状态最多允许50个字符！")
     private String status;
 
@@ -181,7 +179,6 @@ public class CreateShipmentDetailStatisticsVo implements BaseVo, Serializable {
      * 运费
      */
     @ApiModelProperty(value = "运费", required = true)
-    @NotBlank(message = "请输入运费！")
     @Length(message = "运费最多允许20个字符！")
     private String shippingCost;
 
@@ -189,7 +186,6 @@ public class CreateShipmentDetailStatisticsVo implements BaseVo, Serializable {
      * 回程运费
      */
     @ApiModelProperty(value = "回程运费", required = true)
-    @NotBlank(message = "请输入回程运费！")
     @Length(message = "回程运费最多允许20个字符！")
     private String returnFreight;
 
@@ -221,7 +217,6 @@ public class CreateShipmentDetailStatisticsVo implements BaseVo, Serializable {
      * 生产批号
      */
     @ApiModelProperty(value = "生产批号", required = true)
-    @NotBlank(message = "请输入生产批号！")
     @Length(message = "生产批号最多允许50个字符！")
     private String yieldBatchNo;
 
@@ -229,7 +224,6 @@ public class CreateShipmentDetailStatisticsVo implements BaseVo, Serializable {
      * 开票情况
      */
     @ApiModelProperty(value = "开票情况", required = true)
-    @NotBlank(message = "请输入开票情况！")
     @Length(message = "开票情况最多允许50个字符！")
     private String invoicingStatus;
 
@@ -245,7 +239,6 @@ public class CreateShipmentDetailStatisticsVo implements BaseVo, Serializable {
      * 包装费
      */
     @ApiModelProperty(value = "包装费", required = true)
-    @NotNull(message = "请输入包装费！")
     @TypeMismatch(message = "包装费格式有误！")
     @IsNumberPrecision(message = "包装费最多允许4位小数！", value = 4)
     private BigDecimal packagingFee;
@@ -262,7 +255,6 @@ public class CreateShipmentDetailStatisticsVo implements BaseVo, Serializable {
      * 件数
      */
     @ApiModelProperty(value = "件数", required = true)
-    @NotNull(message = "请输入件数！")
     @TypeMismatch(message = "件数格式有误！")
     private Double num;
 
@@ -270,7 +262,6 @@ public class CreateShipmentDetailStatisticsVo implements BaseVo, Serializable {
      * 结算方式
      */
     @ApiModelProperty(value = "结算方式", required = true)
-    @NotBlank(message = "请输入结算方式！")
     @Length(message = "结算方式最多允许50个字符！")
     private String settlementTerms;
 
@@ -286,7 +277,6 @@ public class CreateShipmentDetailStatisticsVo implements BaseVo, Serializable {
      * 包装要求
      */
     @ApiModelProperty(value = "包装要求", required = true)
-    @NotBlank(message = "请输入包装要求！")
     @Length(message = "包装要求最多允许200个字符！")
     private String packagingRequirements;
 
@@ -310,7 +300,6 @@ public class CreateShipmentDetailStatisticsVo implements BaseVo, Serializable {
      * 客户简称
      */
     @ApiModelProperty(value = "客户简称", required = true)
-    @NotBlank(message = "请输入客户简称！")
     @Length(message = "客户简称最多允许50个字符！")
     private String customerShortName;
 
@@ -318,7 +307,6 @@ public class CreateShipmentDetailStatisticsVo implements BaseVo, Serializable {
      * 客户类型
      */
     @ApiModelProperty(value = "客户类型", required = true)
-    @NotBlank(message = "请输入客户类型！")
     @Length(message = "客户类型最多允许20个字符！")
     private String customerType;
 

@@ -146,11 +146,7 @@
             o.invoicing_status,
             o.order_date,
             o.settlement_terms,
-            case
-                when o.supply_unit = 'GJ' then '安徽楚江高精铜带有限公司'
-                when o.supply_unit = 'XC' then '安徽楚江科技新材料股份有限公司'
-            else ''
-            end as supplier,
+            o.supply_unit as supplier,
             o.workshop_id,
             so.code as shipment_order_no,
             so.create_time as shipment_date,