From 43a8301f04a6ea7891ef16861734163b2646e07f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 14 一月 2026 18:05:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java | 38 ++++++
src/main/java/com/ruoyi/procurementrecord/mapper/ProcurementRecordOutMapper.java | 3
src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java | 12 ++
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 1
src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java | 22 +++
src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java | 7
src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java | 5
doc/20260114_add_dimission_reason_and_remark_to_staff_join_leave_record.sql | 3
src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java | 24 ++++
src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml | 7 +
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutAdd.java | 2
src/main/java/com/ruoyi/quality/service/impl/QualityReportServiceImpl.java | 9 +
src/main/resources/mapper/sales/SalesLedgerProductMapper.xml | 2
src/main/java/com/ruoyi/basic/dto/ProductModelDto.java | 4
src/main/java/com/ruoyi/quality/service/QualityReportService.java | 16 ++
src/main/resources/mapper/quality/QualityTestStandardMapper.xml | 16 +-
src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java | 2
src/main/java/com/ruoyi/quality/controller/QualityReportController.java | 31 +++++
src/main/resources/mapper/quality/QualityTestStandardBindingMapper.xml | 3
doc/20260113-product_model.sql | 8 +
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 10 +
src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java | 10 +
src/main/java/com/ruoyi/common/enums/StaffJoinLeaveRecordDimissionReason.java | 28 ++++
src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java | 6
src/main/java/com/ruoyi/quality/dto/QualityTestStandardBindingDto.java | 2
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java | 2
src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java | 14 ++
src/main/java/com/ruoyi/production/service/ProductStructureService.java | 3
src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java | 5
src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java | 14 ++
src/main/java/com/ruoyi/procurementrecord/mapper/ProcurementRecordMapper.java | 3
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml | 5
src/main/java/com/ruoyi/procurementrecord/dto/Details.java | 3
33 files changed, 294 insertions(+), 26 deletions(-)
diff --git a/doc/20260113-product_model.sql b/doc/20260113-product_model.sql
index de82a14..dcbb610 100644
--- a/doc/20260113-product_model.sql
+++ b/doc/20260113-product_model.sql
@@ -4,3 +4,11 @@
alter table process_route
add process_route_code varchar(255) null comment '宸ヨ壓璺嚎缂栫爜';
+alter table procurement_record_storage
+ add product_model_id bigint null comment '浜у搧瑙勬牸id';
+alter table procurement_record_out
+ add product_model_id bigint null comment '浜у搧瑙勬牸id';
+
+
+alter table quality_inspect
+ add product_model_id bigint null comment '浜у搧瑙勬牸id';
diff --git a/doc/20260114_add_dimission_reason_and_remark_to_staff_join_leave_record.sql b/doc/20260114_add_dimission_reason_and_remark_to_staff_join_leave_record.sql
new file mode 100644
index 0000000..c02a3ba
--- /dev/null
+++ b/doc/20260114_add_dimission_reason_and_remark_to_staff_join_leave_record.sql
@@ -0,0 +1,3 @@
+alter table staff_join_leave_record
+ add dimission_reason varchar(255) null,
+ add dimission_remark text null;
diff --git a/src/main/java/com/ruoyi/basic/dto/ProductModelDto.java b/src/main/java/com/ruoyi/basic/dto/ProductModelDto.java
index 577d75d..53b3b5d 100644
--- a/src/main/java/com/ruoyi/basic/dto/ProductModelDto.java
+++ b/src/main/java/com/ruoyi/basic/dto/ProductModelDto.java
@@ -1,8 +1,12 @@
package com.ruoyi.basic.dto;
import com.ruoyi.basic.pojo.ProductModel;
+import com.ruoyi.production.dto.ProductStructureDto;
import lombok.Data;
+
+import java.util.List;
@Data
public class ProductModelDto extends ProductModel {
+ private List<ProductStructureDto> productStructureList;
}
diff --git a/src/main/java/com/ruoyi/common/enums/StaffJoinLeaveRecordDimissionReason.java b/src/main/java/com/ruoyi/common/enums/StaffJoinLeaveRecordDimissionReason.java
new file mode 100644
index 0000000..c59e56c
--- /dev/null
+++ b/src/main/java/com/ruoyi/common/enums/StaffJoinLeaveRecordDimissionReason.java
@@ -0,0 +1,28 @@
+package com.ruoyi.common.enums;
+
+import lombok.AllArgsConstructor;
+
+/**
+ * 闄勪欢璁板綍绫诲瀷鏋氫妇
+ *
+ */
+@AllArgsConstructor
+public enum StaffJoinLeaveRecordDimissionReason {
+ StaffJoinLeaveRecordDimissionReasonSalary("salary","钖祫寰呴亣"),
+ StaffJoinLeaveRecordDimissionReasonCareerDevelopment("career_development","鑱屼笟鍙戝睍"),
+ StaffJoinLeaveRecordDimissionReasonWorkEnvironment("work_environment","宸ヤ綔鐜"),
+ StaffJoinLeaveRecordDimissionReasonPersonalReason("personal_reason","涓汉鍘熷洜"),
+ StaffJoinLeaveRecordDimissionReasonOther("other","鍏朵粬鍘熷洜");
+
+
+ private final String code;
+ private final String info;
+
+ public String getCode() {
+ return code;
+ }
+
+ public String getInfo() {
+ return info;
+ }
+}
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/Details.java b/src/main/java/com/ruoyi/procurementrecord/dto/Details.java
index 2257765..08dd6af 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/Details.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/Details.java
@@ -10,10 +10,11 @@
*/
@Data
public class Details {
- private Integer id; // 浜у搧id
+ private Integer id; // 鍙拌处浜у搧id
private BigDecimal inboundQuantity; // 鍏ュ簱鏁伴噺
private BigDecimal warnNum; // 棰勮鏁伴噺锛堥噰璐叆搴撴墠鏈夛級
//鍗曚环
private BigDecimal unitPrice;
private BigDecimal totalPrice;
+ private Long productModelId; // 鍩虹浜у搧id
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutAdd.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutAdd.java
index 9124e75..78a2f04 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutAdd.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutAdd.java
@@ -24,4 +24,6 @@
*/
private Integer type;
+ private Long productModelId;// 鍩虹浜у搧ID
+
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/mapper/ProcurementRecordMapper.java b/src/main/java/com/ruoyi/procurementrecord/mapper/ProcurementRecordMapper.java
index b4cdbb7..19e76e6 100644
--- a/src/main/java/com/ruoyi/procurementrecord/mapper/ProcurementRecordMapper.java
+++ b/src/main/java/com/ruoyi/procurementrecord/mapper/ProcurementRecordMapper.java
@@ -9,6 +9,7 @@
import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
import org.apache.ibatis.annotations.Param;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -41,4 +42,6 @@
IPage<ProcurementPageDtoCopy> listPageCopyByProduction(Page page, @Param("req") ProcurementPageDto procurementDto);
IPage<ProcurementPageDtoCopy> listPagePRS(Page page, @Param("req") ProcurementPageDto procurementDto);
+
+ BigDecimal getSumQuantity(@Param("productModelId") Long productModelId);
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/mapper/ProcurementRecordOutMapper.java b/src/main/java/com/ruoyi/procurementrecord/mapper/ProcurementRecordOutMapper.java
index 6cd9dab..bb24eb5 100644
--- a/src/main/java/com/ruoyi/procurementrecord/mapper/ProcurementRecordOutMapper.java
+++ b/src/main/java/com/ruoyi/procurementrecord/mapper/ProcurementRecordOutMapper.java
@@ -7,6 +7,7 @@
import com.ruoyi.procurementrecord.pojo.ProcurementRecordOut;
import org.apache.ibatis.annotations.Param;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -26,4 +27,6 @@
IPage<ProcurementRecordOutPageDto> listPageByProduct(Page page,@Param("req") ProcurementRecordOutPageDto procurementDto);
IPage<ProcurementRecordOutPageDto> listPageByCustom(Page page,@Param("req") ProcurementRecordOutPageDto procurementDto);
+
+ BigDecimal getSumQuantity(@Param("productModelId") Long productModelId);
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java
index 7f1cde6..12dc8e9 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java
@@ -1,8 +1,6 @@
package com.ruoyi.procurementrecord.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Data;
@@ -89,4 +87,9 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ /**
+ * 浜у搧ID
+ */
+ private Long productModelId;
+
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
index 5240715..0e18336 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
@@ -95,4 +95,9 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ /**
+ * 浜у搧ID
+ */
+ private Long productModelId;
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java
index 0735a39..b6e215c 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java
@@ -10,7 +10,6 @@
import com.ruoyi.procurementrecord.dto.ProcurementUpdateDto;
import com.ruoyi.procurementrecord.mapper.ProcurementRecordOutMapper;
import com.ruoyi.procurementrecord.pojo.ProcurementRecordOut;
-import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
import com.ruoyi.procurementrecord.service.ProcurementRecordOutService;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
@@ -22,7 +21,6 @@
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
-import java.text.DateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
@@ -80,7 +78,8 @@
.createUser(Long.valueOf(procurementRecordOutAdd.getUserId()))
.createBy(sysUser.getNickName())
.updateUser(Long.valueOf(procurementRecordOutAdd.getUserId()))
- .updateTime(LocalDateTime.now());
+ .updateTime(LocalDateTime.now())
+ .productModelId(procurementRecordOutAdd.getProductModelId());
this.save(procurementRecordOut.build());
return 0;
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
index 3d24081..d0399a6 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -14,8 +14,8 @@
import com.ruoyi.procurementrecord.mapper.ProcurementRecordMapper;
import com.ruoyi.procurementrecord.mapper.ProcurementRecordOutMapper;
import com.ruoyi.procurementrecord.pojo.CustomStorage;
-import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
import com.ruoyi.procurementrecord.pojo.ProcurementRecordOut;
+import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
@@ -29,7 +29,6 @@
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
-import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
@@ -772,7 +771,8 @@
.createUser(loginUser.getUserId())
.updateTime(LocalDateTime.now())
.updateUser(loginUser.getUserId())
- .createBy(procurementDto.getNickName());
+ .createBy(procurementDto.getNickName())
+ .productModelId(detail.getProductModelId());
this.save(procurementRecordBuilder.build());
// 鍏ュ簱鎴愬姛鍑忔帀閲囪喘鏁伴噺
// LambdaQueryWrapper<SalesLedgerProduct> salesLedgerProductLambdaQueryWrapper = new LambdaQueryWrapper<>();
diff --git a/src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java b/src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java
new file mode 100644
index 0000000..ce2cbc9
--- /dev/null
+++ b/src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java
@@ -0,0 +1,24 @@
+package com.ruoyi.procurementrecord.utils;
+
+import com.ruoyi.procurementrecord.mapper.ProcurementRecordMapper;
+import com.ruoyi.procurementrecord.mapper.ProcurementRecordOutMapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+
+@Component
+@RequiredArgsConstructor
+public class StockUtils {
+ private final ProcurementRecordOutMapper procurementRecordOutMapper;
+ private final ProcurementRecordMapper procurementRecordMapper;
+
+ // 鑾峰彇鍟嗗搧鍓╀綑搴撳瓨
+ public BigDecimal getStockQuantity(Long productModelId) {
+ // 鍏ュ簱鏁伴噺
+ BigDecimal sumQuantity = procurementRecordMapper.getSumQuantity(productModelId);
+ // 鍑哄簱鏁伴噺
+ BigDecimal outQuantity = procurementRecordOutMapper.getSumQuantity(productModelId);
+ return outQuantity.compareTo(sumQuantity) > 0 ? BigDecimal.ZERO : sumQuantity.subtract(outQuantity);
+ }
+}
diff --git a/src/main/java/com/ruoyi/production/service/ProductStructureService.java b/src/main/java/com/ruoyi/production/service/ProductStructureService.java
index d41c124..c75c150 100644
--- a/src/main/java/com/ruoyi/production/service/ProductStructureService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductStructureService.java
@@ -1,6 +1,7 @@
package com.ruoyi.production.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.basic.dto.ProductModelDto;
import com.ruoyi.production.dto.ProductStructureDto;
import com.ruoyi.production.pojo.ProductStructure;
@@ -9,7 +10,7 @@
public interface ProductStructureService extends IService<ProductStructure> {
- List<ProductStructureDto> listByproductModelId(Long productId);
+ ProductModelDto listByproductModelId(Long productId);
Boolean addProductStructureDto(ProductStructureDto productStructureDto);
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java
index 8772531..b54617f 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java
@@ -2,15 +2,22 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.basic.dto.ProductModelDto;
+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.production.dto.ProductStructureDto;
import com.ruoyi.production.mapper.ProductStructureMapper;
import com.ruoyi.production.pojo.ProductStructure;
import com.ruoyi.production.service.ProductStructureService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.HashMap;
import java.util.List;
@Service
@@ -20,10 +27,21 @@
@Autowired
private ProductStructureMapper productStructureMapper;
+ @Autowired
+ private ProductModelMapper productModelMapper;
+ @Autowired
+ private ProductMapper productMapper;
@Override
- public List<ProductStructureDto> listByproductModelId(Long productModelId) {
- return productStructureMapper.listByproductModelId( productModelId);
+ public ProductModelDto listByproductModelId(Long productModelId) {
+ ProductModel productModel = productModelMapper.selectById(productModelId);
+ Product product = productMapper.selectById(productModel.getProductId());
+ ProductModelDto productModelDto = new ProductModelDto();
+ BeanUtils.copyProperties(productModel,productModelDto);
+ productModelDto.setProductName(product.getProductName());
+ List<ProductStructureDto> productStructureDtos = productStructureMapper.listByproductModelId(productModelId);
+ productModelDto.setProductStructureList(productStructureDtos);
+ return productModelDto;
}
@Override
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 3d1c846..6c1b7aa 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -13,6 +13,7 @@
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
+import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.production.controller.ProductWorkOrderController;
import com.ruoyi.production.dto.ProductStructureDto;
import com.ruoyi.production.dto.ProductionProductMainDto;
@@ -76,6 +77,8 @@
private ProductOrderMapper productOrderMapper;
private SalesLedgerProductionAccountingMapper salesLedgerProductionAccountingMapper;
+
+ private StockUtils stockUtils;
@Override
@@ -169,6 +172,7 @@
qualityInspect.setInspectState(0);
qualityInspect.setInspectType(inspectType);
qualityInspect.setProductMainId(productionProductMain.getId());
+ qualityInspect.setProductModelId(productModel.getId());
qualityInspectMapper.insert(qualityInspect);
List<QualityTestStandardParam> qualityTestStandardParams = qualityTestStandardParamMapper.selectListByProductId(product.getId());
@@ -186,6 +190,12 @@
if (productModel != null) {
List<ProductStructureDto> productStructureDtos = productStructureMapper.listByproductModelId(productModel.getId());
for (ProductStructureDto productStructureDto : productStructureDtos) {
+ ProductModel productModel1 = productModelMapper.selectById(productStructureDto.getProductModelId());
+
+ BigDecimal stockQuantity = stockUtils.getStockQuantity(productModel1.getId());
+ if (!(stockQuantity.compareTo(BigDecimal.ZERO) > 0)) {
+ throw new RuntimeException("搴撳瓨涓嶈冻");
+ }
ProductionProductInput productionProductInput = new ProductionProductInput();
productionProductInput.setProductModelId(productStructureDto.getProductModelId());
productionProductInput.setQuantity(productStructureDto.getUnitQuantity().multiply(dto.getQuantity()));
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
index 520eca8..22b2501 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -242,6 +242,7 @@
qualityInspect.setProductId(saleProduct.getId());
qualityInspect.setProductName(saleProduct.getProductCategory());
qualityInspect.setModel(saleProduct.getSpecificationModel());
+ qualityInspect.setProductModelId(saleProduct.getProductModelId());
qualityInspect.setUnit(saleProduct.getUnit());
qualityInspect.setQuantity(saleProduct.getQuantity());
qualityInspectMapper.insert(qualityInspect);
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityReportController.java b/src/main/java/com/ruoyi/quality/controller/QualityReportController.java
new file mode 100644
index 0000000..fa6820f
--- /dev/null
+++ b/src/main/java/com/ruoyi/quality/controller/QualityReportController.java
@@ -0,0 +1,31 @@
+package com.ruoyi.quality.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.quality.pojo.QualityTestStandardParam;
+import com.ruoyi.quality.service.QualityReportService;
+import com.ruoyi.quality.service.QualityTestStandardParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 璐ㄩ噺绠＄悊鐨勬姤琛ㄧ鐞� 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-14 03:39:49
+ */
+@RestController
+@RequestMapping("/qualityReport")
+public class QualityReportController {
+
+ @Autowired
+ private QualityReportService qualityReportService;
+
+
+
+}
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
index ac40c91..2e715ac 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
@@ -80,4 +80,14 @@
return AjaxResult.success(qualityTestStandardService.copyParam(qualityTestStandard));
}
+ /**
+ * 妫�娴嬫爣鍑嗘壒閲忓鏍�
+ * @param qualityTestStandards
+ * @return
+ */
+ @PostMapping("/qualityTestStandardAudit")
+ public AjaxResult qualityTestStandardAudit(@RequestBody List<QualityTestStandard> qualityTestStandards) {
+ return AjaxResult.success(qualityTestStandardService.updateBatchById(qualityTestStandards));
+ }
+
}
diff --git a/src/main/java/com/ruoyi/quality/dto/QualityTestStandardBindingDto.java b/src/main/java/com/ruoyi/quality/dto/QualityTestStandardBindingDto.java
index ceac25d..be131bf 100644
--- a/src/main/java/com/ruoyi/quality/dto/QualityTestStandardBindingDto.java
+++ b/src/main/java/com/ruoyi/quality/dto/QualityTestStandardBindingDto.java
@@ -8,4 +8,6 @@
public class QualityTestStandardBindingDto {
private String productName;
+
+ private Long qualityTestStandardBindingId;
}
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
index 4207b8b..179caca 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -144,6 +144,8 @@
* 鎶ュ伐id
*/
private Long productMainId;
+
+ private Long productModelId;
//涓嶅悎鏍肩幇璞�
private String defectivePhenomena;
diff --git a/src/main/java/com/ruoyi/quality/service/QualityReportService.java b/src/main/java/com/ruoyi/quality/service/QualityReportService.java
new file mode 100644
index 0000000..4bc70f5
--- /dev/null
+++ b/src/main/java/com/ruoyi/quality/service/QualityReportService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.quality.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.quality.pojo.QualityTestStandardParam;
+
+/**
+ * <p>
+ * 璐ㄩ噺绠＄悊鐨勬姤琛ㄧ鐞� 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-13 03:39:49
+ */
+public interface QualityReportService {
+
+}
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
index 27111db..dec920d 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -1,6 +1,7 @@
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.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -16,6 +17,7 @@
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.procurementrecord.dto.Details;
import com.ruoyi.procurementrecord.dto.ProcurementAddDto;
+import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
import com.ruoyi.quality.dto.QualityInspectDto;
import com.ruoyi.quality.mapper.QualityInspectMapper;
@@ -43,7 +45,9 @@
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
import java.io.OutputStream;
+import java.math.BigDecimal;
import java.net.URLEncoder;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -119,16 +123,45 @@
ArrayList<Details> detailss = new ArrayList<>();
Details details = new Details();
- details.setId(Math.toIntExact(qualityInspect.getProductId()));
+ details.setId(Math.toIntExact(salesLedgerProduct.getId()));
details.setInboundQuantity(qualityInspect.getQuantity());
details.setWarnNum(salesLedgerProduct.getWarnNum());
details.setUnitPrice(salesLedgerProduct.getTaxInclusiveUnitPrice());
details.setTotalPrice(salesLedgerProduct.getTaxInclusiveTotalPrice());
+ details.setProductModelId(qualityInspect.getProductModelId());
detailss.add( details);
procurementRecordOutAdd.setDetails(detailss);
procurementRecordService.add(procurementRecordOutAdd);
}
}else if (qualityInspect.getInspectType() == 1) {
+ //鏌ヨUnitPrice/TotalPrice
+ ProcurementAddDto procurementRecordOutAdd = new ProcurementAddDto();
+ procurementRecordOutAdd.setType(2);
+ procurementRecordOutAdd.setTypeName("鐢熶骇鍏ュ簱");
+ procurementRecordOutAdd.setNickName(loginUser.getNickName());
+ List<Details> details = new ArrayList<>();
+ Details details1 = new Details();
+ details1.setInboundQuantity(qualityInspect.getQuantity());
+ details1.setProductModelId(qualityInspect.getProductModelId());
+ procurementRecordOutAdd.setDetails(details);
+
+ ProcurementRecordStorage.ProcurementRecordStorageBuilder procurementRecordBuilder = ProcurementRecordStorage.builder()
+ .salesLedgerProductId(details1.getId())
+ .inboundBatches( "鐢熶骇鍗婃垚鍝佸叆搴�")
+ .inboundNum(details1.getInboundQuantity())
+ .type(2)
+ .warnNum(new BigDecimal(0))
+ .unitPrice(new BigDecimal(0))
+ .totalPrice(new BigDecimal(0))
+ .createTime(LocalDateTime.now())
+ .createUser(loginUser.getUserId())
+ .updateTime(LocalDateTime.now())
+ .updateUser(loginUser.getUserId())
+ .createBy(procurementRecordOutAdd.getNickName())
+ .productModelId(details1.getProductModelId());
+ procurementRecordService.save(procurementRecordBuilder.build());
+
+
}else if (qualityInspect.getInspectType() == 2) {
//鏌ヨUnitPrice/TotalPrice
@@ -140,9 +173,10 @@
List<Details> details = new ArrayList<>();
Details details1 = new Details();
details1.setInboundQuantity(qualityInspect.getQuantity());
- details1.setId(Math.toIntExact(salesLedgerProduct.getId()));
+ details1.setId(Math.toIntExact(salesLedgerProduct.getProductId()));
details1.setUnitPrice(salesLedgerProduct.getTaxInclusiveUnitPrice());
details1.setTotalPrice(salesLedgerProduct.getTaxInclusiveTotalPrice());
+ details1.setProductModelId(salesLedgerProduct.getProductModelId());
details.add(details1);
procurementRecordOutAdd.setDetails(details);
procurementRecordService.add(procurementRecordOutAdd);
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityReportServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityReportServiceImpl.java
new file mode 100644
index 0000000..dfdfaf0
--- /dev/null
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityReportServiceImpl.java
@@ -0,0 +1,9 @@
+package com.ruoyi.quality.service.impl;
+
+import com.ruoyi.quality.service.QualityReportService;
+import org.springframework.stereotype.Service;
+
+
+@Service
+public class QualityReportServiceImpl implements QualityReportService {
+}
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
index 2848d5c..dce7ce7 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
@@ -77,7 +77,7 @@
IPage<ProcurementPageDtoCopy> result = procurementRecordService.listPageCopyByProduction(new Page<>(1,-1), procurementDto);
if(result.getRecords().size()>0) {
ProcurementPageDtoCopy procurementDtoCopy = result.getRecords().get(0);
- if (item.getQuantity().compareTo(procurementDtoCopy.getInboundNum0()) >= 0) {
+ if (item.getQuantity().compareTo(procurementDtoCopy.getInboundNum0()) >= 0 && item.getApproveStatus() == 0) {
item.setApproveStatus(1);
salesLedgerProductService.addOrUpdateSalesLedgerProduct(item);
}
diff --git a/src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java b/src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java
index c678c48..b8fab54 100644
--- a/src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java
@@ -9,7 +9,9 @@
import com.ruoyi.procurementrecord.dto.ProcurementAddDto;
import com.ruoyi.procurementrecord.dto.ProcurementRecordOutAdd;
import com.ruoyi.procurementrecord.pojo.ProcurementRecordOut;
+import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
import com.ruoyi.procurementrecord.service.ProcurementRecordOutService;
+import com.ruoyi.procurementrecord.service.ProcurementRecordService;
import com.ruoyi.sales.mapper.ShipmentApprovalMapper;
import com.ruoyi.sales.mapper.ShippingInfoMapper;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
@@ -26,6 +28,7 @@
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@@ -43,6 +46,8 @@
private ISalesLedgerProductService salesLedgerProductService;
@Autowired
private ProcurementRecordOutService procurementRecordOutService;
+ @Autowired
+ private ProcurementRecordService procurementRecordStorageService;
@GetMapping("/listPage")
@ApiOperation("鍙戣揣瀹℃壒鍒楄〃")
@@ -66,15 +71,22 @@
SalesLedgerProduct salesLedgerProduct = salesLedgerProductService.getById(shipmentApproval.getSalesLedgerProductId());
salesLedgerProduct.setApproveStatus(req.getApproveStatus());
salesLedgerProductService.updateById(salesLedgerProduct);
+
if(req.getApproveStatus()==3){
+ ProcurementRecordStorage procurementRecordStorage = procurementRecordStorageService.getOne(new LambdaQueryWrapper<ProcurementRecordStorage>()
+ .eq(ProcurementRecordStorage::getSalesLedgerProductId, req.getSalesLedgerProductId()));
+ if(procurementRecordStorage==null){
+ return AjaxResult.error("閲囪喘璁板綍涓嶅瓨鍦�");
+ }
//鍙戣揣瀹℃壒閫氳繃锛岀敓浜ц璁㈠崟鍑哄簱璁板綍
ProcurementRecordOutAdd procurementRecordOutAdd = new ProcurementRecordOutAdd();
+ procurementRecordOutAdd.setId(procurementRecordStorage.getId());
procurementRecordOutAdd.setSalesLedgerProductId(Math.toIntExact(salesLedgerProduct.getId()));
procurementRecordOutAdd.setType(2);
procurementRecordOutAdd.setUserId(Math.toIntExact(getUserId()));
procurementRecordOutAdd.setQuantity(String.valueOf(salesLedgerProduct.getQuantity()));
//鑾峰彇褰撳墠鏃堕棿
- LocalDateTime now = LocalDateTime.now();
+ LocalDate now = LocalDate.now();
procurementRecordOutAdd.setTime(now.toString());
procurementRecordOutService.stockout(procurementRecordOutAdd);
}
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java b/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
index 0e78067..e8f8934 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
@@ -188,6 +188,18 @@
@Excel(name = "澶囨敞锛堢鍒╁緟閬囷級")
private String remark;
+ /**
+ * 绂昏亴鍘熷洜
+ */
+ @Excel(name = "绂昏亴鍘熷洜",readConverterExp = "salary=钖祫寰呴亣,career_development=鑱屼笟鍙戝睍,work_environment=宸ヤ綔鐜,personal_reason=涓汉鍘熷洜,other=鍏朵粬")
+ private String dimissionReason;
+
+ /**
+ * 绂昏亴澶囨敞
+ */
+ @Excel(name = "绂昏亴澶囨敞")
+ private String dimissionRemark;
+
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java
index 378a1f1..d20ee41 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java
@@ -24,6 +24,8 @@
import java.util.*;
import java.util.function.Function;
+import static com.ruoyi.common.enums.StaffJoinLeaveRecordDimissionReason.StaffJoinLeaveRecordDimissionReasonOther;
+
@Service
@AllArgsConstructor
@Transactional(rollbackFor = Exception.class)
@@ -77,6 +79,12 @@
staffOnJobMapper.updateById(staffOnJob);
}else {
throw new BaseException("娌℃湁鎵惧埌"+staffJoinLeaveRecord.getStaffNo()+"缂栧彿鐨勫憳宸�,鏃犳硶鏂板绂昏亴!!!");
+ }
+ if (staffJoinLeaveRecord.getDimissionReason()==null){
+ throw new BaseException("绂昏亴鍘熷洜涓嶈兘涓虹┖!!!");
+ }
+ if (!StaffJoinLeaveRecordDimissionReasonOther.getCode().equals(staffJoinLeaveRecord.getDimissionReason())){
+ staffJoinLeaveRecord.setDimissionRemark("");
}
}
return staffJoinLeaveRecordMapper.insert(staffJoinLeaveRecord);
@@ -168,6 +176,12 @@
}else {
/*绂昏亴*/
//绂昏亴鐨勭紪杈戜笉浼氬奖鍝嶅湪鑱岃〃
+ if (staffJoinLeaveRecord.getDimissionReason()==null){
+ throw new BaseException("绂昏亴鍘熷洜涓嶈兘涓虹┖!!!");
+ }
+ if (!StaffJoinLeaveRecordDimissionReasonOther.getCode().equals(staffJoinLeaveRecord.getDimissionReason())){
+ staffJoinLeaveRecord.setDimissionRemark("");
+ }
}
return staffJoinLeaveRecordMapper.updateById(staffJoinLeaveRecord);
}
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index 3642db2..6384411 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -353,4 +353,9 @@
</if>
</where>
</select>
+ <select id="getSumQuantity" resultType="BigDecimal">
+ select COALESCE(sum(inbound_num), 0)
+ from procurement_record_storage
+ where product_model_id = #{productModelId}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
index b58db32..0fc12a9 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
@@ -169,4 +169,11 @@
</where>
order by t1.create_time desc
</select>
+
+ <select id="getSumQuantity" resultType="BigDecimal">
+ select COALESCE(sum(inbound_num), 0)
+ from procurement_record_out
+ where type = 1
+ and product_model_id = #{productModelId}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/quality/QualityTestStandardBindingMapper.xml b/src/main/resources/mapper/quality/QualityTestStandardBindingMapper.xml
index 6ba77c5..0cdda33 100644
--- a/src/main/resources/mapper/quality/QualityTestStandardBindingMapper.xml
+++ b/src/main/resources/mapper/quality/QualityTestStandardBindingMapper.xml
@@ -14,7 +14,8 @@
<result column="tenant_id" property="tenantId"/>
</resultMap>
<select id="listBinding" resultType="com.ruoyi.quality.dto.QualityTestStandardBindingDto">
- select *
+ select t2.product_name,
+ t1.id qualityTestStandardBindingId
from quality_test_standard_binding t1
left join product t2 on t1.product_id = t2.id
where t1.test_standard_id = #{testStandardId}
diff --git a/src/main/resources/mapper/quality/QualityTestStandardMapper.xml b/src/main/resources/mapper/quality/QualityTestStandardMapper.xml
index 72a977a..be07a98 100644
--- a/src/main/resources/mapper/quality/QualityTestStandardMapper.xml
+++ b/src/main/resources/mapper/quality/QualityTestStandardMapper.xml
@@ -7,17 +7,17 @@
FROM quality_test_standard
where
1=1
- <if test="qualityTestStandard.standardNo != null and qualityTestStandard.standardNo != '' ">
- AND standard_no like concat('%',#{qualityTestStandard.standardNo},'%')
+ <if test="c.standardNo != null and c.standardNo != '' ">
+ AND standard_no like concat('%',#{c.standardNo},'%')
</if>
- <if test="qualityTestStandard.standardName != null and qualityTestStandard.standardName != '' ">
- AND standard_name like concat('%',#{qualityTestStandard.standardName},'%')
+ <if test="c.standardName != null and c.standardName != '' ">
+ AND standard_name like concat('%',#{c.standardName},'%')
</if>
- <if test="qualityTestStandard.state != null and qualityTestStandard.state != '' ">
- AND state = #{qualityTestStandard.state}
+ <if test="c.state != null and c.state != '' ">
+ AND state = #{c.state}
</if>
- <if test="qualityTestStandard.inspectType != null and qualityTestStandard.inspectType != '' ">
- AND inspect_type = #{qualityTestStandard.inspectType}
+ <if test="c.inspectType != null and c.inspectType != '' ">
+ AND inspect_type = #{c.inspectType}
</if>
</select>
</mapper>
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index a74033f..b2a18d8 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -11,7 +11,7 @@
t3.shipping_date
FROM
sales_ledger_product T1
- left join shipping_info t3 on T1.id = t3.sales_ledger_id
+ left join shipping_info t3 on T1.id = t3.sales_ledger_product_id
<where>
1=1
<if test="salesLedgerProduct.salesLedgerId != null and salesLedgerProduct.salesLedgerId != '' ">
--
Gitblit v1.9.3