试样订单:跟踪单-基础方法

@@ -1174,16 +1174,30 @@ create table if not exists sample_result_feedback(
 
 create table if not exists sample_result_tracking(
     id varchar(32) primary key comment 'ID',
+    dept_id varchar(32) not null 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 '其它描述',
+    surface text comment '表面描述',
+    performance text comment '性能描述',
+    tolerance text comment '公差描述',
+    banding_pattern text comment '带型描述',
+    packaging text comment '包装描述',
+    weight text comment '件重描述',
+    other text comment '其它描述',
+    sample_success boolean DEFAULT FALSE COMMENT '试样成功',
+    bulk_order boolean DEFAULT FALSE COMMENT '批量订货',
+    sample_failure boolean DEFAULT FALSE COMMENT '试样不成功',
+    continue_sample boolean DEFAULT FALSE COMMENT '继续试样',
+    stop_sample boolean DEFAULT FALSE COMMENT '停止再试样',
+    customer_reviews_file_id varchar(100) comment '客户评价依据文件ID',
+    customer_reviews_file_name varchar(200) comment '客户评价依据文件名称',
+    status varchar(20) comment '审核状态',
+    office_supervisor_opinion text DEFAULT NULL COMMENT '办事处主管审核意见',
+    quality_supervisor_opinion text DEFAULT NULL COMMENT '品质管理科主管审核意见',
+    quality_manager_opinion text DEFAULT NULL COMMENT '品质经理审核意见',
+    operations_department_supervisor_opinion text DEFAULT NULL COMMENT '运作科主管审核意见',
+    marketing_deputy_director_opinion text 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 '创建时间',
@@ -1192,8 +1206,8 @@ create table if not exists sample_result_tracking(
 
 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',
+    feedback_id varchar(32) comment '反馈单ID',
+    tracking_id varchar(32) 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',
@@ -1211,6 +1225,7 @@ create table if not exists sample_feedback_tracking_detail(
     status varchar(50) comment '状态',
     shipment_date date default null comment '发货日期',
     quantity double default null comment '实发数量',
+    yield_batch_no varchar(100) 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 '创建时间',

@@ -112,6 +112,84 @@ public class GetSampleResultTrackingBo extends BaseBo<SampleResultTracking> {
     private List<SampleFeedbackTrackingDetail> detailList;
 
     /**
+     * 试样成功
+     */
+    @ApiModelProperty("试样成功")
+    private boolean sampleSuccess;
+
+    /**
+     * 批量订货
+     */
+    @ApiModelProperty("批量订货")
+    private boolean bulkOrder;
+
+    /**
+     * 试样不成功
+     */
+    @ApiModelProperty("试样不成功")
+    private boolean sampleFailure;
+
+    /**
+     * 继续试样
+     */
+    @ApiModelProperty("继续试样")
+    private boolean continueSample;
+
+    /**
+     * 停止再试样
+     */
+    @ApiModelProperty("停止再试样")
+    private boolean stopSample;
+
+    /**
+     * 客户评价依据文件ID
+     */
+    @ApiModelProperty("客户评价依据文件ID")
+    private String customerReviewsFileId;
+
+    /**
+     * 客户评价依据文件名称
+     */
+    @ApiModelProperty("客户评价依据文件名称")
+    private String customerReviewsFileName;
+
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty("审核状态")
+    private String status;
+
+    /**
+     * 办事处主管审核意见
+     */
+    @ApiModelProperty("办事处主管审核意见")
+    private String officeSupervisorOpinion;
+
+    /**
+     * 品质管理科主管审核意见
+     */
+    @ApiModelProperty("品质管理科主管审核意见")
+    private String qualitySupervisorOpinion;
+
+    /**
+     * 品质经理审核意见
+     */
+    @ApiModelProperty("品质经理审核意见")
+    private String qualityManagerOpinion;
+
+    /**
+     * 运作科主管审核意见
+     */
+    @ApiModelProperty("运作科主管审核意见")
+    private String operationsDepartmentSupervisorOpinion;
+
+    /**
+     * 营销部分管审核意见
+     */
+    @ApiModelProperty("营销部分管审核意见")
+    private String marketingDeputyDirectorOpinion;
+
+    /**
      * 创建人ID
      */
     @ApiModelProperty("创建人ID")

@@ -112,6 +112,85 @@ public class QuerySampleResultTrackingBo extends BaseBo<SampleResultTracking> {
     private List<SampleFeedbackTrackingDetail> detailList;
 
     /**
+     * 试样成功
+     */
+    @ApiModelProperty("试样成功")
+    private boolean sampleSuccess;
+
+    /**
+     * 批量订货
+     */
+    @ApiModelProperty("批量订货")
+    private boolean bulkOrder;
+
+    /**
+     * 试样不成功
+     */
+    @ApiModelProperty("试样不成功")
+    private boolean sampleFailure;
+
+    /**
+     * 继续试样
+     */
+    @ApiModelProperty("继续试样")
+    private boolean continueSample;
+
+    /**
+     * 停止再试样
+     */
+    @ApiModelProperty("停止再试样")
+    private boolean stopSample;
+
+
+    /**
+     * 客户评价依据文件ID
+     */
+    @ApiModelProperty("客户评价依据文件ID")
+    private String customerReviewsFileId;
+
+    /**
+     * 客户评价依据文件名称
+     */
+    @ApiModelProperty("客户评价依据文件名称")
+    private String customerReviewsFileName;
+
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty("审核状态")
+    private String status;
+
+    /**
+     * 办事处主管审核意见
+     */
+    @ApiModelProperty("办事处主管审核意见")
+    private String officeSupervisorOpinion;
+
+    /**
+     * 品质管理科主管审核意见
+     */
+    @ApiModelProperty("品质管理科主管审核意见")
+    private String qualitySupervisorOpinion;
+
+    /**
+     * 品质经理审核意见
+     */
+    @ApiModelProperty("品质经理审核意见")
+    private String qualityManagerOpinion;
+
+    /**
+     * 运作科主管审核意见
+     */
+    @ApiModelProperty("运作科主管审核意见")
+    private String operationsDepartmentSupervisorOpinion;
+
+    /**
+     * 营销部分管审核意见
+     */
+    @ApiModelProperty("营销部分管审核意见")
+    private String marketingDeputyDirectorOpinion;
+
+    /**
      * 创建人ID
      */
     @ApiModelProperty("创建人ID")

@@ -2,13 +2,15 @@ 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.entity.SampleFeedbackTrackingDetail;
+import com.lframework.xingyun.sc.service.sample.SampleFeedbackTrackingDetailService;
+import com.lframework.xingyun.sc.vo.sample.tracking.QuerySampleFeedbackTrackingDetailVo;
 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;
@@ -37,9 +39,10 @@ import java.util.stream.Collectors;
 @RequestMapping("/sample/tracking")
 public class SampleResultTrackingController extends DefaultBaseController {
 
-
     @Resource
     private SampleResultTrackingService sampleResultTrackingService;
+    @Resource
+    private SampleFeedbackTrackingDetailService sampleFeedbackTrackingDetailService;
 
 
     /**
@@ -71,6 +74,10 @@ public class SampleResultTrackingController extends DefaultBaseController {
             throw new DefaultClientException("产品试样结果跟踪单不存在！");
         }
         GetSampleResultTrackingBo result = new GetSampleResultTrackingBo(data);
+        QuerySampleFeedbackTrackingDetailVo vo = new QuerySampleFeedbackTrackingDetailVo();
+        vo.setTrackingId(id);
+        List<SampleFeedbackTrackingDetail> query = sampleFeedbackTrackingDetailService.query(vo);
+        result.setDetailList(query);
 
         return InvokeResultBuilder.success(result);
     }

@@ -123,6 +123,11 @@ public class SampleFeedbackTrackingDetail extends BaseEntity implements BaseDto
     private Double quantity;
 
     /**
+     * 批号
+     */
+    private String yieldBatchNo;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)

@@ -20,27 +20,58 @@ public class SampleResultTracking extends BaseEntity implements BaseDto {
 
     private static final long serialVersionUID = 1L;
 
+    public static final String CACHE_NAME = "SampleResultTracking";
+
     /**
      * ID
      */
     private String id;
 
     /**
+     * 办事处ID
+     */
+    private String deptId;
+
+    /**
      * 客户ID
      */
     private String customerId;
 
     /**
+     * 客户名称
+     */
+    @TableField(exist = false)
+    private String customerName;
+
+    /**
      * 所属分厂
      */
     private String workshopId;
 
     /**
+     * 所属分厂编码
+     */
+    @TableField(exist = false)
+    private String workshopCode;
+
+    /**
+     * 所属分厂名称
+     */
+    @TableField(exist = false)
+    private String workshopName;
+
+    /**
      * 订单ID
      */
     private String orderId;
 
     /**
+     * 订单编码
+     */
+    @TableField(exist = false)
+    private String orderNo;
+
+    /**
      * 表面描述
      */
     private String surface;
@@ -76,6 +107,71 @@ public class SampleResultTracking extends BaseEntity implements BaseDto {
     private String other;
 
     /**
+     * 试样成功
+     */
+    private boolean sampleSuccess;
+
+    /**
+     * 批量订货
+     */
+    private boolean bulkOrder;
+
+    /**
+     * 试样不成功
+     */
+    private boolean sampleFailure;
+
+    /**
+     * 继续试样
+     */
+    private boolean continueSample;
+
+    /**
+     * 停止再试样
+     */
+    private boolean stopSample;
+
+    /**
+     * 客户评价依据文件ID
+     */
+    private String customerReviewsFileId;
+
+    /**
+     * 客户评价依据文件名称
+     */
+    private String customerReviewsFileName;
+
+    /**
+     * 审核状态
+     */
+    private String status;
+
+    /**
+     * 办事处主管审核意见
+     */
+    private String officeSupervisorOpinion;
+
+    /**
+     * 品质管理科主管审核意见
+     */
+    private String qualitySupervisorOpinion;
+
+    /**
+     * 品质经理审核意见
+     */
+    private String qualityManagerOpinion;
+
+    /**
+     * 运作科主管审核意见
+     */
+    private String operationsDepartmentSupervisorOpinion;
+
+    /**
+     * 营销部分管审核意见
+     */
+    private String marketingDeputyDirectorOpinion;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)

@@ -4,7 +4,7 @@ import com.lframework.xingyun.sc.entity.SampleFeedbackTrackingDetail;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
-import org.apache.commons.collections4.CollectionUtils;
+import com.lframework.xingyun.sc.vo.sample.tracking.QuerySampleFeedbackTrackingDetailVo;
 import org.springframework.transaction.annotation.Transactional;
 import com.lframework.xingyun.sc.mappers.SampleFeedbackTrackingDetailMapper;
 import com.lframework.xingyun.sc.service.sample.SampleFeedbackTrackingDetailService;
@@ -17,6 +17,12 @@ import java.util.List;
 public class SampleFeedbackTrackingDetailServiceImpl extends BaseMpServiceImpl<SampleFeedbackTrackingDetailMapper, SampleFeedbackTrackingDetail> implements SampleFeedbackTrackingDetailService {
 
     @Override
+    public List<SampleFeedbackTrackingDetail> query(QuerySampleFeedbackTrackingDetailVo vo) {
+
+        return getBaseMapper().query(vo);
+    }
+
+    @Override
     public SampleFeedbackTrackingDetail findById(String id) {
 
         return getBaseMapper().selectById(id);

 package com.lframework.xingyun.sc.impl.sample;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
+import com.lframework.starter.common.utils.CollectionUtil;
+import com.lframework.xingyun.sc.entity.SampleFeedbackTrackingDetail;
 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.utils.OpLogUtil;
+import com.lframework.starter.common.utils.StringUtil;
+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.SampleFeedbackTrackingDetailMapper;
 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.CreateSampleResultTrackingVo;
 import com.lframework.xingyun.sc.vo.sample.tracking.QuerySampleResultTrackingVo;
+import com.lframework.xingyun.sc.vo.sample.tracking.UpdateSampleResultTrackingVo;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 @Service
 public class SampleResultTrackingServiceImpl extends BaseMpServiceImpl<SampleResultTrackingMapper, SampleResultTracking> implements SampleResultTrackingService {
+    @Resource
+    private SampleFeedbackTrackingDetailMapper sampleFeedbackTrackingDetailMapper;
 
     @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);
+        List<SampleResultTracking> datas = this.query(vo);
 
-        return PageResultUtil.convert(new PageInfo<>(dataList));
+        return PageResultUtil.convert(new PageInfo<>(datas));
     }
 
     @Override
@@ -40,7 +56,68 @@ public class SampleResultTrackingServiceImpl extends BaseMpServiceImpl<SampleRes
     @Override
     public SampleResultTracking findById(String id) {
 
-        return getBaseMapper().selectById(id);
+        return getBaseMapper().findById(id);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "新增产品试样结果跟踪单，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public String create(CreateSampleResultTrackingVo vo) {
+
+        SampleResultTracking data = new SampleResultTracking();
+        data.setId(IdUtil.getId());
+        data.setDeptId(vo.getDeptId());
+        data.setCustomerId(vo.getCustomerId());
+        data.setWorkshopId(vo.getWorkshopId());
+        data.setOrderId(vo.getOrderId());
+
+        getBaseMapper().insert(data);
+
+        //批量新增明细数据
+        if (CollectionUtil.isNotEmpty(vo.getSampleFeedbackTrackingDetailList())) {
+            List<SampleFeedbackTrackingDetail> detailList = vo.getSampleFeedbackTrackingDetailList();
+            detailList.forEach(detail -> detail.setTrackingId(data.getId()));
+            sampleFeedbackTrackingDetailMapper.batchAdd(vo.getSampleFeedbackTrackingDetailList());
+        }
+
+        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(UpdateSampleResultTrackingVo vo) {
+
+        SampleResultTracking data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("产品试样结果跟踪单不存在！");
+        }
+
+        LambdaUpdateWrapper<SampleResultTracking> updateWrapper = Wrappers.lambdaUpdate(SampleResultTracking.class)
+                .set(SampleResultTracking::getSurface, StringUtil.isBlank(vo.getSurface()) ? null : vo.getSurface())
+                .set(SampleResultTracking::getPerformance, StringUtil.isBlank(vo.getPerformance()) ? null : vo.getPerformance())
+                .set(SampleResultTracking::getTolerance, StringUtil.isBlank(vo.getTolerance()) ? null : vo.getTolerance())
+                .set(SampleResultTracking::getBandingPattern, StringUtil.isBlank(vo.getBandingPattern()) ? null : vo.getBandingPattern())
+                .set(SampleResultTracking::getPackaging, StringUtil.isBlank(vo.getPackaging()) ? null : vo.getPackaging())
+                .set(SampleResultTracking::getWeight, StringUtil.isBlank(vo.getWeight()) ? null : vo.getWeight())
+                .set(SampleResultTracking::getOther, StringUtil.isBlank(vo.getOther()) ? null : vo.getOther())
+                .set(SampleResultTracking::isSampleSuccess, vo.isSampleSuccess())
+                .set(SampleResultTracking::isBulkOrder, vo.isBulkOrder())
+                .set(SampleResultTracking::isSampleFailure, vo.isSampleFailure())
+                .set(SampleResultTracking::isContinueSample, vo.isContinueSample())
+                .set(SampleResultTracking::isStopSample, vo.isStopSample())
+                .set(SampleResultTracking::getCustomerReviewsFileId, StringUtil.isBlank(vo.getCustomerReviewsFileId()) ? null : vo.getCustomerReviewsFileId())
+                .set(SampleResultTracking::getCustomerReviewsFileName, StringUtil.isBlank(vo.getCustomerReviewsFileName()) ? null : vo.getCustomerReviewsFileName())
+                .set(SampleResultTracking::getStatus, "AUDIT")
+                .eq(SampleResultTracking::getId, vo.getId());
+
+        getBaseMapper().update(updateWrapper);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
     }
 
     @OpLog(type = OtherOpLogType.class, name = "删除产品试样结果跟踪单，ID：{}", params = {"#id"})

@@ -2,7 +2,9 @@ package com.lframework.xingyun.sc.mappers;
 
 import com.lframework.xingyun.sc.entity.SampleFeedbackTrackingDetail;
 import com.lframework.starter.web.core.mapper.BaseMapper;
-
+import com.lframework.xingyun.sc.vo.sample.tracking.QuerySampleFeedbackTrackingDetailVo;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
 
 /**
  * <p>
@@ -12,4 +14,18 @@ import com.lframework.starter.web.core.mapper.BaseMapper;
  */
 public interface SampleFeedbackTrackingDetailMapper extends BaseMapper<SampleFeedbackTrackingDetail> {
 
+    /**
+     * 查询列表
+     *
+     * @param vo
+     * @return
+     */
+    List<SampleFeedbackTrackingDetail> query(@Param("vo") QuerySampleFeedbackTrackingDetailVo vo);
+
+    /**
+     * 批量新增
+     *
+     * @param list
+     */
+    void batchAdd(@Param("list") List<SampleFeedbackTrackingDetail> list);
 }

@@ -15,11 +15,13 @@ import java.util.List;
  */
 public interface SampleResultTrackingMapper extends BaseMapper<SampleResultTracking> {
 
-	/**
+    /**
      * 查询列表
      *
-     * @param vo    查询条件
-     * @return      List<SampleResultTracking>
+     * @param vo 查询条件
+     * @return List<SampleResultTracking>
      */
     List<SampleResultTracking> query(@Param("vo") QuerySampleResultTrackingVo vo);
+
+    SampleResultTracking findById(@Param("id") String id);
 }

@@ -2,6 +2,7 @@ package com.lframework.xingyun.sc.service.sample;
 
 import com.lframework.xingyun.sc.entity.SampleFeedbackTrackingDetail;
 import com.lframework.starter.web.core.service.BaseMpService;
+import com.lframework.xingyun.sc.vo.sample.tracking.QuerySampleFeedbackTrackingDetailVo;
 
 import java.util.List;
 
@@ -11,6 +12,13 @@ import java.util.List;
 public interface SampleFeedbackTrackingDetailService extends BaseMpService<SampleFeedbackTrackingDetail> {
 
     /**
+     * 查询列表
+     * @param vo
+     * @return
+     */
+    List<SampleFeedbackTrackingDetail> query(QuerySampleFeedbackTrackingDetailVo vo);
+
+    /**
      * 根据ID查询
      *
      * @param id    主键ID

 package com.lframework.xingyun.sc.service.sample;
 
+import com.lframework.xingyun.sc.vo.sample.tracking.CreateSampleResultTrackingVo;
 import com.lframework.xingyun.sc.vo.sample.tracking.QuerySampleResultTrackingVo;
+import com.lframework.xingyun.sc.vo.sample.tracking.UpdateSampleResultTrackingVo;
 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.service.BaseMpService;
 import com.lframework.starter.web.core.components.resp.PageResult;
+import javax.validation.constraints.NotBlank;
+import com.lframework.starter.web.core.vo.PageVo;
+import com.lframework.starter.web.core.utils.OpLogUtil;
+import com.lframework.starter.common.utils.StringUtil;
+import com.lframework.starter.web.core.vo.BaseVo;
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import com.lframework.starter.web.core.utils.EnumUtil;
+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 io.swagger.annotations.ApiModelProperty;
+import org.springframework.transaction.annotation.Transactional;
+import org.hibernate.validator.constraints.Length;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -12,32 +34,42 @@ import java.util.List;
 public interface SampleResultTrackingService extends BaseMpService<SampleResultTracking> {
 
     /**
-     * 分页查询
-     *
-     * @return  PageResult<SampleResultTracking>
+     * 查询列表
+     * @return
      */
     PageResult<SampleResultTracking> query(Integer pageIndex, Integer pageSize, QuerySampleResultTrackingVo vo);
 
     /**
      * 查询列表
-     *
-     * @param vo    查询条件
-     * @return      List<SampleResultTracking>
+     * @param vo
+     * @return
      */
     List<SampleResultTracking> query(QuerySampleResultTrackingVo vo);
 
     /**
      * 根据ID查询
-     *
-     * @param id    主键ID
-     * @return      SampleResultTracking
+     * @param id
+     * @return
      */
     SampleResultTracking findById(String id);
 
     /**
+     * 创建
+     * @param vo
+     * @return
+     */
+    String create(CreateSampleResultTrackingVo vo);
+
+    /**
+     * 修改
+     * @param vo
+     */
+    void update(UpdateSampleResultTrackingVo vo);
+
+    /**
      * 根据ID删除
-     *
-     * @param id    主键ID
+     * @param id
+     * @return
      */
     void deleteById(String id);
 }

+package com.lframework.xingyun.sc.vo.sample.tracking;
+
+import javax.validation.constraints.NotBlank;
+import com.lframework.starter.web.core.utils.IdUtil;
+import com.lframework.starter.web.core.vo.BaseVo;
+import com.lframework.xingyun.sc.entity.SampleFeedbackTrackingDetail;
+import com.lframework.xingyun.sc.vo.sample.confirm.CreateProductSampleConfirmationSlipDetailVo;
+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 java.util.List;
+
+import lombok.Data;
+
+@Data
+public class CreateSampleResultTrackingVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 办事处ID
+     */
+    @ApiModelProperty(value = "办事处ID", required = true)
+    @NotBlank(message = "请输入办事处ID！")
+    @Length(message = "办事处ID最多允许32个字符！")
+    private String deptId;
+
+    /**
+     * 客户ID
+     */
+    @ApiModelProperty(value = "客户ID", required = true)
+    @NotBlank(message = "请输入客户ID！")
+    @Length(message = "客户ID最多允许32个字符！")
+    private String customerId;
+
+    /**
+     * 所属分厂
+     */
+    @ApiModelProperty(value = "所属分厂", required = true)
+    @NotBlank(message = "请输入所属分厂！")
+    @Length(message = "所属分厂最多允许32个字符！")
+    private String workshopId;
+
+    /**
+     * 订单ID
+     */
+    @ApiModelProperty(value = "订单ID", required = true)
+    @NotBlank(message = "请输入订单ID！")
+    @Length(message = "订单ID最多允许32个字符！")
+    private String orderId;
+
+    /**
+     * 明细数据
+     */
+    @ApiModelProperty("客户ID")
+    private List<SampleFeedbackTrackingDetail> sampleFeedbackTrackingDetailList;
+
+}

+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 com.lframework.starter.web.core.components.validation.TypeMismatch;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+
+@Data
+public class QuerySampleFeedbackTrackingDetailVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 反馈单ID
+     */
+    @ApiModelProperty("反馈单ID")
+    private String feedbackId;
+
+    /**
+     * 跟踪单ID
+     */
+    @ApiModelProperty("跟踪单ID")
+    private String trackingId;
+
+}

@@ -14,8 +14,8 @@ public class QuerySampleResultTrackingVo extends PageVo implements BaseVo, Seria
     /**
      * 客户ID
      */
-    @ApiModelProperty("客户ID")
-    private String customerId;
+    @ApiModelProperty("客户名称")
+    private String customerName;
 
     /**
      * 所属分厂
@@ -24,9 +24,21 @@ public class QuerySampleResultTrackingVo extends PageVo implements BaseVo, Seria
     private String workshopId;
 
     /**
-     * 订单ID
+     * 订单编号
      */
-    @ApiModelProperty("订单ID")
-    private String orderId;
+    @ApiModelProperty("订单编号")
+    private String orderCode;
+
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty("审核状态")
+    private String status;
+
+    /**
+     * 搜索关键字
+     */
+    @ApiModelProperty("搜索关键字")
+    private String searchKey;
 
 }

+package com.lframework.xingyun.sc.vo.sample.tracking;
+
+import lombok.Data;
+import javax.validation.constraints.NotBlank;
+import com.lframework.starter.web.core.vo.BaseVo;
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Length;
+import java.io.Serializable;
+
+@Data
+public class UpdateSampleResultTrackingVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value = "ID", required = true)
+    @NotBlank(message = "id不能为空！")
+    private String id;
+
+    /**
+     * 表面描述
+     */
+    @ApiModelProperty("表面描述")
+    @Length(message = "表面描述最多允许200个字符！")
+    private String surface;
+
+    /**
+     * 性能描述
+     */
+    @ApiModelProperty("性能描述")
+    @Length(message = "性能描述最多允许200个字符！")
+    private String performance;
+
+    /**
+     * 公差描述
+     */
+    @ApiModelProperty("公差描述")
+    @Length(message = "公差描述最多允许200个字符！")
+    private String tolerance;
+
+    /**
+     * 带型描述
+     */
+    @ApiModelProperty("带型描述")
+    @Length(message = "带型描述最多允许200个字符！")
+    private String bandingPattern;
+
+    /**
+     * 包装描述
+     */
+    @ApiModelProperty("包装描述")
+    @Length(message = "包装描述最多允许200个字符！")
+    private String packaging;
+
+    /**
+     * 件重描述
+     */
+    @ApiModelProperty("件重描述")
+    @Length(message = "件重描述最多允许200个字符！")
+    private String weight;
+
+    /**
+     * 其它描述
+     */
+    @ApiModelProperty("其它描述")
+    @Length(message = "其它描述最多允许200个字符！")
+    private String other;
+
+    /**
+     * 试样成功
+     */
+    @ApiModelProperty("试样成功")
+    @TypeMismatch(message = "试样成功格式有误！")
+    private boolean sampleSuccess;
+
+    /**
+     * 批量订货
+     */
+    @ApiModelProperty("批量订货")
+    @TypeMismatch(message = "批量订货格式有误！")
+    private boolean bulkOrder;
+
+    /**
+     * 试样不成功
+     */
+    @ApiModelProperty("试样不成功")
+    @TypeMismatch(message = "试样不成功格式有误！")
+    private boolean sampleFailure;
+
+    /**
+     * 继续试样
+     */
+    @ApiModelProperty("继续试样")
+    @TypeMismatch(message = "继续试样格式有误！")
+    private boolean continueSample;
+
+    /**
+     * 停止再试样
+     */
+    @ApiModelProperty("停止再试样")
+    @TypeMismatch(message = "停止再试样格式有误！")
+    private boolean stopSample;
+
+    /**
+     * 客户评价依据文件ID
+     */
+    @ApiModelProperty("客户评价依据文件ID")
+    private String customerReviewsFileId;
+
+    /**
+     * 客户评价依据文件名称
+     */
+    @ApiModelProperty("客户评价依据文件名称")
+    private String customerReviewsFileName;
+
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty("审核状态")
+    private String status;
+
+}

+<?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.SampleFeedbackTrackingDetailMapper">
+
+    <resultMap id="SampleFeedbackTrackingDetail" type="com.lframework.xingyun.sc.entity.SampleFeedbackTrackingDetail">
+        <id column="id" property="id"/>
+        <result column="feedback_id" property="feedbackId"/>
+        <result column="tracking_id" property="trackingId"/>
+        <result column="order_id" property="orderId"/>
+        <result column="order_spec_id" property="orderSpecId"/>
+        <result column="shipment_order_id" property="shipmentOrderId"/>
+        <result column="shipment_detail_id" property="shipmentDetailId"/>
+        <result column="brand" property="brand"/>
+        <result column="thickness" property="thickness"/>
+        <result column="thickness_tol_pos" property="thicknessTolPos"/>
+        <result column="thickness_tol_neg" property="thicknessTolNeg"/>
+        <result column="width" property="width"/>
+        <result column="width_tol_pos" property="widthTolPos"/>
+        <result column="width_tol_neg" property="widthTolNeg"/>
+        <result column="length" property="length"/>
+        <result column="length_tol_pos" property="lengthTolPos"/>
+        <result column="length_tol_neg" property="lengthTolNeg"/>
+        <result column="status" property="status"/>
+        <result column="shipment_date" property="shipmentDate"/>
+        <result column="quantity" property="quantity"/>
+        <result column="yield_batch_no" property="yieldBatchNo"/>
+        <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="SampleFeedbackTrackingDetail_sql">
+        SELECT
+            tb.id,
+            tb.feedback_id,
+            tb.tracking_id,
+            tb.order_id,
+            tb.order_spec_id,
+            tb.shipment_order_id,
+            tb.shipment_detail_id,
+            tb.brand,
+            tb.thickness,
+            tb.thickness_tol_pos,
+            tb.thickness_tol_neg,
+            tb.width,
+            tb.width_tol_pos,
+            tb.width_tol_neg,
+            tb.length,
+            tb.length_tol_pos,
+            tb.length_tol_neg,
+            tb.status,
+            tb.shipment_date,
+            tb.quantity,
+            tb.yield_batch_no,
+            tb.create_by_id,
+            tb.update_by_id,
+            tb.create_time,
+            tb.update_time
+        FROM sample_feedback_tracking_detail AS tb
+    </sql>
+
+    <select id="query" resultMap="SampleFeedbackTrackingDetail">
+        <include refid="SampleFeedbackTrackingDetail_sql"/>
+        <where>
+            <if test="vo.feedbackId != null and vo.feedbackId != ''">
+                AND tb.feedback_id = #{vo.feedbackId}
+            </if>
+            <if test="vo.trackingId != null and vo.trackingId != ''">
+                AND tb.tracking_id = #{vo.trackingId}
+            </if>
+        </where>
+    </select>
+
+    <insert id="batchAdd">
+        INSERT INTO sample_feedback_tracking_detail (
+        id,
+        feedback_id,
+        tracking_id,
+        order_id,
+        order_spec_id,
+        shipment_order_id,
+        shipment_detail_id,
+        brand,
+        thickness,
+        thickness_tol_pos,
+        thickness_tol_neg,
+        width,
+        width_tol_pos,
+        width_tol_neg,
+        length,
+        length_tol_pos,
+        length_tol_neg,
+        status,
+        shipment_date,
+        quantity,
+        yield_batch_no,
+        create_by_id,
+        update_by_id,
+        create_time,
+        update_time
+        ) VALUES
+        <foreach collection="list" item="item" separator=",">
+            (
+            #{item.id},
+            #{item.feedbackId},
+            #{item.trackingId},
+            #{item.orderId},
+            #{item.orderSpecId},
+            #{item.shipmentOrderId},
+            #{item.shipmentDetailId},
+            #{item.brand},
+            #{item.thickness},
+            #{item.thicknessTolPos},
+            #{item.thicknessTolNeg},
+            #{item.width},
+            #{item.widthTolPos},
+            #{item.widthTolNeg},
+            #{item.length},
+            #{item.lengthTolPos},
+            #{item.lengthTolNeg},
+            #{item.status},
+            #{item.shipmentDate},
+            #{item.quantity},
+            #{item.yieldBatchNo},
+            #{item.createById},
+            #{item.updateById},
+            #{item.createTime},
+            #{item.updateTime}
+            )
+        </foreach>
+    </insert>
+</mapper>

@@ -5,8 +5,12 @@
     <resultMap id="SampleResultTracking" type="com.lframework.xingyun.sc.entity.SampleResultTracking">
         <id column="id" property="id"/>
         <result column="customer_id" property="customerId"/>
+        <result column="customer_name" property="customerName"/>
         <result column="workshop_id" property="workshopId"/>
+        <result column="workshop_code" property="workshopCode"/>
+        <result column="workshop_name" property="workshopName"/>
         <result column="order_id" property="orderId"/>
+        <result column="order_code" property="orderCode"/>
         <result column="surface" property="surface"/>
         <result column="performance" property="performance"/>
         <result column="tolerance" property="tolerance"/>
@@ -14,6 +18,19 @@
         <result column="packaging" property="packaging"/>
         <result column="weight" property="weight"/>
         <result column="other" property="other"/>
+        <result column="sample_success" property="sampleSuccess"/>
+        <result column="bulk_order" property="bulkOrder"/>
+        <result column="sample_failure" property="sampleFailure"/>
+        <result column="continue_sample" property="continueSample"/>
+        <result column="stop_sample" property="stopSample"/>
+        <result column="customer_reviews_file_id" property="customerReviewsFileId"/>
+        <result column="customer_reviews_file_name" property="customerReviewsFileName"/>
+        <result column="status" property="status"/>
+        <result column="office_supervisor_opinion" property="officeSupervisorOpinion"/>
+        <result column="quality_supervisor_opinion" property="qualitySupervisorOpinion"/>
+        <result column="quality_manager_opinion" property="qualityManagerOpinion"/>
+        <result column="operations_department_supervisor_opinion" property="operationsDepartmentSupervisorOpinion"/>
+        <result column="marketing_deputy_director_opinion" property="marketingDeputyDirectorOpinion"/>
         <result column="create_by_id" property="createById"/>
         <result column="update_by_id" property="updateById"/>
         <result column="create_time" property="createTime"/>
@@ -24,8 +41,12 @@
         SELECT
             tb.id,
             tb.customer_id,
+            cu.name AS customer_name,
             tb.workshop_id,
+            ws.code AS workshop_code,
+            ws.name AS workshop_name,
             tb.order_id,
+            poi.order_no AS order_code,
             tb.surface,
             tb.performance,
             tb.tolerance,
@@ -33,24 +54,56 @@
             tb.packaging,
             tb.weight,
             tb.other,
+            tb.sample_success,
+            tb.bulk_order,
+            tb.sample_failure,
+            tb.continue_sample,
+            tb.stop_sample,
+            tb.customer_reviews_file_id,
+            tb.customer_reviews_file_name,
+            tb.status,
+            tb.office_supervisor_opinion,
+            tb.quality_supervisor_opinion,
+            tb.quality_manager_opinion,
+            tb.operations_department_supervisor_opinion,
+            tb.marketing_deputy_director_opinion,
             tb.create_by_id,
             tb.update_by_id,
             tb.create_time,
-            tb.update_time
+            tb.update_time,
         FROM sample_result_tracking AS tb
+        left join base_data_customer as cu on cu.id = tb.customer_id
+        left join base_data_workshop as ws on ws.id = tb.workshop_id
+        left join purchase_order_info as poi on poi.id = tb.order_id
     </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 test="vo.customerName != null and vo.customerName != ''">
+                AND cu.name LIKE CONCAT('%', #{vo.customerName},'%')
             </if>
             <if test="vo.workshopId != null and vo.workshopId != ''">
-             AND tb.workshop_id = #{vo.workshopId}
+                AND tb.workshop_id = #{vo.workshopId}
             </if>
-            <if test="vo.orderId != null and vo.orderId != ''">
-             AND tb.order_id = #{vo.orderId}
+            <if test="vo.orderCode != null and vo.orderCode != ''">
+                AND poi.order_no LIKE CONCAT('%', #{vo.orderCode},'%')
+            </if>
+            <if test="vo.status != null and vo.status != ''">
+                AND tb.status = #{vo.status}
+            </if>
+            <if test="vo.searchKey != null and vo.searchKey != ''">
+                AND (cu.name LIKE CONCAT('%', #{vo.searchKey},'%')
+                OR poi.order_no LIKE CONCAT('%', #{vo.searchKey},'%'))
+            </if>
+        </where>
+    </select>
+
+    <select id="findById" resultType="com.lframework.xingyun.sc.entity.SampleResultTracking">
+        <include refid="SampleResultTracking_sql"/>
+        <where>
+            <if test="id != null and id != ''">
+                AND tb.id = #{id}
             </if>
         </where>
     </select>