diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java b/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java index c56cf0b1..6d23eefc 100644 --- a/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java +++ b/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java @@ -2201,8 +2201,8 @@ public class QcController { @PostMapping("/saveProductPartData") @ResponseBody public R saveProductPartData(@RequestBody ProductPartData inData){ - qcService.saveProductPartData(inData); - return R.ok(); + R r = qcService.saveProductPartData(inData); + return r; } /** diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java index 28e05168..c7c93d9a 100644 --- a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java +++ b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java @@ -672,4 +672,6 @@ public interface QcMapper { List getButtonsPermission1(); List getButtonsPermission2(); + + List selectProductPartCount(ProductPartData inData); } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java index 23175e89..73c715cb 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java @@ -3475,8 +3475,13 @@ public class QcServiceImpl implements QcService { } @Override - public void saveProductPartData(ProductPartData inData) { + public R saveProductPartData(ProductPartData inData) { + List list = qcMapper.selectProductPartCount(inData); + if (list.size()>0){ + return R.error("该物料已存在,请修改后重新保存!"); + } qcMapper.saveProductPartData(inData); + return R.ok(); } @Override diff --git a/src/main/java/com/xujie/sys/modules/pms/service/QcService.java b/src/main/java/com/xujie/sys/modules/pms/service/QcService.java index efd6e864..8bb13857 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/QcService.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/QcService.java @@ -361,7 +361,7 @@ public interface QcService { List selectPartData(ProductPartData inData); - void saveProductPartData(ProductPartData inData); + R saveProductPartData(ProductPartData inData); void updateProductPartData(ProductPartData inData); diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index 4a9fd451..68d442e2 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -4514,6 +4514,9 @@ LEFT JOIN sys_role c on b.role_id = c.role_id where c.role_name = '成品物料模块-查询导出权限' + UPDATE Equipment_folder_location SET