diff --git a/src/main/java/com/gaotao/modules/toolman/controller/ToolInfoController.java b/src/main/java/com/gaotao/modules/toolman/controller/ToolInfoController.java index dcaeb94..c3a07cd 100644 --- a/src/main/java/com/gaotao/modules/toolman/controller/ToolInfoController.java +++ b/src/main/java/com/gaotao/modules/toolman/controller/ToolInfoController.java @@ -1,8 +1,9 @@ package com.gaotao.modules.toolman.controller; -import com.gaotao.common.exception.ResponseEnum; +import com.gaotao.common.constant.SysMsgConstant; import com.gaotao.common.utils.PageUtils; import com.gaotao.common.utils.R; +import com.gaotao.modules.sys.controller.AbstractController; import com.gaotao.modules.toolman.entity.SfdcToolingHist; import com.gaotao.modules.toolman.entity.ToolDetail; import com.gaotao.modules.toolman.entity.ToolHeader; @@ -27,7 +28,7 @@ import java.util.List; */ @RestController @RequestMapping("toolInfo") -public class ToolInfoController { +public class ToolInfoController extends AbstractController { @Autowired private ToolHeaderService toolHeaderService; @@ -58,7 +59,7 @@ public class ToolInfoController { @PostMapping("editToolHeader") public R editToolHeader(@RequestBody ToolHeaderQuery toolHeaderQuery){ toolHeaderService.editToolHeader(toolHeaderQuery); - return R.ok(ResponseEnum.SUCCESS); + return R.ok(getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)); } /** * @author: sxm @@ -70,7 +71,7 @@ public class ToolInfoController { @PostMapping("saveToolHeader") public R saveHeader(@RequestBody ToolHeaderQuery toolHeaderQuery){ toolHeaderService.saveHeader(toolHeaderQuery); - return R.ok(ResponseEnum.SUCCESS); + return R.ok(getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)); } /** @@ -150,7 +151,7 @@ public class ToolInfoController { @PostMapping("updateToolDetail") public R updateToolDetail(@RequestBody ToolDetailQuery toolDetailQuery){ toolHeaderService.updateToolDetail( toolDetailQuery); - return R.ok().put("msg","操作成功！"); + return R.ok().put("msg",getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)); } /** @@ -163,7 +164,7 @@ public class ToolInfoController { @PostMapping("updateToolDetailInfo") public R updateToolDetailInfo(@RequestBody ToolDetailQuery toolDetailQuery){ toolHeaderService.updateToolDetailInfo( toolDetailQuery); - return R.ok().put("msg","操作成功！"); + return R.ok().put("msg",getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)); } /** @@ -176,7 +177,7 @@ public class ToolInfoController { @PostMapping("saveToolInfoDetail") public R saveToolInfoDetail(@RequestBody ToolDetailQuery toolDetailQuery){ toolHeaderService.saveToolInfoDetail(toolDetailQuery); - return R.ok().put("msg","操作成功！"); + return R.ok().put("msg",getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)); } @@ -217,7 +218,7 @@ public class ToolInfoController { @PostMapping("deleteToolHeader") public R deleteToolHeader(@RequestBody ToolHeaderQuery toolHeaderQuery){ toolHeaderService.deleteToolHeader(toolHeaderQuery); - return R.ok(ResponseEnum.TOOL_HEADER_REMOVER_SUCCESS); + return R.ok(getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)); } @@ -245,7 +246,7 @@ public class ToolInfoController { @PostMapping("updatePoReceiptList") public R updatePoReceiptList(@RequestBody List receiptQueries){ toolHeaderService.updatePoReceiptList(receiptQueries); - return R.ok(ResponseEnum.TOOL_RECONCILIATION); + return R.ok(getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)); } @@ -260,7 +261,7 @@ public class ToolInfoController { @PostMapping("updatePoReceiptListR") public R updatePoReceiptListR(@RequestBody List receiptQueries){ toolHeaderService.updatePoReceiptListR(receiptQueries); - return R.ok(ResponseEnum.TOOL_RECONCILIATION); + return R.ok(getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)); } diff --git a/src/main/java/com/gaotao/modules/toolman/service/impl/LocationServiceImpl.java b/src/main/java/com/gaotao/modules/toolman/service/impl/LocationServiceImpl.java index 2529f83..d3d9166 100644 --- a/src/main/java/com/gaotao/modules/toolman/service/impl/LocationServiceImpl.java +++ b/src/main/java/com/gaotao/modules/toolman/service/impl/LocationServiceImpl.java @@ -3,9 +3,11 @@ package com.gaotao.modules.toolman.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gaotao.common.constant.SysMsgConstant; import com.gaotao.common.exception.XJException; import com.gaotao.common.utils.PageUtils; import com.gaotao.common.utils.R; +import com.gaotao.modules.sys.service.SysMsgService; import com.gaotao.modules.toolman.dao.LocationMapper; import com.gaotao.modules.toolman.dao.ToolDetailMapper; import com.gaotao.modules.toolman.dao.ToolTransDetailMapper; @@ -32,6 +34,9 @@ public class LocationServiceImpl extends ServiceImpl i @Autowired private ToolTransDetailMapper transDetailDao; + @Autowired + private SysMsgService sysMsgService; + @Override public PageUtils getLocationList(LocationQuery locationQuery) { @@ -55,10 +60,10 @@ public class LocationServiceImpl extends ServiceImpl i if (count == 0) { locationMapper.insertSelective(locationQuery); } else { - return R.error(1, "库位编码已存在！"); + return R.error(1, sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200198)); } } - return R.ok("操作成功！"); + return R.ok(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)); } @@ -68,7 +73,7 @@ public class LocationServiceImpl extends ServiceImpl i int toolCount = toolDetailMapper.getLocationCount(locationQuery); int transCount = transDetailDao.getLocationCount(locationQuery); if (toolCount > 0 || transCount > 0) { - throw new XJException("该库位,还存在工具不能删除"); + throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200199)); } locationMapper.deleteLocation(locationQuery); } diff --git a/src/main/java/com/gaotao/modules/toolman/service/impl/ToolHeaderServiceImpl.java b/src/main/java/com/gaotao/modules/toolman/service/impl/ToolHeaderServiceImpl.java index 69a2063..0d997a6 100644 --- a/src/main/java/com/gaotao/modules/toolman/service/impl/ToolHeaderServiceImpl.java +++ b/src/main/java/com/gaotao/modules/toolman/service/impl/ToolHeaderServiceImpl.java @@ -20,6 +20,7 @@ import com.gaotao.modules.pda.utils.ResponseData; import com.gaotao.modules.purchaseorder.dao.PRHeaderMapper; import com.gaotao.modules.purchaseorder.entity.PRHeader; import com.gaotao.modules.sys.entity.SysUserEntity; +import com.gaotao.modules.sys.service.SysMsgService; import com.gaotao.modules.toolman.dao.*; import com.gaotao.modules.toolman.entity.*; import com.gaotao.modules.toolman.query.*; @@ -72,6 +73,9 @@ public class ToolHeaderServiceImpl implements ToolHeaderService { @Autowired private BaseService baseService; + @Autowired + private SysMsgService sysMsgService; + @Transactional public R saveToolDetail1(ToolDetailQuery toolDetailQuery) { @@ -373,7 +377,7 @@ public class ToolHeaderServiceImpl implements ToolHeaderService { public ToolDetail getToolDetail(ToolDetailQuery toolDetailQuery) { ToolDetail toolDetail = toolDetailMapper.getToolDetail(toolDetailQuery); if (toolDetail == null){ - throw new XJException("工具实例不存在"); + throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200200)); } // 采购入库时需要校验是否 工具分类时否开始 校验 if ("Y".equals(toolDetailQuery.getIsPurchase())) { @@ -382,7 +386,7 @@ public class ToolHeaderServiceImpl implements ToolHeaderService { if ("Y".equals(familyData.getInspectFlag())){ int count = toolTransHeaderMapper.getToolFile(toolDetailQuery); if (count == 0){ - throw new XJException("该工具分类需要上传检验文件"); + throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200201)); } } } @@ -662,13 +666,13 @@ public class ToolHeaderServiceImpl implements ToolHeaderService { .eq(ReportfilelistUserprinter::getReportid, reportFileVo.getReportId()) .eq(ReportfilelistUserprinter::getUserid, user.getUsername()).one(); if (userprinter == null) { - throw new XJException("请维护用户打印机打印机信息！", SysMsgConstant.OBJECT_ID_200005); + throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200101)); } if (StringUtils.isEmpty(userprinter.getIpaddress())) { - throw new XJException("请维护打印机地址！"); + throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200102)); } if (StringUtils.isEmpty(userprinter.getNewprintername())) { - throw new XJException("请维护打印机名称！"); + throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200103)); } String printPath = "http://" + userprinter.getIpaddress() + ":" + bartenderPrintServerPath; log.info("打印地址：" + printPath); @@ -698,7 +702,7 @@ public class ToolHeaderServiceImpl implements ToolHeaderService { // 获取打印返回结果 if (!"200".equals(r.getCode())) { log.info("调用错误!" + r.getMsg()); - throw new XJException("错误信息：" + r.getMsg()); + throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200104)+ r.getMsg()); } else { log.info("{},调用成功!", r.getMsg()); bool = true; @@ -734,13 +738,13 @@ public class ToolHeaderServiceImpl implements ToolHeaderService { Integer toolDetailCount = toolDetailMapper.getToolDetailCount(toolDetail); // 工具存在实例不允许删除 if (toolDetailCount > 0) { - throw new XJException(ResponseEnum.TOOL_DETAIL_EXIST); + throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200202)); } // 2.校验工具适用工序 Integer routeCount = toolHeaderMapper.getToolRouteList(toolHeaderQuery); // 还有使用该工具的工艺路路线 if (routeCount > 0) { - throw new XJException(ResponseEnum.TOOL_ROUTE_EXIST); + throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200203)); } // 3.删除工具信息 toolHeaderMapper.deleteBySiteAndToolid(toolHeaderQuery); @@ -764,10 +768,10 @@ public class ToolHeaderServiceImpl implements ToolHeaderService { // 校验是否完成对账 PoReceiptDetailQuery poReceiptDetail = poReceiptDetailMapper.getPoReceiptDetail(receiptQuery); if (poReceiptDetail == null) { - throw new XJException(ResponseEnum.TOOL_RECEIPT_NOT_FOUND); + throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200204)); } if (poReceiptDetail.getArriveQty().intValue() == poReceiptDetail.getInvoiceQty()) { - throw new XJException(ResponseEnum.TOOL_RECONCILIATION_NOT); + throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200205)); } poReceiptDetail.setInspector(userName); poReceiptDetail.setInspectionTime(date); @@ -801,7 +805,7 @@ public class ToolHeaderServiceImpl implements ToolHeaderService { locationQuery.setSite(toolDetailQuery.getSite()); Location location = locationService.getLocation(locationQuery); if (location == null) { - throw new XJException(ResponseEnum.TOOL_LOCATION_NOT_FOUND); + throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200206)); } } toolDetailMapper.updateToolDetailInfo(toolDetailQuery);