订货单：上传质保书，发货单可下载

@@ -1438,3 +1438,8 @@ ALTER TABLE tbl_contract_distributor_line
 ALTER TABLE tbl_contract_std_processing_line
     ADD COLUMN material_code varchar(100) COMMENT '物料编码';
 
+ALTER TABLE purchase_order_info
+    ADD COLUMN warranty_certificate_file_id varchar(100) COMMENT '质保书ID';
+
+ALTER TABLE purchase_order_info
+    ADD COLUMN warranty_certificate_file_name varchar(200) COMMENT '质保书名称';

@@ -326,6 +326,18 @@ public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> {
     @ApiModelProperty("是否为试样订单")
     private boolean sampleOrder;
 
+    /**
+     * 质保书ID
+     */
+    @ApiModelProperty("质保书ID")
+    private String warrantyCertificateFileId;
+
+    /**
+     * 质保书名称
+     */
+    @ApiModelProperty("质保书名称")
+    private String warrantyCertificateFileName;
+
 
     public GetPurchaseOrderInfoBo() {
 

@@ -254,6 +254,20 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
     }
 
     /**
+     * 修改
+     */
+    @ApiOperation("上传质保书")
+    @HasPermission({"order-manage:order-list:upload"})
+    @PutMapping("/uploadWarrantyCertificate")
+    public InvokeResult<Void> uploadWarrantyCertificate(@Valid @RequestBody UpdatePurchaseOrderInfoVo vo) {
+
+        purchaseOrderInfoService.uploadWarrantyCertificate(vo);
+
+        return InvokeResultBuilder.success();
+    }
+
+
+    /**
      * 取消
      */
     @ApiOperation("取消")

@@ -291,6 +291,16 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
     private Boolean sampleOrder;
 
     /**
+     * 质保书ID
+     */
+    private String warrantyCertificateFileId;
+
+    /**
+     * 质保书名称
+     */
+    private String warrantyCertificateFileName;
+
+    /**
      * 下单人(非持久化字段)
      */
     @TableField(exist = false)

@@ -9,6 +9,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.lframework.starter.web.core.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.lframework.xingyun.sc.vo.shipments.order.WarrantyCertificateVo;
 import lombok.Data;
 
 /**
@@ -149,6 +150,12 @@ public class ShipmentsOrderInfo extends BaseEntity implements BaseDto {
     private List<ShipmentsPlanDetail> detailList;
 
     /**
+     * 质保书
+     */
+    @TableField(exist = false)
+    private List<WarrantyCertificateVo> warrantyCertificateList;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)

@@ -818,6 +818,26 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         getBaseMapper().update(updateWrapper);
     }
 
+    @OpLog(type = OtherOpLogType.class, name = "上传质保书，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void uploadWarrantyCertificate(UpdatePurchaseOrderInfoVo vo) {
+        PurchaseOrderInfo data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("订货单表不存在！");
+        }
+
+        LambdaUpdateWrapper<PurchaseOrderInfo> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderInfo.class)
+                .set(PurchaseOrderInfo::getWarrantyCertificateFileId, StringUtil.isBlank(vo.getWarrantyCertificateFileId()) ? null : vo.getWarrantyCertificateFileId())
+                .set(PurchaseOrderInfo::getWarrantyCertificateFileName, StringUtil.isBlank(vo.getWarrantyCertificateFileName()) ? null : vo.getWarrantyCertificateFileName())
+                .eq(PurchaseOrderInfo::getId, vo.getId());
+
+        getBaseMapper().update(updateWrapper);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+    }
+
 
     @Override
     public void cleanCacheByKey(Serializable key) {

@@ -257,6 +257,22 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         // 获取发货单明细数据
         List<ShipmentsPlanDetail> detailList = shipmentsPlanDetailService.listByShipmentOrderId(id);
         orderInfo.setDetailList(detailList);
+        //质保书
+        if (CollectionUtils.isNotEmpty(detailList)) {
+            List<String> orderIds = detailList.stream()
+                    .map(ShipmentsPlanDetail::getOrderId)
+                    .distinct()
+                    .collect(Collectors.toList());
+            List<PurchaseOrderInfo> purchaseOrderInfos = purchaseOrderInfoService.listByIds(orderIds);
+            List<WarrantyCertificateVo> warrantyCertificateList = new ArrayList<>();
+            for (PurchaseOrderInfo info : purchaseOrderInfos) {
+                WarrantyCertificateVo vo = new WarrantyCertificateVo();
+                vo.setFileId(info.getWarrantyCertificateFileId());
+                vo.setFileName(info.getWarrantyCertificateFileName());
+                warrantyCertificateList.add(vo);
+            }
+            orderInfo.setWarrantyCertificateList(warrantyCertificateList);
+        }
 
         return orderInfo;
     }

@@ -154,4 +154,11 @@ public interface PurchaseOrderInfoService extends BaseMpService<PurchaseOrderInf
      * @param ids   主键ID集合
      */
     void freeze(List<String> ids);
+
+    /**
+     * 上传质保书
+     *
+     * @param vo
+     */
+    void uploadWarrantyCertificate(UpdatePurchaseOrderInfoVo vo);
 }

@@ -214,4 +214,16 @@ public class UpdatePurchaseOrderInfoVo implements BaseVo, Serializable {
     @ApiModelProperty("包装费")
     private String packagingFee;
 
+    /**
+     * 质保书ID
+     */
+    @ApiModelProperty("质保书ID")
+    private String warrantyCertificateFileId;
+
+    /**
+     * 质保书名称
+     */
+    @ApiModelProperty("质保书名称")
+    private String warrantyCertificateFileName;
+
 }

+package com.lframework.xingyun.sc.vo.shipments.order;
+
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+@Data
+public class WarrantyCertificateVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 文件ID
+     */
+    @ApiModelProperty(value = "文件ID")
+    private String fileId;
+
+    /**
+     * 文件名称
+     */
+    @ApiModelProperty(value = "文件名称")
+    private String fileName;
+
+}

@@ -48,6 +48,8 @@
         <result column="contract_create_by_id" property="contractCreateById"/>
         <result column="contract_create_by_name" property="contractCreateByName"/>
         <result column="sample_order" property="sampleOrder"/>
+        <result column="warranty_certificate_file_id" property="warrantyCertificateFileId"/>
+        <result column="warranty_certificate_file_name" property="warrantyCertificateFileName"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
@@ -104,6 +106,8 @@
             su.name as contract_create_by_name,
             tb.freeze,
             tb.sample_order,
+            tb.warranty_certificate_file_id,
+            tb.warranty_certificate_file_name,
             tb.create_by_id,
             tb.create_by,
             tb.update_by_id,