From 50f388d9fd64ca89d0d1307813f602deb0fc0142 Mon Sep 17 00:00:00 2001 From: hy2250089 Date: Mon, 16 Mar 2020 19:22:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B7=E7=B3=BB=E7=BB=9F=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E9=A1=B5=E9=9D=A2=E6=89=B9=E6=AC=A1=E5=8A=A0=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E3=80=81=E5=B7=A5=E5=BA=8F=E3=80=81=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/dao/MtAloneProcessMapper.java | 2 + .../dao/ProductProcessBatchDetMapper.java | 2 + .../manage/dao/ProductProcessMapper.java | 1 + .../manage/mapper/MtAloneProcessMapper.xml | 18 +++++ .../mapper/ProductBatchDetectDetMapper.xml | 1 + .../mapper/ProductBatchDetectMapper.xml | 1 + .../mapper/ProductProcessBatchDetMapper.xml | 15 +++++ .../manage/mapper/ProductProcessMapper.xml | 16 +++++ .../produce/manage/model/ProcessAndDet.java | 9 +++ .../manage/model/ProductBatchDetect.java | 26 ++++++++ .../manage/model/ProductBatchDetectDet.java | 24 +++++++ .../ProductProcessBatchDetCondition.java | 48 ++++++++++++++ .../model/ProductProcessBatchDetInfo.java | 39 +++++++++++ .../model/ProductProcessBatchDetParams.java | 9 +++ .../manage/service/MtAloneProcessService.java | 2 + .../ProductProcessBatchDetService.java | 2 + .../manage/service/ProductProcessService.java | 2 + .../impl/MtAloneProcessServiceImpl.java | 5 ++ .../ProductProcessBatchDetServiceImpl.java | 5 ++ .../impl/ProductProcessServiceImpl.java | 5 ++ .../web/ProductBatchDetectController.java | 12 ++++ .../web/ProductProcessBatchDetController.java | 8 +++ .../manage/web/ProductProcessController.java | 65 +++++++++++++++---- 23 files changed, 304 insertions(+), 13 deletions(-) create mode 100644 wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBatchDetCondition.java create mode 100644 wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBatchDetInfo.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 ecbfb1b..a081851 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 @@ -16,5 +16,7 @@ public interface MtAloneProcessMapper extends Mapper { void setNextProcessBeforeHandleStatus(MtAloneProcess currentProcess); + MtAloneProcessVo findProcessById(MtAloneProcessParams processParams); + //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/ProductProcessBatchDetMapper.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProductProcessBatchDetMapper.java index 47735ad..e1b53db 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProductProcessBatchDetMapper.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProductProcessBatchDetMapper.java @@ -13,4 +13,6 @@ public interface ProductProcessBatchDetMapper extends Mapper volumeStepListByProdprocid(ProductProcessParams params); List findListByProductProcess(ProductProcessParams params); + + ProductProcessBatchDet findBatchDetById(ProductProcessBatchDetParams batchDetParams); } \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProductProcessMapper.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProductProcessMapper.java index aa670fa..bfbd9d6 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProductProcessMapper.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProductProcessMapper.java @@ -11,4 +11,5 @@ import java.util.List; public interface ProductProcessMapper extends Mapper { List findList(ProductProcessParams params); + ProductProcessVo findProductProcessById(ProductProcessParams productProcessParams); } \ 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 4868785..eb73194 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 @@ -132,4 +132,22 @@ ORDER BY process.process_step + + \ No newline at end of file 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 1ec17f2..7fddb38 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 @@ -12,6 +12,7 @@ + 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 52e1b14..c346cf8 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 @@ -12,6 +12,7 @@ + diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessBatchDetMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessBatchDetMapper.xml index 4ee5e59..4245c26 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessBatchDetMapper.xml +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessBatchDetMapper.xml @@ -55,5 +55,20 @@ ORDER BY CAST(det.volume_num AS DECIMAL) + + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessMapper.xml index 5ecf5a9..8ede168 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessMapper.xml +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessMapper.xml @@ -119,5 +119,21 @@ GROUP BY prodproc.id ORDER BY prodproc.create_time DESC, prodproc.update_time DESC + + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessAndDet.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessAndDet.java index 9fbf790..0e03da2 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessAndDet.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessAndDet.java @@ -9,11 +9,20 @@ import java.util.List; * @Version 1.0 */ public class ProcessAndDet { + private Integer productProcessId;//批次加工单id private List processVoList;//工序扩展信息 private List productProcessBatchDetList;//明细信息 + public Integer getProductProcessId() { + return productProcessId; + } + + public void setProductProcessId(Integer productProcessId) { + this.productProcessId = productProcessId; + } + public List getProcessVoList() { return processVoList; } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetect.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetect.java index 7bac6f8..0f8a477 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetect.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetect.java @@ -43,6 +43,14 @@ public class ProductBatchDetect { @Column(name = "process_id") private Integer processId; + + /** + * 批次明细id，关联表：mt_alone_product_batch_detect + */ + @Column(name = "batch_det_id") + private Integer batchDetId; + + /** * 卷码code，作为扫描编码，关联表：mt_alone_product_process_batch_det */ @@ -276,4 +284,22 @@ public class ProductBatchDetect { public void setCompanyId(Integer companyId) { this.companyId = companyId; } + + /** + * 获取批次明细id + * + * @return batchDetId - 批次明细id，关联表：mt_alone_product_batch_detect + */ + public Integer getBatchDetId() { + return batchDetId; + } + + /** + * 设置批次明细id + * + * @param batchDetId - 批次明细id，关联表：mt_alone_product_batch_detect + */ + public void setBatchDetId(Integer batchDetId) { + this.batchDetId = batchDetId; + } } \ No newline at end of file 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 c826a0c..568d3ba 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 @@ -69,6 +69,12 @@ public class ProductBatchDetectDet { @Column(name = "company_id") private Integer companyId; + /** + * 批次明细id，关联表：mt_alone_product_batch_detect + */ + @Column(name = "batch_det_id") + private Integer batchDetId; + /** * @return id */ @@ -276,4 +282,22 @@ public class ProductBatchDetectDet { public void setCompanyId(Integer companyId) { this.companyId = companyId; } + + /** + * 获取批次明细id + * + * @return batchDetId - 批次明细id，关联表：mt_alone_product_batch_detect + */ + public Integer getBatchDetId() { + return batchDetId; + } + + /** + * 设置批次明细id + * + * @param batchDetId - 批次明细id，关联表：mt_alone_product_batch_detect + */ + public void setBatchDetId(Integer batchDetId) { + this.batchDetId = batchDetId; + } } \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBatchDetCondition.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBatchDetCondition.java new file mode 100644 index 0000000..fba8067 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBatchDetCondition.java @@ -0,0 +1,48 @@ +package com.deer.wms.produce.manage.model; + +/** + * @Author: hy + * @Date: 2020/3/16 13:59 + * @Version 1.0 + */ +public class ProductProcessBatchDetCondition { + private Integer productProcessId; + + private Integer processId; + + private Integer batchDetId; + + private Integer companyId; + + public Integer getProductProcessId() { + return productProcessId; + } + + public void setProductProcessId(Integer productProcessId) { + this.productProcessId = productProcessId; + } + + public Integer getProcessId() { + return processId; + } + + public void setProcessId(Integer processId) { + this.processId = processId; + } + + public Integer getBatchDetId() { + return batchDetId; + } + + public void setBatchDetId(Integer batchDetId) { + this.batchDetId = batchDetId; + } + + public Integer getCompanyId() { + return companyId; + } + + public void setCompanyId(Integer companyId) { + this.companyId = companyId; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBatchDetInfo.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBatchDetInfo.java new file mode 100644 index 0000000..c161d31 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBatchDetInfo.java @@ -0,0 +1,39 @@ +package com.deer.wms.produce.manage.model; + +/** + * 某个批次加工单、某个工序、某卷明细的详细信息，用于打卷系统打卷操作页面展示 + * @Author: hy + * @Date: 2020/3/16 11:12 + * @Version 1.0 + */ +public class ProductProcessBatchDetInfo { + private ProductProcessVo productProcessVo; + + private MtAloneProcessVo processVo; + + private ProductProcessBatchDet productProcessBatchDet; + + public ProductProcessVo getProductProcessVo() { + return productProcessVo; + } + + public void setProductProcessVo(ProductProcessVo productProcessVo) { + this.productProcessVo = productProcessVo; + } + + public MtAloneProcessVo getProcessVo() { + return processVo; + } + + public void setProcessVo(MtAloneProcessVo processVo) { + this.processVo = processVo; + } + + public ProductProcessBatchDet getProductProcessBatchDet() { + return productProcessBatchDet; + } + + public void setProductProcessBatchDet(ProductProcessBatchDet productProcessBatchDet) { + this.productProcessBatchDet = productProcessBatchDet; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBatchDetParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBatchDetParams.java index 97de9ad..b02d0f8 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBatchDetParams.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBatchDetParams.java @@ -6,4 +6,13 @@ import com.deer.wms.project.seed.core.service.QueryParams; * Created by on 2019/09/09. */ public class ProductProcessBatchDetParams extends QueryParams { + private Integer batchDetId; + + public Integer getBatchDetId() { + return batchDetId; + } + + public void setBatchDetId(Integer batchDetId) { + this.batchDetId = batchDetId; + } } 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 aaa44ea..6d5947f 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 @@ -20,5 +20,7 @@ public interface MtAloneProcessService extends Service void updateProcess(ProcessHo processHo); + MtAloneProcessVo findProcessById(MtAloneProcessParams processParams); + //List processStepListByProdprocid(ProductProcessParams params); } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessBatchDetService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessBatchDetService.java index e413497..9eed41a 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessBatchDetService.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessBatchDetService.java @@ -18,4 +18,6 @@ public interface ProductProcessBatchDetService extends Service volumeStepListByProdprocid(ProductProcessParams params); List findListByProductProcess(ProductProcessParams params); + + ProductProcessBatchDet findBatchDetById(ProductProcessBatchDetParams batchDetParams); } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessService.java index 414ab00..c42dc68 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessService.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessService.java @@ -22,6 +22,8 @@ public interface ProductProcessService extends Service void addProduceProcess(ProductProcessHo productProcessHo, CurrentUser currentUser); + ProductProcessVo findProductProcessById(ProductProcessParams productProcessParams); + //ProcessAndDet stepAndNumByProdprocid(ProductProcessParams 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 ad5190d..ebf476c 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 @@ -112,6 +112,11 @@ public class MtAloneProcessServiceImpl extends AbstractService processStepListByProdprocid(ProductProcessParams params) { // return mtAloneProcessMapper.processStepListByProdprocid(params); diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessBatchDetServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessBatchDetServiceImpl.java index fb9aaa6..27ef5de 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessBatchDetServiceImpl.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessBatchDetServiceImpl.java @@ -37,4 +37,9 @@ public class ProductProcessBatchDetServiceImpl extends AbstractService findListByProductProcess(ProductProcessParams params) { return productProcessBatchDetMapper.findListByProductProcess(params); } + + @Override + public ProductProcessBatchDet findBatchDetById(ProductProcessBatchDetParams batchDetParams) { + return productProcessBatchDetMapper.findBatchDetById(batchDetParams); + } } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessServiceImpl.java index eba2c16..12ca1b8 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessServiceImpl.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessServiceImpl.java @@ -265,6 +265,11 @@ public class ProductProcessServiceImpl extends AbstractService processVoList = processService.findProcessVoListByProductProcess(params); - //获取明细 + //获取批次明细 List productProcessBatchDetList = productProcessBatchDetService.findListByProductProcess(params); - processAndDet.setProcessVoList(processVoList); - processAndDet.setProductProcessBatchDetList(productProcessBatchDetList); + + processAndDet.setProductProcessId(params.getProductProcessId());//批次加工单id赋值 + processAndDet.setProcessVoList(processVoList);//所有工序赋值 + processAndDet.setProductProcessBatchDetList(productProcessBatchDetList);//所有批次明细赋值 return ResultGenerator.genSuccessResult(processAndDet); } + /** + * hy正在用（打卷系统） + * 根据批次加工单id、工序id、明细id，获取批次加工单、工序、明细信息，用于打卷页面信息展示 + * @param condition + * @param currentUser + * @return + */ + @ApiOperation(value = "根据批次加工单id、工序id、批次明细id，获取批次加工单、工序、批次明细信息", notes = "根据批次加工单id、工序id、批次明细id，获取批次加工单、工序、批次明细信息") + @ApiImplicitParams({ + @ApiImplicitParam(name = "productProcessId", value = "批次生产加工单id", paramType = "query", dataType = "int", required = true), + @ApiImplicitParam(name = "processId", value = "工序id", paramType = "query", dataType = "int", required = true), + @ApiImplicitParam(name = "batchDetId", value = "批次明细id", paramType = "query", dataType = "int", required = true) + }) + @OperateLog(description = "根据批次加工单id、工序id、批次明细id，获取批次加工单、工序、批次明细信息", type = "查询") + @GetMapping("/productProcessBatchDetInfoByProductProcess") + public Result productProcessBatchDetInfoByProductProcess(ProductProcessBatchDetCondition condition, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + condition.setCompanyId(currentUser.getCompanyId()); + ProductProcessBatchDetInfo productProcessBatchDetInfo = new ProductProcessBatchDetInfo(); + //获取批次加工单 + ProductProcessParams productProcessParams = new ProductProcessParams(); + BeanUtils.copyProperties(condition, productProcessParams); + ProductProcessVo productProcessVo = productProcessService.findProductProcessById(productProcessParams); + productProcessBatchDetInfo.setProductProcessVo(productProcessVo); + //获取工序 + MtAloneProcessParams processParams = new MtAloneProcessParams(); + BeanUtils.copyProperties(condition, processParams); + MtAloneProcessVo processVo = processService.findProcessById(processParams); + productProcessBatchDetInfo.setProcessVo(processVo); + //获取批次明细 + ProductProcessBatchDetParams batchDetParams = new ProductProcessBatchDetParams(); + BeanUtils.copyProperties(condition, batchDetParams); + ProductProcessBatchDet batchDet = productProcessBatchDetService.findBatchDetById(batchDetParams); + productProcessBatchDetInfo.setProductProcessBatchDet(batchDet); + + return ResultGenerator.genSuccessResult(productProcessBatchDetInfo); + } + }