UDI
/
udi-spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

部门，同步，单据类型修改

Browse Source
master
anthonywj 2 years ago
parent c9ff6afb23
commit 5989c6489b
5 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File

31
src/main/java/com/glxp/api/controller/auth/DeptController.java
Unescape Escape View File

@ -12,13 +12,16 @@ import com.glxp.api.constant.BusinessType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.auth.DeptEntity;
import com.glxp.api.entity.auth.DeptUserEntity;
import com.glxp.api.entity.auth.InvWarehouseEntity;
import com.glxp.api.entity.system.SystemParamConfigEntity;
import com.glxp.api.req.auth.FilterDeptUserReqeust;
import com.glxp.api.req.auth.FilterInvWarehouseRequest;
import com.glxp.api.req.system.DeleteRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.service.auth.CustomerService;
import com.glxp.api.service.auth.DeptService;
import com.glxp.api.service.auth.DeptUserService;
import com.glxp.api.service.auth.InvWarehouseService;
import com.glxp.api.service.system.SystemParamConfigService;
import org.springframework.validation.BindingResult;
@ -82,7 +85,7 @@ public class DeptController extends BaseController {
if (isHosUser()) {
AuthAdmin authAdmin = customerService.getUserBean();
filterInvWarehouseRequest.setUserId(authAdmin.getId());
}else {
} else {
}
@ -261,6 +264,9 @@ public class DeptController extends BaseController {
return ResultVOUtils.success();
}
@Resource
DeptUserService deptUserService;
@AuthRuleAnnotation("")
@PostMapping("/spms/inv/warehouse/delete")
@Log(title = "用户管理", businessType = BusinessType.DELETE)
@ -270,18 +276,19 @@ public class DeptController extends BaseController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
//todo 代码未迁移完，后续记得修改
DeptEntity deptEntity = deptService.selectById(deleteRequest.getId());
List<InvWarehouseEntity> invSubWarehouseEntities = invWarehouseService.findByParentId(deptEntity.getCode());
if (CollUtil.isNotEmpty(invSubWarehouseEntities)) {
return ResultVOUtils.error(500, "删除失败，请先移除该部门关联仓库信息！");
}
FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust();
filterDeptUserReqeust.setDeptId(deptEntity.getId().longValue());
List<DeptUserEntity> deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust);
if (CollUtil.isNotEmpty(deptUserEntities)) {
return ResultVOUtils.error(500, "删除失败，请先移除该部门关联用户信息！");
}
// DeptEntity deptEntity = deptService.selectById(deleteRequest.getId());
// InvProductDetailEntity invProductDetailEntity = invProductDetailService.isExit(deptEntity.getCode());
// if (invProductDetailEntity != null) {
// return ResultVOUtils.error(500, "该仓库已有库存，不能删除！");
// }
//
// List<InvSubWarehouseEntity> invSubWarehouseEntities = invSubWarehouseService.findByParentId(deptEntity.getCode());
// if (CollUtil.isNotEmpty(invSubWarehouseEntities)) {
// return ResultVOUtils.error(500, "删除失败，请先移除该部门关联仓库信息！");
// }
boolean b = deptService.deleteById(deleteRequest.getId());
if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);

1
src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java
Unescape Escape View File

@ -17,7 +17,6 @@ public interface BasicBussinessTypeDao extends BaseMapperPlus<BasicBussinessType
/**
* 查询单据类型列表
*
* @param filterBussinessTypeRequest
* @return
*/
List<BasicBussinessTypeResponse> filterList(FilterBussinessTypeRequest filterBussinessTypeRequest);

42
src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java
Unescape Escape View File

@ -70,7 +70,7 @@ public class IdcServiceImpl implements IdcService {
@Value("${API_SECRET}")
private String apiSecret;
private int orderNum = 0;
@Resource
@ -318,7 +318,7 @@ public class IdcServiceImpl implements IdcService {
return result;
}
public BaseResponse downlaodSuccess(HttpServletRequest request, Map<String, Object> params) {
String sql = "update basic_export_status set receiveStatus='1',endTime=now() where id='" + params.get("taskId") + "'";
@ -326,16 +326,16 @@ public class IdcServiceImpl implements IdcService {
return ResultVOUtils.success();
}
@Override
public BaseResponse receiveJson(HttpServletRequest request,Map<String, Object> params) {
return ResultVOUtils.success();
return ResultVOUtils.success();
}
@Override
public BaseResponse uploadFile(HttpServletRequest request,
String content,MultipartFile[] files) {
return ResultVOUtils.success();
String content,MultipartFile[] files) {
return ResultVOUtils.success();
}
/****/
@Override
@ -562,7 +562,7 @@ public class IdcServiceImpl implements IdcService {
String fileNames = list.get(m).get(filePathColumn).toString();
String[] str = fileNames.split(",");
for (int r = 0; r < str.length; r++) {
if (!StringUtils.isEmpty(str[r])&&FileUtils.isFileExist(filePath + filePathSlash + "register/file/image2/" + str[r]))
if (!StringUtils.isEmpty(str[r])&&FileUtils.isFileExist(filePath + filePathSlash + "register/file/image2/" + str[r]))
files.add(filePath + filePathSlash + "register/file/image2/" + str[r]);
}
}
@ -585,8 +585,8 @@ public class IdcServiceImpl implements IdcService {
if (childList.get(i).get(chidTnames[7]) != null) {
String[] str = childList.get(i).get(chidTnames[7]).toString().split(",");
for (int s = 0; s < str.length; s++) {
if (!StringUtils.isEmpty(str[s])&&FileUtils.isFileExist(filePath + filePathSlash + "register/file/image2/" + str[s]))
files.add(filePath + filePathSlash + "register/file/image2/" + str[s]);
if (!StringUtils.isEmpty(str[s])&&FileUtils.isFileExist(filePath + filePathSlash + "register/file/image2/" + str[s]))
files.add(filePath + filePathSlash + "register/file/image2/" + str[s]);
}
}
}
@ -1151,13 +1151,13 @@ public class IdcServiceImpl implements IdcService {
alterTable("idc_log", "create table idc_log (id varchar(36),orderNum int,taskId varchar(60),type varchar(60),content varchar(2000),offset int,total int,createTime datetime,PRIMARY KEY (id))");
dbDao.delete("delete from idc_record where createTime<date_sub(now(),interval 2 day) and isEnd='0'");
try {
executeSql("alter table basic_export_status add column cacheFilePath varchar(255)");
executeSql("alter table basic_upload_status add column cacheFilePath varchar(255)");
executeSql("alter table idc_status modify column id varchar(100)");
executeSql("delete from idc_log where createTime<date_sub(now(),interval 3 day)");
executeSql("alter table basic_export_status add column msg varchar(255)");
executeSql("alter table basic_upload_status add column msg varchar(255)");
executeSql("alter table basic_download_status add column msg varchar(255)");
executeSql("alter table basic_export_status add column cacheFilePath varchar(255)");
executeSql("alter table basic_upload_status add column cacheFilePath varchar(255)");
executeSql("alter table idc_status modify column id varchar(100)");
executeSql("delete from idc_log where createTime<date_sub(now(),interval 3 day)");
executeSql("alter table basic_export_status add column msg varchar(255)");
executeSql("alter table basic_upload_status add column msg varchar(255)");
executeSql("alter table basic_download_status add column msg varchar(255)");
} catch (Exception e) {
}
@ -1166,15 +1166,15 @@ public class IdcServiceImpl implements IdcService {
private void alterTable(String tableName, String sql) {
Map<String, String> map = dbDao.getMysql(tableName);
if (!(map != null && map.get("tableName") != null)) {
executeSql(sql);
executeSql(sql);
}
}
private void executeSql(String sql) {
try {
try {
jdbcTemplate.execute(sql);
} catch (Exception e) {
}

2
src/main/java/com/glxp/api/task/AsyncSpsTask.java
Unescape Escape View File

@ -36,7 +36,7 @@ public class AsyncSpsTask implements SchedulingConfigurer {
scheduledRequest.setCronName("syncIdcSps");
logger.info("syncIdcSps----------------");
ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
String cron = scheduledEntity != null ? scheduledEntity.getCron() : "0 0/59 * * * ?";
String cron = scheduledEntity != null ? scheduledEntity.getCron() : "0 0/1 * * * ?";
if (cron.isEmpty()) {
logger.error("cron is null");

1
src/main/resources/mybatis/mapper/auth/DeptUserDao.xml
Unescape Escape View File

@ -5,7 +5,6 @@
<mapper namespace="com.glxp.api.dao.auth.DeptUserDao">
<select id="selectDeptUser" parameterType="com.glxp.api.req.auth.FilterDeptUserReqeust"
resultType="com.glxp.api.entity.auth.DeptUserEntity">
>
SELECT *
FROM auth_dept_user
<where>

Write Preview
Loading…
Cancel
Save