From a152f9164d4007442d748c72dfb5ac5798b3b4b2 Mon Sep 17 00:00:00 2001 From: hy2250089 Date: Tue, 24 Mar 2020 18:43:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B9=E6=8D=AE=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=E6=98=8E=E7=BB=86=E6=9F=A5=E8=AF=A2=E5=B7=B2=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E7=9A=84=E5=B7=A5=E5=BA=8F=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE=E6=89=B9=E6=AC=A1=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E5=92=8C=E5=B7=A5=E5=BA=8F=E6=9F=A5=E8=AF=A2=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E7=BB=93=E6=9E=9C=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/dao/MtAloneProcessMapper.java | 2 +- .../dao/ProductBatchDetectDetMapper.java | 4 ++ .../manage/dao/ProductBatchDetectMapper.java | 2 + .../manage/mapper/MtAloneProcessMapper.xml | 11 ++++- .../mapper/ProductBatchDetectDetMapper.xml | 34 ++++++++++++- .../mapper/ProductBatchDetectMapper.xml | 14 ++++++ .../manage/model/MtAloneProcessDo.java | 49 +++++++++++++++++++ .../manage/model/ProductBatchDetectDet.java | 16 +++--- .../manage/model/ProductBatchDetectDetVo.java | 19 +++++++ .../model/ProductBatchDetectParams.java | 30 ++++++++++++ .../model/ProductBatchDetectResult.java | 30 ++++++++++++ .../manage/service/MtAloneProcessService.java | 2 +- .../service/ProductBatchDetectDetService.java | 3 ++ .../service/ProductBatchDetectService.java | 3 ++ .../impl/MtAloneProcessServiceImpl.java | 2 +- .../ProductBatchDetectDetServiceImpl.java | 7 +++ .../impl/ProductBatchDetectServiceImpl.java | 10 ++++ .../manage/web/MtAloneProcessController.java | 25 ++++++++++ .../web/ProductBatchDetectController.java | 30 ++++++++++++ .../web/ProductBatchDetectDetController.java | 5 +- .../web/ProductProcessBatchDetController.java | 24 --------- 21 files changed, 282 insertions(+), 40 deletions(-) create mode 100644 wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcessDo.java create mode 100644 wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetectDetVo.java create mode 100644 wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetectResult.java diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneProcessMapper.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneProcessMapper.java index 1129bfd..d932578 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneProcessMapper.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneProcessMapper.java @@ -15,7 +15,7 @@ public interface MtAloneProcessMapper extends Mapper { MtAloneProcessVo findProcessById(MtAloneProcessParams processParams); - List findDetectProcessByBatchDet(ProductProcessBatchDetParams params); + List findDetectProcessByBatchDet(ProductProcessBatchDetParams params); //List processStepListByProdprocid(ProductProcessParams params); } \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProductBatchDetectDetMapper.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProductBatchDetectDetMapper.java index befab59..b8be2a6 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProductBatchDetectDetMapper.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProductBatchDetectDetMapper.java @@ -2,10 +2,14 @@ package com.deer.wms.produce.manage.dao; import com.deer.wms.produce.manage.model.ProductBatchDetectDet; import com.deer.wms.produce.manage.model.ProductBatchDetectDetParams; +import com.deer.wms.produce.manage.model.ProductBatchDetectDetVo; +import com.deer.wms.produce.manage.model.ProductBatchDetectParams; import com.deer.wms.project.seed.core.mapper.Mapper; import java.util.List; public interface ProductBatchDetectDetMapper extends Mapper { List findList(ProductBatchDetectDetParams params); + + List findDetectDetVoListByBatchDetAndProcess(ProductBatchDetectParams params); } \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProductBatchDetectMapper.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProductBatchDetectMapper.java index 1d98ea2..744f09f 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProductBatchDetectMapper.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProductBatchDetectMapper.java @@ -8,4 +8,6 @@ import java.util.List; public interface ProductBatchDetectMapper extends Mapper { List findList(ProductBatchDetectParams params); + + ProductBatchDetect findDetectByBatchDetAndProcess(ProductBatchDetectParams params); } \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneProcessMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneProcessMapper.xml index 1235138..6a3da3b 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneProcessMapper.xml +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneProcessMapper.xml @@ -74,6 +74,13 @@ + + + + + + + - SELECT process.process_name, process.process_step FROM mt_alone_process process + resultMap="MtAloneProcessDoResultMap"> + SELECT batchdetect.process_id, batchdetect.batch_det_id, process.process_name, process.process_step FROM mt_alone_process process RIGHT JOIN mt_alone_product_batch_detect batchdetect ON batchdetect.process_id = process.id AND batchdetect.company_id = process.company_id diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductBatchDetectDetMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductBatchDetectDetMapper.xml index 7fddb38..c771e63 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductBatchDetectDetMapper.xml +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductBatchDetectDetMapper.xml @@ -16,7 +16,39 @@ - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductBatchDetectMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductBatchDetectMapper.xml index 7fcc092..eabb6e2 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductBatchDetectMapper.xml +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductBatchDetectMapper.xml @@ -22,4 +22,18 @@ + + + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcessDo.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcessDo.java new file mode 100644 index 0000000..4eadff0 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcessDo.java @@ -0,0 +1,49 @@ +package com.deer.wms.produce.manage.model; + +/** + * 根据批次明细id查询已检测的工序，用于标签显示 + * @Author: hy + * @Date: 2020/3/24 15:47 + * @Version 1.0 + */ +public class MtAloneProcessDo { + private Integer batchDetId; + + private Integer processId; + + private Integer processStep; + + private String processName; + + public Integer getBatchDetId() { + return batchDetId; + } + + public void setBatchDetId(Integer batchDetId) { + this.batchDetId = batchDetId; + } + + public Integer getProcessId() { + return processId; + } + + public void setProcessId(Integer processId) { + this.processId = processId; + } + + public Integer getProcessStep() { + return processStep; + } + + public void setProcessStep(Integer processStep) { + this.processStep = processStep; + } + + public String getProcessName() { + return processName; + } + + public void setProcessName(String processName) { + this.processName = processName; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetectDet.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetectDet.java index 568d3ba..209ab95 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetectDet.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetectDet.java @@ -63,8 +63,8 @@ public class ProductBatchDetectDet { /** * 瑕疵点名称 */ - @Column(name = "defect_name") - private String defectName; + @Column(name = "defect_name0") + private String defectName0; @Column(name = "company_id") private Integer companyId; @@ -254,19 +254,19 @@ public class ProductBatchDetectDet { /** * 获取瑕疵点名称 * - * @return defect_name - 瑕疵点名称 + * @return defect_name0 - 瑕疵点名称 */ - public String getDefectName() { - return defectName; + public String getDefectName0() { + return defectName0; } /** * 设置瑕疵点名称 * - * @param defectName 瑕疵点名称 + * @param defectName0 瑕疵点名称 */ - public void setDefectName(String defectName) { - this.defectName = defectName; + public void setDefectName0(String defectName0) { + this.defectName0 = defectName0; } /** diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetectDetVo.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetectDetVo.java new file mode 100644 index 0000000..62d9dbf --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetectDetVo.java @@ -0,0 +1,19 @@ +package com.deer.wms.produce.manage.model; + +/** + * @Author: hy + * @Date: 2020/3/24 18:35 + * @Version 1.0 + */ +public class ProductBatchDetectDetVo extends ProductBatchDetectDet { + + private String defectName;//瑕疵表mt_alone_fabric_defect中关联查询出的瑕疵名称 + + public String getDefectName() { + return defectName; + } + + public void setDefectName(String defectName) { + this.defectName = defectName; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetectParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetectParams.java index f2a8ddd..5871c60 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetectParams.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetectParams.java @@ -6,4 +6,34 @@ import com.deer.wms.project.seed.core.service.QueryParams; * Created by on 2019/09/09. */ public class ProductBatchDetectParams extends QueryParams { + + private Integer productBatchDetectId;//检测等级id + + private Integer batchDetId;//批次明细id + + private Integer processId;//工序id + + public Integer getProductBatchDetectId() { + return productBatchDetectId; + } + + public void setProductBatchDetectId(Integer productBatchDetectId) { + this.productBatchDetectId = productBatchDetectId; + } + + public Integer getBatchDetId() { + return batchDetId; + } + + public void setBatchDetId(Integer batchDetId) { + this.batchDetId = batchDetId; + } + + public Integer getProcessId() { + return processId; + } + + public void setProcessId(Integer processId) { + this.processId = processId; + } } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetectResult.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetectResult.java new file mode 100644 index 0000000..e7dd7df --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetectResult.java @@ -0,0 +1,30 @@ +package com.deer.wms.produce.manage.model; + +import java.util.List; + +/** + * @Author: hy + * @Date: 2020/3/24 16:20 + * @Version 1.0 + */ +public class ProductBatchDetectResult { + private ProductBatchDetect productBatchDetect; + + private List productBatchDetectDetVoList; + + public ProductBatchDetect getProductBatchDetect() { + return productBatchDetect; + } + + public void setProductBatchDetect(ProductBatchDetect productBatchDetect) { + this.productBatchDetect = productBatchDetect; + } + + public List getProductBatchDetectDetVoList() { + return productBatchDetectDetVoList; + } + + public void setProductBatchDetectDetVoList(List productBatchDetectDetVoList) { + this.productBatchDetectDetVoList = productBatchDetectDetVoList; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneProcessService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneProcessService.java index f2892a3..506f720 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneProcessService.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneProcessService.java @@ -22,7 +22,7 @@ public interface MtAloneProcessService extends Service MtAloneProcessVo findProcessById(MtAloneProcessParams processParams); - List findDetectProcessByBatchDet(ProductProcessBatchDetParams params); + List findDetectProcessByBatchDet(ProductProcessBatchDetParams params); //List processStepListByProdprocid(ProductProcessParams params); } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductBatchDetectDetService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductBatchDetectDetService.java index fb1dba5..a55a04b 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductBatchDetectDetService.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductBatchDetectDetService.java @@ -3,6 +3,8 @@ package com.deer.wms.produce.manage.service; import com.deer.wms.produce.manage.model.ProductBatchDetectDet; import com.deer.wms.produce.manage.model.ProductBatchDetectDetParams; +import com.deer.wms.produce.manage.model.ProductBatchDetectDetVo; +import com.deer.wms.produce.manage.model.ProductBatchDetectParams; import com.deer.wms.project.seed.core.service.Service; import java.util.List; @@ -14,4 +16,5 @@ public interface ProductBatchDetectDetService extends Service findList(ProductBatchDetectDetParams params) ; + List findDetectDetVoListByBatchDetAndProcess(ProductBatchDetectParams params); } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductBatchDetectService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductBatchDetectService.java index e63a92c..2c3c5b0 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductBatchDetectService.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductBatchDetectService.java @@ -5,6 +5,7 @@ import com.deer.wms.produce.manage.model.ProductBatchDetect; import com.deer.wms.produce.manage.model.ProductBatchDetectInfo; import com.deer.wms.produce.manage.model.ProductBatchDetectParams; +import com.deer.wms.produce.manage.model.ProductBatchDetectResult; import com.deer.wms.project.seed.core.service.Service; import java.util.List; @@ -17,4 +18,6 @@ public interface ProductBatchDetectService extends Service findList(ProductBatchDetectParams params) ; void saveDetectRusult(ProductBatchDetectInfo productBatchDetectInfo, CurrentUser currentUser); + + ProductBatchDetectResult findDetectResultByBatchDetAndProcess(ProductBatchDetectParams params); } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneProcessServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneProcessServiceImpl.java index 39b67b1..b00a0d3 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneProcessServiceImpl.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneProcessServiceImpl.java @@ -118,7 +118,7 @@ public class MtAloneProcessServiceImpl extends AbstractService findDetectProcessByBatchDet(ProductProcessBatchDetParams params) { + public List findDetectProcessByBatchDet(ProductProcessBatchDetParams params) { return mtAloneProcessMapper.findDetectProcessByBatchDet(params); } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductBatchDetectDetServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductBatchDetectDetServiceImpl.java index 2e56a83..2994acd 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductBatchDetectDetServiceImpl.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductBatchDetectDetServiceImpl.java @@ -3,6 +3,8 @@ package com.deer.wms.produce.manage.service.impl; import com.deer.wms.produce.manage.dao.ProductBatchDetectDetMapper; import com.deer.wms.produce.manage.model.ProductBatchDetectDet; import com.deer.wms.produce.manage.model.ProductBatchDetectDetParams; +import com.deer.wms.produce.manage.model.ProductBatchDetectDetVo; +import com.deer.wms.produce.manage.model.ProductBatchDetectParams; import com.deer.wms.produce.manage.service.ProductBatchDetectDetService; import com.deer.wms.project.seed.core.service.AbstractService; @@ -26,4 +28,9 @@ public class ProductBatchDetectDetServiceImpl extends AbstractService findList(ProductBatchDetectDetParams params) { return productBatchDetectDetMapper.findList(params); } + + @Override + public List findDetectDetVoListByBatchDetAndProcess(ProductBatchDetectParams params) { + return productBatchDetectDetMapper.findDetectDetVoListByBatchDetAndProcess(params); + } } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductBatchDetectServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductBatchDetectServiceImpl.java index ec1749a..93bc634 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductBatchDetectServiceImpl.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductBatchDetectServiceImpl.java @@ -67,4 +67,14 @@ public class ProductBatchDetectServiceImpl extends AbstractService productBatchDetectDetVoList = productBatchDetectDetService.findDetectDetVoListByBatchDetAndProcess(params); + productBatchDetectResult.setProductBatchDetect(productBatchDetect); + productBatchDetectResult.setProductBatchDetectDetVoList(productBatchDetectDetVoList); + return productBatchDetectResult; + } } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneProcessController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneProcessController.java index 01086be..73368e2 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneProcessController.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneProcessController.java @@ -186,4 +186,29 @@ public class MtAloneProcessController { return ResultGenerator.genSuccessResult(); } + /** + * hy正在用 + * 根据批次明细id查询已检测的工序,用于点击查看明细的工序瑕疵后显示的标签名称 + * @param params + * @param currentUser + * @return + */ + @ApiOperation(value = "根据批次明细id查询已检测的工序", notes = "根据批次明细id查询已检测的工序") + @ApiImplicitParams({ + @ApiImplicitParam(name = "batchDetId", value = "批次明细id", paramType = "query", dataType = "int", required = true) + }) + @OperateLog(description = "根据批次明细id查询已检测的工序", type = "查询") + @GetMapping("/detectProcessByBatchDet") + public Result detectProcessByBatchDet(ProductProcessBatchDetParams params, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + params.setCompanyId(currentUser.getCompanyId()); + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + List list = mtAloneProcessService.findDetectProcessByBatchDet(params); + PageInfo pageInfo = new PageInfo(list); + return ResultGenerator.genSuccessResult(pageInfo); + } + } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductBatchDetectController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductBatchDetectController.java index db3fd42..8049ea8 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductBatchDetectController.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductBatchDetectController.java @@ -1,6 +1,7 @@ package com.deer.wms.produce.manage.web; import com.deer.wms.produce.manage.model.ProductBatchDetectInfo; +import com.deer.wms.produce.manage.model.ProductBatchDetectResult; import com.deer.wms.project.seed.annotation.OperateLog; import com.deer.wms.project.seed.constant.SystemManageConstant; import com.deer.wms.project.seed.core.result.CommonCode; @@ -114,4 +115,33 @@ public class ProductBatchDetectController { productBatchDetectService.saveDetectRusult(productBatchDetectInfo, currentUser); return ResultGenerator.genSuccessResult(); } + + /** + * hy正在用 + * 根据批次明细id和已检测工序id，获取检测详细信息（检测长度、等级以及瑕疵明细） + * @param params + * @param currentUser + * @return + */ + @ApiOperation(value = "检测结果和瑕疵明细查询", notes = "检测结果和瑕疵明细查询") + @ApiImplicitParams({ + @ApiImplicitParam(name = "batchDetId", value = "批次明细id", paramType = "query", dataType = "int", required = true), + @ApiImplicitParam(name = "processId", value = "工序id", paramType = "query", dataType = "int", required = true) + }) + @OperateLog(description = "检测结果和瑕疵明细查询", type = "查询") + @GetMapping("/detectResultByBatchDetAndProcess") + public Result detectResultByBatchDetAndProcess(ProductBatchDetectParams params, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + params.setCompanyId(currentUser.getCompanyId()); + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + ProductBatchDetectResult productBatchDetectResult = productBatchDetectService.findDetectResultByBatchDetAndProcess(params); + return ResultGenerator.genSuccessResult(productBatchDetectResult); + } + + + + } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductBatchDetectDetController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductBatchDetectDetController.java index 713e19a..c24fa18 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductBatchDetectDetController.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductBatchDetectDetController.java @@ -1,12 +1,11 @@ package com.deer.wms.produce.manage.web; +import com.deer.wms.produce.manage.model.*; import com.deer.wms.project.seed.annotation.OperateLog; import com.deer.wms.project.seed.constant.SystemManageConstant; import com.deer.wms.project.seed.core.result.CommonCode; import com.deer.wms.project.seed.core.result.Result; import com.deer.wms.project.seed.core.result.ResultGenerator; -import com.deer.wms.produce.manage.model.ProductBatchDetectDet; -import com.deer.wms.produce.manage.model.ProductBatchDetectDetParams; import com.deer.wms.produce.manage.service.ProductBatchDetectDetService; import com.deer.wms.intercept.annotation.User; import com.deer.wms.intercept.common.data.CurrentUser; @@ -14,6 +13,8 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import springfox.documentation.annotations.ApiIgnore; diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessBatchDetController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessBatchDetController.java index ef4da8c..a1fee9d 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessBatchDetController.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessBatchDetController.java @@ -102,28 +102,4 @@ public class ProductProcessBatchDetController { return ResultGenerator.genSuccessResult(pageInfo); } -/** - * hy正在用 - * 根据批次明细id查询已检测的工序,用于点击查看明细的工序瑕疵后显示的标签名称 - * @param params - * @param currentUser - * @return - */ - @ApiOperation(value = "根据批次明细id查询已检测的工序", notes = "根据批次明细id查询已检测的工序") - @ApiImplicitParams({ - @ApiImplicitParam(name = "batchDetId", value = "批次明细id", paramType = "query", dataType = "int", required = true) - }) - @OperateLog(description = "根据批次明细id查询已检测的工序", type = "查询") - @GetMapping("/detectProcessByBatchDet") - public Result detectProcessByBatchDet(ProductProcessBatchDetParams params, @ApiIgnore @User CurrentUser currentUser) { - if(currentUser==null){ - return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); - } - - params.setCompanyId(currentUser.getCompanyId()); - PageHelper.startPage(params.getPageNum(), params.getPageSize()); - List list = mtAloneProcessService.findDetectProcessByBatchDet(params); - PageInfo pageInfo = new PageInfo(list); - return ResultGenerator.genSuccessResult(pageInfo); - } }