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);