mes/mes-lqqt
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：部分功能编码做唯一校验

Browse Source
This commit is contained in:
zhangxuanming 2024-12-30 17:46:24 +08:00
parent dc7cd7be18
commit 46121c05b6
12 changed files with 73 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmItemRecptController.java
View File

@ -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());

6
ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmOutsourceIssueController.java
View File

@ -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));
}

6
ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmOutsourceRecptController.java
View File

@ -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));
}

6
ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmWarehouseController.java
View File

@ -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));
}

2
ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmOutsourceIssueMapper.java
View File

@ -61,4 +61,6 @@ public interface WmOutsourceIssueMapper
public int deleteWmOutsourceIssueByIssueIds(Long[] issueIds);
public List<OutsourceIssueTxBean> getTxBeans(Long issueId);
WmOutsourceIssue checkIssueCodeUnique(WmOutsourceIssue wmOutsourceIssue);
}

2
ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmOutsourceRecptMapper.java
View File

@ -61,4 +61,6 @@ public interface WmOutsourceRecptMapper
public int deleteWmOutsourceRecptByRecptIds(Long[] recptIds);
public List<OutsourceRecptTxBean> getTxBeans(Long recptId);
WmOutsourceRecpt checkIssueCodeUnique(WmOutsourceRecpt wmOutsourceRecpt);
}

2
ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmOutsourceIssueService.java
View File

@ -62,4 +62,6 @@ public interface IWmOutsourceIssueService
public int deleteWmOutsourceIssueByIssueId(Long issueId);
public List<OutsourceIssueTxBean> getTxBeans(Long issueId);
String checkIssueCodeUnique(WmOutsourceIssue wmOutsourceIssue);
}

7
ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmOutsourceRecptService.java
View File

@ -66,4 +66,11 @@ public interface IWmOutsourceRecptService
* @return
*/
public List<OutsourceRecptTxBean> getTxBeans(Long recptId);
/**
* 校验编码是否唯一
* @param wmOutsourceRecpt
* @return
*/
String checkIssueCodeUnique(WmOutsourceRecpt wmOutsourceRecpt);
}

13
ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmOutsourceIssueServiceImpl.java
View File

@ -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<OutsourceIssueTxBean> 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;
}
}

13
ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmOutsourceRecptServiceImpl.java
View File

@ -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<OutsourceRecptTxBean> 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;
}
}

5
ktg-mes/src/main/resources/mapper/wm/WmOutsourceIssueMapper.xml
View File

@ -115,6 +115,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ON ir.issue_id = irl.`issue_id`
WHERE ir.`issue_id` = #{issueId}
</select>
<select id="checkIssueCodeUnique" resultType="com.ktg.mes.wm.domain.WmOutsourceIssue" resultMap="WmOutsourceIssueResult">
<include refid="selectWmOutsourceIssueVo"/>
where issue_code = #{issueCode}
limit 1
</select>
<insert id="insertWmOutsourceIssue" parameterType="WmOutsourceIssue" useGeneratedKeys="true" keyProperty="issueId">
insert into wm_outsource_issue

5
ktg-mes/src/main/resources/mapper/wm/WmOutsourceRecptMapper.xml
View File

@ -119,6 +119,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ON ir.recpt_id = irl.`recpt_id`
WHERE ir.`recpt_id` = #{recptId}
</select>
<select id="checkIssueCodeUnique" resultType="com.ktg.mes.wm.domain.WmOutsourceRecpt" resultMap="WmOutsourceRecptResult">
<include refid="selectWmOutsourceRecptVo"/>
where recpt_code = #{recptCode}
limit 1
</select>
<insert id="insertWmOutsourceRecpt" parameterType="WmOutsourceRecpt" useGeneratedKeys="true" keyProperty="recptId">
insert into wm_outsource_recpt