diff --git a/pom.xml b/pom.xml
index 8917ad68..fdc691a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
https://github.com/YunaiV/ruoyi-vue-pro
- 3.0.46
+ 3.0.47-SNAPSHOT
17
${java.version}
@@ -167,11 +167,11 @@
中铜 ZStack 私服
http://172.16.46.63:30708/repository/test/
-
-
-
-
-
+
+ ZT-snap
+ 中铜 ZStack 私服
+ http://172.16.46.63:30708/repository/test-snap/
+
diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/internalwarehouse/InternalWarehouseMapper.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/internalwarehouse/InternalWarehouseMapper.java
index fb99b541..e3d208af 100644
--- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/internalwarehouse/InternalWarehouseMapper.java
+++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/internalwarehouse/InternalWarehouseMapper.java
@@ -35,8 +35,8 @@ public interface InternalWarehouseMapper extends BaseMapperX0) {
+ public void validateInternalWarehouseExists(String number, String type, Long id) {
+ InternalWarehouseDO internalWarehouseDO = internalWarehouseMapper.selectInternalWarehouseDOByNumber(number);
+ if (internalWarehouseDO != null && "insert".equals(type)) {
+ throw exception(INTERNAL_WAREHOUSE_EXISTS);
+ } else if (internalWarehouseDO != null && "update".equals(type) && !Objects.equals(id, internalWarehouseDO.getId())) {
throw exception(INTERNAL_WAREHOUSE_EXISTS);
}
}
+
@Override
public void updateInternalWarehouse(InternalWarehouseSaveReqVO updateReqVO) {
// 校验存在
validateInternalWarehouseExists(updateReqVO.getId());
+ // 校验所绑定的库位是否已经存在
+ validateInternalWarehouseExists(updateReqVO.getNumber(), "update", updateReqVO.getId());
// 更新
InternalWarehouseDO updateObj = BeanUtils.toBean(updateReqVO, InternalWarehouseDO.class);
internalWarehouseMapper.updateById(updateObj);
@@ -77,12 +82,12 @@ public class InternalWarehouseServiceImpl implements InternalWarehouseService {
}
@Override
- public void deleteInternalWarehouseListByIds(List ids) {
+ public void deleteInternalWarehouseListByIds(List ids) {
// 校验存在
validateInternalWarehouseExists(ids);
// 删除
internalWarehouseMapper.deleteByIds(ids);
- }
+ }
private void validateInternalWarehouseExists(List ids) {
List list = internalWarehouseMapper.selectByIds(ids);