去除外键之多单位表jsh_unit相关修改
This commit is contained in:
@@ -206,7 +206,17 @@
|
|||||||
if(res && res.code == 200) {
|
if(res && res.code == 200) {
|
||||||
$("#searchBtn").click();
|
$("#searchBtn").click();
|
||||||
} else {
|
} else {
|
||||||
$.messager.alert('删除提示', '删除计量单位失败,请稍后再试!', 'error');
|
if(res && res.code == 601){
|
||||||
|
var jsondata={};
|
||||||
|
jsondata.ids=unitID;
|
||||||
|
jsondata.deleteType='2';
|
||||||
|
var type='single';
|
||||||
|
batDeleteUnitForceConfirm(res,"/unit/batchDeleteUnitByIds",jsondata,type);
|
||||||
|
}else if(res && res.code == 600){
|
||||||
|
$.messager.alert('删除提示', res.msg, 'error');
|
||||||
|
}else{
|
||||||
|
$.messager.alert('删除提示', '删除计量单位异常,请稍后再试!', 'error');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
//此处添加错误处理
|
//此处添加错误处理
|
||||||
@@ -251,7 +261,17 @@
|
|||||||
$("#searchBtn").click();
|
$("#searchBtn").click();
|
||||||
$(":checkbox").attr("checked", false);
|
$(":checkbox").attr("checked", false);
|
||||||
} else {
|
} else {
|
||||||
$.messager.alert('删除提示', '删除计量单位失败,请稍后再试!', 'error');
|
if(res && res.code == 601){
|
||||||
|
var jsondata={};
|
||||||
|
jsondata.ids=ids;
|
||||||
|
jsondata.deleteType='2';
|
||||||
|
var type='batch';
|
||||||
|
batDeleteUnitForceConfirm(res,"/unit/batchDeleteUnitByIds",jsondata,type);
|
||||||
|
}else if(res && res.code == 600){
|
||||||
|
$.messager.alert('删除提示', res.msg, 'error');
|
||||||
|
}else{
|
||||||
|
$.messager.alert('删除提示', '删除计量单位异常,请稍后再试!', 'error');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
//此处添加错误处理
|
//此处添加错误处理
|
||||||
@@ -264,6 +284,38 @@
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* 确认强制删除
|
||||||
|
* */
|
||||||
|
function batDeleteUnitForceConfirm(res,url,jsondata,type) {
|
||||||
|
$.messager.confirm('删除确认', res.msg, function (r) {
|
||||||
|
if (r) {
|
||||||
|
$.ajax({
|
||||||
|
type: "post",
|
||||||
|
url: url,
|
||||||
|
dataType: "json",
|
||||||
|
data: (jsondata),
|
||||||
|
success: function (res) {
|
||||||
|
if(res && res.code == 200) {
|
||||||
|
$("#searchBtn").click();
|
||||||
|
if(type=='batch'){
|
||||||
|
$(":checkbox").attr("checked", false);
|
||||||
|
}
|
||||||
|
}else if(res && res.code == 600){
|
||||||
|
$.messager.alert('删除提示', res.msg, 'error');
|
||||||
|
}else {
|
||||||
|
$.messager.alert('删除提示', '删除计量单位异常,请稍后再试!', 'error');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
//此处添加错误处理
|
||||||
|
error: function () {
|
||||||
|
$.messager.alert('删除提示', '删除计量单位异常,请稍后再试!', 'error');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
//增加
|
//增加
|
||||||
var url;
|
var url;
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.jsh.erp.controller;
|
package com.jsh.erp.controller;
|
||||||
|
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
|
import com.jsh.erp.constants.BusinessConstants;
|
||||||
import com.jsh.erp.constants.ExceptionConstants;
|
import com.jsh.erp.constants.ExceptionConstants;
|
||||||
import com.jsh.erp.exception.BusinessRunTimeException;
|
import com.jsh.erp.exception.BusinessRunTimeException;
|
||||||
import com.jsh.erp.service.unit.UnitService;
|
import com.jsh.erp.service.unit.UnitService;
|
||||||
@@ -34,9 +35,20 @@ public class UnitController {
|
|||||||
* @return java.lang.Object
|
* @return java.lang.Object
|
||||||
*/
|
*/
|
||||||
@RequestMapping(value = "/batchDeleteUnitByIds")
|
@RequestMapping(value = "/batchDeleteUnitByIds")
|
||||||
public Object batchDeleteUnitByIds(@RequestParam("ids") String ids) throws Exception {
|
public Object batchDeleteUnitByIds(@RequestParam("ids") String ids,@RequestParam(value="deleteType",
|
||||||
|
required =false,defaultValue= BusinessConstants.DELETE_TYPE_NORMAL)String deleteType) throws Exception {
|
||||||
JSONObject result = ExceptionConstants.standardSuccess();
|
JSONObject result = ExceptionConstants.standardSuccess();
|
||||||
int i= unitService.batchDeleteUnitByIds(ids);
|
int i=0;
|
||||||
|
if(BusinessConstants.DELETE_TYPE_NORMAL.equals(deleteType)){
|
||||||
|
i= unitService.batchDeleteUnitByIdsNormal(ids);
|
||||||
|
}else if(BusinessConstants.DELETE_TYPE_FORCE.equals(deleteType)){
|
||||||
|
i= unitService.batchDeleteUnitByIds(ids);
|
||||||
|
}else{
|
||||||
|
logger.error("异常码[{}],异常提示[{}],参数,ids[{}],deleteType[{}]",
|
||||||
|
ExceptionConstants.DELETE_REFUSED_CODE,ExceptionConstants.DELETE_REFUSED_MSG,ids,deleteType);
|
||||||
|
throw new BusinessRunTimeException(ExceptionConstants.DELETE_REFUSED_CODE,
|
||||||
|
ExceptionConstants.DELETE_REFUSED_MSG);
|
||||||
|
}
|
||||||
if(i<1){
|
if(i<1){
|
||||||
logger.error("异常码[{}],异常提示[{}],参数,ids[{}]",
|
logger.error("异常码[{}],异常提示[{}],参数,ids[{}]",
|
||||||
ExceptionConstants.UNIT_DELETE_FAILED_CODE,ExceptionConstants.UNIT_DELETE_FAILED_MSG,ids);
|
ExceptionConstants.UNIT_DELETE_FAILED_CODE,ExceptionConstants.UNIT_DELETE_FAILED_MSG,ids);
|
||||||
|
|||||||
@@ -60,4 +60,6 @@ public interface MaterialMapperEx {
|
|||||||
int batchDeleteMaterialByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]);
|
int batchDeleteMaterialByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]);
|
||||||
|
|
||||||
List<Material> getMaterialListByCategoryIds(@Param("categoryIds") String[] categoryIds);
|
List<Material> getMaterialListByCategoryIds(@Param("categoryIds") String[] categoryIds);
|
||||||
|
|
||||||
|
List<Material> getMaterialListByUnitIds(@Param("unitIds") String[] unitIds);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,17 @@
|
|||||||
package com.jsh.erp.service.unit;
|
package com.jsh.erp.service.unit;
|
||||||
|
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
||||||
import com.jsh.erp.constants.BusinessConstants;
|
import com.jsh.erp.constants.BusinessConstants;
|
||||||
|
import com.jsh.erp.constants.ExceptionConstants;
|
||||||
|
import com.jsh.erp.datasource.entities.Material;
|
||||||
import com.jsh.erp.datasource.entities.Unit;
|
import com.jsh.erp.datasource.entities.Unit;
|
||||||
import com.jsh.erp.datasource.entities.UnitExample;
|
import com.jsh.erp.datasource.entities.UnitExample;
|
||||||
import com.jsh.erp.datasource.entities.User;
|
import com.jsh.erp.datasource.entities.User;
|
||||||
|
import com.jsh.erp.datasource.mappers.MaterialMapperEx;
|
||||||
import com.jsh.erp.datasource.mappers.UnitMapper;
|
import com.jsh.erp.datasource.mappers.UnitMapper;
|
||||||
import com.jsh.erp.datasource.mappers.UnitMapperEx;
|
import com.jsh.erp.datasource.mappers.UnitMapperEx;
|
||||||
|
import com.jsh.erp.exception.BusinessRunTimeException;
|
||||||
import com.jsh.erp.service.log.LogService;
|
import com.jsh.erp.service.log.LogService;
|
||||||
import com.jsh.erp.service.user.UserService;
|
import com.jsh.erp.service.user.UserService;
|
||||||
import com.jsh.erp.utils.StringUtil;
|
import com.jsh.erp.utils.StringUtil;
|
||||||
@@ -35,6 +40,8 @@ public class UnitService {
|
|||||||
private UserService userService;
|
private UserService userService;
|
||||||
@Resource
|
@Resource
|
||||||
private LogService logService;
|
private LogService logService;
|
||||||
|
@Resource
|
||||||
|
private MaterialMapperEx materialMapperEx;
|
||||||
|
|
||||||
public Unit getUnit(long id) {
|
public Unit getUnit(long id) {
|
||||||
return unitMapper.selectByPrimaryKey(id);
|
return unitMapper.selectByPrimaryKey(id);
|
||||||
@@ -95,5 +102,41 @@ public class UnitService {
|
|||||||
return unitMapperEx.batchDeleteUnitByIds(new Date(),userInfo==null?null:userInfo.getId(),idArray);
|
return unitMapperEx.batchDeleteUnitByIds(new Date(),userInfo==null?null:userInfo.getId(),idArray);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* create by: qiankunpingtai
|
||||||
|
* website:https://qiankunpingtai.cn
|
||||||
|
* description:
|
||||||
|
* 正常删除,要考虑数据完整性,进行完整性校验
|
||||||
|
* create time: 2019/4/11 10:20
|
||||||
|
* @Param: ids
|
||||||
|
* @return int
|
||||||
|
*/
|
||||||
|
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
|
||||||
|
public int batchDeleteUnitByIdsNormal(String ids) throws Exception {
|
||||||
|
/**
|
||||||
|
* 校验
|
||||||
|
* 1、产品表 jsh_material
|
||||||
|
* 是否有相关数据
|
||||||
|
* */
|
||||||
|
int deleteTotal=0;
|
||||||
|
if(StringUtils.isEmpty(ids)){
|
||||||
|
return deleteTotal;
|
||||||
|
}
|
||||||
|
String [] idArray=ids.split(",");
|
||||||
|
/**
|
||||||
|
* 校验产品表 jsh_material
|
||||||
|
* */
|
||||||
|
List<Material> materialList=materialMapperEx.getMaterialListByUnitIds(idArray);
|
||||||
|
if(materialList!=null&&materialList.size()>0){
|
||||||
|
logger.error("异常码[{}],异常提示[{}],参数,UnitIds[{}]",
|
||||||
|
ExceptionConstants.DELETE_FORCE_CONFIRM_CODE,ExceptionConstants.DELETE_FORCE_CONFIRM_MSG,ids);
|
||||||
|
throw new BusinessRunTimeException(ExceptionConstants.DELETE_FORCE_CONFIRM_CODE,
|
||||||
|
ExceptionConstants.DELETE_FORCE_CONFIRM_MSG);
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* 校验通过执行删除操作
|
||||||
|
* */
|
||||||
|
deleteTotal= batchDeleteUnitByIds(ids);
|
||||||
|
return deleteTotal;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -161,6 +161,18 @@
|
|||||||
)
|
)
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_Flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
|
<select id="getMaterialListByUnitIds" resultMap="com.jsh.erp.datasource.mappers.MaterialMapper.BaseResultMap">
|
||||||
|
select
|
||||||
|
<include refid="com.jsh.erp.datasource.mappers.MaterialMapper.Base_Column_List" />
|
||||||
|
from jsh_material
|
||||||
|
where 1=1
|
||||||
|
and unitId in (
|
||||||
|
<foreach collection="unitIds" item="unitId" separator=",">
|
||||||
|
#{unitId}
|
||||||
|
</foreach>
|
||||||
|
)
|
||||||
|
and ifnull(delete_Flag,'0') !='1'
|
||||||
|
</select>
|
||||||
|
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
Reference in New Issue
Block a user