From 3322c20909d2cc762b9a7a4a4c8b2bb728ebebd9 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 16 三月 2026 14:51:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg
---
src/main/resources/static/report-template.docx | 0
src/main/java/com/ruoyi/common/enums/RawMaterialInspectState.java | 4
src/main/java/com/ruoyi/inspectiontask/pojo/QualityInspectItem.java | 8
src/main/java/com/ruoyi/device/pojo/DeviceRepair.java | 5
src/main/java/com/ruoyi/quality/pojo/RawMaterial.java | 18 +
src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java | 4
src/main/java/com/ruoyi/common/enums/FileNameType.java | 3
src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java | 4
src/main/resources/mapper/quality/RawMaterialMapper.xml | 4
doc/20260313_坤泰化工.sql | 2
src/main/java/com/ruoyi/quality/pojo/RawMaterialQualityInspectItem.java | 17 +
src/main/java/com/ruoyi/quality/controller/RawMaterialController.java | 53 +++++
src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java | 47 ++++
src/main/java/com/ruoyi/quality/dto/RawMaterialQualityInspectItemDto.java | 27 +++
src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java | 258 ++++++++++++++++++++++++++--
src/main/java/com/ruoyi/common/enums/RawMaterialCheckResult.java | 4
src/main/java/com/ruoyi/common/enums/RawMaterialCheckType.java | 4
src/main/java/com/ruoyi/other/service/TempFileService.java | 3
src/main/java/com/ruoyi/quality/service/RawMaterialService.java | 15 +
src/main/resources/application-kthg.yml | 4
src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java | 33 ++-
21 files changed, 449 insertions(+), 68 deletions(-)
diff --git "a/doc/20260313_\345\235\244\346\263\260\345\214\226\345\267\245.sql" "b/doc/20260313_\345\235\244\346\263\260\345\214\226\345\267\245.sql"
index 3cfe25b..275e581 100644
--- "a/doc/20260313_\345\235\244\346\263\260\345\214\226\345\267\245.sql"
+++ "b/doc/20260313_\345\235\244\346\263\260\345\214\226\345\267\245.sql"
@@ -25,3 +25,5 @@
update_time datetime null comment '鏇存柊鏃堕棿',
unique idx_raw_material_id_quality_inspect_item_id (raw_material_id, quality_inspect_item_id)
);
+alter table raw_material
+ add quantity decimal(18, 2) null;
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/common/enums/FileNameType.java b/src/main/java/com/ruoyi/common/enums/FileNameType.java
index 7afc045..ab33d70 100644
--- a/src/main/java/com/ruoyi/common/enums/FileNameType.java
+++ b/src/main/java/com/ruoyi/common/enums/FileNameType.java
@@ -14,7 +14,8 @@
SHIP(9),//鍙戣揣鍙拌处
INSPECTION_PRODUCTION_BEFORE(10),
INSPECTION_PRODUCTION_AFTER(11),
- INSPECTION(12);//宸℃ 鐢熶骇鍓�
+ INSPECTION(12),//宸℃ 鐢熶骇鍓�
+ DeviceRepair(13);// 璁惧缁翠慨
private final int value;
diff --git a/src/main/java/com/ruoyi/common/enums/RawMaterialCheckResult.java b/src/main/java/com/ruoyi/common/enums/RawMaterialCheckResult.java
index 7f692e4..fba8085 100644
--- a/src/main/java/com/ruoyi/common/enums/RawMaterialCheckResult.java
+++ b/src/main/java/com/ruoyi/common/enums/RawMaterialCheckResult.java
@@ -26,10 +26,10 @@
*/
public static RawMaterialCheckResult fromValue(Integer value) {
for (RawMaterialCheckResult type : values()) {
- if (type.getValue().equals(value)) {
+ if (type.getCode().equals(value)) {
return type;
}
}
- throw new IllegalArgumentException("鏈煡鐨� RawMaterialCheckResult 鍊�: " + value);
+ return null;
}
}
diff --git a/src/main/java/com/ruoyi/common/enums/RawMaterialCheckType.java b/src/main/java/com/ruoyi/common/enums/RawMaterialCheckType.java
index 82792fa..2387e2d 100644
--- a/src/main/java/com/ruoyi/common/enums/RawMaterialCheckType.java
+++ b/src/main/java/com/ruoyi/common/enums/RawMaterialCheckType.java
@@ -27,10 +27,10 @@
*/
public static RawMaterialCheckType fromValue(Integer value) {
for (RawMaterialCheckType type : values()) {
- if (type.getValue().equals(value)) {
+ if (type.getCode().equals(value)) {
return type;
}
}
- throw new IllegalArgumentException("鏈煡鐨� RawMaterialCheckType 鍊�: " + value);
+ return null;
}
}
diff --git a/src/main/java/com/ruoyi/common/enums/RawMaterialInspectState.java b/src/main/java/com/ruoyi/common/enums/RawMaterialInspectState.java
index 5e711f3..7890b81 100644
--- a/src/main/java/com/ruoyi/common/enums/RawMaterialInspectState.java
+++ b/src/main/java/com/ruoyi/common/enums/RawMaterialInspectState.java
@@ -26,10 +26,10 @@
*/
public static RawMaterialInspectState fromValue(Integer value) {
for (RawMaterialInspectState type : values()) {
- if (type.getValue().equals(value)) {
+ if (type.getCode().equals(value)) {
return type;
}
}
- throw new IllegalArgumentException("鏈煡鐨� RawMaterialInspectState 鍊�: " + value);
+ return null;
}
}
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
index e200740..a63ff86 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
@@ -3,11 +3,13 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.sales.pojo.CommonFile;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.Date;
+import java.util.List;
@Data
public class DeviceRepairDto {
@@ -74,5 +76,7 @@
private String sparePartsNames;
+ private List<CommonFile> fileList;
+
}
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
index 130f0df..89c3869 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
@@ -4,12 +4,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.other.pojo.TempFile;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import java.util.Date;
+import java.util.List;
@Data
@TableName("device_repair")
@@ -76,5 +78,6 @@
@ApiModelProperty("棰嗙敤澶囦欢ids")
private String sparePartsIds;
-
+ @ApiModelProperty("鏂囦欢鍒楄〃")
+ private List<TempFile> fileList;
}
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
index 0293956..84c46e9 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
@@ -1,11 +1,12 @@
package com.ruoyi.device.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.xiaoymin.knife4j.core.util.StrUtil;
-import com.google.common.collect.Lists;
+import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.device.dto.DeviceDefectRecordDto;
@@ -20,14 +21,15 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.measuringinstrumentledger.mapper.SparePartsMapper;
import com.ruoyi.measuringinstrumentledger.pojo.SpareParts;
-import com.ruoyi.measuringinstrumentledger.service.SparePartsService;
+import com.ruoyi.other.pojo.TempFile;
+import com.ruoyi.other.service.TempFileService;
+import com.ruoyi.sales.mapper.CommonFileMapper;
+import com.ruoyi.sales.pojo.CommonFile;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.Pair;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
import javax.servlet.http.HttpServletResponse;
import java.util.*;
@@ -46,12 +48,20 @@
private IDeviceLedgerService deviceLedgerService;
@Autowired
private SparePartsMapper sparePartsMapper;
+ @Autowired
+ private TempFileService tempFileService;
+ @Autowired
+ private CommonFileMapper commonFileMapper;
@Override
public IPage<DeviceRepairDto> queryPage(Page page, DeviceRepairDto deviceRepairDto) {
IPage<DeviceRepairDto> deviceRepairDtoIPage = deviceRepairMapper.queryPage(page, deviceRepairDto);
List<DeviceRepairDto> records = deviceRepairDtoIPage.getRecords();
+ List<Long> recordIds = records.stream()
+ .map(DeviceRepairDto::getId)
+ .collect(Collectors.toList());
+
if (!CollectionUtils.isEmpty(records)) {
// 1. 鑾峰彇鎵�鏈夊敮涓�鐨勫浠禝D
Set<String> allIds = records.stream()
@@ -86,6 +96,12 @@
record.setSparePartsNames(names);
});
}
+ // 澶勭悊鏂囦欢
+ List<CommonFile> commonFiles = commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>().in(CommonFile::getCommonId, recordIds)
+ .eq(CommonFile::getType, FileNameType.DeviceRepair.getValue()));
+ Map<Long, List<CommonFile>> collect = commonFiles.stream()
+ .collect(Collectors.groupingBy(CommonFile::getCommonId));
+ records.forEach(record -> record.setFileList(collect.get(record.getId())));
}
return deviceRepairDtoIPage;
@@ -94,6 +110,17 @@
@Override
public AjaxResult saveDeviceRepair(DeviceRepair deviceRepair) {
DeviceLedger byId = deviceLedgerService.getById(deviceRepair.getDeviceLedgerId());
+ if (CollectionUtils.isNotEmpty(deviceRepair.getFileList())) {
+ List<String> fileIds = deviceRepair.getFileList().stream()
+ .map(TempFile::getTempId)
+ .collect(Collectors.toList());
+ try {
+ tempFileService.migrateTempFilesToFormal(deviceRepair.getId(), fileIds, FileNameType.DeviceRepair.getValue());
+ } catch (Exception e) {
+ log.error("璁惧缁翠慨鏂囦欢杩佺Щ閿欒", e);
+ }
+ }
+
deviceRepair.setDeviceName(byId.getDeviceName());
deviceRepair.setDeviceModel(byId.getDeviceModel());
boolean save = this.save(deviceRepair);
@@ -106,6 +133,16 @@
@Override
public AjaxResult updateDeviceRepair(DeviceRepair deviceRepair) {
if (this.updateById(deviceRepair)) {
+ if (CollectionUtils.isNotEmpty(deviceRepair.getFileList())) {
+ List<String> fileIds = deviceRepair.getFileList().stream()
+ .map(TempFile::getTempId)
+ .collect(Collectors.toList());
+ try {
+ tempFileService.migrateTempFilesToFormal(deviceRepair.getId(), fileIds, FileNameType.DeviceRepair.getValue());
+ } catch (Exception e) {
+ log.error("璁惧缁翠慨鏂囦欢杩佺Щ閿欒", e);
+ }
+ }
Long id = deviceRepair.getId();
//
DeviceDefectRecordDto deviceDefectRecordDto = new DeviceDefectRecordDto();
diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/QualityInspectItem.java b/src/main/java/com/ruoyi/inspectiontask/pojo/QualityInspectItem.java
index 0d5cc30..b9b5533 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/QualityInspectItem.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/QualityInspectItem.java
@@ -1,10 +1,12 @@
package com.ruoyi.inspectiontask.pojo;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.time.LocalDateTime;
-import lombok.Data;
/**
* 璐ㄩ噺妫�娴嬮」
@@ -59,12 +61,16 @@
*
*/
@TableField(value = "create_time",fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
/**
*
*/
@TableField(value = "update_time",fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
/**
diff --git a/src/main/java/com/ruoyi/other/service/TempFileService.java b/src/main/java/com/ruoyi/other/service/TempFileService.java
index 355e43c..ec782b3 100644
--- a/src/main/java/com/ruoyi/other/service/TempFileService.java
+++ b/src/main/java/com/ruoyi/other/service/TempFileService.java
@@ -4,9 +4,12 @@
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
+import java.util.List;
public interface TempFileService {
TempFile uploadFile(MultipartFile file,Integer type) throws IOException;
String uploadByCommon(MultipartFile file, Integer type, Long id) throws IOException;
+
+ void migrateTempFilesToFormal(Long businessId, List<String> tempFileIds, Integer fileType) throws IOException;
}
diff --git a/src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java b/src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java
index b8e0e2a..9290e6f 100644
--- a/src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java
+++ b/src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java
@@ -9,16 +9,13 @@
import com.ruoyi.sales.mapper.CommonFileMapper;
import com.ruoyi.sales.pojo.CommonFile;
import lombok.extern.slf4j.Slf4j;
-import org.apache.catalina.util.URLEncoder;
import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
-import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -98,6 +95,7 @@
* @param fileType 鏂囦欢绫诲瀷(鏉ヨ嚜FileNameType)
* @throws IOException 鏂囦欢鎿嶄綔寮傚父
*/
+ @Override
public void migrateTempFilesToFormal(Long businessId, List<String> tempFileIds, Integer fileType) throws IOException {
if (com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(tempFileIds)) {
return;
diff --git a/src/main/java/com/ruoyi/quality/controller/RawMaterialController.java b/src/main/java/com/ruoyi/quality/controller/RawMaterialController.java
index d3e0a38..92f13f1 100644
--- a/src/main/java/com/ruoyi/quality/controller/RawMaterialController.java
+++ b/src/main/java/com/ruoyi/quality/controller/RawMaterialController.java
@@ -1,12 +1,17 @@
package com.ruoyi.quality.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.enums.RawMaterialInspectState;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.dto.RawMaterialDto;
+import com.ruoyi.quality.pojo.QualityInspect;
+import com.ruoyi.quality.pojo.RawMaterial;
import com.ruoyi.quality.service.RawMaterialService;
+import com.ruoyi.staff.pojo.StaffOnJob;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -31,6 +36,13 @@
return AjaxResult.success(rawMaterialService.listPage(page, rawMaterialDto));
}
+ /**
+ * 鍘熸枡璇︽儏
+ */
+ @GetMapping("/detail/{id}")
+ public AjaxResult detail(@PathVariable Long id) {
+ return AjaxResult.success(rawMaterialService.detail(id));
+ }
/**
* 鍘熸枡鏂板
@@ -41,11 +53,37 @@
}
/**
+ * 妫�娴嬫彁浜�
+ * @param id 鍘熸枡id
+ * @return
+ */
+ @PatchMapping("/submit/{id}")
+ public AjaxResult submit(@PathVariable Long id) {
+ RawMaterial rawMaterial = new RawMaterial();
+ rawMaterial.setId(id);
+ rawMaterial.setInspectState(RawMaterialInspectState.RawMaterialInspectStateSubmitted.getCode());
+ return AjaxResult.success(rawMaterialService.updateById(rawMaterial));
+ }
+
+ /**
+ * 淇敼妫�楠屼汉
+ * @param rawMaterialDto 鍘熸枡
+ * @return
+ */
+ @PatchMapping("/updateCheckUserName")
+ public AjaxResult updateCheckUserName(@RequestBody RawMaterialDto rawMaterialDto) {
+ RawMaterial rawMaterial = new RawMaterial();
+ rawMaterial.setId(rawMaterialDto.getId());
+ rawMaterial.setCheckUserName(rawMaterialDto.getCheckUserName());
+ return AjaxResult.success(rawMaterialService.updateById(rawMaterial));
+ }
+
+ /**
* 鍘熸枡鏇存柊
*/
@PutMapping("")
public AjaxResult update(@RequestBody RawMaterialDto rawMaterialDto) {
- return AjaxResult.success(rawMaterialService.updateById(rawMaterialDto));
+ return AjaxResult.success(rawMaterialService.update(rawMaterialDto));
}
/**
@@ -55,4 +93,17 @@
public AjaxResult delete(@RequestBody List<Integer> ids) {
return AjaxResult.success(rawMaterialService.removeByIds(ids));
}
+
+ /**
+ * 瀵煎嚭鍘熸枡鏁版嵁
+ */
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, RawMaterialDto rawMaterialDto) {
+ rawMaterialService.export(response, rawMaterialDto);
+ }
+
+ @PostMapping("/down")
+ public void down(HttpServletResponse response,@RequestBody RawMaterialDto rawMaterialDto) {
+ rawMaterialService.down(response, rawMaterialDto);
+ }
}
diff --git a/src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java b/src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java
index d1c1224..7357a19 100644
--- a/src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java
+++ b/src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java
@@ -1,16 +1,13 @@
package com.ruoyi.quality.dto;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.inspectiontask.pojo.QualityInspectItem;
import com.ruoyi.quality.pojo.RawMaterial;
-
-import com.ruoyi.quality.pojo.RawMaterialQualityInspectItem;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
-import java.time.LocalDate;
import java.util.List;
/**
@@ -24,18 +21,14 @@
/**
* 寮�濮嬫椂闂�
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty("琛ㄥ崟鎼滅储鏃堕棿鑼冨洿锛氬紑濮嬫椂闂�")
- private LocalDate entryDateStart;
+ private String entryDateStart;
/**
* 缁撴潫鏃堕棿
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty("琛ㄥ崟鎼滅储鏃堕棿鑼冨洿锛氱粨鏉熸椂闂�")
- private LocalDate entryDateEnd;
+ private String entryDateEnd;
@ApiModelProperty("妫�楠岀被鍨� 0鍏ュ満妫� 1杞﹂棿妫� 2鍑哄巶妫�")
private String checkTypeText;
@@ -46,6 +39,20 @@
@ApiModelProperty("绫诲埆(0:鏈彁浜�;1:宸叉彁浜�)")
private String inspectStateText;
- @ApiModelProperty("鍘熸枡妫�娴嬮」鍒楄〃ids")
- private List<Long> qualityInspectItemIds;
+ @ApiModelProperty("鍘熸枡妫�娴嬮」鍒楄〃")
+ private List<QualityInspectItem> qualityInspectItem;
+
+ @ApiModelProperty("浜у搧鍚嶇О")
+ @Excel(name = "浜у搧鍚嶇О")
+ private String productName;
+
+ @ApiModelProperty("瑙勬牸鍨嬪彿")
+ @Excel(name = "瑙勬牸鍨嬪彿")
+ private String model;
+
+ @ApiModelProperty("浜у搧id")
+ private Long productId;
+
+ @ApiModelProperty("鍗曚綅")
+ private String unit;
}
diff --git a/src/main/java/com/ruoyi/quality/dto/RawMaterialQualityInspectItemDto.java b/src/main/java/com/ruoyi/quality/dto/RawMaterialQualityInspectItemDto.java
new file mode 100644
index 0000000..0ae9a32
--- /dev/null
+++ b/src/main/java/com/ruoyi/quality/dto/RawMaterialQualityInspectItemDto.java
@@ -0,0 +1,27 @@
+package com.ruoyi.quality.dto;
+
+import com.ruoyi.quality.pojo.RawMaterialQualityInspectItem;
+import lombok.Data;
+
+@Data
+public class RawMaterialQualityInspectItemDto extends RawMaterialQualityInspectItem {
+ /**
+ * 椤圭洰鍚嶇О
+ */
+ private String name;
+
+ /**
+ * 鍗曚綅
+ */
+ private String unit;
+
+ /**
+ * 鏍囧噯鍊�
+ */
+ private String standardValue;
+
+ /**
+ * 鍐呮帶鍊�
+ */
+ private String internalControl;
+}
diff --git a/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java b/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java
index bb7f632..098ca2a 100644
--- a/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java
+++ b/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -35,19 +36,28 @@
@ApiModelProperty("浜у搧鍨嬪彿id")
private Long productModelId;
- @ApiModelProperty("鎵规鍙�")
- private String batchNo;
-
- @ApiModelProperty("妫�楠岀被鍨� 0鍏ュ満妫� 1杞﹂棿妫� 2鍑哄巶妫�")
+ @ApiModelProperty("妫�楠岀被鍨� 0鍏ュ巶妫� 1杞﹂棿妫� 2鍑哄巶妫�")
+ @Excel(name = "妫�楠岀被鍨�", readConverterExp = "0=鍏ュ巶妫�,1=杞﹂棿妫�,2=鍑哄巶妫�")
private Integer checkType;
+ @ApiModelProperty("鎵规鍙�")
+ @Excel(name = "鎵规鍙�")
+ private String batchNo;
+
+ @ApiModelProperty("鏁伴噺")
+ @Excel(name = "鏁伴噺")
+ private BigDecimal quantity;
+
@ApiModelProperty("妫�楠岀粨鏋� 0鍚堟牸 1涓嶅悎鏍�")
+ @Excel(name = "妫�楠岀粨鏋�", readConverterExp = "0=鍚堟牸,1=涓嶅悎鏍�")
private Integer checkResult;
@ApiModelProperty("绫诲埆(0:鏈彁浜�;1:宸叉彁浜�)")
+ @Excel(name = "鎻愪氦鐘舵��", readConverterExp = "0=鏈彁浜�,1=宸叉彁浜�")
private Integer inspectState;
@ApiModelProperty("妫�楠屽憳鍚嶇О")
+ @Excel(name = "妫�楠屽憳")
private String checkUserName;
@ApiModelProperty("妫�楠屾棩鏈�")
diff --git a/src/main/java/com/ruoyi/quality/pojo/RawMaterialQualityInspectItem.java b/src/main/java/com/ruoyi/quality/pojo/RawMaterialQualityInspectItem.java
index d45162d..640dce8 100644
--- a/src/main/java/com/ruoyi/quality/pojo/RawMaterialQualityInspectItem.java
+++ b/src/main/java/com/ruoyi/quality/pojo/RawMaterialQualityInspectItem.java
@@ -1,16 +1,13 @@
package com.ruoyi.quality.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 com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
/**
* <p>
@@ -37,6 +34,9 @@
@ApiModelProperty("璐ㄩ噺妫�楠岄」id")
private Long qualityInspectItemId;
+ @ApiModelProperty("鍖栭獙鍊�")
+ private String testValue;
+
@ApiModelProperty("褰曞叆鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
@@ -44,4 +44,7 @@
@ApiModelProperty("鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
+
+ @TableField(select = false, exist = false)
+ private Integer index;
}
diff --git a/src/main/java/com/ruoyi/quality/service/RawMaterialService.java b/src/main/java/com/ruoyi/quality/service/RawMaterialService.java
index bdbc216..d032c3c 100644
--- a/src/main/java/com/ruoyi/quality/service/RawMaterialService.java
+++ b/src/main/java/com/ruoyi/quality/service/RawMaterialService.java
@@ -2,10 +2,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.quality.dto.RawMaterialDto;
-import com.ruoyi.quality.pojo.QualityInspectFile;
-import com.ruoyi.quality.pojo.RawMaterial;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.quality.dto.RawMaterialDto;
+import com.ruoyi.quality.pojo.RawMaterial;
+
+import javax.servlet.http.HttpServletResponse;
/**
* <p>
@@ -18,5 +19,13 @@
public interface RawMaterialService extends IService<RawMaterial> {
IPage<RawMaterialDto> listPage(Page page, RawMaterialDto rawMaterialDto);
+ RawMaterialDto detail(Long id);
+
boolean add(RawMaterialDto rawMaterialDto);
+
+ boolean update(RawMaterialDto rawMaterialDto);
+
+ void export(HttpServletResponse response, RawMaterialDto rawMaterialDto);
+
+ void down(HttpServletResponse response, RawMaterialDto rawMaterialDto);
}
diff --git a/src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java
index 555763c..035648f 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java
@@ -1,25 +1,42 @@
package com.ruoyi.quality.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.collaborativeApproval.dto.DutyPlanDTO;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.deepoove.poi.XWPFTemplate;
+import com.deepoove.poi.config.Configure;
+import com.ruoyi.basic.mapper.ProductMapper;
+import com.ruoyi.basic.mapper.ProductModelMapper;
+import com.ruoyi.basic.pojo.Product;
+import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.common.enums.RawMaterialCheckResult;
import com.ruoyi.common.enums.RawMaterialCheckType;
import com.ruoyi.common.enums.RawMaterialInspectState;
-import com.ruoyi.production.mapper.ProductProcessRouteMapper;
+import com.ruoyi.common.utils.HackLoopTableRenderPolicy;
+import com.ruoyi.common.utils.bean.BeanUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.inspectiontask.mapper.QualityInspectItemMapper;
+import com.ruoyi.inspectiontask.pojo.QualityInspectItem;
import com.ruoyi.quality.dto.RawMaterialDto;
-import com.ruoyi.quality.mapper.RawMaterialQualityInspectItemMapper;
-import com.ruoyi.quality.pojo.RawMaterial;
+import com.ruoyi.quality.dto.RawMaterialQualityInspectItemDto;
import com.ruoyi.quality.mapper.RawMaterialMapper;
+import com.ruoyi.quality.pojo.QualityInspect;
+import com.ruoyi.quality.pojo.QualityInspectParam;
+import com.ruoyi.quality.pojo.RawMaterial;
import com.ruoyi.quality.pojo.RawMaterialQualityInspectItem;
import com.ruoyi.quality.service.RawMaterialQualityInspectItemService;
import com.ruoyi.quality.service.RawMaterialService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.util.*;
import java.util.stream.Collectors;
@@ -38,33 +55,236 @@
private RawMaterialQualityInspectItemService rawMaterialQualityInspectItemService;
+ private QualityInspectItemMapper qualityInspectItemMapper;
+
+ private ProductModelMapper productModelMapper;
+
+ private ProductMapper productMapper;
+
@Override
public IPage<RawMaterialDto> listPage(Page page, RawMaterialDto rawMaterialDto) {
- IPage<RawMaterialDto> rawMaterials = rawMaterialMapper.listPage(page, rawMaterialDto);
- for (RawMaterialDto rawMaterial : rawMaterials.getRecords()) {
- rawMaterial.setCheckTypeText(RawMaterialCheckType.fromValue(rawMaterial.getCheckType()).getValue());
- rawMaterial.setCheckResultText(RawMaterialCheckResult.fromValue(rawMaterial.getCheckResult()).getValue());
- rawMaterial.setInspectStateText(RawMaterialInspectState.fromValue(rawMaterial.getInspectState()).getValue());
+ IPage<RawMaterialDto> pageRes = rawMaterialMapper.listPage(page, rawMaterialDto);
+ List<RawMaterialDto> rawMaterials = pageRes.getRecords();
+ Map<Long, ProductModel> productModelMap = new HashMap<>();
+ Map<Long, Product> productMap = new HashMap<>();
+ if (CollectionUtils.isNotEmpty(rawMaterials)) {
+ List<Long> productModelIds = rawMaterials.stream().map(RawMaterialDto::getProductModelId).collect(Collectors.toList());
+ List<ProductModel> productModels = productModelMapper.selectList(new LambdaQueryWrapper<ProductModel>()
+ .in(ProductModel::getId, productModelIds));
+ productModelMap = productModels.stream().collect(Collectors.toMap(ProductModel::getId, productModel -> productModel));
+ List<Long> productIds = productModels.stream().map(ProductModel::getProductId).collect(Collectors.toList());
+ List<Product> products = productMapper.selectList(new LambdaQueryWrapper<Product>()
+ .in(Product::getId, productIds));
+ productMap = products.stream().collect(Collectors.toMap(Product::getId, product -> product));
}
- return rawMaterials;
+
+ for (RawMaterialDto rawMaterial : pageRes.getRecords()) {
+ rawMaterial.setCheckTypeText(RawMaterialCheckType.fromValue(rawMaterial.getCheckType()) == null ? "" : RawMaterialCheckType.fromValue(rawMaterial.getCheckType()).getValue());
+ rawMaterial.setCheckResultText(RawMaterialCheckResult.fromValue(rawMaterial.getCheckResult()) == null ? "" : RawMaterialCheckResult.fromValue(rawMaterial.getCheckResult()).getValue());
+ rawMaterial.setInspectStateText(RawMaterialInspectState.fromValue(rawMaterial.getInspectState()) == null ? "" : RawMaterialInspectState.fromValue(rawMaterial.getInspectState()).getValue());
+ rawMaterial.setProductName(productMap.get(productModelMap.get(rawMaterial.getProductModelId()).getProductId()).getProductName());
+ rawMaterial.setModel(productModelMap.get(rawMaterial.getProductModelId()).getModel());
+ rawMaterial.setProductId(productModelMap.get(rawMaterial.getProductModelId()).getProductId());
+ }
+ return pageRes;
+ }
+
+ @Override
+ public RawMaterialDto detail(Long id) {
+ RawMaterial rawMaterial = rawMaterialMapper.selectById(id);
+ RawMaterialDto rawMaterialDto = new RawMaterialDto();
+ BeanUtils.copyBeanProp(rawMaterialDto, rawMaterial);
+ // 鑾峰彇妫�娴嬮」鍏宠仈鍏崇郴
+ List<RawMaterialQualityInspectItem> rawQualityList = rawMaterialQualityInspectItemService.list(new LambdaQueryWrapper<RawMaterialQualityInspectItem>()
+ .eq(RawMaterialQualityInspectItem::getRawMaterialId, id));
+ Map<Long, RawMaterialQualityInspectItem> map = rawQualityList.stream().collect(Collectors.toMap(RawMaterialQualityInspectItem::getQualityInspectItemId, qualityInspectItem -> qualityInspectItem));
+ // 鑾峰彇妫�楠岄」鐩�
+ List<QualityInspectItem> qualityInspectItems = new ArrayList<>();
+ if (CollectionUtils.isNotEmpty(rawQualityList)) {
+ List<Long> qualityInspectItemIds = rawQualityList.stream().map(RawMaterialQualityInspectItem::getQualityInspectItemId).collect(Collectors.toList());
+ qualityInspectItems = qualityInspectItemMapper.selectList(new LambdaQueryWrapper<QualityInspectItem>()
+ .in(QualityInspectItem::getId, qualityInspectItemIds));
+ }
+ // 鏇挎崲鍖栭獙鍊�
+ qualityInspectItems.forEach(qualityInspectItem -> {
+ qualityInspectItem.setTestValue(map.get(qualityInspectItem.getId()).getTestValue());
+ });
+ rawMaterialDto.setQualityInspectItem(qualityInspectItems);
+
+ // 鏌ヨ浜у搧id
+ ProductModel productModel = productModelMapper.selectById(rawMaterialDto.getProductModelId());
+ rawMaterialDto.setProductId(productModel.getProductId());
+ rawMaterialDto.setUnit(productModel.getUnit());
+ return rawMaterialDto;
}
@Override
@Transactional(rollbackFor = Exception.class)
public boolean add(RawMaterialDto rawMaterialDto) {
+ rawMaterialDto.setInspectState(RawMaterialInspectState.RawMaterialInspectStateUnsubmitted.getCode());
+ // 鏂板鍘熸枡
+ int i = rawMaterialMapper.insert(rawMaterialDto);
// 鏂板妫�娴嬮」鍏宠仈鍏崇郴
- if (rawMaterialDto.getQualityInspectItemIds() != null && !rawMaterialDto.getQualityInspectItemIds().isEmpty()) {
- List<RawMaterialQualityInspectItem> rawMaterialQualityInspectItems = rawMaterialDto.getQualityInspectItemIds().stream()
- .map(id -> {
+ if (CollectionUtils.isNotEmpty(rawMaterialDto.getQualityInspectItem())) {
+ List<RawMaterialQualityInspectItem> rawMaterialQualityInspectItems = rawMaterialDto.getQualityInspectItem().stream()
+ .map(qualityInspectItem -> {
RawMaterialQualityInspectItem item = new RawMaterialQualityInspectItem();
item.setRawMaterialId(rawMaterialDto.getId());
- item.setQualityInspectItemId(id);
+ item.setQualityInspectItemId(qualityInspectItem.getId());
+ item.setTestValue(qualityInspectItem.getTestValue());
return item;
})
.collect(Collectors.toList());
rawMaterialQualityInspectItemService.saveBatch(rawMaterialQualityInspectItems);
}
- // 鏂板鍘熸枡
- return rawMaterialMapper.insert(rawMaterialDto) > 0;
+ return i > 0;
}
-}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean update(RawMaterialDto rawMaterialDto) {
+ // 鏇存柊鍘熸枡
+ if (rawMaterialMapper.updateById(rawMaterialDto) <= 0) {
+ return false;
+ }
+
+ Long rawMaterialId = rawMaterialDto.getId();
+ List<QualityInspectItem> newQualityInspectItems = rawMaterialDto.getQualityInspectItem();
+
+ // 鑾峰彇鐜版湁妫�楠岄」鍏宠仈璁板綍
+ List<RawMaterialQualityInspectItem> existingItems = rawMaterialQualityInspectItemService.list(
+ new LambdaQueryWrapper<RawMaterialQualityInspectItem>()
+ .eq(RawMaterialQualityInspectItem::getRawMaterialId, rawMaterialId)
+ );
+
+ // 鍒犻櫎涓嶅瓨鍦ㄧ殑鍏宠仈璁板綍
+ if (CollectionUtils.isEmpty(newQualityInspectItems)) {
+ // 濡傛灉娌℃湁妫�楠岄」锛屽垹闄ゆ墍鏈夌幇鏈夊叧鑱旇褰�
+ if (CollectionUtils.isNotEmpty(existingItems)) {
+ List<Long> existingIds = existingItems.stream()
+ .map(RawMaterialQualityInspectItem::getId)
+ .collect(Collectors.toList());
+ rawMaterialQualityInspectItemService.removeByIds(existingIds);
+ }
+ return true;
+ }
+
+ // 鑾峰彇鏂版楠岄」鐨処D闆嗗悎鍜屾祴璇曞�兼槧灏�
+ Set<Long> newItemIds = newQualityInspectItems.stream()
+ .map(QualityInspectItem::getId)
+ .collect(Collectors.toSet());
+
+ Map<Long, String> testValueMap = newQualityInspectItems.stream()
+ .collect(Collectors.toMap(QualityInspectItem::getId, QualityInspectItem::getTestValue));
+
+ // 鍒犻櫎涓嶅瓨鍦ㄧ殑鍏宠仈璁板綍
+ List<Long> toDelete = existingItems.stream()
+ .filter(item -> !newItemIds.contains(item.getQualityInspectItemId()))
+ .map(RawMaterialQualityInspectItem::getId)
+ .collect(Collectors.toList());
+
+ if (CollectionUtils.isNotEmpty(toDelete)) {
+ rawMaterialQualityInspectItemService.removeByIds(toDelete);
+ }
+
+ // 澶勭悊鏇存柊鏁版嵁
+ List<RawMaterialQualityInspectItem> toUpdate = existingItems.stream()
+ .filter(item -> newItemIds.contains(item.getQualityInspectItemId()))
+ .peek(item -> item.setTestValue(testValueMap.get(item.getQualityInspectItemId())))
+ .collect(Collectors.toList());
+
+ if (CollectionUtils.isNotEmpty(toUpdate)) {
+ rawMaterialQualityInspectItemService.updateBatchById(toUpdate);
+ }
+
+ // 澶勭悊鏂板鏁版嵁
+ Set<Long> existingItemIds = existingItems.stream()
+ .map(RawMaterialQualityInspectItem::getQualityInspectItemId)
+ .collect(Collectors.toSet());
+
+ List<RawMaterialQualityInspectItem> toCreate = newQualityInspectItems.stream()
+ .filter(item -> !existingItemIds.contains(item.getId()))
+ .map(item -> {
+ RawMaterialQualityInspectItem newItem = new RawMaterialQualityInspectItem();
+ newItem.setRawMaterialId(rawMaterialId);
+ newItem.setQualityInspectItemId(item.getId());
+ newItem.setTestValue(item.getTestValue());
+ return newItem;
+ })
+ .collect(Collectors.toList());
+
+ if (CollectionUtils.isNotEmpty(toCreate)) {
+ rawMaterialQualityInspectItemService.saveBatch(toCreate);
+ }
+
+ return true;
+ }
+
+ @Override
+ public void export(HttpServletResponse response, RawMaterialDto rawMaterialDto) {
+ List<RawMaterialDto> rawMaterials = rawMaterialMapper.listPage(new Page<>(1, Integer.MAX_VALUE), rawMaterialDto).getRecords();
+ ExcelUtil<RawMaterialDto> util = new ExcelUtil<RawMaterialDto>(RawMaterialDto.class);
+ util.exportExcel(response, rawMaterials, "鍘熸枡妫�楠屽鍑�");
+ }
+
+ @Override
+ public void down(HttpServletResponse response, RawMaterialDto rawMaterialDto) {
+ RawMaterial rawMaterial = rawMaterialMapper.selectById(rawMaterialDto.getId());
+ // 鑾峰彇浜у搧鍨嬪彿淇℃伅
+ ProductModel productModel = productModelMapper.selectById(rawMaterial.getProductModelId());
+ Product product = productMapper.selectById(productModel.getProductId());
+ RawMaterialDto inspect = new RawMaterialDto();
+ BeanUtils.copyProperties(rawMaterial, inspect);
+ inspect.setModel(productModel.getModel());
+ inspect.setProductName(product.getProductName());
+ inspect.setCheckTypeText(RawMaterialCheckType.fromValue(rawMaterial.getCheckType()) == null ? "" : RawMaterialCheckType.fromValue(rawMaterial.getCheckType()).getValue());
+ inspect.setCheckResultText(RawMaterialCheckResult.fromValue(rawMaterial.getCheckResult()) == null ? "" : RawMaterialCheckResult.fromValue(rawMaterial.getCheckResult()).getValue());
+
+ List<RawMaterialQualityInspectItem> paramList = rawMaterialQualityInspectItemService.list(
+ new LambdaQueryWrapper<RawMaterialQualityInspectItem>()
+ .eq(RawMaterialQualityInspectItem::getRawMaterialId, rawMaterialDto.getId())
+ );
+ List<RawMaterialQualityInspectItemDto> inspectItems = new ArrayList<>();
+
+ int index = 1;
+ for (RawMaterialQualityInspectItem item : paramList) {
+ RawMaterialQualityInspectItemDto dto = new RawMaterialQualityInspectItemDto();
+ BeanUtils.copyProperties(item, dto);
+ QualityInspectItem qualityInspectItem = qualityInspectItemMapper.selectById(item.getQualityInspectItemId());
+ dto.setName(qualityInspectItem.getName());
+ dto.setUnit(qualityInspectItem.getUnit());
+ dto.setStandardValue(qualityInspectItem.getStandardValue());
+ dto.setInternalControl(qualityInspectItem.getInternalControl());
+ dto.setIndex(index);
+ inspectItems.add(dto);
+ index++;
+ }
+
+ InputStream inputStream = this.getClass().getResourceAsStream("/static/report-template.docx");
+ Configure configure = Configure.builder()
+ .bind("paramList", new HackLoopTableRenderPolicy())
+ .build();
+ XWPFTemplate template = XWPFTemplate.compile(inputStream, configure).render(
+ new HashMap<String, Object>() {{
+ put("inspect", inspect);
+ put("paramList", inspectItems);
+ }});
+
+ 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("瀵煎嚭澶辫触");
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/resources/application-kthg.yml b/src/main/resources/application-kthg.yml
index a95172a..72ab6b4 100644
--- a/src/main/resources/application-kthg.yml
+++ b/src/main/resources/application-kthg.yml
@@ -75,7 +75,7 @@
# 涓诲簱鏁版嵁婧�
master:
# url: jdbc:mysql://localhost:3306/product-inventory-management-new?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- url: jdbc:mysql://1.15.17.182:9999/product-inventory-management-kthg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-kthg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: xd@123456..
# 浠庡簱鏁版嵁婧�
@@ -256,4 +256,4 @@
# temp-dir: D:/ruoyi/temp/uploads # 涓存椂鐩綍
# upload-dir: D:/ruoyi/prod/uploads # 姝ｅ紡鐩綍
temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
+ upload-dir: /javaWork/product-inventory-management/file/prod/uploads
diff --git a/src/main/resources/mapper/quality/RawMaterialMapper.xml b/src/main/resources/mapper/quality/RawMaterialMapper.xml
index a5869d5..88b7603 100644
--- a/src/main/resources/mapper/quality/RawMaterialMapper.xml
+++ b/src/main/resources/mapper/quality/RawMaterialMapper.xml
@@ -28,10 +28,10 @@
AND rm.check_type = #{params.checkType}
</if>
<if test="params.entryDateStart != null and params.entryDateStart != '' ">
- AND rm.check_time >= DATE_FORMAT(#{params.entryDateStart},'%Y-%m-%d')
+ AND rm.check_time >= #{params.entryDateStart}
</if>
<if test="params.entryDateEnd != null and params.entryDateEnd != '' ">
- AND rm.check_time <= DATE_FORMAT(#{params.entryDateEnd},'%Y-%m-%d')
+ AND rm.check_time <= #{params.entryDateEnd}
</if>
ORDER BY rm.check_time DESC
</select>
diff --git a/src/main/resources/static/report-template.docx b/src/main/resources/static/report-template.docx
index 6824a62..9a47def 100644
--- a/src/main/resources/static/report-template.docx
+++ b/src/main/resources/static/report-template.docx
Binary files differ
--
Gitblit v1.9.3