From 0c1f1b154f88699b81a25e00b76d3ae07bb508eb Mon Sep 17 00:00:00 2001 From: ruanqi Date: Sat, 15 Jan 2022 18:06:28 +0800 Subject: [PATCH] 20211213 --- .../base/controller/BaseController.java | 22 ++++++++ .../gaotao/modules/base/dao/BaseMapper.java | 33 ++++++++++++ .../modules/base/service/BaseService.java | 12 +++++ .../base/service/Impl/BaseServiceImpl.java | 50 +++++++++++++++++++ src/main/resources/mapper/base/BaseMapper.xml | 33 ++++++++++++ 5 files changed, 150 insertions(+) diff --git a/src/main/java/com/gaotao/modules/base/controller/BaseController.java b/src/main/java/com/gaotao/modules/base/controller/BaseController.java index d7c7a71..c83259e 100644 --- a/src/main/java/com/gaotao/modules/base/controller/BaseController.java +++ b/src/main/java/com/gaotao/modules/base/controller/BaseController.java @@ -1141,4 +1141,26 @@ public class BaseController { } return map; } + + /** + * @Description TODO + * @Title saveRoutingDetailData + * @param inData + * @author rq + * @date 2022/1/15 15:48 + * @return Object + * @throw + */ + @PostMapping("/saveRoutingDetailData") + @ResponseBody + public Object saveRoutingDetailData(@RequestBody RoutingDetailData inData){ + ResponseData responseData = new ResponseData(); + try { + responseData = baseService.saveRoutingDetailData(inData); + } catch (Exception e) { + responseData.setMsg(e.getMessage()); + responseData.setCode("500"); + } + return responseData; + } } diff --git a/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java b/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java index 35d08f5..6da1bae 100644 --- a/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java +++ b/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java @@ -877,4 +877,37 @@ public interface BaseMapper { * @throw */ List searchRoutingDetailData(RoutingDetailData indata); + + /** + * @Description 检查工序号 + * @Title checkRoutingDetailData + * @param + * @author rq + * @date 2021/10/10 16:49 + * @return List + * @throw + */ + List checkRoutingItemNo(RoutingDetailData inData); + + /** + * @Description 保存工艺路线 + * @Title saveRoutingDetailData + * @param inData + * @author rq + * @date 2022/1/15 17:01 + * @return void + * @throw + */ + void saveRoutingDetailData(RoutingDetailData inData); + + /** + * @Description 保存工艺路线 + * @Title saveRoutingDetailData + * @param inData + * @author rq + * @date 2022/1/15 17:01 + * @return void + * @throw + */ + void editRoutingDetailData(RoutingDetailData inData); } diff --git a/src/main/java/com/gaotao/modules/base/service/BaseService.java b/src/main/java/com/gaotao/modules/base/service/BaseService.java index 8360cc9..fc26327 100644 --- a/src/main/java/com/gaotao/modules/base/service/BaseService.java +++ b/src/main/java/com/gaotao/modules/base/service/BaseService.java @@ -2,6 +2,7 @@ package com.gaotao.modules.base.service; import com.gaotao.modules.base.entity.*; import com.gaotao.modules.pda.utils.ResponseData; +import org.springframework.web.bind.annotation.RequestBody; import java.text.ParseException; import java.util.List; @@ -546,4 +547,15 @@ public interface BaseService { * @throw */ List searchRoutingDetailData(RoutingDetailData indata); + + /** + * @Description TODO + * @Title saveRoutingDetailData + * @param inData + * @author rq + * @date 2022/1/15 16:17 + * @return ResponseData + * @throw + */ + ResponseData saveRoutingDetailData(RoutingDetailData inData); } diff --git a/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java b/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java index c7e22a3..6a6303d 100644 --- a/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java +++ b/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java @@ -2,6 +2,7 @@ package com.gaotao.modules.base.service.Impl; import com.gaotao.common.utils.DateUtil; +import com.gaotao.modules.app.entity.WorkCenter; import com.gaotao.modules.base.dao.BaseMapper; import com.gaotao.modules.base.entity.*; import com.gaotao.modules.base.service.BaseService; @@ -1217,4 +1218,53 @@ public class BaseServiceImpl implements BaseService { return baseMapper.searchRoutingDetailData(indata); } + + @Override + public ResponseData saveRoutingDetailData(RoutingDetailData inData){ + ResponseData responseData = new ResponseData(); + WorkCenterData workCenter=new WorkCenterData(); + workCenter.setWorkCenterNo(inData.getWorkCenterNo()); + workCenter.setSite(inData.getSite()); + List checkList1=baseMapper.getWorkCenterData(workCenter); + if("单位/小时".equals(inData.getFactorUnit())){ + inData.setFactorUnitDb("1"); + } + if("小时".equals(inData.getFactorUnit())){ + inData.setFactorUnitDb("2"); + } + if("小时".equals(inData.getJjgzUnitFactor())){ + inData.setJjgzUnitFactorDb("1"); + } + if("件".equals(inData.getJjgzUnitFactor())){ + inData.setJjgzUnitFactorDb("2"); + } + if(checkList1.size()==0){ + responseData.setMsg("该加工中心不存在！"); + responseData.setCode("500"); + return responseData; + } + if (inData.getAdd()==0){ + List list3=baseMapper.checkSiteId(inData.getSite()); + if(list3.size()==0){ + responseData.setMsg("该工厂编码不存在！"); + responseData.setCode("500"); + return responseData; + } + List list2=baseMapper.checkRoutingItemNo(inData); + if(list2.size()!=0){ + responseData.setMsg("该工序已经存在！"); + responseData.setCode("500"); + return responseData; + } + //新增 + baseMapper.saveRoutingDetailData(inData); + }else{ + + baseMapper.editRoutingDetailData(inData); + } + responseData.setCode("200"); + responseData.setSuccess(true); + responseData.setMsg("操作成功!"); + return responseData; + } } diff --git a/src/main/resources/mapper/base/BaseMapper.xml b/src/main/resources/mapper/base/BaseMapper.xml index e646f5a..e16e85c 100644 --- a/src/main/resources/mapper/base/BaseMapper.xml +++ b/src/main/resources/mapper/base/BaseMapper.xml @@ -649,5 +649,38 @@ dbo.Get_Part_DescSpec(site,WX_PartNo) as wxSpec,dbo.Get_WorkCenter_Type(Site,Wor and revNo = #{revNo} + order by ItemNo + + + + + insert into RoutingDetail (Site,PartNo,RevNo,ItemNo,OperationDesc,WorkCenterNo,MachSetupTime,MachRunFactor,FactorUnit_DB,FactorUnit,Efficiency, + Crewsize,JJGZ_UnitFactor_DB,JJGZ_UnitFactor,JJGZ_UnitPrice,Remark,WX_UnitCost,BatchQty) + VALUES(#{site},#{partNo},#{revNo},#{itemNo},#{operationDesc},#{workCenterNo},#{machSetupTime},#{machRunFactor},#{factorUnitDb},#{factorUnit},#{efficiency}, + #{crewsize},#{jjgzUnitFactorDb},#{jjgzUnitFactor},#{jjgzUnitPrice},#{remark},0,0) + + + + UPDATE RoutingDetail SET OperationDesc=#{operationDesc},WorkCenterNo=#{workCenterNo},MachSetupTime=#{machSetupTime}, + MachRunFactor=#{machRunFactor},FactorUnit_DB=#{factorUnitDb},FactorUnit=#{factorUnit},Efficiency=#{efficiency}, + Crewsize=#{crewsize},JJGZ_UnitFactor_DB=#{jjgzUnitFactorDb},JJGZ_UnitFactor=#{jjgzUnitFactor},JJGZ_UnitPrice=#{jjgzUnitPrice},Remark=#{remark} + WHERE partNo = #{partNo} and site = #{site} and revNo = #{revNo} and ItemNo = #{itemNo} + \ No newline at end of file