From 7dd84fb96e78d38cc46985f8d9e6903e29ab574c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 27 一月 2026 15:40:10 +0800
Subject: [PATCH] 迁移军泰的生产工单的附件上传+工单生成二维码
---
src/main/resources/mapper/production/ProductWorkOrderMapper.xml | 35 ++++
src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java | 1
src/main/java/com/ruoyi/common/utils/MatrixToImageWriter.java | 67 ++++++++
src/main/java/com/ruoyi/production/pojo/ProductWorkOrderFile.java | 65 ++++++++
pom.xml | 6
src/main/java/com/ruoyi/production/controller/ProductWorkOrderFileController.java | 70 ++++++++
src/main/java/com/ruoyi/production/pojo/ProductProcessRoute.java | 2
src/main/java/com/ruoyi/production/mapper/ProductWorkOrderMapper.java | 1
src/main/resources/mapper/production/ProductWorkOrderFileMapper.xml | 19 ++
src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java | 86 ++++++++++
src/main/java/com/ruoyi/production/controller/ProductWorkOrderController.java | 14 +
src/main/java/com/ruoyi/production/service/ProductWorkOrderFileService.java | 16 ++
src/main/java/com/ruoyi/production/service/ProductWorkOrderService.java | 3
src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java | 5
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 ++
17 files changed, 423 insertions(+), 5 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/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/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/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