From 5bece0b46d58b0b6853399e9e2200de9f363348a Mon Sep 17 00:00:00 2001 From: hy2250089 Date: Thu, 2 Jan 2020 16:13:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=8A=A0=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E3=80=81=E5=B7=A5=E5=BA=8F=E8=AF=A6=E6=83=85=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E3=80=81=E5=A4=84=E7=90=86=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/service/MtAloneProcessService.java | 6 +- .../service/ProcessMaterialsService.java | 3 - .../manage/service/ProductProcessService.java | 4 +- .../impl/MtAloneProcessServiceImpl.java | 27 ++-- .../impl/ProductProcessServiceImpl.java | 129 +++++++----------- .../manage/web/MtAloneProcessController.java | 36 ++++- .../manage/web/ProductProcessController.java | 7 +- 7 files changed, 99 insertions(+), 113 deletions(-) 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 efd5556..87bf193 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 @@ -14,11 +14,7 @@ public interface MtAloneProcessService extends Service List findProcessVoListByProductProcess(ProductProcessParams params); - ProcessAndMaterialsBom queryProcessDetail(MtAloneProcessParams params); + ProcessHo queryProcessDetail(MtAloneProcessParams params); void saveProcAndProcMat(ProcessAndProcMat processAndProcMat, CurrentUser currentUser); - - - //List findList(MtAloneProcessParams params) ; - } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProcessMaterialsService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProcessMaterialsService.java index 9cfdf3e..56ec91e 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProcessMaterialsService.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProcessMaterialsService.java @@ -14,7 +14,4 @@ import java.util.List; public interface ProcessMaterialsService extends Service { List findProcMatVoListByProcess(MtAloneProcessParams params); - - //List findList(ProcessMaterialsParams params) ; - } 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 e0d339b..4a68be4 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 @@ -16,9 +16,7 @@ public interface ProductProcessService extends Service void saveProdAndProc(ProductAndProcess productAndProcess, CurrentUser currentUser); - ProductAndProcess queryProductProcessDetail(ProductProcessParams params); - - void saveInitial(ProductProcessHo productProcessHo, CurrentUser currentUser); + ProductProcessHo queryProductProcessDetail(ProductProcessParams params); ProductProcessHo initialProdProcByProdProcBom(ProductProcessBomParams 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 9695693..39b1f82 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 @@ -1,9 +1,7 @@ package com.deer.wms.produce.manage.service.impl; import com.deer.wms.intercept.common.data.CurrentUser; -import com.deer.wms.produce.manage.constant.ProduceManagePublicMethod; import com.deer.wms.produce.manage.dao.MtAloneProcessMapper; -import com.deer.wms.produce.manage.dao.ProcessMaterialsMapper; import com.deer.wms.produce.manage.model.*; import com.deer.wms.produce.manage.service.MtAloneProcessService; import com.deer.wms.produce.manage.service.ProcessBomService; @@ -16,7 +14,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; -import java.util.Date; import java.util.List; /** @@ -62,21 +59,19 @@ public class MtAloneProcessServiceImpl extends AbstractService procMatBomVoList = processMaterialsBomService.findProcMatBomVoListByProcBom(procMatBomParams); - - ProcessAndMaterialsBom processAndMaterialsBom = new ProcessAndMaterialsBom(); - processAndMaterialsBom.setProcessVo(processVo); - processAndMaterialsBom.setProcMatBomVoList(procMatBomVoList); - - return processAndMaterialsBom; + //根据工序id查询物料信息 + List procMatVoList = processMaterialsService.findProcMatVoListByProcess(params); + ProcessHo processHo = new ProcessHo(); + if(null != processVo){ + System.out.println("----------"+processVo.getId()); + System.out.println("----------"+processVo.getProcessName()); + BeanUtils.copyProperties(processVo, processHo); + processHo.setProcessMaterialsVoList(procMatVoList); + } + return processHo; } @Override 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 e217d55..05aef31 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 @@ -97,55 +97,29 @@ public class ProductProcessServiceImpl extends AbstractService tempProcessVoList = processService.findProcessVoListByProductProcess(params); - ProductAndProcess productAndProcess = new ProductAndProcess(); - productAndProcess.setProductProcess(productProcess); - List processVoList; - if(null != tempProcessVoList) { - processVoList = new ArrayList(tempProcessVoList.size()); - for (MtAloneProcessVo processVo : tempProcessVoList) { - processVoList.add(processVo); + ProductProcessHo productProcessHo = new ProductProcessHo(); + if(null != productProcess) { + BeanUtils.copyProperties(productProcess, productProcessHo); + if (null != tempProcessVoList) { + List processHoList = new ArrayList(tempProcessVoList.size()); + for (MtAloneProcessVo processVo : tempProcessVoList) { + ProcessHo processHo = new ProcessHo(); + BeanUtils.copyProperties(processVo, processHo); + processHoList.add(processHo); + } + productProcessHo.setProcessHoList(processHoList); } - productAndProcess.setProcessVoList(processVoList); } - return productAndProcess; + return productProcessHo; } - @Override - public void saveInitial(ProductProcessHo productProcessHo, CurrentUser currentUser) { - //ProductProcess productProcessHo = new ProductProcessHo(); - //新增批次产品加工单信息，多数变量由前端赋值 - // Date date = new Date(); - // productProcess.setOperatorId(currentUser.getUserId()); - // productProcess.setCreateTime(date); - // productProcess.setUpdateTime(date); - // productProcess.setVersion("1.1"); - // productProcess.setStatus(ProduceManageConstant.STATUS_AVAILABLE); - // productProcess.setWorkOrderCode(ProduceManagePublicMethod.creatUniqueCode("PCJGD")); - // productProcess.setShrinkage((productProcess.getDetectionLen()/productProcess.getLen())*100+"%"); - // productProcess.setReviewStatus(ProduceManageConstant.REVIEW_STATUS_FORREVIEW); - // productProcess.setCompanyId(currentUser.getCompanyId()); - // productProcessMapper.insert(productProcess); - // - // //保存由前端获取的工序信息 - // List processVoList = productAndProcess.getProcessVoList(); - // if(null != processVoList) { - // List processList = new ArrayList(processVoList.size()); - // for (MtAloneProcess processVo : processVoList) { - // MtAloneProcess process = new MtAloneProcess(); - // BeanUtils.copyProperties(processVo, process); - // process.setProductProcessId(productProcess.getId()); - // processList.add(process); - // } - // processService.save(processList); - // } - } @Override public ProductProcessHo initialProdProcByProdProcBom(ProductProcessBomParams params) { @@ -153,47 +127,50 @@ public class ProductProcessServiceImpl extends AbstractService processBomList = processBomService.findListByProductBom(processBomParams); - List processHoList; - if(null != processBomList){ - processHoList = new ArrayList(processBomList.size()); - for(ProcessBom processBom : processBomList){ - ProcessHo processHo = new ProcessHo(); - processHo.setProcessBomId(processBom.getId()); - processHo.setProcessBomName(processBom.getProcessName()); - processHo.setProcessStep(processBom.getProcessStep()); - processHo.setProcessName(processBom.getProcessName()); - processHo.setProcessContent(processBom.getProcessContent()); - processHo.setSpecification(processBom.getSpecification()); + if(null != productProcessBom) { + productProcessHo.setProductBomId(productProcessBom.getId()); + productProcessHo.setProductProcessBomName(productProcessBom.getProductProcessName()); + //工序初步赋值，关联bom + ProcessBomParams processBomParams = new ProcessBomParams(); + processBomParams.setProductProcessId(params.getProductBomId()); + processBomParams.setCompanyId(params.getCompanyId()); + List processBomList = processBomService.findListByProductBom(processBomParams); + List processHoList; + if (null != processBomList) { + processHoList = new ArrayList(processBomList.size()); + for (ProcessBom processBom : processBomList) { + ProcessHo processHo = new ProcessHo(); + processHo.setProcessBomId(processBom.getId()); + processHo.setProcessBomName(processBom.getProcessName()); + processHo.setProcessStep(processBom.getProcessStep()); + processHo.setProcessName(processBom.getProcessName()); + processHo.setProcessContent(processBom.getProcessContent()); + processHo.setSpecification(processBom.getSpecification()); - //物料初步赋值，关联bom - ProcessMaterialsBomParams procMatBomParams = new ProcessMaterialsBomParams(); - procMatBomParams.setProcessBomId(processBom.getId()); - procMatBomParams.setCompanyId(processBomParams.getCompanyId()); - List procMatBomVoList = processMaterialsBomService.findProcMatBomVoListByProcBom(procMatBomParams); - List procMatVoList; - if(null != procMatBomVoList){ - procMatVoList = new ArrayList(procMatBomVoList.size()); - for (ProcessMaterialsBomVo procMatBomVo : procMatBomVoList){ - ProcessMaterialsVo procMatVo = new ProcessMaterialsVo(); - procMatVo.setMaterialsBomId(procMatBomVo.getId()); - procMatVo.setMaterialsName(procMatBomVo.getMaterialsName()); - procMatVo.setSpecification(procMatBomVo.getSpecification()); - procMatVo.setUnitId(procMatBomVo.getUnitId()); - procMatVo.setUnitName0(procMatBomVo.getUnitName()); - procMatVoList.add(procMatVo); + //物料初步赋值，关联bom + ProcessMaterialsBomParams procMatBomParams = new ProcessMaterialsBomParams(); + procMatBomParams.setProcessBomId(processBom.getId()); + procMatBomParams.setCompanyId(processBomParams.getCompanyId()); + List procMatBomVoList = processMaterialsBomService.findProcMatBomVoListByProcBom(procMatBomParams); + List procMatVoList; + if (null != procMatBomVoList) { + procMatVoList = new ArrayList(procMatBomVoList.size()); + for (ProcessMaterialsBomVo procMatBomVo : procMatBomVoList) { + ProcessMaterialsVo procMatVo = new ProcessMaterialsVo(); + procMatVo.setMaterialsBomId(procMatBomVo.getId()); + procMatVo.setMaterialsName(procMatBomVo.getMaterialsName()); + procMatVo.setSpecification(procMatBomVo.getSpecification()); + procMatVo.setUnitId(procMatBomVo.getUnitId()); + procMatVo.setUnitName0(procMatBomVo.getUnitName()); + procMatVo.setDosage(procMatBomVo.getDosage());//先按照模板对用量赋值,前端在将匹数乘以用量计算后展示在表格 + procMatVoList.add(procMatVo); + } + processHo.setProcessMaterialsVoList(procMatVoList); } - processHo.setProcessMaterialsVoList(procMatVoList); + processHoList.add(processHo); } - processHoList.add(processHo); + productProcessHo.setProcessHoList(processHoList); } - productProcessHo.setProcessHoList(processHoList); } return productProcessHo; 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 f35594e..3546d95 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 @@ -129,13 +129,40 @@ public class MtAloneProcessController { * @param currentUser * @return */ - @ApiOperation(value = "根据工序id查询工序详情及物料信息", notes = "根据工序id查询工序详情及物料信息") + //@ApiOperation(value = "根据工序id查询工序详情及物料信息", notes = "根据工序id查询工序详情及物料信息") + //@ApiImplicitParams({ + // @ApiImplicitParam(name = "processId", value = "工序id", paramType = "query", dataType = "int", required = true), + // @ApiImplicitParam(name = "companyId", value = "公司id", paramType = "query", dataType = "int", required = false) + // + //}) + //@OperateLog(description = "根据工序id查询工序详情及物料信息", type = "查询") + //@GetMapping("/query/process/detail") + //public Result queryProcessDetail(MtAloneProcessParams 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()); + // ProcessAndMaterialsBom processAndMaterialsBom = mtAloneProcessService.queryProcessDetail(params); + // return ResultGenerator.genSuccessResult(processAndMaterialsBom); + //} + + /** + * hy正在用 + * 点击加工处理页面中工序列表最后一列查看或处理按钮， + * 由工序id获取该工序详情及包含的物料信息 + * @param params + * @param currentUser + * @return + */ + @ApiOperation(value = "工序详情查询", notes = "工序详情查询") @ApiImplicitParams({ @ApiImplicitParam(name = "processId", value = "工序id", paramType = "query", dataType = "int", required = true), @ApiImplicitParam(name = "companyId", value = "公司id", paramType = "query", dataType = "int", required = false) }) - @OperateLog(description = "根据工序id查询工序详情及物料信息", type = "查询") + @OperateLog(description = "工序详情查询", type = "查询") @GetMapping("/query/process/detail") public Result queryProcessDetail(MtAloneProcessParams params, @ApiIgnore @User CurrentUser currentUser) { if(currentUser==null){ @@ -143,9 +170,8 @@ public class MtAloneProcessController { } params.setCompanyId(currentUser.getCompanyId()); - PageHelper.startPage(params.getPageNum(), params.getPageSize()); - ProcessAndMaterialsBom processAndMaterialsBom = mtAloneProcessService.queryProcessDetail(params); - return ResultGenerator.genSuccessResult(processAndMaterialsBom); + ProcessHo processHo = mtAloneProcessService.queryProcessDetail(params); + return ResultGenerator.genSuccessResult(processHo); } /** diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessController.java index 3149600..75bf476 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessController.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessController.java @@ -129,7 +129,6 @@ public class ProductProcessController { return ResultGenerator.genSuccessResult(); } - /** * hy正在用 * 点击批次生产加工单列表最后一列查看或处理按钮， @@ -142,7 +141,6 @@ public class ProductProcessController { @ApiImplicitParams({ @ApiImplicitParam(name = "productProcessId", value = "批次生产加工单id", paramType = "query", dataType = "int", required = true), @ApiImplicitParam(name = "companyId", value = "公司id", paramType = "query", dataType = "int", required = false) - }) @OperateLog(description = "批次生产加工单详情查询", type = "查询") @GetMapping("/query/product/process/detail") @@ -152,8 +150,8 @@ public class ProductProcessController { } params.setCompanyId(currentUser.getCompanyId()); - ProductAndProcess productAndProcess = productProcessService.queryProductProcessDetail(params); - return ResultGenerator.genSuccessResult(productAndProcess); + ProductProcessHo productProcessHo = productProcessService.queryProductProcessDetail(params); + return ResultGenerator.genSuccessResult(productProcessHo); } /** @@ -205,5 +203,4 @@ public class ProductProcessController { return ResultGenerator.genSuccessResult(); } - }