From 4047e7396e7b672242614f225e5e1cff4e69c234 Mon Sep 17 00:00:00 2001 From: hy2250089 Date: Mon, 23 Dec 2019 18:57:10 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=89=B9=E6=AC=A1=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E6=97=A5=E6=9C=9F=E5=8F=98=E9=87=8F=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/produce/manage/mapper/ProductProcessMapper.xml | 2 +- .../wms/produce/manage/model/ProductProcessParams.java | 7 +++---- .../wms/produce/manage/web/ProductProcessController.java | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) 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 ce20904..69c7840 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 @@ -109,7 +109,7 @@ OR client.client_name LIKE CONCAT('%', #{keywords}, '%') OR prodproc.contract_name LIKE CONCAT('%', #{keywords}, '%') - + AND DATE_FORMAT(prodproc.create_time,'%Y-%m-%d') = DATE_FORMAT(#{createDate}, '%Y-%m-%d') diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessParams.java index 7d00eca..4fa77c2 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessParams.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessParams.java @@ -11,8 +11,7 @@ import java.util.Date; public class ProductProcessParams extends QueryParams { private Integer productProcessId; - @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8") - private Date createDate; + private String createDate; public Integer getProductProcessId() { return productProcessId; @@ -22,11 +21,11 @@ public class ProductProcessParams extends QueryParams { this.productProcessId = productProcessId; } - public Date getCreateDate() { + public String getCreateDate() { return createDate; } - public void setCreateDate(Date createDate) { + public void setCreateDate(String createDate) { this.createDate = createDate; } } 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 5f3df4a..a674c09 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 @@ -91,7 +91,7 @@ public class ProductProcessController { */ @ApiOperation(value = "批次生产加工单分页查询", notes = "批次生产加工单分页查询") @ApiImplicitParams({ - @ApiImplicitParam(name = "createDate", value = "创建时间", paramType = "query", dataType = "Date", required = false), + @ApiImplicitParam(name = "createDate", value = "创建时间", paramType = "query", dataType = "String", required = false), @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String", required = false), @ApiImplicitParam(name = "companyId", value = "公司id", paramType = "query", dataType = "int", required = false) From 994c8ce18dae0590144f58364bfaf3420b5c6033 Mon Sep 17 00:00:00 2001 From: hy2250089 Date: Tue, 24 Dec 2019 20:45:28 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E5=8D=95=E4=B8=8E=E5=B7=A5=E5=BA=8F=E5=85=B3?= =?UTF-8?q?=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/model/ProcessAndProcMat.java | 29 ++++++++++++++ .../manage/model/ProductAndProcess.java | 10 ++--- .../manage/model/ProductProcessBomPo.java | 19 +++------- .../manage/service/MtAloneProcessService.java | 3 ++ .../impl/MtAloneProcessServiceImpl.java | 15 +++++++- .../service/impl/ProcessBomServiceImpl.java | 6 +-- .../impl/ProductProcessServiceImpl.java | 38 +++++++++++-------- .../manage/web/MtAloneProcessController.java | 30 +++++++++++++-- .../manage/web/ProcessBomController.java | 2 - 9 files changed, 106 insertions(+), 46 deletions(-) create mode 100644 wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessAndProcMat.java diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessAndProcMat.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessAndProcMat.java new file mode 100644 index 0000000..ea41317 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessAndProcMat.java @@ -0,0 +1,29 @@ +package com.deer.wms.produce.manage.model; + +/** + * @Author: hy + * @Date: 2019/12/23 20:06 + * @Version 1.0 + */ +public class ProcessAndProcMat { + + private MtAloneProcessVo mtAloneProcessVo; + + private ProcessMaterialsVo[] processMaterialsVo; + + public MtAloneProcessVo getMtAloneProcessVo() { + return mtAloneProcessVo; + } + + public void setMtAloneProcessVo(MtAloneProcessVo mtAloneProcessVo) { + this.mtAloneProcessVo = mtAloneProcessVo; + } + + public ProcessMaterialsVo[] getProcessMaterialsVo() { + return processMaterialsVo; + } + + public void setProcessMaterialsVo(ProcessMaterialsVo[] processMaterialsVo) { + this.processMaterialsVo = processMaterialsVo; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductAndProcess.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductAndProcess.java index c7d211b..e4c7188 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductAndProcess.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductAndProcess.java @@ -12,7 +12,7 @@ import java.util.List; public class ProductAndProcess { private ProductProcess productProcess;//批次生产加工信息 - private MtAloneProcessVo[] processesVo;//工序扩展信息 + private List processVoList;//工序扩展信息 public ProductProcess getProductProcess() { return productProcess; @@ -22,11 +22,11 @@ public class ProductAndProcess { this.productProcess = productProcess; } - public MtAloneProcessVo[] getProcessesVo() { - return processesVo; + public List getProcessVoList() { + return processVoList; } - public void setProcessesVo(MtAloneProcessVo[] processesVo) { - this.processesVo = processesVo; + public void setProcessVoList(List processVoList) { + this.processVoList = processVoList; } } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBomPo.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBomPo.java index 9ee75b9..3d7f1a7 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBomPo.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBomPo.java @@ -8,26 +8,17 @@ import java.util.List; * @Version 1.0 */ public class ProductProcessBomPo { - private String specification;//加工规格型号 + private ProductProcessBom productProcessBom;//产品bom - private String processContent;//加工描述内容 private List processBomList;//产品bom下的工序bom - public String getSpecification() { - return specification; + public ProductProcessBom getProductProcessBom() { + return productProcessBom; } - public void setSpecification(String specification) { - this.specification = specification; - } - - public String getProcessContent() { - return processContent; - } - - public void setProcessContent(String processContent) { - this.processContent = processContent; + public void setProductProcessBom(ProductProcessBom productProcessBom) { + this.productProcessBom = productProcessBom; } public List getProcessBomList() { 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 b60086e..d9e99f9 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 @@ -1,5 +1,6 @@ package com.deer.wms.produce.manage.service; +import com.deer.wms.intercept.common.data.CurrentUser; import com.deer.wms.produce.manage.model.*; import com.deer.wms.project.seed.core.service.Service; @@ -15,6 +16,8 @@ public interface MtAloneProcessService extends Service ProcessAndMaterials 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/impl/MtAloneProcessServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneProcessServiceImpl.java index cfdc34d..5bcb2bf 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,5 +1,6 @@ package com.deer.wms.produce.manage.service.impl; +import com.deer.wms.intercept.common.data.CurrentUser; import com.deer.wms.produce.manage.dao.MtAloneProcessMapper; import com.deer.wms.produce.manage.model.*; import com.deer.wms.produce.manage.service.MtAloneProcessService; @@ -53,7 +54,6 @@ public class MtAloneProcessServiceImpl extends AbstractService findList(MtAloneProcessParams params) { diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProcessBomServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProcessBomServiceImpl.java index c3a5e3e..fe902c8 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProcessBomServiceImpl.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProcessBomServiceImpl.java @@ -73,11 +73,9 @@ public class ProcessBomServiceImpl extends AbstractService ProductProcessBom productProcessBom = productProcessBomService.findById(params.getProductProcessId()); ProductProcessBomPo productProcessBomPo = new ProductProcessBomPo(); + productProcessBomPo.setProductProcessBom(productProcessBom); productProcessBomPo.setProcessBomList(processBomList); - if(null != productProcessBom) { - productProcessBomPo.setSpecification(productProcessBom.getSpecification()); - productProcessBomPo.setProcessContent(productProcessBom.getProcessContent()); - } + return productProcessBomPo; } } 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 c3eb334..8ad1348 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 @@ -28,6 +28,9 @@ public class ProductProcessServiceImpl extends AbstractService 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 ProductAndProcess queryProductProcessDetail(ProductProcessParams params) { - //根据批次产品加工id查询批次产品加工单信息 + //根据批次生产加工id查询批次产品加工单信息 ProductProcess productProcess = productProcessMapper.selectByPrimaryKey(params.getProductProcessId()); //根据批次产品加工id查询工序信息 - List processVoList = processService.findProcessVoListByProductProcess(params); + List tempProcessVoList = processService.findProcessVoListByProductProcess(params); ProductAndProcess productAndProcess = new ProductAndProcess(); productAndProcess.setProductProcess(productProcess); - if(null != processVoList) { - MtAloneProcessVo[] processesVo = new MtAloneProcessVo[processVoList.size()]; - for (int i = 0; i < processesVo.length; i++) { - processesVo[i] = processVoList.get(i); + List processVoList; + if(null != tempProcessVoList) { + processVoList = new ArrayList(tempProcessVoList.size()); + for (MtAloneProcessVo processVo : tempProcessVoList) { + processVoList.add(processVo); } - productAndProcess.setProcessesVo(processesVo); + productAndProcess.setProcessVoList(processVoList); } return productAndProcess; 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 9b62c26..aafa2d9 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 @@ -138,13 +138,35 @@ public class MtAloneProcessController { @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 ); - //} + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } - params.setCompanyId(1); + params.setCompanyId(currentUser.getCompanyId()); PageHelper.startPage(params.getPageNum(), params.getPageSize()); ProcessAndMaterials processAndMaterials = mtAloneProcessService.queryProcessDetail(params); return ResultGenerator.genSuccessResult(processAndMaterials); } + + /** + * hy正在用 + * 工序处理完毕时，点击提交同时更新工序信息、保存物料信息、更新物料库存信息 + * @param productAndProcess + * @param currentUser + * @return + */ + @ApiOperation(value = "工序及物料信息保存", notes = "工序及物料信息保存") + @ApiImplicitParams({ + @ApiImplicitParam(name = "productAndProcess", value = "批次生产加工及工序", paramType = "body", dataType = "ProductAndProcess", required = true) + }) + @OperateLog(description = "工序及物料信息保存", type = "更新、保存") + @PostMapping("/saveProcAndProcMat") + public Result saveProcAndProcMat(@RequestBody ProcessAndProcMat processAndProcMat, @ApiIgnore @User CurrentUser currentUser) { + //if(currentUser==null){ + // return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + //} + + mtAloneProcessService.saveProcAndProcMat(processAndProcMat, currentUser); + return ResultGenerator.genSuccessResult(); + } } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessBomController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessBomController.java index 8498b64..c2fa1ec 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessBomController.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessBomController.java @@ -161,10 +161,8 @@ public class ProcessBomController { */ @ApiOperation(value = "根据产品bom的id获取产品bom部分数据和工序数据", notes = "根据产品bom的id获取产品bom部分数据和工序数据") @ApiImplicitParams({ - @ApiImplicitParam(name = "access-token", value = "token", paramType = "header", dataType = "String", required = true), @ApiImplicitParam(name = "productProcessId", value = "产品bom的id", paramType = "query", dataType = "int", required = true), @ApiImplicitParam(name = "companyId", value = "公司id", paramType = "query", dataType = "int", required = false) - }) @GetMapping("/and/product/bom/by/prodbom") public Result ProductAndProcessBomByProdBom(ProcessBomParams params, @ApiIgnore @User CurrentUser currentUser){ From ab07aed1af8d6569d07090feabd27ec358c6cf44 Mon Sep 17 00:00:00 2001 From: hy2250089 Date: Thu, 26 Dec 2019 21:20:09 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E3=80=81=E4=BF=9D=E5=AD=98=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E5=8F=8A=E7=89=A9=E6=96=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/dao/ProcessMaterialsBomMapper.java | 1 + .../manage/mapper/MtAloneProcessMapper.xml | 2 +- .../mapper/ProcessMaterialsBomMapper.xml | 15 +++++ .../manage/mapper/ProductProcessMapper.xml | 2 +- .../manage/model/MtAloneProcessParams.java | 10 +++ .../manage/model/ProcessAndMaterials.java | 30 --------- .../manage/model/ProcessAndMaterialsBom.java | 32 ++++++++++ .../manage/model/ProcessMaterialsBomVo.java | 2 - .../manage/service/MtAloneProcessService.java | 2 +- .../service/ProcessMaterialsBomService.java | 2 + .../impl/MtAloneProcessServiceImpl.java | 63 ++++++++++++++----- .../impl/ProcessMaterialsBomServiceImpl.java | 5 ++ .../manage/web/MtAloneProcessController.java | 8 +-- 13 files changed, 120 insertions(+), 54 deletions(-) delete mode 100644 wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessAndMaterials.java create mode 100644 wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessAndMaterialsBom.java diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProcessMaterialsBomMapper.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProcessMaterialsBomMapper.java index dc924bb..1666b68 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProcessMaterialsBomMapper.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProcessMaterialsBomMapper.java @@ -17,4 +17,5 @@ public interface ProcessMaterialsBomMapper extends Mapper { void insertOrUpdate(List processMaterialsBomList); + List findProcMatBomVoListByProcBom(ProcessMaterialsBomParams procMatBomParams); } \ 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 0f512c3..8a0aded 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 @@ -95,7 +95,7 @@ AND process.company_id = #{companyId} - + ORDER BY process.process_step diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessMaterialsBomMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessMaterialsBomMapper.xml index 1012dd8..03c8f5a 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessMaterialsBomMapper.xml +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessMaterialsBomMapper.xml @@ -60,6 +60,20 @@ + + + - - - - - - - - - - + + + + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessBomHo.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessBomHo.java new file mode 100644 index 0000000..8298916 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessBomHo.java @@ -0,0 +1,20 @@ +package com.deer.wms.produce.manage.model; + +import java.util.List; + +/** + * @Author: hy + * @Date: 2019/12/27 10:51 + * @Version 1.0 + */ +public class ProcessBomHo extends ProcessBom { + private List procMatBomVoList; + + public List getProcMatBomVoList() { + return procMatBomVoList; + } + + public void setProcMatBomVoList(List procMatBomVoList) { + this.procMatBomVoList = procMatBomVoList; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessHo.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessHo.java new file mode 100644 index 0000000..cd01de2 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessHo.java @@ -0,0 +1,21 @@ +package com.deer.wms.produce.manage.model; + +import java.util.List; + +/** + * @Author: hy + * @Date: 2019/12/27 18:26 + * @Version 1.0 + */ +public class ProcessHo extends MtAloneProcessVo{ + + private List processMaterialsVoList; + + public List getProcessMaterialsVoList() { + return processMaterialsVoList; + } + + public void setProcessMaterialsVoList(List processMaterialsVoList) { + this.processMaterialsVoList = processMaterialsVoList; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBomHo.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBomHo.java new file mode 100644 index 0000000..d056e4d --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBomHo.java @@ -0,0 +1,40 @@ +package com.deer.wms.produce.manage.model; + +import java.util.List; + +/** + * @Author: hy + * @Date: 2019/12/27 10:48 + * @Version 1.0 + */ +public class ProductProcessBomHo { + private Integer prodProcBomId; + + private String prodProcBomName; + + private List processBomHoList; + + public Integer getProdProcBomId() { + return prodProcBomId; + } + + public void setProdProcBomId(Integer prodProcBomId) { + this.prodProcBomId = prodProcBomId; + } + + public String getProdProcBomName() { + return prodProcBomName; + } + + public void setProdProcBomName(String prodProcBomName) { + this.prodProcBomName = prodProcBomName; + } + + public List getProcessBomHoList() { + return processBomHoList; + } + + public void setProcessBomHoList(List processBomHoList) { + this.processBomHoList = processBomHoList; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBomParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBomParams.java index 77d743e..f0d71e4 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBomParams.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBomParams.java @@ -15,7 +15,7 @@ public class ProductProcessBomParams extends QueryParams { */ private Integer productId; - private String productBomId; + private Integer productBomId; private String productName; @@ -141,11 +141,11 @@ public class ProductProcessBomParams extends QueryParams { this.productId = productId; } - public String getProductBomId() { + public Integer getProductBomId() { return productBomId; } - public void setProductBomId(String productBomId) { + public void setProductBomId(Integer productBomId) { this.productBomId = productBomId; } } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessHo.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessHo.java new file mode 100644 index 0000000..6d4bfc0 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessHo.java @@ -0,0 +1,20 @@ +package com.deer.wms.produce.manage.model; + +import java.util.List; + +/** + * @Author: hy + * @Date: 2019/12/27 15:33 + * @Version 1.0 + */ +public class ProductProcessHo extends ProductProcess{ + private List processHoList; + + public List getProcessHoList() { + return processHoList; + } + + public void setProcessHoList(List processHoList) { + this.processHoList = processHoList; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessBomService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessBomService.java index dd31aa2..cbdbed2 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessBomService.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessBomService.java @@ -1,9 +1,6 @@ package com.deer.wms.produce.manage.service; -import com.deer.wms.produce.manage.model.ProductProcessBom; -import com.deer.wms.produce.manage.model.ProductProcessBomDto; -import com.deer.wms.produce.manage.model.ProductProcessBomParams; -import com.deer.wms.produce.manage.model.ProductProcessBomVO; +import com.deer.wms.produce.manage.model.*; import com.deer.wms.project.seed.core.service.Service; import java.util.List; @@ -23,6 +20,8 @@ public interface ProductProcessBomService extends Service void saveProdAndProc(ProductAndProcess productAndProcess, CurrentUser currentUser); ProductAndProcess queryProductProcessDetail(ProductProcessParams params); + + void saveInitial(ProductProcessHo productProcessHo, CurrentUser currentUser); + + ProductProcessHo initialProdProcByProdProcBom(ProductProcessBomParams params); } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessBomServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessBomServiceImpl.java index 9beed59..161c880 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessBomServiceImpl.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessBomServiceImpl.java @@ -4,10 +4,12 @@ import com.deer.wms.produce.manage.dao.ProcessBomMapper; import com.deer.wms.produce.manage.dao.ProcessMaterialsBomMapper; import com.deer.wms.produce.manage.dao.ProductProcessBomMapper; import com.deer.wms.produce.manage.model.*; +import com.deer.wms.produce.manage.service.ProcessMaterialsBomService; import com.deer.wms.produce.manage.service.ProductProcessBomService; import com.deer.wms.project.seed.core.service.AbstractService; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -32,6 +34,9 @@ public class ProductProcessBomServiceImpl extends AbstractService findProBomAndProList(ProductProcessBomParams params) { @@ -134,4 +139,41 @@ public class ProductProcessBomServiceImpl extends AbstractService processBomList = processBomMapper.findListByProductBom(processBomParams); + List processBomHoList = null; + if(null != processBomList){ + processBomHoList = new ArrayList(processBomList.size()); + for(ProcessBom processBom : processBomList){ + ProcessBomHo processBomHo = new ProcessBomHo(); + BeanUtils.copyProperties(processBom, processBomHo); + processBomHoList.add(processBomHo); + //物料bom获取 + ProcessMaterialsBomParams procMatBomParams = new ProcessMaterialsBomParams(); + procMatBomParams.setProcessBomId(processBom.getId()); + procMatBomParams.setCompanyId(processBomParams.getCompanyId()); + List procMatBomVoList = processMaterialsBomService.findProcMatBomVoListByProcBom(procMatBomParams); + processBomHo.setProcMatBomVoList(procMatBomVoList); + } + } + productProcessBomHo.setProcessBomHoList(processBomHoList); + + return productProcessBomHo; + } + + @Override + public ProductProcessBom selectByProdProcBom(ProductProcessBomParams params) { + return productProcessBomMapper.selectByProdProcBom(params); + } } 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 8ad1348..3c1cab7 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 @@ -5,9 +5,7 @@ import com.deer.wms.produce.manage.constant.ProduceManageConstant; import com.deer.wms.produce.manage.constant.ProduceManagePublicMethod; import com.deer.wms.produce.manage.dao.ProductProcessMapper; import com.deer.wms.produce.manage.model.*; -import com.deer.wms.produce.manage.service.MtAloneProcessService; -import com.deer.wms.produce.manage.service.ProcessBomService; -import com.deer.wms.produce.manage.service.ProductProcessService; +import com.deer.wms.produce.manage.service.*; import com.deer.wms.project.seed.core.service.AbstractService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -37,6 +35,12 @@ public class ProductProcessServiceImpl extends AbstractService findList(ProductProcessParams params) { return productProcessMapper.findList(params); @@ -110,4 +114,87 @@ public class ProductProcessServiceImpl extends AbstractService 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) { + ProductProcessHo productProcessHo = new ProductProcessHo(); + + //批次产品加工单初步赋值，关联bom + ProductProcessBom productProcessBom = productProcessBomService.selectByProdProcBom(params); + 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); + } + processHo.setProcessMaterialsVoList(procMatVoList); + } + processHoList.add(processHo); + } + productProcessHo.setProcessHoList(processHoList); + } + + return productProcessHo; + + } + } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessBomController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessBomController.java index ddb29a5..26f85bf 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessBomController.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessBomController.java @@ -2,10 +2,7 @@ package com.deer.wms.produce.manage.web; import com.deer.wms.intercept.annotation.User; import com.deer.wms.intercept.common.data.CurrentUser; -import com.deer.wms.produce.manage.model.ProductProcessBom; -import com.deer.wms.produce.manage.model.ProductProcessBomDto; -import com.deer.wms.produce.manage.model.ProductProcessBomParams; -import com.deer.wms.produce.manage.model.ProductProcessBomVO; +import com.deer.wms.produce.manage.model.*; import com.deer.wms.produce.manage.service.ProductProcessBomService; import com.deer.wms.project.seed.annotation.OperateLog; import com.deer.wms.project.seed.constant.SystemManageConstant; @@ -183,6 +180,24 @@ public class ProductProcessBomController { return ResultGenerator.genSuccessResult(pageInfo); } + /** + * hy暂时没用 + * 根据产品bom的id获取产品bom、工序bom、物料bom信息 + * @param params + * @param currentUser + * @return + */ + @GetMapping("/findAllBomByProdProcBom") + public Result findAllBomByProdProcBom(ProductProcessBomParams params, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + params.setCompanyId(currentUser.getCompanyId()); + ProductProcessBomHo productProcessBomHo = productProcessBomService.findAllBomByProdProcBom(params); + return ResultGenerator.genSuccessResult(productProcessBomHo); + } + /** * author:caixiang * 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 a674c09..7f5a296 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 @@ -3,10 +3,7 @@ package com.deer.wms.produce.manage.web; import com.deer.wms.intercept.annotation.Authority; import com.deer.wms.intercept.annotation.User; import com.deer.wms.intercept.common.data.CurrentUser; -import com.deer.wms.produce.manage.model.ProductAndProcess; -import com.deer.wms.produce.manage.model.ProductProcess; -import com.deer.wms.produce.manage.model.ProductProcessParams; -import com.deer.wms.produce.manage.model.ProductProcessVo; +import com.deer.wms.produce.manage.model.*; import com.deer.wms.produce.manage.service.ProcessBomService; import com.deer.wms.produce.manage.service.ProductProcessService; import com.deer.wms.project.seed.annotation.OperateLog; @@ -111,7 +108,7 @@ public class ProductProcessController { } /** - * hy正在用 + * hy停用 * 新建批次产品加工完毕时，点击提交同时保存产品加工和工序信息 * @param productAndProcess * @param currentUser @@ -159,4 +156,48 @@ public class ProductProcessController { return ResultGenerator.genSuccessResult(productAndProcess); } + /** + * hy正在用 + * 新建批次产品加工时，选择产品bom后， + * 生成加工单、工序、物料信息并对其初步赋值，用于表格展示 + * @param + * @param currentUser + * @return + */ + @GetMapping("/initialProdProcByProdProcBom") + public Result initialProdProcByProdProcBom(ProductProcessBomParams params, @ApiIgnore @User CurrentUser currentUser) { + //if(currentUser==null){ + // return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + //} + + params.setCompanyId(1); + ProductProcessHo productProcessHo = productProcessService.initialProdProcByProdProcBom(params); + return ResultGenerator.genSuccessResult(productProcessHo); + } + + + /** + * hy正在用 + * 首次新建批次产品加工时，点击提交初步根据bom对加工单、工序、物料信息赋值，并保存 + * @param + * @param currentUser + * @return + */ + //@ApiOperation(value = "批次生产加工初步保存", notes = "批次生产加工初步保存") + //@ApiImplicitParams({ + // @ApiImplicitParam(name = "productAndProcess", value = "批次生产加工信息", paramType = "body", dataType = "ProductAndProcess", required = true) + //}) + //@OperateLog(description = "批次生产加工初步保存", type = "保存") + //@GetMapping("/findAllBomByProdProcBom") + //public Result findAllBomByProdProcBom(ProductProcessBomParams params, @ApiIgnore @User CurrentUser currentUser) { + // if(currentUser==null){ + // return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + // } + // + // params.setCompanyId(currentUser.getCompanyId()); + // ProductProcessBomHo productProcessBomHo = productProcessBomService.findAllBomByProdProcBom(params); + // return ResultGenerator.genSuccessResult(productProcessBomHo); + //} + + } From cafc73d80f91e6b293b68866daa4a07a8e78a5ec Mon Sep 17 00:00:00 2001 From: hy2250089 Date: Fri, 27 Dec 2019 21:23:02 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/deer/wms/produce/manage/model/MtAloneProcessParams.java | 1 + 1 file changed, 1 insertion(+) diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcessParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcessParams.java index 18238d7..a06b2fe 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcessParams.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcessParams.java @@ -6,6 +6,7 @@ import com.deer.wms.project.seed.core.service.QueryParams; * Created by hy on 2019/07/19. */ public class MtAloneProcessParams extends QueryParams { + private Integer processId; private Integer productBomId; From 7f450f70a41e2e7c0ef64e72f7b6a10aa5c576eb Mon Sep 17 00:00:00 2001 From: hy2250089 Date: Mon, 30 Dec 2019 19:32:31 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=88=9D=E6=AD=A5=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=8A=A0=E5=B7=A5=E5=8D=95=E3=80=81=E5=B7=A5?= =?UTF-8?q?=E5=BA=8F=E3=80=81=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E6=8E=A5?= =?UTF-8?q?=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/mapper/ProcessMaterialsMapper.xml | 4 +- .../manage/model/ProcessMaterials.java | 6 +- .../manage/service/ProductProcessService.java | 2 + .../impl/ProductProcessServiceImpl.java | 67 +++++++++++++++++++ .../manage/web/ProductProcessController.java | 52 +++++++------- 5 files changed, 103 insertions(+), 28 deletions(-) diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessMaterialsMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessMaterialsMapper.xml index 8207ac6..df8ddb4 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessMaterialsMapper.xml +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessMaterialsMapper.xml @@ -9,7 +9,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterials.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterials.java index 62f4814..a2837d4 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterials.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterials.java @@ -30,7 +30,7 @@ public class ProcessMaterials { /** * 版本号 默认为 1.1 */ - private Integer version; + private String version; /** * 状态 0使用，1禁用 @@ -158,7 +158,7 @@ public class ProcessMaterials { * * @return version - 版本号 默认为 1.1 */ - public Integer getVersion() { + public String getVersion() { return version; } @@ -167,7 +167,7 @@ public class ProcessMaterials { * * @param version 版本号 默认为 1.1 */ - public void setVersion(Integer version) { + public void setVersion(String version) { this.version = version; } 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 88387c5..e0d339b 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 @@ -21,4 +21,6 @@ public interface ProductProcessService extends Service void saveInitial(ProductProcessHo productProcessHo, CurrentUser currentUser); ProductProcessHo initialProdProcByProdProcBom(ProductProcessBomParams params); + + void addProduceProcess(ProductProcessHo productProcessHo, CurrentUser currentUser); } 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 3c1cab7..e217d55 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 @@ -41,6 +41,9 @@ public class ProductProcessServiceImpl extends AbstractService findList(ProductProcessParams params) { return productProcessMapper.findList(params); @@ -197,4 +200,68 @@ public class ProductProcessServiceImpl extends AbstractService processHoList = productProcessHo.getProcessHoList(); + List processList; + List processMaterialsList; + if(null != processHoList) { + processList = new ArrayList(processHoList.size()); + for (ProcessHo processHo : processHoList) { + MtAloneProcess process = new MtAloneProcess(); + BeanUtils.copyProperties(processHo, process); + process.setOperatorId(currentUser.getUserId()); + process.setCreateTime(date); + process.setUpdateTime(date); + process.setVersion("1.1"); + process.setStatus(ProduceManageConstant.STATUS_AVAILABLE); + process.setProductProcessId(productProcess.getId()); + process.setCode(ProduceManagePublicMethod.creatUniqueCode("GX")); + process.setCompanyId(currentUser.getCompanyId()); + processList.add(process); + + } + processService.save(processList); + + processMaterialsList = new ArrayList(); + for (int i=0; i processMaterialsVoList = processHo.getProcessMaterialsVoList(); + if(null != processMaterialsVoList) { + for (ProcessMaterialsVo processMaterialsVo : processMaterialsVoList) { + ProcessMaterials processMaterials = new ProcessMaterials(); + BeanUtils.copyProperties(processMaterialsVo, processMaterials); + processMaterials.setOperatorId(currentUser.getUserId()); + processMaterials.setCreateTime(date); + processMaterials.setUpdateTime(date); + processMaterials.setVersion("1.1"); + processMaterials.setStatus(ProduceManageConstant.STATUS_AVAILABLE); + processMaterials.setProcessId(process.getId()); + processMaterials.setCode(ProduceManagePublicMethod.creatUniqueCode("SCWL")); + processMaterials.setCompanyId(currentUser.getCompanyId()); + processMaterialsList.add(processMaterials); + } + } + } + processMaterialsService.save(processMaterialsList); + } + } + } 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 7f5a296..3149600 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 @@ -38,7 +38,7 @@ public class ProductProcessController { private ProcessBomService processBomService; /** - * hy + * hy暂时没用 * 生成某种产品某一批次的生产加工单 * 需要调用对应产品bom * @param productProcess @@ -160,17 +160,24 @@ public class ProductProcessController { * hy正在用 * 新建批次产品加工时，选择产品bom后， * 生成加工单、工序、物料信息并对其初步赋值，用于表格展示 - * @param + * @param params * @param currentUser * @return */ + @ApiOperation(value = "初始化批次生产加工单信息", notes = "初始化批次生产加工单信息") + @ApiImplicitParams({ + @ApiImplicitParam(name = "productBomId", value = "产品bom的id", paramType = "query", dataType = "int", required = true), + @ApiImplicitParam(name = "companyId", value = "公司id", paramType = "query", dataType = "int", required = false) + + }) + @OperateLog(description = "初始化批次生产加工单信息", type = "查询") @GetMapping("/initialProdProcByProdProcBom") public Result initialProdProcByProdProcBom(ProductProcessBomParams params, @ApiIgnore @User CurrentUser currentUser) { - //if(currentUser==null){ - // return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); - //} + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } - params.setCompanyId(1); + params.setCompanyId(currentUser.getCompanyId()); ProductProcessHo productProcessHo = productProcessService.initialProdProcByProdProcBom(params); return ResultGenerator.genSuccessResult(productProcessHo); } @@ -178,26 +185,25 @@ public class ProductProcessController { /** * hy正在用 - * 首次新建批次产品加工时，点击提交初步根据bom对加工单、工序、物料信息赋值，并保存 - * @param + * 新建批次产品加工时，点击提交按钮在库表中同时保存初步的加工单、工序、物料信息 + * @param productProcessHo * @param currentUser * @return */ - //@ApiOperation(value = "批次生产加工初步保存", notes = "批次生产加工初步保存") - //@ApiImplicitParams({ - // @ApiImplicitParam(name = "productAndProcess", value = "批次生产加工信息", paramType = "body", dataType = "ProductAndProcess", required = true) - //}) - //@OperateLog(description = "批次生产加工初步保存", type = "保存") - //@GetMapping("/findAllBomByProdProcBom") - //public Result findAllBomByProdProcBom(ProductProcessBomParams params, @ApiIgnore @User CurrentUser currentUser) { - // if(currentUser==null){ - // return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); - // } - // - // params.setCompanyId(currentUser.getCompanyId()); - // ProductProcessBomHo productProcessBomHo = productProcessBomService.findAllBomByProdProcBom(params); - // return ResultGenerator.genSuccessResult(productProcessBomHo); - //} + @ApiOperation(value = "新增批次生产加工单", notes = "新增批次生产加工单") + @ApiImplicitParams({ + @ApiImplicitParam(name = "productProcessHo", value = "批次生产加工信息", paramType = "body", dataType = "ProductProcessHo", required = true) + }) + @OperateLog(description = "新增批次生产加工单", type = "保存") + @PostMapping("/addProductProcess") + public Result addProductProcess(@RequestBody ProductProcessHo productProcessHo, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + productProcessService.addProduceProcess(productProcessHo, currentUser); + return ResultGenerator.genSuccessResult(); + } } From 5bece0b46d58b0b6853399e9e2200de9f363348a Mon Sep 17 00:00:00 2001 From: hy2250089 Date: Thu, 2 Jan 2020 16:13:56 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=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=E8=AF=A6=E6=83=85=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E3=80=81=E5=A4=84=E7=90=86=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=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(); } - } From d73f4504882a4d1bc61f5f303855ef0a6b1b40a6 Mon Sep 17 00:00:00 2001 From: hy2250089 Date: Thu, 2 Jan 2020 16:36:57 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=94=A8=E9=87=8F?= =?UTF-8?q?=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProductProcessServiceImpl.java | 1 + .../manage/web/MtAloneProcessController.java | 48 +++++++------------ 2 files changed, 18 insertions(+), 31 deletions(-) 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 05aef31..bb8bd6d 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 @@ -232,6 +232,7 @@ public class ProductProcessServiceImpl extends AbstractService Date: Thu, 2 Jan 2020 19:19:21 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=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=E5=A4=84=E7=90=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=88=9D=E6=AD=A5=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/service/MtAloneProcessService.java | 2 + .../manage/service/ProductProcessService.java | 2 + .../impl/MtAloneProcessServiceImpl.java | 64 +++++++++---------- .../impl/ProductProcessServiceImpl.java | 2 + .../manage/web/MtAloneProcessController.java | 28 ++++---- .../manage/web/ProductProcessController.java | 22 +++++++ 6 files changed, 76 insertions(+), 44 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 87bf193..7d339a7 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 @@ -17,4 +17,6 @@ public interface MtAloneProcessService extends Service ProcessHo queryProcessDetail(MtAloneProcessParams params); void saveProcAndProcMat(ProcessAndProcMat processAndProcMat, CurrentUser currentUser); + + void updateProcess(ProcessHo processHo); } 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 4a68be4..8ba52f2 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 @@ -21,4 +21,6 @@ public interface ProductProcessService extends Service ProductProcessHo initialProdProcByProdProcBom(ProductProcessBomParams params); void addProduceProcess(ProductProcessHo productProcessHo, CurrentUser currentUser); + + } 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 39b1f82..e7e8723 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 @@ -14,6 +14,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -87,39 +88,38 @@ public class MtAloneProcessServiceImpl extends AbstractService procMatBomVoList = processMaterialsBomService.findProcMatBomVoListByProcBom(procMatBomParams); - - ////由物料bom对物料赋值，保存物料,其中前端赋值物料用量 - //MtAloneProcessParams processParams = new MtAloneProcessParams(); - //processParams.setProcessId(mtAloneProcessVo.getId()); - //List procMatVoList = processMaterialsService.findProcMatVoListByProcess(processParams); - //if(null == procMatVoList){ - // procMatVoList = new ArrayList(procMatBomVoList.size()); - // Date date = new Date(); - // for (ProcessMaterialsBomVo procMatBomVo : procMatBomVoList){ - // ProcessMaterialsVo procMatVo = new ProcessMaterialsVo(); - // procMatVo.setCreateTime(date); - // procMatVo.setUpdateTime(date); - // procMatVo.setStatus(0); - // procMatVo.setProcessId(mtAloneProcessVo.getId()); - // procMatVo.setMaterialsBomId(procMatBomVo.getId()); - // procMatVo.setMaterialsName(procMatBomVo.getMaterialsName()); - // procMatVo.setCode(ProduceManagePublicMethod.creatUniqueCode("WL")); - // procMatVo.setSpecification(procMatBomVo.getSpecification()); - // procMatVo.setUnitId(procMatBomVo.getUnitId()); - // procMatVo.setCompanyId(currentUser.getCompanyId()); - // procMatVoList.add(procMatVo); - // } - // processMaterialsService.save(); - //}else{ - // for () - //} - - } + @Override + public void updateProcess(ProcessHo processHo) { + Date date = new Date(); + MtAloneProcess process = new MtAloneProcess(); + processHo.setUpdateTime(date); + BeanUtils.copyProperties(processHo, process); + this.update(process); + + //if(null != processHo.getProcessMaterialsVoList()) { + // List procMatVoList = processHo.getProcessMaterialsVoList(); + // List procMatList = new ArrayList(procMatVoList.size()); + // for (ProcessMaterialsVo processMaterialsVo : procMatVoList){ + // ProcessMaterials processMaterials = new ProcessMaterials(); + // processMaterialsVo.setUpdateTime(date); + // BeanUtils.copyProperties(processMaterialsVo, processMaterials); + // procMatList.add(processMaterials); + // } + // processMaterialsService.update(procMatList); + //} + + if(null != processHo.getProcessMaterialsVoList()) { + List procMatVoList = processHo.getProcessMaterialsVoList(); + for (ProcessMaterialsVo processMaterialsVo : procMatVoList){ + ProcessMaterials processMaterials = new ProcessMaterials(); + processMaterialsVo.setUpdateTime(date); + BeanUtils.copyProperties(processMaterialsVo, processMaterials); + processMaterialsService.update(processMaterials); + } + + } + } - //@Override - //public List findList(MtAloneProcessParams params) { - // return mtAloneProcessMapper.findList(params); - //} } 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 bb8bd6d..0dc460e 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 @@ -242,4 +242,6 @@ public class ProductProcessServiceImpl extends AbstractService