楚江erp：样品反馈单基础接口开发

 package com.lframework.xingyun.sc.bo.sample.feedback;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.starter.web.core.utils.ApplicationUtil;
+import com.lframework.xingyun.basedata.entity.Customer;
+import com.lframework.xingyun.basedata.entity.Workshop;
+import com.lframework.xingyun.basedata.service.customer.CustomerService;
+import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
+import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.entity.SampleFeedbackTrackingDetail;
 import com.lframework.xingyun.sc.entity.SampleResultFeedback;
 import com.lframework.starter.common.constants.StringPool;
@@ -8,9 +14,11 @@ import com.lframework.starter.web.core.bo.BaseBo;
 import java.time.LocalDateTime;
 import java.util.List;
 
+import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * <p>
@@ -111,6 +119,20 @@ public class GetSampleResultFeedbackBo extends BaseBo<SampleResultFeedback> {
 
     @Override
     protected void afterInit(SampleResultFeedback dto) {
-
+        if (StringUtils.isNotBlank(dto.getCustomerId())) {
+            CustomerService customerService = ApplicationUtil.getBean(CustomerService.class);
+            Customer customer = customerService.findById(dto.getCustomerId());
+            this.customerName = customer == null ? null : customer.getName();
+        }
+        if (StringUtils.isNotBlank(dto.getWorkshopId())) {
+            WorkshopService workshopService = ApplicationUtil.getBean(WorkshopService.class);
+            Workshop workshop = workshopService.findById(dto.getWorkshopId());
+            this.workshopName = workshop == null ? null : workshop.getName();
+        }
+        if (StringUtils.isNotBlank(dto.getOrderId())) {
+            PurchaseOrderInfoService purchaseOrderInfoService = ApplicationUtil.getBean(PurchaseOrderInfoService.class);
+            PurchaseOrderInfo orderInfo = purchaseOrderInfoService.findById(dto.getOrderId());
+            this.orderNo = orderInfo == null ? null : orderInfo.getOrderNo();
+        }
     }
 }

@@ -3,6 +3,8 @@ 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 java.util.List;
+
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.lframework.starter.web.core.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -59,6 +61,12 @@ public class SampleResultFeedback extends BaseEntity implements BaseDto {
     private String orderNo;
 
     /**
+     * 反馈单明细数据
+     */
+    @TableField(exist = false)
+    private List<SampleFeedbackTrackingDetail> detailList;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)

 package com.lframework.xingyun.sc.impl.sample;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 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 com.lframework.xingyun.sc.vo.sample.tracking.QuerySampleFeedbackTrackingDetailVo;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.transaction.annotation.Transactional;
 import com.lframework.xingyun.sc.mappers.SampleFeedbackTrackingDetailMapper;
 import com.lframework.xingyun.sc.service.sample.SampleFeedbackTrackingDetailService;
@@ -38,7 +41,13 @@ public class SampleFeedbackTrackingDetailServiceImpl extends BaseMpServiceImpl<S
 
     @Override
     public List<SampleFeedbackTrackingDetail> listByFeedbackIds(List<String> feedbackIds) {
-        return Collections.emptyList();
+        if (CollectionUtils.isEmpty(feedbackIds)) {
+            return Collections.emptyList();
+        }
+        LambdaQueryWrapper<SampleFeedbackTrackingDetail> queryWrapper = Wrappers.lambdaQuery(SampleFeedbackTrackingDetail.class);
+        queryWrapper.in(SampleFeedbackTrackingDetail::getFeedbackId, feedbackIds);
+
+        return getBaseMapper().selectList(queryWrapper);
     }
 
     @Override

 package com.lframework.xingyun.sc.impl.sample;
 
 import com.github.pagehelper.PageInfo;
-import com.lframework.xingyun.sc.entity.SampleFeedbackTrackingDetail;
-import com.lframework.xingyun.sc.entity.SampleResultFeedback;
+import com.lframework.starter.web.core.utils.IdUtil;
+import com.lframework.xingyun.sc.entity.*;
 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;
@@ -10,8 +10,11 @@ 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.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.sample.SampleFeedbackTrackingDetailService;
+import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.transaction.annotation.Transactional;
 import com.lframework.xingyun.sc.mappers.SampleResultFeedbackMapper;
 import com.lframework.xingyun.sc.service.sample.SampleResultFeedbackService;
@@ -19,9 +22,7 @@ import com.lframework.xingyun.sc.vo.sample.feedback.QuerySampleResultFeedbackVo;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
+import java.util.*;
 
 @Service
 public class SampleResultFeedbackServiceImpl extends BaseMpServiceImpl<SampleResultFeedbackMapper, SampleResultFeedback> implements SampleResultFeedbackService {
@@ -29,6 +30,10 @@ public class SampleResultFeedbackServiceImpl extends BaseMpServiceImpl<SampleRes
 
     @Resource
     private SampleFeedbackTrackingDetailService sampleFeedbackTrackingDetailService;
+    @Resource
+    private PurchaseOrderLineService purchaseOrderLineService;
+    @Resource
+    private ShipmentsPlanDetailService shipmentsPlanDetailService;
 
 
     @Override
@@ -44,20 +49,18 @@ public class SampleResultFeedbackServiceImpl extends BaseMpServiceImpl<SampleRes
 
     @Override
     public List<SampleResultFeedback> query(QuerySampleResultFeedbackVo vo) {
-        List<SampleResultFeedback> feedbackList = getBaseMapper().query(vo);
-        if (CollectionUtils.isEmpty(feedbackList)) {
-            return Collections.emptyList();
-        }
-        List<String> feedbackIds = feedbackList.stream().map(SampleResultFeedback::getId).collect(Collectors.toList());
-        List<SampleFeedbackTrackingDetail> detailList = sampleFeedbackTrackingDetailService.listByFeedbackIds(feedbackIds);
 
         return getBaseMapper().query(vo);
     }
 
     @Override
     public SampleResultFeedback findById(String id) {
-
-        return getBaseMapper().selectById(id);
+        SampleResultFeedback sampleResultFeedback = getBaseMapper().selectById(id);
+        if (sampleResultFeedback != null) {
+            List<SampleFeedbackTrackingDetail> detailList = sampleFeedbackTrackingDetailService.listByFeedbackIds(Collections.singletonList(id));
+            sampleResultFeedback.setDetailList(detailList);
+        }
+        return sampleResultFeedback;
     }
 
     @OpLog(type = OtherOpLogType.class, name = "删除产品试样结果反馈单，ID：{}", params = {"#id"})
@@ -67,4 +70,87 @@ public class SampleResultFeedbackServiceImpl extends BaseMpServiceImpl<SampleRes
 
         getBaseMapper().deleteById(id);
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void generateFeedbackData(List<PurchaseOrderInfo> orderInfoList, List<String> shipmentsDetailIds) {
+        if (CollectionUtils.isEmpty(orderInfoList) || CollectionUtils.isEmpty(shipmentsDetailIds)) {
+            return;
+        }
+        // 获取发货明细数据
+        List<ShipmentsPlanDetail> shipmentsDetailList = shipmentsPlanDetailService.listByIds(shipmentsDetailIds);
+        if (CollectionUtils.isEmpty(shipmentsDetailList)) {
+            return;
+        }
+        List<String> orderSpecIds = new ArrayList<>();
+        Map<String, ShipmentsPlanDetail> shipmentsDetailMap = new HashMap<>();
+        for (ShipmentsPlanDetail shipmentsDetail : shipmentsDetailList) {
+            String orderSpecId = shipmentsDetail.getOrderSpecId();
+            orderSpecIds.add(orderSpecId);
+            shipmentsDetailMap.put(orderSpecId, shipmentsDetail);
+        }
+        // 获取订货单规格数据
+        List<PurchaseOrderLine> orderLineList = purchaseOrderLineService.listByIds(orderSpecIds);
+        if (CollectionUtils.isEmpty(orderLineList)) {
+            return;
+        }
+        Map<String, List<PurchaseOrderLine>> orderSpecMap = new HashMap<>();
+        for (PurchaseOrderLine purchaseOrderLine : orderLineList) {
+            String orderId = purchaseOrderLine.getPurchaseOrderId();
+            List<PurchaseOrderLine> list = orderSpecMap.computeIfAbsent(orderId, k -> new ArrayList<>());
+            list.add(purchaseOrderLine);
+        }
+        // 此处数据不会特别多，直接循环新增
+        for (PurchaseOrderInfo orderInfo : orderInfoList) {
+            if (!BooleanUtils.isTrue(orderInfo.getSampleOrder())) {
+                // 非试样订单
+                continue;
+            }
+            String orderId = orderInfo.getId();
+            List<PurchaseOrderLine> lineList = orderSpecMap.get(orderId);
+            if (CollectionUtils.isEmpty(lineList)) {
+                continue;
+            }
+            SampleResultFeedback feedback = new SampleResultFeedback();
+            feedback.setId(IdUtil.getUUID());
+            feedback.setCustomerId(orderInfo.getOrderingUnit());
+            feedback.setWorkshopId(orderInfo.getWorkshopId());
+            feedback.setOrderId(orderId);
+
+            getBaseMapper().insert(feedback);
+            // 生成明细数据
+            for (PurchaseOrderLine line : lineList) {
+                if (!orderId.equals(line.getPurchaseOrderId())) {
+                    continue;
+                }
+                ShipmentsPlanDetail shipmentsDetail = shipmentsDetailMap.get(line.getId());
+                if (shipmentsDetail == null) {
+                    continue;
+                }
+                SampleFeedbackTrackingDetail detail = new SampleFeedbackTrackingDetail();
+                detail.setId(IdUtil.getUUID());
+                detail.setFeedbackId(feedback.getId());
+                detail.setOrderId(orderId);
+                detail.setOrderSpecId(line.getId());
+                detail.setShipmentOrderId(shipmentsDetail.getShipmentOrderId());
+                detail.setShipmentDetailId(shipmentsDetail.getId());
+                detail.setBrand(line.getBrand());
+                detail.setThickness(line.getThickness());
+                detail.setThicknessTolPos(line.getThicknessTolPos());
+                detail.setThicknessTolNeg(line.getThicknessTolNeg());
+                detail.setWidth(line.getWidth());
+                detail.setWidthTolPos(line.getWidthTolPos());
+                detail.setWidthTolNeg(line.getWidthTolPos());
+                detail.setLength(line.getLength());
+                detail.setLengthTolPos(line.getLengthTolPos());
+                detail.setLengthTolNeg(line.getLengthTolNeg());
+                detail.setStatus(line.getStatus());
+                detail.setShipmentDate(shipmentsDetail.getShipmentsDate());
+                detail.setQuantity(shipmentsDetail.getActualShipmentQuantity());
+                detail.setYieldBatchNo(shipmentsDetail.getYieldBatchNo());
+
+                sampleFeedbackTrackingDetailService.getBaseMapper().insert(detail);
+            }
+        }
+    }
 }

@@ -30,6 +30,7 @@ import com.lframework.xingyun.sc.handlers.MessageHandler;
 import com.lframework.xingyun.sc.service.ledger.ReceiptLedgerInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
+import com.lframework.xingyun.sc.service.sample.SampleResultFeedbackService;
 import com.lframework.xingyun.sc.service.sample.SampleResultTrackingService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanService;
@@ -99,6 +100,8 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
     private SysUserRoleService sysUserRoleService;
     @Resource
     private SampleResultTrackingService sampleResultTrackingService;
+    @Resource
+    private SampleResultFeedbackService sampleResultFeedbackService;
 
 
     @Override
@@ -434,6 +437,9 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         String type = vo.getType();
         List<PurchaseOrderInfo> orderInfoList = purchaseOrderInfoService.listByIds(orderIds);
         if (CollectionUtils.isNotEmpty(orderInfoList)) {
+            // 试样订单生成反馈单数据
+            sampleResultFeedbackService.generateFeedbackData(orderInfoList, detailIds);
+
             List<String> userIds = new ArrayList<>();
             StringBuilder orderNoBuilder = new StringBuilder();
             for (PurchaseOrderInfo info : orderInfoList) {

 package com.lframework.xingyun.sc.service.sample;
 
+import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
+import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
 import com.lframework.xingyun.sc.vo.sample.feedback.QuerySampleResultFeedbackVo;
 import com.lframework.xingyun.sc.entity.SampleResultFeedback;
 import com.lframework.starter.web.core.service.BaseMpService;
@@ -39,4 +41,12 @@ public interface SampleResultFeedbackService extends BaseMpService<SampleResultF
      * @param id    主键ID
      */
     void deleteById(String id);
+
+    /**
+     * 生成样品反馈单数据（包含明细）
+     *
+     * @param orderInfoList         订货单数据
+     * @param shipmentsDetailIds    发货明细ID
+     */
+    void generateFeedbackData(List<PurchaseOrderInfo> orderInfoList, List<String> shipmentsDetailIds);
 }

@@ -18,15 +18,33 @@ public class QuerySampleResultFeedbackVo extends PageVo implements BaseVo, Seria
     private String customerId;
 
     /**
+     * 客户名称
+     */
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    /**
      * 所属分厂
      */
     @ApiModelProperty("所属分厂")
     private String workshopId;
 
     /**
+     * 所属分厂名称
+     */
+    @ApiModelProperty("所属分厂名称")
+    private String workshopName;
+
+    /**
      * 订单ID
      */
     @ApiModelProperty("订单ID")
     private String orderId;
 
+    /**
+     * 订单编号
+     */
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
 }

@@ -5,8 +5,11 @@
     <resultMap id="SampleResultFeedback" type="com.lframework.xingyun.sc.entity.SampleResultFeedback">
         <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_name" property="workshopName"/>
         <result column="order_id" property="orderId"/>
+        <result column="order_no" property="orderNo"/>
         <result column="create_by_id" property="createById"/>
         <result column="update_by_id" property="updateById"/>
         <result column="create_time" property="createTime"/>
@@ -44,6 +47,15 @@
             <if test="vo.orderId != null and vo.orderId != ''">
              AND tb.order_id = #{vo.orderId}
             </if>
+            <if test="vo.customerName != null and vo.customerName != ''">
+                AND c.name LIKE CONCAT('%', #{vo.customerName}, '%')
+            </if>
+            <if test="vo.workshopName != null and vo.workshopName != ''">
+                AND w.name LIKE CONCAT('%', #{vo.workshopName}, '%')
+            </if>
+            <if test="vo.orderNo != null and vo.orderNo != ''">
+                AND o.order_no LIKE CONCAT('%', #{vo.orderNo}, '%')
+            </if>
         </where>
     </select>
 </mapper>