From 91ab1a15515c4c213b2ac4f777a7f20c3d0d59ad Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期五, 28 三月 2025 13:49:53 +0800 Subject: [PATCH] 一个订单在每个站点检验都需要扫码入库报检,在中间站点复核继续试验之后默认自动将样品出库,且在列表中也不需要再展示出来,到最后一步复核结束反而是需要手动去出库不能自动出库,且出库之后也不需要在页面展示 --- inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTemplateServiceImpl.java | 31 ++++++++++++++++++++++++------- 1 files changed, 24 insertions(+), 7 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTemplateServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTemplateServiceImpl.java index 8acb374..04ce217 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTemplateServiceImpl.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTemplateServiceImpl.java @@ -1,15 +1,13 @@ package com.yuanchu.mom.service.impl; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yuanchu.mom.common.GetLook; import com.yuanchu.mom.common.PrintChina; +import com.yuanchu.mom.mapper.StandardTemplateMapper; import com.yuanchu.mom.pojo.StandardTemplate; import com.yuanchu.mom.service.StandardTemplateService; -import com.yuanchu.mom.mapper.StandardTemplateMapper; import com.yuanchu.mom.utils.QueryWrappers; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -49,6 +47,9 @@ @Override public int upStandardTemplate(StandardTemplate standardTemplate) { + if(standardTemplate.getThing().equals("")){ + standardTemplate.setThing(null); + } return standardTemplateMapper.updateById(standardTemplate); } @@ -64,10 +65,26 @@ @Override public String getStandTempThingById(Integer templateId) { - return standardTemplateMapper.selectById(templateId).getThing(); + StandardTemplate standardTemplate = standardTemplateMapper.selectById(templateId); + if(standardTemplate==null){ + return null; + }else{ + return standardTemplate.getThing(); + } } -} + @Override + public String getStandTempNameById(Integer templateId) { + StandardTemplate standardTemplate = standardTemplateMapper.selectById(templateId); + if(standardTemplate==null){ + return null; + }else{ + return standardTemplate.getName(); + } + } - - + @Override + public StandardTemplate getStandTempIdByName(String name) { + return standardTemplateMapper.getStandTempIdByName(name); + } +} \ No newline at end of file -- Gitblit v1.9.3