From 1765150bd38a53f6466a6e355f231e21f25fc9f2 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 27 一月 2026 16:03:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/resources/mapper/production/ProductWorkOrderMapper.xml | 35 +
src/main/java/com/ruoyi/home/controller/HomeController.java | 46 ++
src/main/java/com/ruoyi/common/utils/MatrixToImageWriter.java | 67 +++
src/main/java/com/ruoyi/production/pojo/ProductWorkOrderFile.java | 65 +++
src/main/java/com/ruoyi/home/dto/CustomerRevenueAnalysisDto.java | 19 +
pom.xml | 6
src/main/java/com/ruoyi/production/controller/ProductWorkOrderFileController.java | 70 +++
src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java | 445 ++++++++++++++++++++++-
src/main/java/com/ruoyi/production/mapper/ProductWorkOrderMapper.java | 1
src/main/java/com/ruoyi/production/controller/ProductWorkOrderController.java | 14
src/main/java/com/ruoyi/home/dto/ProductCategoryDistributionDto.java | 49 ++
src/main/java/com/ruoyi/home/dto/HomeSummaryDto.java | 31 +
src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java | 5
src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java | 2
src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java | 1
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 6
src/main/java/com/ruoyi/home/dto/DeptStaffDistributionDto.java | 22 +
src/main/java/com/ruoyi/home/dto/CustomerContributionRankingDto.java | 21 +
src/main/java/com/ruoyi/home/dto/SupplierPurchaseRankingDto.java | 21 +
src/main/java/com/ruoyi/production/pojo/ProductProcessRoute.java | 2
src/main/resources/mapper/production/ProductWorkOrderFileMapper.xml | 19 +
src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java | 86 ++++
src/main/java/com/ruoyi/home/service/HomeService.java | 12
src/main/java/com/ruoyi/production/service/ProductWorkOrderFileService.java | 16
src/main/java/com/ruoyi/production/service/ProductWorkOrderService.java | 3
src/main/resources/static/work-order-template.docx | 0
src/main/java/com/ruoyi/production/mapper/ProductWorkOrderFileMapper.java | 18
src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderFileServiceImpl.java | 20 +
28 files changed, 1,061 insertions(+), 41 deletions(-)
diff --git a/pom.xml b/pom.xml
index 44c9360..790a3e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -301,6 +301,12 @@
<artifactId>easyexcel</artifactId>
<version>4.0.3</version>
</dependency>
+
+ <dependency>
+ <groupId>com.google.zxing</groupId>
+ <artifactId>core</artifactId>
+ <version>3.3.3</version>
+ </dependency>
</dependencies>
diff --git a/src/main/java/com/ruoyi/common/utils/MatrixToImageWriter.java b/src/main/java/com/ruoyi/common/utils/MatrixToImageWriter.java
new file mode 100644
index 0000000..ad9f2aa
--- /dev/null
+++ b/src/main/java/com/ruoyi/common/utils/MatrixToImageWriter.java
@@ -0,0 +1,67 @@
+package com.ruoyi.common.utils;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.MultiFormatWriter;
+import com.google.zxing.WriterException;
+import com.google.zxing.common.BitMatrix;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 閰嶇疆鍥惧儚鍐欏叆鍣�
+ *
+ * @author z1292
+ *
+ */
+public class MatrixToImageWriter {
+ private final int BLACK = 0xFF000000;
+ private final int WHITE = 0xFFFFFFFF;
+
+ private BufferedImage toBufferedImage(BitMatrix matrix) {
+ int width = matrix.getWidth();
+ int height = matrix.getHeight();
+ BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+ for (int x = 0; x < width; x++) {
+ for (int y = 0; y < height; y++) {
+ image.setRGB(x, y, matrix.get(x, y) ? BLACK : WHITE);
+ }
+ }
+ return image;
+ }
+
+ private void writeToFile(BitMatrix matrix, String format, File file) throws IOException {
+ BufferedImage image = toBufferedImage(matrix);
+ if (!ImageIO.write(image, format, file)) {
+ throw new RuntimeException("Could not write an image of format " + format + " to " + file);
+ }
+ }
+
+ public String code(String content, String path) {
+ try {
+ String codeName = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yy_MM_dd&HH_mm_ss"));// 浜岀淮鐮佺殑鍥剧墖鍚�
+ String imageType = "jpg";// 鍥剧墖绫诲瀷
+ MultiFormatWriter multiFormatWriter = new MultiFormatWriter();
+ Map<EncodeHintType, Object> hints = new HashMap<>();
+ hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
+ hints.put(EncodeHintType.MARGIN, 0);
+ BitMatrix bitMatrix = multiFormatWriter.encode(content, BarcodeFormat.QR_CODE, 400, 400, hints);
+ File file1 = new File(path, codeName + "." + imageType);
+ writeToFile(bitMatrix, imageType, file1);
+ return file1.getPath();
+ } catch (WriterException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ throw new RuntimeException("浜岀淮鐮佺敓鎴愬け璐�");
+ }
+
+}
diff --git a/src/main/java/com/ruoyi/home/controller/HomeController.java b/src/main/java/com/ruoyi/home/controller/HomeController.java
index edda887..d6fe834 100644
--- a/src/main/java/com/ruoyi/home/controller/HomeController.java
+++ b/src/main/java/com/ruoyi/home/controller/HomeController.java
@@ -1,7 +1,5 @@
package com.ruoyi.home.controller;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -9,9 +7,6 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.home.dto.*;
import com.ruoyi.home.service.HomeService;
-import com.ruoyi.production.dto.ProductOrderDto;
-import com.ruoyi.production.dto.ProductWorkOrderDto;
-import com.ruoyi.production.dto.SalesLedgerWorkDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -59,6 +54,47 @@
return AjaxResult.success(count);
}
+ @GetMapping("/deptStaffDistribution")
+ @ApiOperation("鍚勯儴闂ㄤ汉鍛樺垎甯�")
+ public AjaxResult deptStaffDistribution() {
+ DeptStaffDistributionDto dto = homeService.deptStaffDistribution();
+ return AjaxResult.success(dto);
+ }
+
+ @GetMapping("/summaryStatistics")
+ @ApiOperation("鍛樺伐-瀹㈡埛-渚涘簲鍟嗘�绘暟")
+ public AjaxResult summaryStatistics() {
+ HomeSummaryDto homeSummaryDto = homeService.summaryStatistics();
+ return AjaxResult.success(homeSummaryDto);
+ }
+
+ @GetMapping("/supplierPurchaseRanking")
+ @ApiOperation("渚涘簲鍟嗛噰璐帓鍚�")
+ public AjaxResult supplierPurchaseRanking(@RequestParam(value = "type", defaultValue = "0") Integer type) {
+ List<SupplierPurchaseRankingDto> list = homeService.supplierPurchaseRanking(type);
+ return AjaxResult.success(list);
+ }
+
+ @GetMapping("/customerRevenueAnalysis")
+ @ApiOperation("瀹㈡埛钀ユ敹璐＄尞鏁板�煎垎鏋�")
+ public AjaxResult customerRevenueAnalysis(@RequestParam("customerId") Long customerId, @RequestParam(value = "type", defaultValue = "0") Integer type) {
+ CustomerRevenueAnalysisDto dto = homeService.customerRevenueAnalysis(customerId, type);
+ return AjaxResult.success(dto);
+ }
+
+ @GetMapping("/productCategoryDistribution")
+ @ApiOperation("浜у搧澶х被鍒嗗竷")
+ public AjaxResult productCategoryDistribution() {
+ ProductCategoryDistributionDto dto = homeService.productCategoryDistribution();
+ return AjaxResult.success(dto);
+ }
+
+ @GetMapping("/customerContributionRanking")
+ @ApiOperation("瀹㈡埛閲戦璐＄尞鎺掑悕")
+ public AjaxResult customerContributionRanking(@RequestParam(value = "type", defaultValue = "1") Integer type) {
+ List<CustomerContributionRankingDto> list = homeService.customerContributionRanking(type);
+ return AjaxResult.success(list);
+ }
/********************************************************钀ラ攢閲囪喘绫�**************************************************/
@GetMapping("/business")
diff --git a/src/main/java/com/ruoyi/home/dto/CustomerContributionRankingDto.java b/src/main/java/com/ruoyi/home/dto/CustomerContributionRankingDto.java
new file mode 100644
index 0000000..2b6468d
--- /dev/null
+++ b/src/main/java/com/ruoyi/home/dto/CustomerContributionRankingDto.java
@@ -0,0 +1,21 @@
+package com.ruoyi.home.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 瀹㈡埛閲戦璐＄尞鎺掑悕DTO
+ */
+@Data
+@ApiModel("瀹㈡埛閲戦璐＄尞鎺掑悕")
+public class CustomerContributionRankingDto {
+
+ @ApiModelProperty("瀹㈡埛鍚嶇О")
+ private String customerName;
+
+ @ApiModelProperty("鍚堝悓鎬婚噾棰�")
+ private BigDecimal totalAmount;
+}
diff --git a/src/main/java/com/ruoyi/home/dto/CustomerRevenueAnalysisDto.java b/src/main/java/com/ruoyi/home/dto/CustomerRevenueAnalysisDto.java
new file mode 100644
index 0000000..1bad069
--- /dev/null
+++ b/src/main/java/com/ruoyi/home/dto/CustomerRevenueAnalysisDto.java
@@ -0,0 +1,19 @@
+package com.ruoyi.home.dto;
+
+import com.ruoyi.dto.MapDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 瀹㈡埛钀ユ敹璐＄尞鏁板�煎垎鏋怐TO
+ */
+@Data
+@ApiModel("瀹㈡埛钀ユ敹璐＄尞鏁板�煎垎鏋�")
+public class CustomerRevenueAnalysisDto {
+
+ @ApiModelProperty("鍒嗘瀽鏉＄洰鍒楄〃")
+ private List<MapDto> items;
+}
diff --git a/src/main/java/com/ruoyi/home/dto/DeptStaffDistributionDto.java b/src/main/java/com/ruoyi/home/dto/DeptStaffDistributionDto.java
new file mode 100644
index 0000000..4ead293
--- /dev/null
+++ b/src/main/java/com/ruoyi/home/dto/DeptStaffDistributionDto.java
@@ -0,0 +1,22 @@
+package com.ruoyi.home.dto;
+
+import com.ruoyi.dto.MapDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 閮ㄩ棬浜哄憳鍒嗗竷缁熻DTO
+ */
+@Data
+@ApiModel("閮ㄩ棬浜哄憳鍒嗗竷缁熻")
+public class DeptStaffDistributionDto {
+
+ @ApiModelProperty("閮ㄩ棬鎬讳汉鏁�")
+ private Long total;
+
+ @ApiModelProperty("閮ㄩ棬鍒嗗竷鍒楄〃")
+ private List<MapDto> items;
+}
diff --git a/src/main/java/com/ruoyi/home/dto/HomeSummaryDto.java b/src/main/java/com/ruoyi/home/dto/HomeSummaryDto.java
new file mode 100644
index 0000000..9d8863b
--- /dev/null
+++ b/src/main/java/com/ruoyi/home/dto/HomeSummaryDto.java
@@ -0,0 +1,31 @@
+package com.ruoyi.home.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 棣栭〉姹囨�荤粺璁TO
+ */
+@Data
+@ApiModel("棣栭〉姹囨�荤粺璁�")
+public class HomeSummaryDto {
+
+ @ApiModelProperty("鎬诲伐浣滀汉鍛�")
+ private Long totalStaff;
+
+ @ApiModelProperty("鎬诲伐浣滀汉鍛樺悓姣斿闀跨巼")
+ private String staffGrowthRate;
+
+ @ApiModelProperty("鎬诲鎴锋暟")
+ private Long totalCustomer;
+
+ @ApiModelProperty("鎬诲鎴峰悓姣斿闀跨巼")
+ private String customerGrowthRate;
+
+ @ApiModelProperty("鎬讳緵搴斿晢鏁�")
+ private Long totalSupplier;
+
+ @ApiModelProperty("鎬讳緵搴斿晢鍚屾瘮澧為暱鐜�")
+ private String supplierGrowthRate;
+}
diff --git a/src/main/java/com/ruoyi/home/dto/ProductCategoryDistributionDto.java b/src/main/java/com/ruoyi/home/dto/ProductCategoryDistributionDto.java
new file mode 100644
index 0000000..5b11452
--- /dev/null
+++ b/src/main/java/com/ruoyi/home/dto/ProductCategoryDistributionDto.java
@@ -0,0 +1,49 @@
+package com.ruoyi.home.dto;
+
+import com.ruoyi.dto.MapDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 浜у搧澶х被鍒嗗竷缁熻DTO
+ */
+@Data
+@ApiModel("浜у搧澶х被鍒嗗竷缁熻")
+public class ProductCategoryDistributionDto {
+
+ @ApiModelProperty("澶х被鍒嗗竷鍒楄〃")
+ private List<MajorCategoryDto> items;
+
+ @Data
+ public static class MajorCategoryDto {
+ @ApiModelProperty("澶х被鍚嶇О")
+ private String name;
+
+ @ApiModelProperty("搴撳瓨鎬绘暟")
+ private String value;
+
+ @ApiModelProperty("鍗犳瘮")
+ private String rate;
+
+ @ApiModelProperty("灏忕被鍒嗗竷璇︽儏")
+ private List<MinorCategoryDto> children;
+ }
+
+ @Data
+ public static class MinorCategoryDto {
+ @ApiModelProperty("灏忕被鍚嶇О")
+ private String name;
+
+ @ApiModelProperty("搴撳瓨鏁伴噺")
+ private String value;
+
+ @ApiModelProperty("鍗犳瘮")
+ private String rate;
+
+ @ApiModelProperty("鍨嬪彿鍒嗗竷璇︽儏")
+ private List<MapDto> children;
+ }
+}
diff --git a/src/main/java/com/ruoyi/home/dto/SupplierPurchaseRankingDto.java b/src/main/java/com/ruoyi/home/dto/SupplierPurchaseRankingDto.java
new file mode 100644
index 0000000..db9c370
--- /dev/null
+++ b/src/main/java/com/ruoyi/home/dto/SupplierPurchaseRankingDto.java
@@ -0,0 +1,21 @@
+package com.ruoyi.home.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 渚涘簲鍟嗛噰璐帓鍚岲TO
+ */
+@Data
+@ApiModel("渚涘簲鍟嗛噰璐帓鍚�")
+public class SupplierPurchaseRankingDto {
+
+ @ApiModelProperty("渚涘簲鍟嗗悕绉�")
+ private String supplierName;
+
+ @ApiModelProperty("閲囪喘鎬婚噾棰�")
+ private BigDecimal totalAmount;
+}
diff --git a/src/main/java/com/ruoyi/home/service/HomeService.java b/src/main/java/com/ruoyi/home/service/HomeService.java
index 2dbab27..db43d86 100644
--- a/src/main/java/com/ruoyi/home/service/HomeService.java
+++ b/src/main/java/com/ruoyi/home/service/HomeService.java
@@ -33,4 +33,16 @@
ProductionProgressDto productionProgress();
ProductionTurnoverDto workInProcessTurnover();
+
+ DeptStaffDistributionDto deptStaffDistribution();
+
+ HomeSummaryDto summaryStatistics();
+
+ List<SupplierPurchaseRankingDto> supplierPurchaseRanking(Integer type);
+
+ CustomerRevenueAnalysisDto customerRevenueAnalysis(Long customerId, Integer type);
+
+ ProductCategoryDistributionDto productCategoryDistribution();
+
+ List<CustomerContributionRankingDto> customerContributionRanking(Integer type);
}
diff --git a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
index 4ceed69..3b48ec4 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -1,45 +1,40 @@
package com.ruoyi.home.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.approve.mapper.ApproveProcessMapper;
import com.ruoyi.approve.pojo.ApproveProcess;
+import com.ruoyi.basic.mapper.CustomerMapper;
+import com.ruoyi.basic.mapper.ProductMapper;
import com.ruoyi.basic.mapper.ProductModelMapper;
+import com.ruoyi.basic.mapper.SupplierManageMapper;
+import com.ruoyi.basic.pojo.Customer;
+import com.ruoyi.basic.pojo.Product;
import com.ruoyi.basic.pojo.ProductModel;
+import com.ruoyi.basic.pojo.SupplierManage;
import com.ruoyi.collaborativeApproval.mapper.NoticeMapper;
import com.ruoyi.collaborativeApproval.pojo.Notice;
import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.device.mapper.DeviceMaintenanceMapper;
import com.ruoyi.device.mapper.DeviceRepairMapper;
-import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.dto.MapDto;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.home.dto.*;
import com.ruoyi.home.service.HomeService;
-import com.ruoyi.lavorissue.mapper.LavorIssueMapper;
-import com.ruoyi.lavorissue.pojo.LaborIssue;
-import com.ruoyi.procurementrecord.mapper.CustomStorageMapper;
import com.ruoyi.procurementrecord.mapper.ProcurementRecordMapper;
-import com.ruoyi.procurementrecord.mapper.ProcurementRecordOutMapper;
-import com.ruoyi.procurementrecord.pojo.CustomStorage;
-import com.ruoyi.procurementrecord.pojo.ProcurementRecordOut;
import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.production.dto.ProductOrderDto;
import com.ruoyi.production.dto.ProductWorkOrderDto;
-import com.ruoyi.production.dto.ProductionProductMainDto;
import com.ruoyi.production.mapper.ProductOrderMapper;
-import com.ruoyi.production.mapper.ProductProcessMapper;
import com.ruoyi.production.mapper.ProductWorkOrderMapper;
-import com.ruoyi.production.mapper.ProductionProductMainMapper;
-import com.ruoyi.production.pojo.ProductOrder;
-import com.ruoyi.production.pojo.ProductProcess;
import com.ruoyi.production.pojo.ProductWorkOrder;
import com.ruoyi.project.system.domain.SysDept;
+import com.ruoyi.project.system.domain.SysUserDept;
import com.ruoyi.project.system.mapper.SysDeptMapper;
+import com.ruoyi.project.system.mapper.SysUserDeptMapper;
import com.ruoyi.purchase.mapper.PaymentRegistrationMapper;
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.pojo.PaymentRegistration;
@@ -49,9 +44,13 @@
import com.ruoyi.sales.mapper.ReceiptPaymentMapper;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.sales.pojo.ReceiptPayment;
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import com.ruoyi.staff.mapper.StaffOnJobMapper;
+import com.ruoyi.staff.pojo.StaffOnJob;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -60,13 +59,11 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.ParseException;
-import java.text.SimpleDateFormat;
import java.time.*;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalAdjusters;
import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
/**
@@ -87,13 +84,7 @@
private SalesLedgerProductMapper salesLedgerProductMapper;
@Autowired
- private ProcurementRecordOutMapper procurementRecordOutMapper;
-
- @Autowired
private ProcurementRecordMapper procurementRecordStorageMapper;
-
- @Autowired
- private CustomStorageMapper customStorageMapper;
@Autowired
private QualityInspectMapper qualityStatisticsMapper;
@@ -108,9 +99,6 @@
private PaymentRegistrationMapper paymentRegistrationMapper;
@Autowired
- private LavorIssueMapper lavorIssueMapper;
-
- @Autowired
private SysDeptMapper sysDeptMapper;
@Autowired
@@ -118,13 +106,24 @@
@Autowired
private ProductOrderMapper productOrderMapper;
@Autowired
- private ProductProcessMapper productProcessMapper;
- @Autowired
private ProductWorkOrderMapper productWorkOrderMapper;
@Autowired
private ProductModelMapper productModelMapper;
@Autowired
+ private ProductMapper productMapper;
+ @Autowired
private StockUtils stockUtils;
+ @Autowired
+ private StaffOnJobMapper staffOnJobMapper;
+ @Autowired
+ private CustomerMapper customerMapper;
+ @Autowired
+ private SupplierManageMapper supplierManageMapper;
+ @Autowired
+ private SysUserMapper sysUserMapper;
+ @Autowired
+ private SysUserDeptMapper sysUserDeptMapper;
+
@Override
public HomeBusinessDto business() {
// 鏋勫缓缁撴灉
@@ -581,6 +580,398 @@
productionTurnoverDto.setProcessDetails(strings);
productionTurnoverDto.setProcessQuantityDetails(processQuantityDetails);
return productionTurnoverDto;
+ }
+ @Override
+ public DeptStaffDistributionDto deptStaffDistribution() {
+ DeptStaffDistributionDto dto = new DeptStaffDistributionDto();
+ List<MapDto> items = new ArrayList<>();
+
+ // 鏌ヨ鎵�鏈夋甯镐笖鏈垹闄ょ殑閮ㄩ棬
+ List<SysDept> depts = sysDeptMapper.selectDeptList(new SysDept());
+ if (CollectionUtils.isEmpty(depts)) {
+ dto.setItems(items);
+ return dto;
+ }
+
+ long totalUsers = 0;
+ List<Map<String, Object>> countsByDept = new ArrayList<>();
+
+ for (SysDept dept : depts) {
+ if ("0".equals(dept.getStatus()) && "0".equals(dept.getDelFlag())) {
+ Long count = sysUserDeptMapper.selectCount(new LambdaQueryWrapper<SysUserDept>()
+ .eq(SysUserDept::getDeptId, dept.getDeptId()));
+ if (count > 0) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("name", dept.getDeptName());
+ map.put("count", count);
+ countsByDept.add(map);
+ totalUsers += count;
+ }
+ }
+ }
+
+ if (totalUsers > 0) {
+ BigDecimal total = BigDecimal.valueOf(totalUsers);
+ for (Map<String, Object> map : countsByDept) {
+ MapDto mapDto = new MapDto();
+ mapDto.setName((String) map.get("name"));
+ Long count = (Long) map.get("count");
+ mapDto.setValue(count.toString());
+ mapDto.setRate(BigDecimal.valueOf(count).multiply(new BigDecimal("100"))
+ .divide(total, 2, RoundingMode.HALF_UP).toString());
+ items.add(mapDto);
+ }
+ }
+
+ dto.setTotal(totalUsers);
+ dto.setItems(items);
+ return dto;
+ }
+
+ @Override
+ public HomeSummaryDto summaryStatistics() {
+ HomeSummaryDto dto = new HomeSummaryDto();
+ LocalDate now = LocalDate.now();
+ YearMonth currentMonth = YearMonth.from(now);
+ YearMonth prevMonth = currentMonth.minusMonths(1);
+
+ LocalDateTime currentMonthEnd = currentMonth.atEndOfMonth().atTime(23, 59, 59);
+ LocalDateTime prevMonthEnd = prevMonth.atEndOfMonth().atTime(23, 59, 59);
+
+ // 鎬诲伐浣滀汉鍛�
+ Long currentStaff = countStaff(currentMonthEnd);
+ Long prevStaff = countStaff(prevMonthEnd);
+ dto.setTotalStaff(currentStaff);
+ dto.setStaffGrowthRate(calculateMoM(currentStaff, prevStaff));
+
+ // 鎬诲鎴锋暟
+ Long currentCustomers = countCustomers(currentMonthEnd);
+ Long prevCustomers = countCustomers(prevMonthEnd);
+ dto.setTotalCustomer(currentCustomers);
+ dto.setCustomerGrowthRate(calculateMoM(currentCustomers, prevCustomers));
+
+ // 鎬讳緵搴斿晢鏁�
+ Long currentSuppliers = countSuppliers(currentMonthEnd);
+ Long prevSuppliers = countSuppliers(prevMonthEnd);
+ dto.setTotalSupplier(currentSuppliers);
+ dto.setSupplierGrowthRate(calculateMoM(currentSuppliers, prevSuppliers));
+
+ return dto;
+ }
+
+ private Long countStaff(LocalDateTime dateTime) {
+ Long sysUserCount = sysUserMapper.selectCount(new LambdaQueryWrapper<SysUser>()
+ .eq(SysUser::getDelFlag, "0")
+ .le(SysUser::getCreateTime, dateTime));
+ Long staffCountItem = staffOnJobMapper.selectCount(new LambdaQueryWrapper<StaffOnJob>()
+ .le(StaffOnJob::getCreateTime, dateTime));
+ return sysUserCount + staffCountItem;
+ }
+
+
+ private Long countCustomers(LocalDateTime dateTime) {
+ return customerMapper.selectCount(new LambdaQueryWrapper<Customer>()
+ .le(Customer::getMaintenanceTime, dateTime.toLocalDate()));
+ }
+
+ private Long countSuppliers(LocalDateTime dateTime) {
+ return supplierManageMapper.selectCount(new LambdaQueryWrapper<SupplierManage>()
+ .le(SupplierManage::getCreateTime, dateTime));
+ }
+
+ private String calculateMoM(Number current, Number prev) {
+ BigDecimal curVal = new BigDecimal(current.toString());
+ BigDecimal prevVal = new BigDecimal(prev.toString());
+ if (prevVal.compareTo(BigDecimal.ZERO) == 0) {
+ return curVal.compareTo(BigDecimal.ZERO) > 0 ? "100.00" : "0.00";
+ }
+ return curVal.subtract(prevVal)
+ .divide(prevVal, 4, RoundingMode.HALF_UP)
+ .multiply(new BigDecimal("100"))
+ .setScale(2, RoundingMode.HALF_UP)
+ .toString();
+ }
+
+ @Override
+ public List<SupplierPurchaseRankingDto> supplierPurchaseRanking(Integer type) {
+ LocalDate today = LocalDate.now();
+ LocalDate startDate;
+ LocalDate endDate;
+ switch (type) {
+ case 0: // 鍛�
+ startDate = today.with(DayOfWeek.MONDAY);
+ endDate = today.with(DayOfWeek.SUNDAY);
+ break;
+ case 1: // 鏈�
+ startDate = today.with(TemporalAdjusters.firstDayOfMonth());
+ endDate = today.with(TemporalAdjusters.lastDayOfMonth());
+ break;
+ case 2: // 瀛ｅ害
+ Month currentMonth = today.getMonth();
+ Month firstMonthOfQuarter = currentMonth.firstMonthOfQuarter();
+ Month lastMonthOfQuarter = Month.of(firstMonthOfQuarter.getValue() + 2);
+
+ startDate = today.withMonth(firstMonthOfQuarter.getValue()).with(TemporalAdjusters.firstDayOfMonth());
+ endDate = today.withMonth(lastMonthOfQuarter.getValue()).with(TemporalAdjusters.lastDayOfMonth());
+ break;
+ default:
+ return new ArrayList<>();
+ }
+
+ QueryWrapper<PurchaseLedger> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("supplier_name", "SUM(contract_amount) as total_amount")
+ .ge("entry_date", startDate)
+ .le("entry_date", endDate)
+// .ne("approval_status", 3)
+ .groupBy("supplier_name")
+ .orderByDesc("total_amount")
+ .last("LIMIT 5");
+
+ List<Map<String, Object>> maps = purchaseLedgerMapper.selectMaps(queryWrapper);
+ return maps.stream().map(map -> {
+ SupplierPurchaseRankingDto dto = new SupplierPurchaseRankingDto();
+ dto.setSupplierName(map.get("supplier_name") != null ? map.get("supplier_name").toString() : "");
+ Object amount = map.get("total_amount");
+ dto.setTotalAmount(amount != null ? new BigDecimal(amount.toString()) : BigDecimal.ZERO);
+ return dto;
+ }).collect(Collectors.toList());
+ }
+
+ @Override
+ public CustomerRevenueAnalysisDto customerRevenueAnalysis(Long customerId, Integer type) {
+ CustomerRevenueAnalysisDto dto = new CustomerRevenueAnalysisDto();
+ List<MapDto> items = new ArrayList<>();
+ LocalDate today = LocalDate.now();
+
+ LocalDate start;
+ LocalDate end;
+ boolean groupByMonth = false;
+
+ switch (type) {
+ case 0: // 鍛�
+ start = today.with(DayOfWeek.MONDAY);
+ end = today.with(DayOfWeek.SUNDAY);
+ break;
+ case 1: // 鏈�
+ start = today.with(TemporalAdjusters.firstDayOfMonth());
+ end = today.with(TemporalAdjusters.lastDayOfMonth());
+ break;
+ case 2: // 瀛ｅ害
+ Month firstMonthOfQuarter = today.getMonth().firstMonthOfQuarter();
+ start = today.withMonth(firstMonthOfQuarter.getValue()).with(TemporalAdjusters.firstDayOfMonth());
+ end = today.withMonth(firstMonthOfQuarter.plus(2).getValue()).with(TemporalAdjusters.lastDayOfMonth());
+ groupByMonth = true;
+ break;
+ default:
+ dto.setItems(items);
+ return dto;
+ }
+
+ List<SalesLedger> list = salesLedgerMapper.selectList(new LambdaQueryWrapper<SalesLedger>()
+ .eq(SalesLedger::getCustomerId, customerId)
+ .ge(SalesLedger::getEntryDate, start)
+ .le(SalesLedger::getEntryDate, end));
+
+ if (groupByMonth) {
+ for (int i = 0; i < 3; i++) {
+ LocalDate m = start.plusMonths(i);
+ String monthName = m.getMonthValue() + "鏈�";
+ BigDecimal sum = list.stream()
+ .filter(l -> l.getEntryDate() != null)
+ .filter(l -> {
+ LocalDate ld = l.getEntryDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+ return ld.getMonth() == m.getMonth() && ld.getYear() == m.getYear();
+ })
+ .map(SalesLedger::getContractAmount)
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ MapDto mapDto = new MapDto();
+ mapDto.setName(monthName);
+ mapDto.setValue(sum.setScale(2, RoundingMode.HALF_UP).toString());
+ items.add(mapDto);
+ }
+ } else {
+ long days = ChronoUnit.DAYS.between(start, end) + 1;
+ for (int i = 0; i < days; i++) {
+ LocalDate d = start.plusDays(i);
+ String dayName = d.getMonthValue() + "/" + d.getDayOfMonth();
+ BigDecimal sum = list.stream()
+ .filter(l -> l.getEntryDate() != null)
+ .filter(l -> l.getEntryDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate().equals(d))
+ .map(SalesLedger::getContractAmount)
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ MapDto mapDto = new MapDto();
+ mapDto.setName(dayName);
+ mapDto.setValue(sum.setScale(2, RoundingMode.HALF_UP).toString());
+ items.add(mapDto);
+ }
+ }
+
+ dto.setItems(items);
+ return dto;
+ }
+
+ @Override
+ public ProductCategoryDistributionDto productCategoryDistribution() {
+ ProductCategoryDistributionDto dto = new ProductCategoryDistributionDto();
+ List<ProductCategoryDistributionDto.MajorCategoryDto> majorItems = new ArrayList<>();
+
+ // 鎵�鏈夌殑浜у搧澶х被鍜屽皬绫�
+ List<Product> allProducts = productMapper.selectList(new LambdaQueryWrapper<Product>());
+ if (CollectionUtils.isEmpty(allProducts)) {
+ dto.setItems(majorItems);
+ return dto;
+ }
+
+ List<Product> majorCategories = allProducts.stream().filter(p -> p.getParentId() == null).collect(Collectors.toList());
+ List<Product> minorCategories = allProducts.stream().filter(p -> p.getParentId() != null).collect(Collectors.toList());
+
+ // 浠� sales_ledger_product 鎷垮埌姣忎釜浜у搧鐨勫瀷鍙峰簱瀛�
+ // 闇�鍖呭惈瑙勬牸鍨嬪彿浠ユ敮鎸佷笁绾у垎甯�
+ List<Map<String, Object>> quantityMaps = salesLedgerProductMapper.selectMaps(new QueryWrapper<SalesLedgerProduct>()
+ .select("product_id", "specification_model", "type", "SUM(quantity) as sum_qty")
+ .isNotNull("product_id")
+ .groupBy("product_id", "specification_model", "type"));
+
+ Map<Long, Map<String, Map<Integer, BigDecimal>>> modelStockGroups = new HashMap<>();
+ for (Map<String, Object> map : quantityMaps) {
+ Long productId = Long.parseLong(map.get("product_id").toString());
+ String model = map.get("specification_model") != null ? map.get("specification_model").toString() : "鏈煡鍨嬪彿";
+ Integer type = Integer.parseInt(map.get("type").toString());
+ BigDecimal sum = map.get("sum_qty") != null ? new BigDecimal(map.get("sum_qty").toString()) : BigDecimal.ZERO;
+
+ modelStockGroups.computeIfAbsent(productId, k -> new HashMap<>())
+ .computeIfAbsent(model, k -> new HashMap<>())
+ .put(type, sum);
+ }
+
+ // 搴撳瓨骞舵眹鎬�
+ Map<Long, List<MapDto>> productModelsMap = new HashMap<>();
+ Map<Long, BigDecimal> productTotalStockMap = new HashMap<>();
+
+ for (Long pid : modelStockGroups.keySet()) {
+ Map<String, Map<Integer, BigDecimal>> models = modelStockGroups.get(pid);
+ BigDecimal productStock = BigDecimal.ZERO;
+ List<MapDto> modelDtos = new ArrayList<>();
+
+ for (String modelName : models.keySet()) {
+ Map<Integer, BigDecimal> types = models.get(modelName);
+ BigDecimal procurement = types.getOrDefault(2, BigDecimal.ZERO);
+ BigDecimal sales = types.getOrDefault(1, BigDecimal.ZERO);
+ BigDecimal stock = procurement.subtract(sales);
+ if (stock.compareTo(BigDecimal.ZERO) < 0) stock = BigDecimal.ZERO;
+
+ MapDto modelDto = new MapDto();
+ modelDto.setName(modelName);
+ modelDto.setValue(stock.stripTrailingZeros().toPlainString());
+ modelDtos.add(modelDto);
+ productStock = productStock.add(stock);
+ }
+ productModelsMap.put(pid, modelDtos);
+ productTotalStockMap.put(pid, productStock);
+ }
+
+ BigDecimal totalInventory = productTotalStockMap.values().stream().reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ // 鍨嬪彿鍗犳瘮
+ if (totalInventory.compareTo(BigDecimal.ZERO) > 0) {
+ for (List<MapDto> dtos : productModelsMap.values()) {
+ for (MapDto m : dtos) {
+ BigDecimal val = new BigDecimal(m.getValue());
+ m.setRate(val.multiply(new BigDecimal("100"))
+ .divide(totalInventory, 2, RoundingMode.HALF_UP).toString());
+ }
+ }
+ }
+
+ // 鍒嗗眰鏁版嵁
+ for (Product major : majorCategories) {
+ ProductCategoryDistributionDto.MajorCategoryDto majorDto = new ProductCategoryDistributionDto.MajorCategoryDto();
+ majorDto.setName(major.getProductName());
+
+ List<ProductCategoryDistributionDto.MinorCategoryDto> minorDtos = new ArrayList<>();
+ BigDecimal majorStock = BigDecimal.ZERO;
+
+ for (Product minor : minorCategories) {
+ if (major.getId().equals(minor.getParentId())) {
+ BigDecimal stock = productTotalStockMap.getOrDefault(minor.getId(), BigDecimal.ZERO);
+ ProductCategoryDistributionDto.MinorCategoryDto minorDto = new ProductCategoryDistributionDto.MinorCategoryDto();
+ minorDto.setName(minor.getProductName());
+ minorDto.setValue(stock.stripTrailingZeros().toPlainString());
+
+ if (totalInventory.compareTo(BigDecimal.ZERO) > 0) {
+ minorDto.setRate(stock.multiply(new BigDecimal("100"))
+ .divide(totalInventory, 2, RoundingMode.HALF_UP).toString());
+ } else {
+ minorDto.setRate("0.00");
+ }
+
+ minorDto.setChildren(productModelsMap.getOrDefault(minor.getId(), new ArrayList<>()));
+ minorDtos.add(minorDto);
+ majorStock = majorStock.add(stock);
+ }
+ }
+
+ majorDto.setValue(majorStock.stripTrailingZeros().toPlainString());
+
+ if (totalInventory.compareTo(BigDecimal.ZERO) > 0) {
+ majorDto.setRate(majorStock.multiply(new BigDecimal("100"))
+ .divide(totalInventory, 2, RoundingMode.HALF_UP).toString());
+ } else {
+ majorDto.setRate("0.00");
+ }
+ majorDto.setChildren(minorDtos);
+ majorItems.add(majorDto);
+ }
+
+ dto.setItems(majorItems);
+ return dto;
+ }
+
+ @Override
+ public List<CustomerContributionRankingDto> customerContributionRanking(Integer type) {
+ LocalDate today = LocalDate.now();
+ LocalDate startDate = null;
+ LocalDate endDate = null;
+ switch (type) {
+ case 0:
+ startDate = today.with(DayOfWeek.MONDAY);
+ endDate = today.with(DayOfWeek.SUNDAY);
+ break;
+ case 1:
+ startDate = today.with(TemporalAdjusters.firstDayOfMonth());
+ endDate = today.with(TemporalAdjusters.lastDayOfMonth());
+ break;
+ case 2:
+ Month currentMonth = today.getMonth();
+ Month firstMonthOfQuarter = currentMonth.firstMonthOfQuarter();
+ Month lastMonthOfQuarter = Month.of(firstMonthOfQuarter.getValue() + 2);
+ startDate = today.withMonth(firstMonthOfQuarter.getValue()).with(TemporalAdjusters.firstDayOfMonth());
+ endDate = today.withMonth(lastMonthOfQuarter.getValue()).with(TemporalAdjusters.lastDayOfMonth());
+ break;
+ }
+
+ QueryWrapper<SalesLedger> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("customer_name", "SUM(contract_amount) as total_amount")
+ .isNotNull("customer_name")
+ .groupBy("customer_name")
+ .orderByDesc("total_amount")
+ .last("LIMIT 5");
+
+ if (startDate != null && endDate != null) {
+ queryWrapper.between("entry_date", startDate, endDate);
+ }
+
+ List<Map<String, Object>> maps = salesLedgerMapper.selectMaps(queryWrapper);
+ List<CustomerContributionRankingDto> result = new ArrayList<>();
+ for (Map<String, Object> map : maps) {
+ CustomerContributionRankingDto rankingDto = new CustomerContributionRankingDto();
+ rankingDto.setCustomerName(map.get("customer_name").toString());
+ rankingDto.setTotalAmount(map.get("total_amount") != null ? new BigDecimal(map.get("total_amount").toString()) : BigDecimal.ZERO);
+ result.add(rankingDto);
+ }
+ return result;
}
}
diff --git a/src/main/java/com/ruoyi/production/controller/ProductWorkOrderController.java b/src/main/java/com/ruoyi/production/controller/ProductWorkOrderController.java
index 188a701..029e457 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductWorkOrderController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductWorkOrderController.java
@@ -3,10 +3,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.dto.ProductWorkOrderDto;
+import com.ruoyi.production.pojo.ProductWorkOrder;
import com.ruoyi.production.service.ProductWorkOrderService;
+import com.ruoyi.quality.pojo.QualityInspect;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
@RestController
@AllArgsConstructor
@@ -43,4 +47,14 @@
return R.ok(productWorkOrderservice.getById(id));
}
+ /**
+ * 宸ュ崟娴佽浆鍗′笅杞�
+ * @param response
+ * @param productWorkOrder
+ */
+ @PostMapping("/down")
+ public void down(HttpServletResponse response, @RequestBody ProductWorkOrder productWorkOrder) {
+ productWorkOrderservice.down(response, productWorkOrder);
+ }
+
}
diff --git a/src/main/java/com/ruoyi/production/controller/ProductWorkOrderFileController.java b/src/main/java/com/ruoyi/production/controller/ProductWorkOrderFileController.java
new file mode 100644
index 0000000..1f1b37e
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/controller/ProductWorkOrderFileController.java
@@ -0,0 +1,70 @@
+package com.ruoyi.production.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.production.pojo.ProductWorkOrderFile;
+import com.ruoyi.production.service.ProductWorkOrderFileService;
+import com.ruoyi.quality.pojo.QualityInspectFile;
+import com.ruoyi.quality.service.IQualityInspectFileService;
+import io.swagger.annotations.Api;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * <p>
+ * 鐢熶骇宸ュ崟闄勪欢琛� 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-23 03:28:32
+ */
+@Api(tags = "鐢熶骇宸ュ崟闄勪欢琛�")
+@RestController
+@RequestMapping("/productWorkOrderFile")
+public class ProductWorkOrderFileController {
+
+ @Resource
+ private ProductWorkOrderFileService productWorkOrderFileService;
+
+
+ /**
+ * 鏂板
+ * @param productWorkOrderFile
+ * @return
+ */
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody ProductWorkOrderFile productWorkOrderFile) {
+ return AjaxResult.success(productWorkOrderFileService.save(productWorkOrderFile));
+ }
+
+ /**
+ * 鍒犻櫎
+ * @param ids
+ * @return
+ */
+ @DeleteMapping("/del")
+ public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
+ if(CollectionUtils.isEmpty(ids)){
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ }
+ //鍒犻櫎妫�楠岄檮浠�
+ return AjaxResult.success(productWorkOrderFileService.removeBatchByIds(ids));
+ }
+
+ /**
+ *鍒嗛〉鏌ヨ
+ * @param page
+ * @param productWorkOrderFile
+ * @return
+ */
+ @GetMapping("/listPage")
+ public AjaxResult listPage(Page page, ProductWorkOrderFile productWorkOrderFile) {
+ return AjaxResult.success(productWorkOrderFileService.page(page, Wrappers.<ProductWorkOrderFile>lambdaQuery().eq(ProductWorkOrderFile::getWorkOrderId,productWorkOrderFile.getWorkOrderId())));
+ }
+
+}
diff --git a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
index f4ebe75..50a91f5 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
@@ -2,11 +2,13 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.production.pojo.ProductWorkOrder;
+import com.ruoyi.production.pojo.ProductWorkOrderFile;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
+import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Data
@@ -35,4 +37,7 @@
@ApiModelProperty(value = "瀹屾垚杩涘害")
private BigDecimal completionStatus;
+
+ @ApiModelProperty(value = "鎶ュ簾鏁伴噺")
+ private BigDecimal scrapQty;
}
diff --git a/src/main/java/com/ruoyi/production/mapper/ProductWorkOrderFileMapper.java b/src/main/java/com/ruoyi/production/mapper/ProductWorkOrderFileMapper.java
new file mode 100644
index 0000000..72b8f94
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/mapper/ProductWorkOrderFileMapper.java
@@ -0,0 +1,18 @@
+package com.ruoyi.production.mapper;
+
+import com.ruoyi.production.pojo.ProductWorkOrderFile;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 鐢熶骇宸ュ崟闄勪欢琛� Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-23 03:28:32
+ */
+@Mapper
+public interface ProductWorkOrderFileMapper extends BaseMapper<ProductWorkOrderFile> {
+
+}
diff --git a/src/main/java/com/ruoyi/production/mapper/ProductWorkOrderMapper.java b/src/main/java/com/ruoyi/production/mapper/ProductWorkOrderMapper.java
index 8a8a52f..b0b8d6a 100644
--- a/src/main/java/com/ruoyi/production/mapper/ProductWorkOrderMapper.java
+++ b/src/main/java/com/ruoyi/production/mapper/ProductWorkOrderMapper.java
@@ -17,4 +17,5 @@
IPage<ProductWorkOrderDto> pageProductWorkOrder(Page<ProductWorkOrderDto> page, @Param("c") ProductWorkOrderDto productWorkOrder);
+ ProductWorkOrderDto getProductWorkOrderFlowCard(@Param("id") Long id);
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductProcessRoute.java b/src/main/java/com/ruoyi/production/pojo/ProductProcessRoute.java
index 833de7c..5d7ab56 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcessRoute.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcessRoute.java
@@ -5,8 +5,10 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+
import java.io.Serializable;
import java.time.LocalDateTime;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductWorkOrderFile.java b/src/main/java/com/ruoyi/production/pojo/ProductWorkOrderFile.java
new file mode 100644
index 0000000..028e1ab
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/pojo/ProductWorkOrderFile.java
@@ -0,0 +1,65 @@
+package com.ruoyi.production.pojo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 鐢熶骇宸ュ崟闄勪欢琛�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-23 03:28:32
+ */
+@Getter
+@Setter
+@TableName("product_work_order_file")
+@ApiModel(value = "ProductWorkOrderFile瀵硅薄", description = "鐢熶骇宸ュ崟闄勪欢琛�")
+public class ProductWorkOrderFile implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("鍏宠仈宸ュ崟id")
+ private Integer workOrderId;
+
+ @ApiModelProperty("鏂囦欢鍚嶇О")
+ private String name;
+
+ @ApiModelProperty("鏂囦欢璺緞")
+ private String url;
+
+ @ApiModelProperty("鏂囦欢澶у皬")
+ private Integer fileSize;
+
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ @ApiModelProperty("鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Long createUser;
+
+ @ApiModelProperty("淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty("淇敼鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Long updateUser;
+
+ @ApiModelProperty("绉熸埛ID")
+ @TableField(fill = FieldFill.INSERT)
+ private Long tenantId;
+}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
index 20417ae..2889bdd 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
@@ -20,7 +20,6 @@
@ApiModelProperty(value = "浜у搧id")
private Long productModelId;
- //鍚堟牸鏁伴噺=鎶ュ伐鏁伴噺-鎶ュ簾鏁伴噺
@ApiModelProperty(value = "鎶ュ伐鏁伴噺")
private BigDecimal quantity;
diff --git a/src/main/java/com/ruoyi/production/service/ProductWorkOrderFileService.java b/src/main/java/com/ruoyi/production/service/ProductWorkOrderFileService.java
new file mode 100644
index 0000000..0df0a8c
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/service/ProductWorkOrderFileService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.production.service;
+
+import com.ruoyi.production.pojo.ProductWorkOrderFile;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鐢熶骇宸ュ崟闄勪欢琛� 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-23 03:28:32
+ */
+public interface ProductWorkOrderFileService extends IService<ProductWorkOrderFile> {
+
+}
diff --git a/src/main/java/com/ruoyi/production/service/ProductWorkOrderService.java b/src/main/java/com/ruoyi/production/service/ProductWorkOrderService.java
index 392230e..8ef28e6 100644
--- a/src/main/java/com/ruoyi/production/service/ProductWorkOrderService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductWorkOrderService.java
@@ -6,10 +6,13 @@
import com.ruoyi.production.dto.ProductWorkOrderDto;
import com.ruoyi.production.pojo.ProductWorkOrder;
+import javax.servlet.http.HttpServletResponse;
+
public interface ProductWorkOrderService extends IService<ProductWorkOrder>{
IPage<ProductWorkOrderDto> listPage(Page<ProductWorkOrderDto> page, ProductWorkOrderDto productWorkOrder);
int updateProductWorkOrder(ProductWorkOrderDto productWorkOrderDto);
+ void down(HttpServletResponse response, ProductWorkOrder productWorkOrder);
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
index 93119de..3dc98a1 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
@@ -91,7 +91,7 @@
ProductWorkOrder productWorkOrder = new ProductWorkOrder();
productWorkOrder.setProductProcessRouteItemId(productProcessRouteItem.getId());
productWorkOrder.setProductOrderId(productOrder.getId());
- ProductOrder order = productOrderMapper.selectById(productOrder);
+ ProductOrder order = productOrderMapper.selectById(productOrder.getId());
productWorkOrder.setPlanQuantity(order.getQuantity());
productWorkOrder.setWorkOrderNo(workOrderNoStr);
productWorkOrder.setStatus(1);
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderFileServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderFileServiceImpl.java
new file mode 100644
index 0000000..b0391ea
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderFileServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.production.service.impl;
+
+import com.ruoyi.production.pojo.ProductWorkOrderFile;
+import com.ruoyi.production.mapper.ProductWorkOrderFileMapper;
+import com.ruoyi.production.service.ProductWorkOrderFileService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鐢熶骇宸ュ崟闄勪欢琛� 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-23 03:28:32
+ */
+@Service
+public class ProductWorkOrderFileServiceImpl extends ServiceImpl<ProductWorkOrderFileMapper, ProductWorkOrderFile> implements ProductWorkOrderFileService {
+
+}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
index 6f70e7c..4a68ce8 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
@@ -2,22 +2,49 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.deepoove.poi.XWPFTemplate;
+import com.deepoove.poi.config.Configure;
+import com.deepoove.poi.data.PictureRenderData;
+import com.deepoove.poi.data.Pictures;
+import com.ruoyi.common.utils.HackLoopTableRenderPolicy;
+import com.ruoyi.common.utils.MatrixToImageWriter;
import com.ruoyi.production.dto.ProductWorkOrderDto;
+import com.ruoyi.production.mapper.ProductWorkOrderFileMapper;
import com.ruoyi.production.mapper.ProductWorkOrderMapper;
import com.ruoyi.production.pojo.ProductWorkOrder;
+import com.ruoyi.production.pojo.ProductWorkOrderFile;
import com.ruoyi.production.service.ProductWorkOrderService;
+import com.ruoyi.quality.pojo.QualityInspectParam;
import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
@Service
-@AllArgsConstructor
@Transactional(rollbackFor = Exception.class)
public class ProductWorkOrderServiceImpl extends ServiceImpl<ProductWorkOrderMapper, ProductWorkOrder> implements ProductWorkOrderService {
+ @Autowired
private ProductWorkOrderMapper productWorkOrdermapper;
+ @Autowired
+ private ProductWorkOrderFileMapper productWorkOrderFileMapper;
+
+ @Value("${file.temp-dir}")
+ private String tempDir;
@Override
public IPage<ProductWorkOrderDto> listPage(Page<ProductWorkOrderDto> page, ProductWorkOrderDto productWorkOrder) {
@@ -29,4 +56,61 @@
return productWorkOrdermapper.updateById(productWorkOrderDto);
}
+ @Override
+ public void down(HttpServletResponse response, ProductWorkOrder productWorkOrder) {
+ ProductWorkOrderDto productWorkOrderDto = productWorkOrdermapper.getProductWorkOrderFlowCard(productWorkOrder.getId());
+ String codePath;
+ try {
+ codePath = new MatrixToImageWriter().code(productWorkOrderDto.getId().toString(), tempDir);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ /*鑾峰彇闄勪欢鍥剧墖绫诲瀷*/
+ List<Map<String, Object>> images = new ArrayList<>();
+ List<ProductWorkOrderFile> productWorkOrderFiles = productWorkOrderFileMapper.selectList(Wrappers.<ProductWorkOrderFile>lambdaQuery().eq(ProductWorkOrderFile::getWorkOrderId, productWorkOrder.getId()));
+ if (CollectionUtils.isNotEmpty(productWorkOrderFiles)) {
+ productWorkOrderFiles.forEach(productWorkOrderFile -> {
+ Map<String, Object> image = new HashMap<>();
+ PictureRenderData pictureRenderData = Pictures.ofLocal( productWorkOrderFile.getUrl()).sizeInCm(17, 20).create();
+ image.put("url", pictureRenderData);
+ images.add(image);
+ });
+ }
+ InputStream inputStream = this.getClass().getResourceAsStream("/static/work-order-template.docx");
+ XWPFTemplate template = XWPFTemplate.compile(inputStream).render(
+ new HashMap<String, Object>() {{
+ put("process", productWorkOrderDto.getProcessName());
+ put("workOrderNo", productWorkOrderDto.getWorkOrderNo());
+ put("productOrderNpsNo", productWorkOrderDto.getProductOrderNpsNo());
+ put("productName", productWorkOrderDto.getProductName());
+ put("planQuantity", productWorkOrderDto.getPlanQuantity());
+ put("model", productWorkOrderDto.getModel());
+ put("completeQuantity", productWorkOrderDto.getCompleteQuantity());
+ put("scrapQty", productWorkOrderDto.getScrapQty());
+ put("planStartTime", productWorkOrderDto.getPlanStartTime());
+ put("planEndTime", productWorkOrderDto.getPlanEndTime());
+ put("actualStartTime", productWorkOrderDto.getActualStartTime());
+ put("actualEndTime", productWorkOrderDto.getActualEndTime());
+ put("twoCode", Pictures.ofLocal(codePath).create());
+ put("images", images.isEmpty()?null:images);
+ }});
+
+ try {
+ response.setContentType("application/msword");
+ String fileName = URLEncoder.encode(
+ "娴佽浆鍗�", "UTF-8");
+ response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+ response.setHeader("Content-disposition",
+ "attachment;filename=" + fileName + ".docx");
+ OutputStream os = response.getOutputStream();
+ template.write(os);
+ os.flush();
+ os.close();
+ inputStream.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException("瀵煎嚭澶辫触");
+ }
+ }
+
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
index 66270d4..804c630 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -187,7 +187,7 @@
qualityInspect.setModel(productModel.getModel());
qualityInspect.setUnit(productModel.getUnit());
qualityInspect.setQuantity(productQty);
- qualityInspect.setProcess(productProcess.getName());
+ qualityInspect.setProcess(process);
qualityInspect.setInspectState(0);
qualityInspect.setInspectType(inspectType);
qualityInspect.setProductMainId(productionProductMain.getId());
@@ -209,7 +209,7 @@
}
/*鏇存柊宸ュ崟鍜岀敓浜ц鍗�*/
ProductWorkOrder productWorkOrder = productWorkOrderMapper.selectById(dto.getWorkOrderId());
- productWorkOrder.setCompleteQuantity(productQty.add(dto.getQuantity()));
+ productWorkOrder.setCompleteQuantity(productWorkOrder.getCompleteQuantity().add(productQty));
if (ObjectUtils.isNull(productWorkOrder.getActualStartTime())) {
productWorkOrder.setActualStartTime(LocalDate.now());//瀹為檯寮�濮嬫椂闂�
}
@@ -291,7 +291,7 @@
// 鍒犻櫎浜у嚭璁板綍
productionProductOutputMapper.delete(new LambdaQueryWrapper<ProductionProductOutput>()
.eq(ProductionProductOutput::getProductMainId, productionProductMain.getId()));
- //鍒犻櫎鍏ュ簱
+ //鍒犻櫎鎶曞叆璁板綍
productionProductInputMapper.delete(new LambdaQueryWrapper<ProductionProductInput>()
.eq(ProductionProductInput::getProductMainId, productionProductMain.getId()));
//鍒犻櫎鎶ュ簾鐨勫叆搴撹褰�
diff --git a/src/main/resources/mapper/production/ProductWorkOrderFileMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderFileMapper.xml
new file mode 100644
index 0000000..ae5686b
--- /dev/null
+++ b/src/main/resources/mapper/production/ProductWorkOrderFileMapper.xml
@@ -0,0 +1,19 @@
+<?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.ruoyi.production.mapper.ProductWorkOrderFileMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.production.pojo.ProductWorkOrderFile">
+ <id column="id" property="id" />
+ <result column="work_order_id" property="workOrderId" />
+ <result column="name" property="name" />
+ <result column="url" property="url" />
+ <result column="file_size" property="fileSize" />
+ <result column="create_time" property="createTime" />
+ <result column="create_user" property="createUser" />
+ <result column="update_time" property="updateTime" />
+ <result column="update_user" property="updateUser" />
+ <result column="tenant_id" property="tenantId" />
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index 06f79e1..6eea92a 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -34,13 +34,42 @@
LEFT JOIN product_process pp ON pp.id = ppri.process_id
LEFT JOIN product_model pm ON pm.id = ppri.product_model_id
LEFT JOIN product p ON p.id = pm.product_id
- <where>
+ where 1=1
<if test="c.workOrderNo != null and c.workOrderNo != ''">
- pwo.work_order_no like concat('%',#{c.workOrderNo},'%')
+ and pwo.work_order_no like concat('%',#{c.workOrderNo},'%')
</if>
<if test="c.planStartTime != null and c.planEndTime != null">
and DATE(pwo.create_time) between #{c.planStartTime} and #{c.planEndTime}
</if>
- </where>
+ <if test="c.productOrderId != null and c.productOrderId != ''">
+ and pwo.product_order_id = #{c.productOrderId}
+ </if>
+ </select>
+ <select id="getProductWorkOrderFlowCard" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
+ SELECT
+ pwo.*,
+ pp.NAME as processName,
+ pm.model,
+ pm.unit,
+ p.product_name AS productName,
+ po.nps_no AS productOrderNpsNo,
+ ROUND(pwo.complete_quantity / pwo.plan_quantity * 100, 2) AS completionStatus,
+ sum(ppo.scrap_qty) scrapQty
+ FROM
+ product_work_order pwo
+ LEFT JOIN product_process_route_item ppri ON ppri.id = pwo.product_process_route_item_id
+ LEFT JOIN production_product_main ppm ON ppm.work_order_id = pwo.id
+ LEFT JOIN production_product_output ppo ON ppo.product_main_id = ppm.id
+ LEFT JOIN product_order po ON po.id = pwo.product_order_id
+ LEFT JOIN product_process pp ON pp.id = ppri.process_id
+ LEFT JOIN product_model pm ON pm.id = ppri.product_model_id
+ LEFT JOIN product p ON p.id = pm.product_id
+ WHERE pwo.id = #{id}
+ GROUP BY pwo.id, pwo.product_process_route_item_id, pwo.create_time, pwo.update_time, pwo.work_order_no, pwo.plan_start_time, pwo.plan_end_time, pwo.actual_start_time, pwo.actual_end_time, pwo.status, pwo.tenant_id, pwo.plan_quantity, pwo.product_order_id, pwo.complete_quantity,
+ pp.NAME ,
+ pm.model,
+ pm.unit,
+ p.product_name,
+ po.nps_no
</select>
</mapper>
diff --git a/src/main/resources/static/work-order-template.docx b/src/main/resources/static/work-order-template.docx
new file mode 100644
index 0000000..bea2da4
--- /dev/null
+++ b/src/main/resources/static/work-order-template.docx
Binary files differ
--
Gitblit v1.9.3