rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【优化】添加检验标准时更新对应质检物料的规则是否已维护字段

This commit is contained in:
曹鹏飞 2026-04-20 15:26:51 +08:00
parent 6ff777e808
commit b31f6dd847
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsInspectionStandardControllerService.java
View File

@ -16,10 +16,12 @@ import com.nflg.wms.common.util.UserUtil;
import com.nflg.wms.repository.entity.QmsInspectionStandard; import com.nflg.wms.repository.entity.QmsInspectionStandard;
import com.nflg.wms.repository.entity.QmsInspectionStandardItem; import com.nflg.wms.repository.entity.QmsInspectionStandardItem;
import com.nflg.wms.repository.entity.QmsInspectionStandardItemContent; import com.nflg.wms.repository.entity.QmsInspectionStandardItemContent;
import com.nflg.wms.repository.entity.QmsQcMaterial;
import com.nflg.wms.repository.mapper.QmsInspectionStandardMapper; import com.nflg.wms.repository.mapper.QmsInspectionStandardMapper;
import com.nflg.wms.repository.service.IQmsInspectionStandardItemContentService; import com.nflg.wms.repository.service.IQmsInspectionStandardItemContentService;
import com.nflg.wms.repository.service.IQmsInspectionStandardItemService; import com.nflg.wms.repository.service.IQmsInspectionStandardItemService;
import com.nflg.wms.repository.service.IQmsInspectionStandardService; import com.nflg.wms.repository.service.IQmsInspectionStandardService;
import com.nflg.wms.repository.service.IQmsQcMaterialService;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -49,6 +51,9 @@ public class QmsInspectionStandardControllerService {
@Resource @Resource
private IQmsInspectionStandardItemContentService inspectionStandardItemContentService; private IQmsInspectionStandardItemContentService inspectionStandardItemContentService;
@Resource
private IQmsQcMaterialService qmsQcMaterialService;
/** /**
* 分页查询检验标准 * 分页查询检验标准
*/ */
@ -270,7 +275,13 @@ public class QmsInspectionStandardControllerService {
standard.setUpdateTime(now); standard.setUpdateTime(now);
inspectionStandardService.save(standard); inspectionStandardService.save(standard);
qmsQcMaterialService.lambdaUpdate()
.set(QmsQcMaterial::getIsStandardMaintained, true)
.eq(QmsQcMaterial::getId, qo.getMaterialId())
.eq(QmsQcMaterial::getIsStandardMaintained, false)
.update();
return standard.getId(); return standard.getId();
} }

3
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsSamplingPlanControllerService.java
View File

@ -396,7 +396,8 @@ public class QmsSamplingPlanControllerService {
.like(StrUtil.isNotBlank(request.getPlanName()), QmsSamplingPlan::getPlanName, request.getPlanName()) .like(StrUtil.isNotBlank(request.getPlanName()), QmsSamplingPlan::getPlanName, request.getPlanName())
.ge(request.getStartDate() != null, QmsSamplingPlan::getCreateTime, request.getStartDate()) .ge(request.getStartDate() != null, QmsSamplingPlan::getCreateTime, request.getStartDate())
.le(request.getEndDate() != null, QmsSamplingPlan::getCreateTime, request.getEndDate()) .le(request.getEndDate() != null, QmsSamplingPlan::getCreateTime, request.getEndDate())
.orderByDesc(QmsSamplingPlan::getCreateTime); .orderByAsc(QmsSamplingPlan::getPublishStatus)
.orderByDesc(QmsSamplingPlan::getId);
IPage<QmsSamplingPlan> result = query.page(page); IPage<QmsSamplingPlan> result = query.page(page);