diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmItemRecptController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmItemRecptController.java index fd1fbf7..96c5b94 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmItemRecptController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmItemRecptController.java @@ -99,7 +99,7 @@ public class WmItemRecptController extends BaseController public AjaxResult add(@RequestBody WmItemRecpt wmItemRecpt) { if(UserConstants.NOT_UNIQUE.equals(wmItemRecptService.checkRecptCodeUnique(wmItemRecpt))){ - return AjaxResult.error("单据编号已存在!"); + return AjaxResult.error("编号已存在!"); } if(StringUtils.isNotNull(wmItemRecpt.getWarehouseId())){ @@ -166,6 +166,9 @@ public class WmItemRecptController extends BaseController @PutMapping public AjaxResult edit(@RequestBody WmItemRecpt wmItemRecpt) { + if(UserConstants.NOT_UNIQUE.equals(wmItemRecptService.checkRecptCodeUnique(wmItemRecpt))){ + return AjaxResult.error("编号已存在!"); + } if(StringUtils.isNotNull(wmItemRecpt.getWarehouseId())){ WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmItemRecpt.getWarehouseId()); wmItemRecpt.setWarehouseCode(warehouse.getWarehouseCode()); diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmOutsourceIssueController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmOutsourceIssueController.java index f7592df..43f4d8e 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmOutsourceIssueController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmOutsourceIssueController.java @@ -94,6 +94,9 @@ public class WmOutsourceIssueController extends BaseController @PostMapping public AjaxResult add(@RequestBody WmOutsourceIssue wmOutsourceIssue) { + if(UserConstants.NOT_UNIQUE.equals(wmOutsourceIssueService.checkIssueCodeUnique(wmOutsourceIssue))){ + return AjaxResult.error("编号已存在!"); + } return toAjax(wmOutsourceIssueService.insertWmOutsourceIssue(wmOutsourceIssue)); } @@ -105,6 +108,9 @@ public class WmOutsourceIssueController extends BaseController @PutMapping public AjaxResult edit(@RequestBody WmOutsourceIssue wmOutsourceIssue) { + if(UserConstants.NOT_UNIQUE.equals(wmOutsourceIssueService.checkIssueCodeUnique(wmOutsourceIssue))){ + return AjaxResult.error("编号已存在!"); + } return toAjax(wmOutsourceIssueService.updateWmOutsourceIssue(wmOutsourceIssue)); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmOutsourceRecptController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmOutsourceRecptController.java index d3e310f..d46d0c9 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmOutsourceRecptController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmOutsourceRecptController.java @@ -102,6 +102,9 @@ public class WmOutsourceRecptController extends BaseController @PostMapping public AjaxResult add(@RequestBody WmOutsourceRecpt wmOutsourceRecpt) { + if(UserConstants.NOT_UNIQUE.equals(wmOutsourceRecptService.checkIssueCodeUnique(wmOutsourceRecpt))){ + return AjaxResult.error("编号已存在!"); + } return toAjax(wmOutsourceRecptService.insertWmOutsourceRecpt(wmOutsourceRecpt)); } @@ -113,6 +116,9 @@ public class WmOutsourceRecptController extends BaseController @PutMapping public AjaxResult edit(@RequestBody WmOutsourceRecpt wmOutsourceRecpt) { + if(UserConstants.NOT_UNIQUE.equals(wmOutsourceRecptService.checkIssueCodeUnique(wmOutsourceRecpt))){ + return AjaxResult.error("编号已存在!"); + } return toAjax(wmOutsourceRecptService.updateWmOutsourceRecpt(wmOutsourceRecpt)); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmWarehouseController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmWarehouseController.java index ab16366..395d68e 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmWarehouseController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmWarehouseController.java @@ -121,6 +121,12 @@ public class WmWarehouseController extends BaseController @PutMapping public AjaxResult edit(@RequestBody WmWarehouse wmWarehouse) { + if(UserConstants.NOT_UNIQUE.equals(wmWarehouseService.checkWarehouseCodeUnique(wmWarehouse))){ + return AjaxResult.error("仓库编码已存在!"); + } + if(UserConstants.NOT_UNIQUE.equals(wmWarehouseService.checkWarehouseNameUnique(wmWarehouse))){ + return AjaxResult.error("仓库名称已存在!"); + } return toAjax(wmWarehouseService.updateWmWarehouse(wmWarehouse)); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmOutsourceIssueMapper.java b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmOutsourceIssueMapper.java index 37db478..518f7a7 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmOutsourceIssueMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmOutsourceIssueMapper.java @@ -61,4 +61,6 @@ public interface WmOutsourceIssueMapper public int deleteWmOutsourceIssueByIssueIds(Long[] issueIds); public List getTxBeans(Long issueId); + + WmOutsourceIssue checkIssueCodeUnique(WmOutsourceIssue wmOutsourceIssue); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmOutsourceRecptMapper.java b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmOutsourceRecptMapper.java index f6d1dc2..d1efc18 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmOutsourceRecptMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmOutsourceRecptMapper.java @@ -61,4 +61,6 @@ public interface WmOutsourceRecptMapper public int deleteWmOutsourceRecptByRecptIds(Long[] recptIds); public List getTxBeans(Long recptId); + + WmOutsourceRecpt checkIssueCodeUnique(WmOutsourceRecpt wmOutsourceRecpt); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmOutsourceIssueService.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmOutsourceIssueService.java index f4dc4a9..3ce15a9 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmOutsourceIssueService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmOutsourceIssueService.java @@ -62,4 +62,6 @@ public interface IWmOutsourceIssueService public int deleteWmOutsourceIssueByIssueId(Long issueId); public List getTxBeans(Long issueId); + + String checkIssueCodeUnique(WmOutsourceIssue wmOutsourceIssue); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmOutsourceRecptService.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmOutsourceRecptService.java index bb69149..9dc2ffc 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmOutsourceRecptService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmOutsourceRecptService.java @@ -66,4 +66,11 @@ public interface IWmOutsourceRecptService * @return */ public List getTxBeans(Long recptId); + + /** + * 校验编码是否唯一 + * @param wmOutsourceRecpt + * @return + */ + String checkIssueCodeUnique(WmOutsourceRecpt wmOutsourceRecpt); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmOutsourceIssueServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmOutsourceIssueServiceImpl.java index 40a7bb8..f24b103 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmOutsourceIssueServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmOutsourceIssueServiceImpl.java @@ -1,7 +1,10 @@ package com.ktg.mes.wm.service.impl; import java.util.List; + +import com.ktg.common.constant.UserConstants; import com.ktg.common.utils.DateUtils; +import com.ktg.common.utils.StringUtils; import com.ktg.mes.wm.domain.tx.IssueTxBean; import com.ktg.mes.wm.domain.tx.OutsourceIssueTxBean; import org.springframework.beans.factory.annotation.Autowired; @@ -94,4 +97,14 @@ public class WmOutsourceIssueServiceImpl implements IWmOutsourceIssueService { public List getTxBeans(Long issueId) { return wmOutsourceIssueMapper.getTxBeans(issueId); } + + @Override + public String checkIssueCodeUnique(WmOutsourceIssue wmOutsourceIssue) { + WmOutsourceIssue outsourceIssue = wmOutsourceIssueMapper.checkIssueCodeUnique(wmOutsourceIssue); + Long issueId = wmOutsourceIssue.getIssueId() == null ? -1L : wmOutsourceIssue.getIssueId(); + if (StringUtils.isNotNull(outsourceIssue) && outsourceIssue.getIssueId().longValue() != issueId.longValue()) { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmOutsourceRecptServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmOutsourceRecptServiceImpl.java index 751fec1..73d1427 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmOutsourceRecptServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmOutsourceRecptServiceImpl.java @@ -1,7 +1,10 @@ package com.ktg.mes.wm.service.impl; import java.util.List; + +import com.ktg.common.constant.UserConstants; import com.ktg.common.utils.DateUtils; +import com.ktg.common.utils.StringUtils; import com.ktg.mes.wm.domain.tx.OutsourceRecptTxBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -99,4 +102,14 @@ public class WmOutsourceRecptServiceImpl implements IWmOutsourceRecptService public List getTxBeans(Long recptId) { return wmOutsourceRecptMapper.getTxBeans(recptId); } + + @Override + public String checkIssueCodeUnique(WmOutsourceRecpt wmOutsourceRecpt) { + WmOutsourceRecpt outsourceRecpt = wmOutsourceRecptMapper.checkIssueCodeUnique(wmOutsourceRecpt); + Long recptId = wmOutsourceRecpt.getRecptId() == null ? -1L : wmOutsourceRecpt.getRecptId(); + if (StringUtils.isNotNull(outsourceRecpt) && outsourceRecpt.getRecptId().longValue() != recptId.longValue()) { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } } diff --git a/ktg-mes/src/main/resources/mapper/wm/WmOutsourceIssueMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmOutsourceIssueMapper.xml index b490b04..72505cb 100644 --- a/ktg-mes/src/main/resources/mapper/wm/WmOutsourceIssueMapper.xml +++ b/ktg-mes/src/main/resources/mapper/wm/WmOutsourceIssueMapper.xml @@ -115,7 +115,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ON ir.issue_id = irl.`issue_id` WHERE ir.`issue_id` = #{issueId} - + + insert into wm_outsource_issue diff --git a/ktg-mes/src/main/resources/mapper/wm/WmOutsourceRecptMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmOutsourceRecptMapper.xml index 48b97ef..c4da72d 100644 --- a/ktg-mes/src/main/resources/mapper/wm/WmOutsourceRecptMapper.xml +++ b/ktg-mes/src/main/resources/mapper/wm/WmOutsourceRecptMapper.xml @@ -119,7 +119,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ON ir.recpt_id = irl.`recpt_id` WHERE ir.`recpt_id` = #{recptId} - + + insert into wm_outsource_recpt