楚江erp：样品反馈单和样品追踪单相关基础接口开发

@@ -1095,3 +1095,60 @@ CREATE TABLE `pending_delivery_order` (
   `update_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
   `update_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
   PRIMARY KEY (`id`)
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='待交付订单'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='待交付订单'
+
+
+create table if not exists sample_result_feedback(
+    id varchar(32) primary key comment 'ID',
+    customer_id varchar(32) not null comment '客户ID',
+    workshop_id varchar(32) not null comment '所属分厂',
+    order_id varchar(32) not null comment '订单ID',
+    create_by_id varchar(32) not null comment '创建人ID',
+    update_by_id varchar(32) not null comment '更新人ID',
+    create_time datetime default now() comment '创建时间',
+    update_time datetime default now() comment '更新时间'
+) comment '产品试样结果反馈单';
+
+create table if not exists sample_result_tracking(
+    id varchar(32) primary key comment 'ID',
+    customer_id varchar(32) not null comment '客户ID',
+    workshop_id varchar(32) not null comment '所属分厂',
+    order_id varchar(32) not null comment '订单ID',
+    surface varchar(200) comment '表面描述',
+    performance varchar(200) comment '性能描述',
+    tolerance varchar(200) comment '公差描述',
+    banding_pattern varchar(200) comment '带型描述',
+    packaging varchar(200) comment '包装描述',
+    weight varchar(200) comment '件重描述',
+    other varchar(200) comment '其它描述',
+    create_by_id varchar(32) not null comment '创建人ID',
+    update_by_id varchar(32) not null comment '更新人ID',
+    create_time datetime default now() comment '创建时间',
+    update_time datetime default now() comment '更新时间'
+) comment '产品试样结果跟踪单';
+
+create table if not exists sample_feedback_tracking_detail(
+    id varchar(32) primary key comment 'ID',
+    feedback_id varchar(32) not null comment '反馈单ID',
+    tracking_id varchar(32) not null comment '跟踪单ID',
+    order_id varchar(32) not null comment '订单ID',
+    order_spec_id varchar(32) not null comment '订单规格ID',
+    shipment_order_id varchar(32) not null comment '发货单ID',
+    shipment_detail_id varchar(32) not null comment '发货明细ID',
+    brand varchar(100) comment '牌号',
+    thickness decimal(10, 4) default null comment '厚度',
+    thickness_tol_pos decimal(10, 4) default null comment '厚度公差正',
+    thickness_tol_neg decimal(10, 4) default null comment '厚度公差负',
+    width decimal(10, 4) default null comment '宽度',
+    width_tol_pos decimal(10, 4) default null comment '宽度公差正',
+    width_tol_neg decimal(10, 4) default null comment '宽度公差负',
+    length decimal(10, 4) default null comment '长度',
+    length_tol_pos decimal(10, 4) default null comment '长度公差正',
+    length_tol_neg decimal(10, 4) default null comment '长度公差负',
+    status varchar(50) comment '状态',
+    shipment_date date default null comment '发货日期',
+    quantity double default null comment '实发数量',
+    create_by_id varchar(32) not null comment '创建人ID',
+    update_by_id varchar(32) not null comment '更新人ID',
+    create_time datetime default now() comment '创建时间',
+    update_time datetime default now() comment '更新时间'
+) comment '样品反馈和追踪明细';

+package com.lframework.xingyun.sc.bo.sample.feedback;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.xingyun.sc.entity.SampleFeedbackTrackingDetail;
+import com.lframework.xingyun.sc.entity.SampleResultFeedback;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.bo.BaseBo;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Data;
+
+/**
+ * <p>
+ * 产品试样结果反馈单 GetBo
+ * </p>
+ *
+ */
+@Data
+public class GetSampleResultFeedbackBo extends BaseBo<SampleResultFeedback> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 客户ID
+     */
+    @ApiModelProperty("客户ID")
+    private String customerId;
+
+    /**
+     * 客户名称
+     */
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    /**
+     * 所属分厂ID
+     */
+    @ApiModelProperty("所属分厂ID")
+    private String workshopId;
+
+    /**
+     * 所属分厂名称
+     */
+    @ApiModelProperty("所属分厂名称")
+    private String workshopName;
+
+    /**
+     * 订单ID
+     */
+    @ApiModelProperty("订单ID")
+    private String orderId;
+
+    /**
+     * 订单编号
+     */
+    @ApiModelProperty("订单编号")
+    private String orderCode;
+
+    /**
+     * 明细数据
+     */
+    @ApiModelProperty("明细数据")
+    private List<SampleFeedbackTrackingDetail> detailList;
+
+    /**
+     * 创建人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 GetSampleResultFeedbackBo() {
+
+    }
+
+    public GetSampleResultFeedbackBo(SampleResultFeedback dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<SampleResultFeedback> convert(SampleResultFeedback dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(SampleResultFeedback dto) {
+
+    }
+}

+package com.lframework.xingyun.sc.bo.sample.feedback;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.xingyun.sc.entity.SampleFeedbackTrackingDetail;
+import com.lframework.xingyun.sc.entity.SampleResultFeedback;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.bo.BaseBo;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Data;
+
+/**
+ * <p>
+ * 产品试样结果反馈单 QueryBo
+ * </p>
+ *
+ */
+@Data
+public class QuerySampleResultFeedbackBo extends BaseBo<SampleResultFeedback> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 客户ID
+     */
+    @ApiModelProperty("客户ID")
+    private String customerId;
+
+    /**
+     * 客户名称
+     */
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    /**
+     * 所属分厂ID
+     */
+    @ApiModelProperty("所属分厂ID")
+    private String workshopId;
+
+    /**
+     * 所属分厂名称
+     */
+    @ApiModelProperty("所属分厂名称")
+    private String workshopName;
+
+    /**
+     * 订单ID
+     */
+    @ApiModelProperty("订单ID")
+    private String orderId;
+
+    /**
+     * 订单编号
+     */
+    @ApiModelProperty("订单编号")
+    private String orderCode;
+
+    /**
+     * 明细数据
+     */
+    @ApiModelProperty("明细数据")
+    private List<SampleFeedbackTrackingDetail> detailList;
+
+    /**
+     * 创建人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 QuerySampleResultFeedbackBo() {
+
+    }
+
+    public QuerySampleResultFeedbackBo(SampleResultFeedback dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<SampleResultFeedback> convert(SampleResultFeedback dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(SampleResultFeedback dto) {
+
+    }
+}

+package com.lframework.xingyun.sc.bo.sample.tracking;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.xingyun.sc.entity.SampleFeedbackTrackingDetail;
+import com.lframework.xingyun.sc.entity.SampleResultTracking;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.bo.BaseBo;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Data;
+
+/**
+ * <p>
+ * 产品试样结果跟踪单 GetBo
+ * </p>
+ *
+ */
+@Data
+public class GetSampleResultTrackingBo extends BaseBo<SampleResultTracking> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 客户ID
+     */
+    @ApiModelProperty("客户ID")
+    private String customerId;
+
+    /**
+     * 客户名称
+     */
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    /**
+     * 所属分厂ID
+     */
+    @ApiModelProperty("所属分厂ID")
+    private String workshopId;
+
+    /**
+     * 所属分厂名称
+     */
+    @ApiModelProperty("所属分厂名称")
+    private String workshopName;
+
+    /**
+     * 订单ID
+     */
+    @ApiModelProperty("订单ID")
+    private String orderId;
+
+    /**
+     * 订单编号
+     */
+    @ApiModelProperty("订单编号")
+    private String orderCode;
+
+    /**
+     * 表面描述
+     */
+    @ApiModelProperty("表面描述")
+    private String surface;
+
+    /**
+     * 性能描述
+     */
+    @ApiModelProperty("性能描述")
+    private String performance;
+
+    /**
+     * 公差描述
+     */
+    @ApiModelProperty("公差描述")
+    private String tolerance;
+
+    /**
+     * 带型描述
+     */
+    @ApiModelProperty("带型描述")
+    private String bandingPattern;
+
+    /**
+     * 包装描述
+     */
+    @ApiModelProperty("包装描述")
+    private String packaging;
+
+    /**
+     * 件重描述
+     */
+    @ApiModelProperty("件重描述")
+    private String weight;
+
+    /**
+     * 其它描述
+     */
+    @ApiModelProperty("其它描述")
+    private String other;
+
+    /**
+     * 明细数据
+     */
+    @ApiModelProperty("明细数据")
+    private List<SampleFeedbackTrackingDetail> detailList;
+
+    /**
+     * 创建人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 GetSampleResultTrackingBo() {
+
+    }
+
+    public GetSampleResultTrackingBo(SampleResultTracking dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<SampleResultTracking> convert(SampleResultTracking dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(SampleResultTracking dto) {
+
+    }
+}

+package com.lframework.xingyun.sc.bo.sample.tracking;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.xingyun.sc.entity.SampleFeedbackTrackingDetail;
+import com.lframework.xingyun.sc.entity.SampleResultTracking;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.bo.BaseBo;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Data;
+
+/**
+ * <p>
+ * 产品试样结果跟踪单 QueryBo
+ * </p>
+ *
+ */
+@Data
+public class QuerySampleResultTrackingBo extends BaseBo<SampleResultTracking> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 客户ID
+     */
+    @ApiModelProperty("客户ID")
+    private String customerId;
+
+    /**
+     * 客户名称
+     */
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    /**
+     * 所属分厂ID
+     */
+    @ApiModelProperty("所属分厂ID")
+    private String workshopId;
+
+    /**
+     * 所属分厂名称
+     */
+    @ApiModelProperty("所属分厂名称")
+    private String workshopName;
+
+    /**
+     * 订单ID
+     */
+    @ApiModelProperty("订单ID")
+    private String orderId;
+
+    /**
+     * 订单编号
+     */
+    @ApiModelProperty("订单编号")
+    private String orderCode;
+
+    /**
+     * 表面描述
+     */
+    @ApiModelProperty("表面描述")
+    private String surface;
+
+    /**
+     * 性能描述
+     */
+    @ApiModelProperty("性能描述")
+    private String performance;
+
+    /**
+     * 公差描述
+     */
+    @ApiModelProperty("公差描述")
+    private String tolerance;
+
+    /**
+     * 带型描述
+     */
+    @ApiModelProperty("带型描述")
+    private String bandingPattern;
+
+    /**
+     * 包装描述
+     */
+    @ApiModelProperty("包装描述")
+    private String packaging;
+
+    /**
+     * 件重描述
+     */
+    @ApiModelProperty("件重描述")
+    private String weight;
+
+    /**
+     * 其它描述
+     */
+    @ApiModelProperty("其它描述")
+    private String other;
+
+    /**
+     * 明细数据
+     */
+    @ApiModelProperty("明细数据")
+    private List<SampleFeedbackTrackingDetail> detailList;
+
+    /**
+     * 创建人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 QuerySampleResultTrackingBo() {
+
+    }
+
+    public QuerySampleResultTrackingBo(SampleResultTracking dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<SampleResultTracking> convert(SampleResultTracking dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(SampleResultTracking dto) {
+
+    }
+}

+package com.lframework.xingyun.sc.controller.sample;
+
+import com.lframework.xingyun.sc.bo.sample.feedback.GetSampleResultFeedbackBo;
+import com.lframework.xingyun.sc.bo.sample.feedback.QuerySampleResultFeedbackBo;
+import com.lframework.xingyun.sc.vo.sample.feedback.QuerySampleResultFeedbackVo;
+import com.lframework.xingyun.sc.service.sample.SampleResultFeedbackService;
+import com.lframework.xingyun.sc.entity.SampleResultFeedback;
+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 javax.annotation.Resource;
+import javax.validation.constraints.NotBlank;
+import io.swagger.annotations.ApiImplicitParam;
+import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import io.swagger.annotations.ApiOperation;
+import com.lframework.starter.common.utils.CollectionUtil;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.validation.Valid;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 产品试样结果反馈单 Controller
+ *
+ */
+@Api(tags = "产品试样结果反馈单")
+@Validated
+@RestController
+@RequestMapping("/sample/feedback")
+public class SampleResultFeedbackController extends DefaultBaseController {
+
+
+    @Resource
+    private SampleResultFeedbackService sampleResultFeedbackService;
+
+
+    /**
+     * 查询列表
+     */
+    @ApiOperation("查询列表")
+    @HasPermission({"sample:feedback:query"})
+    @GetMapping("/query")
+    public InvokeResult<PageResult<QuerySampleResultFeedbackBo>> query(@Valid QuerySampleResultFeedbackVo vo) {
+        PageResult<SampleResultFeedback> pageResult = sampleResultFeedbackService.query(getPageIndex(vo), getPageSize(vo), vo);
+        List<SampleResultFeedback> dataList = pageResult.getDatas();
+        List<QuerySampleResultFeedbackBo> results = null;
+        if (!CollectionUtil.isEmpty(dataList)) {
+            results = dataList.stream().map(QuerySampleResultFeedbackBo::new).collect(Collectors.toList());
+        }
+        return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
+    }
+
+    /**
+     * 根据ID查询
+     */
+    @ApiOperation("根据ID查询")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"sample:feedback:query"})
+    @GetMapping
+    public InvokeResult<GetSampleResultFeedbackBo> get(@NotBlank(message = "id不能为空！") String id) {
+        SampleResultFeedback data = sampleResultFeedbackService.findById(id);
+        if (data == null) {
+            throw new DefaultClientException("产品试样结果反馈单不存在！");
+        }
+        GetSampleResultFeedbackBo result = new GetSampleResultFeedbackBo(data);
+
+        return InvokeResultBuilder.success(result);
+    }
+
+    /**
+     * 根据ID删除
+     */
+    @ApiOperation("根据ID删除")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"sample:feedback:delete"})
+    @DeleteMapping
+    public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
+        sampleResultFeedbackService.deleteById(id);
+        return InvokeResultBuilder.success();
+    }
+}

+package com.lframework.xingyun.sc.controller.sample;
+
+import com.lframework.xingyun.sc.bo.sample.tracking.GetSampleResultTrackingBo;
+import com.lframework.xingyun.sc.bo.sample.tracking.QuerySampleResultTrackingBo;
+import com.lframework.xingyun.sc.vo.sample.tracking.QuerySampleResultTrackingVo;
+import com.lframework.xingyun.sc.service.sample.SampleResultTrackingService;
+import com.lframework.xingyun.sc.entity.SampleResultTracking;
+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 javax.annotation.Resource;
+import javax.validation.constraints.NotBlank;
+import io.swagger.annotations.ApiImplicitParam;
+import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import io.swagger.annotations.ApiOperation;
+import com.lframework.starter.common.utils.CollectionUtil;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.validation.Valid;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 产品试样结果跟踪单 Controller
+ *
+ */
+@Api(tags = "产品试样结果跟踪单")
+@Validated
+@RestController
+@RequestMapping("/sample/tracking")
+public class SampleResultTrackingController extends DefaultBaseController {
+
+
+    @Resource
+    private SampleResultTrackingService sampleResultTrackingService;
+
+
+    /**
+     * 查询列表
+     */
+    @ApiOperation("查询列表")
+    @HasPermission({"sample:tracking:query"})
+    @GetMapping("/query")
+    public InvokeResult<PageResult<QuerySampleResultTrackingBo>> query(@Valid QuerySampleResultTrackingVo vo) {
+        PageResult<SampleResultTracking> pageResult = sampleResultTrackingService.query(getPageIndex(vo), getPageSize(vo), vo);
+        List<SampleResultTracking> dataList = pageResult.getDatas();
+        List<QuerySampleResultTrackingBo> results = null;
+        if (!CollectionUtil.isEmpty(dataList)) {
+            results = dataList.stream().map(QuerySampleResultTrackingBo::new).collect(Collectors.toList());
+        }
+        return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
+    }
+
+    /**
+     * 根据ID查询
+     */
+    @ApiOperation("根据ID查询")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"sample:tracking:query"})
+    @GetMapping
+    public InvokeResult<GetSampleResultTrackingBo> get(@NotBlank(message = "id不能为空！") String id) {
+        SampleResultTracking data = sampleResultTrackingService.findById(id);
+        if (data == null) {
+            throw new DefaultClientException("产品试样结果跟踪单不存在！");
+        }
+        GetSampleResultTrackingBo result = new GetSampleResultTrackingBo(data);
+
+        return InvokeResultBuilder.success(result);
+    }
+
+    /**
+     * 根据ID删除
+     */
+    @ApiOperation("根据ID删除")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"sample:tracking:delete"})
+    @DeleteMapping
+    public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
+        sampleResultTrackingService.deleteById(id);
+        return InvokeResultBuilder.success();
+    }
+}

+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("sample_feedback_tracking_detail")
+public class SampleFeedbackTrackingDetail extends BaseEntity implements BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 反馈单ID
+     */
+    private String feedbackId;
+
+    /**
+     * 跟踪单ID
+     */
+    private String trackingId;
+
+    /**
+     * 订单ID
+     */
+    private String orderId;
+
+    /**
+     * 订单规格ID
+     */
+    private String orderSpecId;
+
+    /**
+     * 发货单ID
+     */
+    private String shipmentOrderId;
+
+    /**
+     * 发货明细ID
+     */
+    private String shipmentDetailId;
+
+    /**
+     * 牌号
+     */
+    private String brand;
+
+    /**
+     * 厚度
+     */
+    private BigDecimal thickness;
+
+    /**
+     * 厚度公差正
+     */
+    private BigDecimal thicknessTolPos;
+
+    /**
+     * 厚度公差负
+     */
+    private BigDecimal thicknessTolNeg;
+
+    /**
+     * 宽度
+     */
+    private BigDecimal width;
+
+    /**
+     * 宽度公差正
+     */
+    private BigDecimal widthTolPos;
+
+    /**
+     * 宽度公差负
+     */
+    private BigDecimal widthTolNeg;
+
+    /**
+     * 长度
+     */
+    private BigDecimal length;
+
+    /**
+     * 长度公差正
+     */
+    private BigDecimal lengthTolPos;
+
+    /**
+     * 长度公差负
+     */
+    private BigDecimal lengthTolNeg;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 发货日期
+     */
+    private LocalDate shipmentDate;
+
+    /**
+     * 实发数量
+     */
+    private Double quantity;
+
+    /**
+     * 创建人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;
+
+}

+package com.lframework.xingyun.sc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.lframework.starter.web.core.dto.BaseDto;
+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("sample_result_feedback")
+public class SampleResultFeedback extends BaseEntity implements BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 所属分厂
+     */
+    private String workshopId;
+
+    /**
+     * 订单ID
+     */
+    private String orderId;
+
+    /**
+     * 创建人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;
+
+}

+package com.lframework.xingyun.sc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.lframework.starter.web.core.dto.BaseDto;
+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("sample_result_tracking")
+public class SampleResultTracking extends BaseEntity implements BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 所属分厂
+     */
+    private String workshopId;
+
+    /**
+     * 订单ID
+     */
+    private String orderId;
+
+    /**
+     * 表面描述
+     */
+    private String surface;
+
+    /**
+     * 性能描述
+     */
+    private String performance;
+
+    /**
+     * 公差描述
+     */
+    private String tolerance;
+
+    /**
+     * 带型描述
+     */
+    private String bandingPattern;
+
+    /**
+     * 包装描述
+     */
+    private String packaging;
+
+    /**
+     * 件重描述
+     */
+    private String weight;
+
+    /**
+     * 其它描述
+     */
+    private String other;
+
+    /**
+     * 创建人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;
+
+}

+package com.lframework.xingyun.sc.impl.sample;
+
+import com.github.pagehelper.PageInfo;
+import com.lframework.xingyun.sc.entity.SampleResultFeedback;
+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.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 org.springframework.transaction.annotation.Transactional;
+import com.lframework.xingyun.sc.mappers.SampleResultFeedbackMapper;
+import com.lframework.xingyun.sc.service.sample.SampleResultFeedbackService;
+import com.lframework.xingyun.sc.vo.sample.feedback.QuerySampleResultFeedbackVo;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class SampleResultFeedbackServiceImpl extends BaseMpServiceImpl<SampleResultFeedbackMapper, SampleResultFeedback> implements SampleResultFeedbackService {
+
+    @Override
+    public PageResult<SampleResultFeedback> query(Integer pageIndex, Integer pageSize, QuerySampleResultFeedbackVo vo) {
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+        // 开启分页
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<SampleResultFeedback> dataList = this.query(vo);
+
+        return PageResultUtil.convert(new PageInfo<>(dataList));
+    }
+
+    @Override
+    public List<SampleResultFeedback> query(QuerySampleResultFeedbackVo vo) {
+
+        return getBaseMapper().query(vo);
+    }
+
+    @Override
+    public SampleResultFeedback findById(String id) {
+
+        return getBaseMapper().selectById(id);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "删除产品试样结果反馈单，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void deleteById(String id) {
+
+        getBaseMapper().deleteById(id);
+    }
+}

+package com.lframework.xingyun.sc.impl.sample;
+
+import com.github.pagehelper.PageInfo;
+import com.lframework.xingyun.sc.entity.SampleResultTracking;
+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.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 org.springframework.transaction.annotation.Transactional;
+import com.lframework.xingyun.sc.mappers.SampleResultTrackingMapper;
+import com.lframework.xingyun.sc.service.sample.SampleResultTrackingService;
+import com.lframework.xingyun.sc.vo.sample.tracking.QuerySampleResultTrackingVo;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class SampleResultTrackingServiceImpl extends BaseMpServiceImpl<SampleResultTrackingMapper, SampleResultTracking> implements SampleResultTrackingService {
+
+    @Override
+    public PageResult<SampleResultTracking> query(Integer pageIndex, Integer pageSize, QuerySampleResultTrackingVo vo) {
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+        // 开启分页
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<SampleResultTracking> dataList = this.query(vo);
+
+        return PageResultUtil.convert(new PageInfo<>(dataList));
+    }
+
+    @Override
+    public List<SampleResultTracking> query(QuerySampleResultTrackingVo vo) {
+
+        return getBaseMapper().query(vo);
+    }
+
+    @Override
+    public SampleResultTracking findById(String id) {
+
+        return getBaseMapper().selectById(id);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "删除产品试样结果跟踪单，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void deleteById(String id) {
+
+        getBaseMapper().deleteById(id);
+    }
+}

+package com.lframework.xingyun.sc.mappers;
+
+import com.lframework.xingyun.sc.entity.SampleResultFeedback;
+import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.xingyun.sc.vo.sample.feedback.QuerySampleResultFeedbackVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 产品试样结果反馈单 Mapper 接口
+ * </p>
+ *
+ */
+public interface SampleResultFeedbackMapper extends BaseMapper<SampleResultFeedback> {
+
+	/**
+     * 查询列表
+     * @param vo    查询条件
+     * @return      List<SampleResultFeedback>
+     */
+    List<SampleResultFeedback> query(@Param("vo") QuerySampleResultFeedbackVo vo);
+}

+package com.lframework.xingyun.sc.mappers;
+
+import com.lframework.xingyun.sc.entity.SampleResultTracking;
+import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.xingyun.sc.vo.sample.tracking.QuerySampleResultTrackingVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 产品试样结果跟踪单 Mapper 接口
+ * </p>
+ *
+ */
+public interface SampleResultTrackingMapper extends BaseMapper<SampleResultTracking> {
+
+	/**
+     * 查询列表
+     *
+     * @param vo    查询条件
+     * @return      List<SampleResultTracking>
+     */
+    List<SampleResultTracking> query(@Param("vo") QuerySampleResultTrackingVo vo);
+}

+package com.lframework.xingyun.sc.service.sample;
+
+import com.lframework.xingyun.sc.vo.sample.feedback.QuerySampleResultFeedbackVo;
+import com.lframework.xingyun.sc.entity.SampleResultFeedback;
+import com.lframework.starter.web.core.service.BaseMpService;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import java.util.List;
+
+/**
+ * 产品试样结果反馈单 Service
+ */
+public interface SampleResultFeedbackService extends BaseMpService<SampleResultFeedback> {
+
+    /**
+     * 分页查询
+     *
+     * @return  PageResult<SampleResultFeedback>
+     */
+    PageResult<SampleResultFeedback> query(Integer pageIndex, Integer pageSize, QuerySampleResultFeedbackVo vo);
+
+    /**
+     * 查询列表
+     * @param vo    查询条件
+     * @return      List<SampleResultFeedback>
+     */
+    List<SampleResultFeedback> query(QuerySampleResultFeedbackVo vo);
+
+    /**
+     * 根据ID查询
+     *
+     * @param id    主键ID
+     * @return      SampleResultFeedback
+     */
+    SampleResultFeedback findById(String id);
+
+    /**
+     * 根据ID删除
+     *
+     * @param id    主键ID
+     */
+    void deleteById(String id);
+}

+package com.lframework.xingyun.sc.service.sample;
+
+import com.lframework.xingyun.sc.vo.sample.tracking.QuerySampleResultTrackingVo;
+import com.lframework.xingyun.sc.entity.SampleResultTracking;
+import com.lframework.starter.web.core.service.BaseMpService;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import java.util.List;
+
+/**
+ * 产品试样结果跟踪单 Service
+ */
+public interface SampleResultTrackingService extends BaseMpService<SampleResultTracking> {
+
+    /**
+     * 分页查询
+     *
+     * @return  PageResult<SampleResultTracking>
+     */
+    PageResult<SampleResultTracking> query(Integer pageIndex, Integer pageSize, QuerySampleResultTrackingVo vo);
+
+    /**
+     * 查询列表
+     *
+     * @param vo    查询条件
+     * @return      List<SampleResultTracking>
+     */
+    List<SampleResultTracking> query(QuerySampleResultTrackingVo vo);
+
+    /**
+     * 根据ID查询
+     *
+     * @param id    主键ID
+     * @return      SampleResultTracking
+     */
+    SampleResultTracking findById(String id);
+
+    /**
+     * 根据ID删除
+     *
+     * @param id    主键ID
+     */
+    void deleteById(String id);
+}

+package com.lframework.xingyun.sc.vo.sample.feedback;
+
+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 QuerySampleResultFeedbackVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+    @ApiModelProperty("客户ID")
+    private String customerId;
+
+    /**
+     * 所属分厂
+     */
+    @ApiModelProperty("所属分厂")
+    private String workshopId;
+
+    /**
+     * 订单ID
+     */
+    @ApiModelProperty("订单ID")
+    private String orderId;
+
+}

+package com.lframework.xingyun.sc.vo.sample.tracking;
+
+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 QuerySampleResultTrackingVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+    @ApiModelProperty("客户ID")
+    private String customerId;
+
+    /**
+     * 所属分厂
+     */
+    @ApiModelProperty("所属分厂")
+    private String workshopId;
+
+    /**
+     * 订单ID
+     */
+    @ApiModelProperty("订单ID")
+    private String orderId;
+
+}

+<?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.SampleResultFeedbackMapper">
+
+    <resultMap id="SampleResultFeedback" type="com.lframework.xingyun.sc.entity.SampleResultFeedback">
+        <id column="id" property="id"/>
+        <result column="customer_id" property="customerId"/>
+        <result column="workshop_id" property="workshopId"/>
+        <result column="order_id" property="orderId"/>
+        <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"/>
+    </resultMap>
+
+    <sql id="SampleResultFeedback_sql">
+        SELECT
+            tb.id,
+            tb.customer_id,
+            tb.workshop_id,
+            tb.order_id,
+            tb.create_by_id,
+            tb.update_by_id,
+            tb.create_time,
+            tb.update_time
+        FROM sample_result_feedback AS tb
+    </sql>
+
+    <select id="query" resultMap="SampleResultFeedback">
+        <include refid="SampleResultFeedback_sql"/>
+        <where>
+            <if test="vo.customerId != null and vo.customerId != ''">
+             AND tb.customer_id = #{vo.customerId}
+            </if>
+            <if test="vo.workshopId != null and vo.workshopId != ''">
+             AND tb.workshop_id = #{vo.workshopId}
+            </if>
+            <if test="vo.orderId != null and vo.orderId != ''">
+             AND tb.order_id = #{vo.orderId}
+            </if>
+        </where>
+    </select>
+</mapper>

+<?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.SampleResultTrackingMapper">
+
+    <resultMap id="SampleResultTracking" type="com.lframework.xingyun.sc.entity.SampleResultTracking">
+        <id column="id" property="id"/>
+        <result column="customer_id" property="customerId"/>
+        <result column="workshop_id" property="workshopId"/>
+        <result column="order_id" property="orderId"/>
+        <result column="surface" property="surface"/>
+        <result column="performance" property="performance"/>
+        <result column="tolerance" property="tolerance"/>
+        <result column="banding_pattern" property="bandingPattern"/>
+        <result column="packaging" property="packaging"/>
+        <result column="weight" property="weight"/>
+        <result column="other" property="other"/>
+        <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"/>
+    </resultMap>
+
+    <sql id="SampleResultTracking_sql">
+        SELECT
+            tb.id,
+            tb.customer_id,
+            tb.workshop_id,
+            tb.order_id,
+            tb.surface,
+            tb.performance,
+            tb.tolerance,
+            tb.banding_pattern,
+            tb.packaging,
+            tb.weight,
+            tb.other,
+            tb.create_by_id,
+            tb.update_by_id,
+            tb.create_time,
+            tb.update_time
+        FROM sample_result_tracking AS tb
+    </sql>
+
+    <select id="query" resultMap="SampleResultTracking">
+        <include refid="SampleResultTracking_sql"/>
+        <where>
+            <if test="vo.customerId != null and vo.customerId != ''">
+             AND tb.customer_id = #{vo.customerId}
+            </if>
+            <if test="vo.workshopId != null and vo.workshopId != ''">
+             AND tb.workshop_id = #{vo.workshopId}
+            </if>
+            <if test="vo.orderId != null and vo.orderId != ''">
+             AND tb.order_id = #{vo.orderId}
+            </if>
+        </where>
+    </select>
+</mapper>