From b31f6dd84725ad8ed5c3f1e229d03ccfca5e2fcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 20 Apr 2026 15:26:51 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=A3=80=E9=AA=8C=E6=A0=87=E5=87=86=E6=97=B6=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=AF=B9=E5=BA=94=E8=B4=A8=E6=A3=80=E7=89=A9=E6=96=99?= =?UTF-8?q?=E7=9A=84=E8=A7=84=E5=88=99=E6=98=AF=E5=90=A6=E5=B7=B2=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QmsInspectionStandardControllerService.java | 13 ++++++++++++- .../service/QmsSamplingPlanControllerService.java | 3 ++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsInspectionStandardControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsInspectionStandardControllerService.java index 77345b7b..f779a03f 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsInspectionStandardControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsInspectionStandardControllerService.java @@ -16,10 +16,12 @@ import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.repository.entity.QmsInspectionStandard; import com.nflg.wms.repository.entity.QmsInspectionStandardItem; 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.service.IQmsInspectionStandardItemContentService; import com.nflg.wms.repository.service.IQmsInspectionStandardItemService; import com.nflg.wms.repository.service.IQmsInspectionStandardService; +import com.nflg.wms.repository.service.IQmsQcMaterialService; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -49,6 +51,9 @@ public class QmsInspectionStandardControllerService { @Resource private IQmsInspectionStandardItemContentService inspectionStandardItemContentService; + @Resource + private IQmsQcMaterialService qmsQcMaterialService; + /** * 分页查询检验标准 */ @@ -270,7 +275,13 @@ public class QmsInspectionStandardControllerService { standard.setUpdateTime(now); inspectionStandardService.save(standard); - + + qmsQcMaterialService.lambdaUpdate() + .set(QmsQcMaterial::getIsStandardMaintained, true) + .eq(QmsQcMaterial::getId, qo.getMaterialId()) + .eq(QmsQcMaterial::getIsStandardMaintained, false) + .update(); + return standard.getId(); } diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsSamplingPlanControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsSamplingPlanControllerService.java index d88e2374..5c4018c4 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsSamplingPlanControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsSamplingPlanControllerService.java @@ -396,7 +396,8 @@ public class QmsSamplingPlanControllerService { .like(StrUtil.isNotBlank(request.getPlanName()), QmsSamplingPlan::getPlanName, request.getPlanName()) .ge(request.getStartDate() != null, QmsSamplingPlan::getCreateTime, request.getStartDate()) .le(request.getEndDate() != null, QmsSamplingPlan::getCreateTime, request.getEndDate()) - .orderByDesc(QmsSamplingPlan::getCreateTime); + .orderByAsc(QmsSamplingPlan::getPublishStatus) + .orderByDesc(QmsSamplingPlan::getId); IPage result = query.page(page);