统计报表-品质科订单明细报表

@@ -1443,3 +1443,5 @@ ALTER TABLE purchase_order_info
 
 
 ALTER TABLE purchase_order_info
 ALTER TABLE purchase_order_info
     ADD COLUMN warranty_certificate_file_name varchar(200) COMMENT '质保书名称';
     ADD COLUMN warranty_certificate_file_name varchar(200) COMMENT '质保书名称';
+
+ALTER TABLE order_detail_report ADD COLUMN production_process text COMMENT '工艺要求';

@@ -284,6 +284,12 @@ public class QueryOrderDetailReportBo extends BaseBo<OrderDetailReport> {
     @ApiModelProperty("操作时间")
     @ApiModelProperty("操作时间")
     private LocalDateTime createTime;
     private LocalDateTime createTime;
 
 
+    /**
+     * 工艺要求
+     */
+    @ApiModelProperty("工艺要求")
+    private String productionProcess;
+
     public QueryOrderDetailReportBo() {
     public QueryOrderDetailReportBo() {
 
 
     }
     }

@@ -12,6 +12,7 @@ import com.lframework.xingyun.sc.bo.statistics.orderDetail.QueryOrderDetailRepor
 import com.lframework.xingyun.sc.entity.OrderDetailReport;
 import com.lframework.xingyun.sc.entity.OrderDetailReport;
 import com.lframework.xingyun.sc.enums.ExportType;
 import com.lframework.xingyun.sc.enums.ExportType;
 import com.lframework.xingyun.sc.excel.statistics.OrderDetailReportExportTaskWorker;
 import com.lframework.xingyun.sc.excel.statistics.OrderDetailReportExportTaskWorker;
+import com.lframework.xingyun.sc.excel.statistics.QualityOrderDetailReportExportTaskWorker;
 import com.lframework.xingyun.sc.service.statistics.OrderDetailReportService;
 import com.lframework.xingyun.sc.service.statistics.OrderDetailReportService;
 import com.lframework.xingyun.sc.vo.statistics.orderDetail.CreateOrderDetailReportVo;
 import com.lframework.xingyun.sc.vo.statistics.orderDetail.CreateOrderDetailReportVo;
 import com.lframework.xingyun.sc.vo.statistics.orderDetail.QueryOrderDetailReportVo;
 import com.lframework.xingyun.sc.vo.statistics.orderDetail.QueryOrderDetailReportVo;
@@ -115,4 +116,16 @@ public class OrderDetailReportController extends DefaultBaseController {
 
 
         return InvokeResultBuilder.success();
         return InvokeResultBuilder.success();
     }
     }
+
+    /**
+     * 品质科订单明细导出
+     */
+    @ApiOperation("品质科订单明细导出")
+    @HasPermission({"statistical-report:order-detail:export"})
+    @PostMapping("/quality/export")
+    public InvokeResult<Void> qualityExport(@Valid @RequestBody QueryOrderDetailReportVo vo) {
+        vo.setExportType(ExportType.QUALITY_ORDER_DETAIL_REPORT.getCode());
+        ExportTaskUtil.exportTask("品质科订单明细报表", QualityOrderDetailReportExportTaskWorker.class, vo);
+        return InvokeResultBuilder.success();
+    }
 }
 }

@@ -246,6 +246,11 @@ public class OrderDetailReport extends BaseEntity implements BaseDto {
     private String type;
     private String type;
 
 
     /**
     /**
+     * 工艺要求
+     */
+    private String productionProcess;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)

@@ -13,6 +13,7 @@ public enum ExportType implements BaseEnum<String> {
     SHIPMENT_DETAIL_REPORT("SHIPMENT_DETAIL_REPORT", "发货明细报表"),
     SHIPMENT_DETAIL_REPORT("SHIPMENT_DETAIL_REPORT", "发货明细报表"),
     ORDER_DETAIL_REPORT("ORDER_DETAIL_REPORT", "订单明细报表"),
     ORDER_DETAIL_REPORT("ORDER_DETAIL_REPORT", "订单明细报表"),
     ORDER_EXPORT_ZIP("ORDER_EXPORT_ZIP", "订货单信息"),
     ORDER_EXPORT_ZIP("ORDER_EXPORT_ZIP", "订货单信息"),
+    QUALITY_ORDER_DETAIL_REPORT("QUALITY_ORDER_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.orderDetail.QueryOrderDetailReportBo;
+import com.lframework.xingyun.sc.entity.OrderDetailReport;
+import com.lframework.xingyun.sc.service.statistics.OrderDetailReportService;
+import com.lframework.xingyun.sc.utils.CommonUtil;
+import com.lframework.xingyun.sc.vo.statistics.orderDetail.QueryOrderDetailReportVo;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+public class QualityOrderDetailReportExportTaskWorker implements
+        ExportTaskWorker<QueryOrderDetailReportVo, QueryOrderDetailReportBo, QualityOrderDetailStatisticsModel> {
+
+
+    @Override
+    public QueryOrderDetailReportVo parseParams(String json) {
+        return JsonUtil.parseObject(json, QueryOrderDetailReportVo.class);
+    }
+
+    @Override
+    public PageResult<QueryOrderDetailReportBo> getDataList(int pageIndex, int pageSize, QueryOrderDetailReportVo params) {
+        OrderDetailReportService orderDetailReportService = ApplicationUtil.getBean(OrderDetailReportService.class);
+        PageResult<OrderDetailReport> pageResult = orderDetailReportService.query(pageIndex, pageSize, params);
+        List<QueryOrderDetailReportBo> results = null;
+        if (!CollectionUtil.isEmpty(pageResult.getDatas())) {
+            results = pageResult.getDatas().stream().map(QueryOrderDetailReportBo::new).collect(Collectors.toList());
+        }
+        return PageResultUtil.rebuild(pageResult, results);
+    }
+
+    @Override
+    public QualityOrderDetailStatisticsModel exportData(QueryOrderDetailReportBo data) {
+        // 公差数据处理
+        String thicknessTol = CommonUtil.handleTolData(
+                data.getThicknessTolPos() != null ? data.getThicknessTolPos().doubleValue() : null,
+                data.getThicknessTolNeg() != null ? data.getThicknessTolNeg().doubleValue() : null);
+        String widthTol = CommonUtil.handleTolData(
+                data.getWidthTolPos() != null ? data.getWidthTolPos().doubleValue() : null,
+                data.getWidthTolNeg() != null ? data.getWidthTolNeg().doubleValue() : null);
+        String lengthTol = CommonUtil.handleTolData(
+                data.getLengthTolPos() != null ? data.getLengthTolPos().doubleValue() : null,
+                data.getLengthTolNeg() != null ? data.getLengthTolNeg().doubleValue() : null);
+
+        QualityOrderDetailStatisticsModel model = JsonUtil.parseObject(JsonUtil.toJsonString(data), QualityOrderDetailStatisticsModel.class);
+        model.setThicknessTol(thicknessTol);
+        model.setWidthTol(widthTol);
+        model.setLengthTol(lengthTol);
+        return model;
+    }
+
+    @Override
+    public Class<QualityOrderDetailStatisticsModel> getModelClass() {
+        return QualityOrderDetailStatisticsModel.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;
+
+/**
+ * <p>
+ * 品质科订单明细Excel Model
+ * </p>
+ *
+ */
+@Data
+public class QualityOrderDetailStatisticsModel implements ExcelModel {
+
+    /**
+     * 订单编号
+     */
+    @ExcelProperty("订单编号")
+    private String orderNo;
+
+    /**
+     * 订货日期
+     */
+    @ExcelProperty("订货日期")
+    private String orderDate;
+
+    /**
+     * 生产厂
+     */
+    @ExcelProperty("生产厂")
+    private String workshopName;
+
+    /**
+     * 科办
+     */
+    @ExcelProperty("科办")
+    private String deptName;
+
+    /**
+     * 片
+     */
+    @ExcelProperty("片")
+    private String regionName;
+
+    /**
+     * 订货单位名称
+     */
+    @ExcelProperty("订货单位名称")
+    private String orderingUnitName;
+
+    /**
+     * 行业(用途)
+     */
+    @ExcelProperty("行业(用途)")
+    private String industry;
+
+    /**
+     * 高新标识
+     */
+    @ExcelProperty("高新标识")
+    private String highTechLogo;
+
+    /**
+     * 牌号
+     */
+    @ExcelProperty("牌号")
+    private String brand;
+
+    /**
+     * 厚
+     */
+    @ExcelProperty("厚")
+    private BigDecimal thickness;
+
+    /**
+     * 厚差
+     */
+    @ExcelProperty("厚差")
+    private String thicknessTol;
+
+    /**
+     * 宽
+     */
+    @ExcelProperty("宽")
+    private BigDecimal width;
+
+    /**
+     * 宽差
+     */
+    @ExcelProperty("宽差")
+    private String widthTol;
+
+    /**
+     * 长
+     */
+    @ExcelProperty("长")
+    private BigDecimal length;
+
+    /**
+     * 长差
+     */
+    @ExcelProperty("长差")
+    private String lengthTol;
+
+    /**
+     * 状态
+     */
+    @ExcelProperty("状态")
+    private String status;
+
+    /**
+     * 数量
+     */
+    @ExcelProperty("数量")
+    private BigDecimal quantity;
+
+    /**
+     * 发货日期
+     */
+    @ExcelProperty("发货日期")
+    private String deliveryDate;
+
+    /**
+     * 工艺要求
+     */
+    @ExcelProperty("工艺要求")
+    private String productionProcess;
+
+    /**
+     * 件重条头
+     */
+    @ExcelProperty("件重条头")
+    private String pieceWeightHeader;
+
+    /**
+     * 表面
+     */
+    @ExcelProperty("表面")
+    private String surface;
+
+    /**
+     * 公差
+     */
+    @ExcelProperty("公差")
+    private String tolerance;
+
+    /**
+     * 性能
+     */
+    @ExcelProperty("性能")
+    private String performance;
+
+    /**
+     * 包装
+     */
+    @ExcelProperty("包装")
+    private String packaging;
+
+    /**
+     * 特别注重要求
+     */
+    @ExcelProperty("特别注重要求")
+    private String specialRequirements;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty("备注")
+    private String remarks;
+
+    /**
+     * 客户类型
+     */
+    @ExcelProperty("客户类型")
+    private String customerType;
+
+    /**
+     * 加工经销
+     */
+    @ExcelProperty("加工经销")
+    private String contractType;
+
+    /**
+     * 备货单位/人（生产标准）
+     */
+    @ExcelProperty("备货单位/人（生产标准）")
+    private String stockUpCompanyName;
+
+}

@@ -549,6 +549,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
                 vo1.setRemarks(vo.getRemarks());
                 vo1.setRemarks(vo.getRemarks());
                 vo1.setShippingCost(vo.getShippingCost());
                 vo1.setShippingCost(vo.getShippingCost());
                 vo1.setSalesPrice(updatePurchaseOrderLineVo.getSalesPrice());
                 vo1.setSalesPrice(updatePurchaseOrderLineVo.getSalesPrice());
+                vo1.setProductionProcess(vo.getProductionProcess());
                 orderDetailReportService.update(vo1);
                 orderDetailReportService.update(vo1);
             }
             }
         }
         }

@@ -120,5 +120,11 @@ public class UpdateOrderDetailReportVo implements BaseVo, Serializable {
     @ApiModelProperty("销售价格")
     @ApiModelProperty("销售价格")
     private BigDecimal salesPrice;
     private BigDecimal salesPrice;
 
 
+    /**
+     * 工艺要求
+     */
+    @ApiModelProperty("工艺要求")
+    private String productionProcess;
+
 
 
 }
 }

@@ -47,6 +47,7 @@
         <result column="order_type" property="orderType"/>
         <result column="order_type" property="orderType"/>
         <result column="show_order" property="showOrder"/>
         <result column="show_order" property="showOrder"/>
         <result column="type" property="type"/>
         <result column="type" property="type"/>
+        <result column="production_process" property="productionProcess"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
         <result column="update_by_id" property="updateById"/>
@@ -189,6 +190,7 @@
         tb.order_type,
         tb.order_type,
         tb.show_order,
         tb.show_order,
         tb.type,
         tb.type,
+        tb.production_process,
         tb.create_by_id,
         tb.create_by_id,
         tb.create_by,
         tb.create_by,
         tb.update_by_id,
         tb.update_by_id,