Merge remote-tracking branch 'origin/dev_1.0.0' into dev_1.0.0

ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/OmsPurchaseOrderController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.sip.controller.vue;
 
 import cn.hutool.core.collection.CollUtil;
+import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -136,12 +137,13 @@ public class OmsPurchaseOrderController extends BaseController
     /**
      * 导出采购单主表列表
      */
-    @RequiresPermissions("sip:purchaseorder:export")
-    @Log(title = "采购单主表", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, OmsPurchaseOrder omsPurchaseOrder)
+//    @RequiresPermissions("sip:purchaseorder:export")
+    @Anonymous
+    @GetMapping("/export")
+    public void export(OmsPurchaseOrder omsPurchaseOrder, HttpServletResponse response)
     {
         List<OmsPurchaseOrder> list = omsPurchaseOrderService.selectOmsPurchaseOrderList(omsPurchaseOrder);
+        todoService.fillPurchaseOrderApproveNode(list);
         ExcelUtil<OmsPurchaseOrder> util = new ExcelUtil<OmsPurchaseOrder>(OmsPurchaseOrder.class);
         util.exportExcel(response, list, "采购单主表数据");
     }
@@ -247,4 +249,11 @@ public class OmsPurchaseOrderController extends BaseController
     {
         return toAjax(omsPurchaseOrderService.deleteOmsPurchaseOrderByIds(ids));
     }
+
+    @Anonymous
+    @GetMapping("/test")
+    public String test(HttpServletResponse response)
+    {
+        return "ok";
+    }
 }

ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrder.java

@@ -3,6 +3,8 @@ package com.ruoyi.sip.domain;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
+
+import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.Getter;
@@ -26,70 +28,92 @@ public class OmsPurchaseOrder extends BaseEntity
     private Long id;
 
     /** 采购单号（系统生成） */
+    @Excel(name = "采购单号")
     private String purchaseNo;
 
     /** 采购方名称 */
+    @Excel(name = "采购方名称")
     private String buyerName;
 
     /** 采购方地址 */
+    @Excel(name = "采购方地址")
     private String buyerAddress;
 
     /** 制造商ID */
+    @Excel(name = "制造商ID")
     private Long vendorId;
-
     private String vendorCode;
     private List<String> authVendorCodeList;
+    @Excel(name = "供应商名称")
     private String vendorName;
+    @Excel(name = "供应商联系人")
     private String vendorUser;
+    @Excel(name = "供应商电话")
     private String vendorPhone;
     /** 币别（固定人民币） */
+    @Excel(name = "币别")
     private String currency;
 
     /** 采购员ID */
+    @Excel(name = "采购员ID")
     private Long purchaserId;
 
 
     /** 采购员姓名 */
+    @Excel(name = "采购员姓名")
     private String purchaserName;
 
     /** 采购员电话 */
+    @Excel(name = "采购员电话")
     private String purchaserMobile;
 
     /** 采购员邮箱 */
+    @Excel(name = "采购员邮箱")
     private String purchaserEmail;
 
     /** 入库仓库ID */
     private Long warehouseId;
+    @Excel(name = "入库仓库名称")
     private String warehouseName;
 
-    /** 付款方式 */
+    /** 付款方式 1为出库付款，其他为入库*/
+    @Excel(name = "付款方式", defaultValue = "入库付款", readConverterExp = "0=入库付款,1=出库付款,2=入库付款")
     private String payMethod;
 
     /** 汇智负责人ID */
+    @Excel(name = "汇智负责人ID")
     private Long ownerId;
 
     /** 汇智负责人姓名 */
+    @Excel(name = "汇智负责人姓名")
     private String ownerName;
 
     /** 含税总金额 */
+    @Excel(name = "含税总金额")
     private BigDecimal totalAmount;
 
     /** 采购状态（0待入库 1部分入库 2已完成） */
+    @Excel(name = "采购状态", readConverterExp = "0=待入库,1=部分入库,2=已完成")
     private Integer status;
 
     /** 审批状态（0草稿 1审批中 2已通过 3驳回） */
+    @Excel(name = "审批状态", readConverterExp = "0=草稿,1=审批中,2=已通过,3=驳回")
     private String approveStatus;
 
     /** 审批时间 */
+    @Excel(name = "审批时间")
     private Date approveTime;
 
     /** 当前审批节点 */
+    @Excel(name = "当前审批节点")
     private String approveNode;
 
     /** 确认状态（待审批、已确认、或空） */
+    @Excel(name = "确认状态", readConverterExp = "0=待审批,1=已确认,2=已驳回")
     private String confirmStatus;
 
     /** 流程类型（online线上 offline线下） */
+    @Excel(name = "流程类型", readConverterExp = "online=线上,offline=线下")
     private String flowType;
 
     /** 删除标志（0正常 1删除） */

ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java

@@ -111,8 +111,11 @@ public class ProjectInfoServiceImpl implements IProjectInfoService {
         Map<String, List<ProjectProductInfo>> productListMap = projectProductInfos.stream().collect(Collectors.groupingBy(ProjectProductInfo::getType));
         projectInfo.setSoftwareProjectProductInfoList(productListMap.get(ProductInfo.ProductTypeEnum.SOFTWARE.getType()));
         projectInfo.setHardwareProjectProductInfoList(productListMap.get(ProductInfo.ProductTypeEnum.HARDWARE.getType()));
+        // 硬件
         List<ProjectProductInfo> maintenanceProjectProductInfoList = productListMap.getOrDefault(ProductInfo.ProductTypeEnum.HARDWARE_MAINTENANCE.getType(), new ArrayList<>());
+        // 软件
         maintenanceProjectProductInfoList.addAll(productListMap.getOrDefault(ProductInfo.ProductTypeEnum.SOFTWARE_MAINTENANCE.getType(), new ArrayList<>()));
+        // 其他
         maintenanceProjectProductInfoList.addAll(productListMap.getOrDefault(ProductInfo.ProductTypeEnum.OTHER.getType(), new ArrayList<>()));
         projectInfo.setMaintenanceProjectProductInfoList(maintenanceProjectProductInfoList);
         //查询变更记录信息