feat: controller 代码优化

dev_drug_dm
chenhc 4 months ago
parent 5145886b08
commit 853715fbea

@ -1,33 +0,0 @@
package com.glxp.api.common.converter;
import org.apache.commons.lang3.StringUtils;
import java.util.*;
/**
* Long List
*/
public class LongList2StringConverter {
/**
* Long List
* @param longList
* @param regex
* @return
*/
public static String convert(List<Long> longList, String regex) {
if (longList.isEmpty()) {
return null;
}
Set<String> stringSet = new HashSet<>();
for (Long value: longList){
stringSet.add(value.toString());
}
if (stringSet.isEmpty()) {
return null;
}
return StringUtils.join(stringSet, regex);
}
}

@ -1,38 +0,0 @@
package com.glxp.api.common.converter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
* List<Long>
*/
public class String2LongListConverter {
/**
*
* @param string
* @param regex
* @return
*/
public static List<Long> convert(String string, String regex) {
try {
if (null == string || "".equals(string)) {
return Collections.emptyList();
}
String[] strings = string.split(regex);
if (strings.length == 0) {
return Collections.emptyList();
}
List<Long> longList = new ArrayList<>();
for (String str : strings) {
longList.add(Long.valueOf(str));
}
return longList;
}catch (Exception e) {
return Collections.emptyList();
}
}
}

@ -1,34 +0,0 @@
package com.glxp.api.common.converter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
/**
* List<String>
*/
public class String2StringListConverter {
/**
*
* @param string
* @param regex
* @return
*/
public static List<String> convert(String string, String regex) {
try {
if (null == string || "".equals(string)) {
return Collections.emptyList();
}
String[] strings = string.split(regex);
if (strings.length == 0) {
return Collections.emptyList();
}
return new ArrayList<>(Arrays.asList(strings));
}catch (Exception e) {
return Collections.emptyList();
}
}
}

@ -1,56 +0,0 @@
package com.glxp.api.common.req;
/**
*
*/
public class BaseLimitRequest extends BaseRequest {
/**
*
*/
private Integer page;
/**
*
*/
private Integer limit;
/**
*
*/
private Integer offset;
public Integer getPage() {
return page;
}
public void setPage(Integer page) {
this.page = page;
}
public Integer getLimit() {
return limit;
}
public void setLimit(Integer limit) {
this.limit = limit;
}
public Integer getOffset() {
return offset;
}
/**
*
*/
public void setOffset() {
if (null == this.getPage() || this.getPage() <= 0) {
this.setPage(1);
}
if (null == this.getLimit() || this.getLimit() <= 0) {
this.setLimit(10);
}
this.offset = (this.getPage() - 1) * this.getLimit();
}
}

@ -1,37 +0,0 @@
package com.glxp.api.common.req;
import java.util.UUID;
public class BaseRequest {
/**
*
*/
private String reqNo;
/**
*
*/
private Long timeStamp;
public BaseRequest() {
this.reqNo = UUID.randomUUID().toString();
this.timeStamp = System.currentTimeMillis();
}
public String getReqNo() {
return reqNo;
}
public void setReqNo(String reqNo) {
this.reqNo = reqNo;
}
public Long getTimeStamp() {
return timeStamp;
}
public void setTimeStamp(Long timeStamp) {
this.timeStamp = timeStamp;
}
}

@ -1,10 +0,0 @@
package com.glxp.api.constant;
public interface DeviceType {
int TYPE_INSPECTTION = 1; //巡检
int TYPE_MAINTAIN = 2; //养护
int TYPE_REPAIR = 3; //报修
}

@ -1,16 +0,0 @@
package com.glxp.api.constant;
/**
*
*/
public class IncodeStatus {
public static final Integer PROCESS = 0; //处理中
public static final Integer FINISH = 1; //已完成
public static final Integer ERROR = 2; //异常
public static final Integer FROM_UDIINFO = 0; //产品信息
public static final Integer FROM_INVINFO = 1; //库存产品信息
public static final Integer FROM_THRSYS = 2; //第三方提交
}

@ -1,43 +0,0 @@
package com.glxp.api.constant;
/**
*
*/
public interface ThirdSysConstant {
/**
*
*/
public static final String WAREHOUSE_QUERY_URL = "warehouseQueryUrl";
/**
*
*/
public static final String ORDER_SUBMIT_URL = "orderSubmitUrl";
/**
*
*/
public static final String ORDER_QUERY_URL = "orderQueryUrl";
/**
*
*/
public static final String BUS_TYPE_QUERY_URL = "busTypeQueryUrl";
/**
* /
*/
public static final String invPiUrl = "invPiUrl";
/**
*
*/
public static final String CORP_URL = "corpUrl";
/**
*
*/
public static final String PI_QUERY_URL = "piQueryUrl";
}

@ -6,7 +6,6 @@ import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.res.BaseResponse;
@ -14,11 +13,9 @@ import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.controller.inout.IoOrderReviewController;
import com.glxp.api.dao.inout.IoCodeDao;
import com.glxp.api.entity.alihealth.AliYljgBillDetail;
import com.glxp.api.entity.alihealth.AliYljgSearchbill;
import com.glxp.api.entity.collect.IoCollectCodeBackup;
import com.glxp.api.entity.inout.IoCodeEntity;
import com.glxp.api.entity.inout.IoOrderEntity;
import com.glxp.api.entity.thrsys.CodeRel;
import com.glxp.api.entity.thrsys.ThirdAliDrug;
@ -26,7 +23,6 @@ import com.glxp.api.entity.thrsys.YbDrug;
import com.glxp.api.req.alihealth.AliYljgSearchbillReqeust;
import com.glxp.api.req.alihealth.AlihealthKytDrugrescodeReqeust;
import com.glxp.api.req.alihealth.AlihealthKytGetentinfoReqeust;
import com.glxp.api.req.alihealth.AlihealthYljgUploadinoutbillReqeust;
import com.glxp.api.req.alihealth.local.AliBillsDisposeReqeust;
import com.glxp.api.req.alihealth.local.AlihealthGetRelCodeReqeust;
import com.glxp.api.req.alihealth.local.AlihealthRelCodeInsertReqeust;
@ -37,11 +33,8 @@ import com.glxp.api.res.alihealth.AlihealthKytGetentinfoResponse;
import com.glxp.api.service.alihealth.AlihealthBusService;
import com.glxp.api.service.collect.RelCodeBatchService;
import com.glxp.api.service.inout.IoOrderService;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.alihealth.AlihealthUtils;
import com.glxp.api.util.alihealth.AlihealthYljgUtils;
import com.glxp.api.util.alihealth.PaginationUtil;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;

@ -8,10 +8,7 @@ import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.entity.auth.AuthRole;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.auth.AuthAdminRoleResponse;
import com.glxp.api.service.auth.AuthAdminService;
import com.glxp.api.service.auth.AuthRoleAdminService;
import com.glxp.api.service.auth.AuthRoleService;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@ -26,136 +23,15 @@ import java.util.stream.Collectors;
@RestController
public class AuthAdminController {
@Resource
private AuthAdminService authAdminService;
@Resource
private AuthRoleService authRoleService;
@Resource
private AuthRoleAdminService authRoleAdminService;
// @Resource
// private CustomerInfoService customerInfoService;
//
// @Resource
// private WarehouseUserService warehouseUserService;
//
// @Resource
// private InvBusUserService invBusUserService;
//
// @Resource
// private InvSubWarehouseService invSubWarehouseService;
// @Resource
// private AuthPermissionRuleService authPermissionRuleService;
// @Resource
// private AuthPermissionService authPermissionService;
/**
*
*/
// @AuthRuleAnnotation("admin/auth/admin/index")
// @GetMapping("/admin/auth/admin/index")
// public BaseResponse index(@Valid FilterAuthUserRequest authAdminQueryRequest,
// BindingResult bindingResult) {
//
// if (bindingResult.hasErrors()) {
// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
// }
//
// if (authAdminQueryRequest.getRoleId() != null) {
// List<AuthRoleAdmin> authRoleAdmins = authRoleAdminService.listByRoleId(authAdminQueryRequest.getRoleId());
// List<Long> ids = new ArrayList<>();
// if (authRoleAdmins != null && !authRoleAdmins.isEmpty()) {
// ids = authRoleAdmins.stream().map(AuthRoleAdmin::getAdmin_id).collect(Collectors.toList());
// }
// authAdminQueryRequest.setIds(ids);
// }
// List<AuthAdmin> authAdminList = authAdminService.listAdminPage(authAdminQueryRequest);
// // 查询所有的权限
// List<Long> adminIds = authAdminList.stream().map(AuthAdmin::getId).collect(Collectors.toList());
// List<AuthRoleAdmin> authRoleAdminList = authRoleAdminService.listByAdminIdIn(adminIds);
//
// // 视图列表
// List<AuthAdminResponse> authAdminResponseList = authAdminList.stream().map(item -> {
// AuthAdminResponse authAdminResponse = new AuthAdminResponse();
// BeanUtil.copyProperties(item, authAdminResponse);
// List<Long> roles = authRoleAdminList.stream()
// .filter(authRoleAdmin -> authAdminResponse.getId().equals(authRoleAdmin.getAdmin_id()))
// .map(AuthRoleAdmin::getRole_id)
// .collect(Collectors.toList());
// authAdminResponse.setRoles(roles);
// return authAdminResponse;
// }).collect(Collectors.toList());
//
// PageInfo<AuthAdmin> authAdminPageInfo = new PageInfo<>(authAdminList);
// PageSimpleResponse<AuthAdminResponse> authAdminPageSimpleResponse = new PageSimpleResponse<>();
// authAdminPageSimpleResponse.setTotal(authAdminPageInfo.getTotal());
// authAdminPageSimpleResponse.setList(authAdminResponseList);
//
// return ResultVOUtils.success(authAdminPageSimpleResponse);
// }
/**
*
*/
// @AuthRuleAnnotation("admin/auth/admin/roleList")
// @GetMapping("/admin/auth/admin/roleList")
// public BaseResponse roleList(@RequestParam(value = "page", defaultValue = "1") Integer page,
// @RequestParam(value = "limit", defaultValue = "100") Integer limit) {
//
// List<AuthRole> authRoleList = authRoleService.listAuthAdminRolePage(page, limit, null);
// PageInfo<AuthRole> pageInfo = new PageInfo<>(authRoleList);
// PageSimpleResponse<AuthAdminRoleResponse> pageSimpleResponse = new PageSimpleResponse<>();
// pageSimpleResponse.setTotal(pageInfo.getTotal());
// List<AuthAdminRoleResponse> authAdminRoleResponses = authRoleList.stream().map(e -> {
// AuthAdminRoleResponse authAdminRoleResponse = new AuthAdminRoleResponse();
// BeanUtil.copyProperties(e, authAdminRoleResponse);
// return authAdminRoleResponse;
// }).collect(Collectors.toList());
// pageSimpleResponse.setList(authAdminRoleResponses);
//
// return ResultVOUtils.success(pageSimpleResponse);
// }
//
// @AuthRuleAnnotation("admin/auth/admin/roleCustomers")
// @GetMapping("/admin/auth/admin/roleCustomers")
// public BaseResponse roleCustomers(@RequestParam(value = "page", defaultValue = "1") Integer page,
// @RequestParam(value = "limit", defaultValue = "100") Integer limit) {
// AuthAdmin authAdmin = getCustomerId();
// List<AuthRole> authRoles = authRoleAdminService.listAdminRole(authAdmin.getId());
// List<AuthRole> authRoleList = null;
// if (authRoles != null && authRoles.size() > 0) {
// int status = authRoles.get(0).getIsCustomer();
// authRoleList = authRoleService.listCustomerRoles(page, limit, status);
// } else {
// authRoleList = authRoleService.listAuthAdminRolePage(page, limit, null);
// }
//
// PageInfo<AuthRole> pageInfo = new PageInfo<>(authRoleList);
// PageSimpleResponse<AuthAdminRoleResponse> pageSimpleResponse = new PageSimpleResponse<>();
// pageSimpleResponse.setTotal(pageInfo.getTotal());
// List<AuthAdminRoleResponse> authAdminRoleResponses = authRoleList.stream().map(e -> {
// AuthAdminRoleResponse authAdminRoleResponse = new AuthAdminRoleResponse();
// BeanUtil.copyProperties(e, authAdminRoleResponse);
// return authAdminRoleResponse;
// }).collect(Collectors.toList());
// pageSimpleResponse.setList(authAdminRoleResponses);
//
// return ResultVOUtils.success(pageSimpleResponse);
// }
@AuthRuleAnnotation("admin/auth/admin/customerRoles")
@GetMapping("/admin/auth/admin/customerRoles")
public BaseResponse customerRoles(@RequestParam(value = "page", defaultValue = "1") Integer page,
@RequestParam(value = "limit", defaultValue = "100") Integer limit) {
List<AuthRole> authRoleList = authRoleService.listCustomerRoles(page, limit, 1);
// List<AuthRole> authRoleList = authRoleService.listAuthRoles2(page, limit);
PageInfo<AuthRole> pageInfo = new PageInfo<>(authRoleList);
PageSimpleResponse<AuthAdminRoleResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
@ -176,7 +52,6 @@ public class AuthAdminController {
@RequestParam(value = "limit", defaultValue = "100") Integer limit) {
List<AuthRole> authRoleList = authRoleService.getlistCustomerRoles(page, limit, 1);
// List<AuthRole> authRoleList = authRoleService.listAuthRoles2(page, limit);
PageInfo<AuthRole> pageInfo = new PageInfo<>(authRoleList);
PageSimpleResponse<AuthAdminRoleResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
@ -190,241 +65,4 @@ public class AuthAdminController {
return ResultVOUtils.success(pageSimpleResponse);
}
/**
*
*
* @return
*/
// @AuthRuleAnnotation("admin/auth/admin/save")
// @PostMapping("/admin/auth/admin/save")
// public BaseResponse save(@RequestBody @Valid AuthAdminSaveRequest authAdminSaveRequest,
// BindingResult bindingResult) {
//
// if (bindingResult.hasErrors()) {
// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
// }
// AuthAdmin curUser = getCustomerId();
// if (!curUser.getCustomerId().equals("110")) {
// CustomerInfoEntity customerInfoEntity = customerInfoService.selectById(curUser.getCustomerId());
// int max = customerInfoEntity.getUserMax();
// int count = authAdminService.findCountByCustomerId(authAdminSaveRequest.getCustomerId());
// if (count >= max) {
// return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "已超过最大用户数");
// }
// }
//
// // 检查是否存在相同名称的管理员
// AuthAdmin byUserName = authAdminService.findByUserName(authAdminSaveRequest.getUserName());
// if (byUserName != null) {
// return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "当前管理员已存在");
// }
//
// AuthAdmin authAdmin = new AuthAdmin();
// BeanUtil.copyProperties(authAdminSaveRequest, authAdmin);
//
// if (authAdmin.getPassWord() != null) {
// authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord()));
// }
// authAdmin.setCustomerId(curUser.getCustomerId());
// authAdmin.setLastModifyTime(new Date());
// boolean b = authAdminService.insertAuthAdmin(authAdmin);
// authAdmin = authAdminService.findByUserName(authAdmin.getUserName());
// if (!b) {
// return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
// }
//
// // 插入角色
// if (authAdminSaveRequest.getRoles() != null) {
// authRoleAdminService.insertRolesAdminIdAll(authAdminSaveRequest.getRoles(), authAdmin.getId());
// } else {
// List<AuthRoleAdmin> authRoleAdmins = authRoleAdminService.listByAdminId(curUser.getId());
// List<Long> roles = new ArrayList<>();
// if (!authRoleAdmins.isEmpty()) {
// for (AuthRoleAdmin authRoleAdmin : authRoleAdmins) {
// roles.add(authRoleAdmin.getRole_id());
// }
// authRoleAdminService.insertRolesAdminIdAll(roles, authAdmin.getId());
// }
// }
//
// Map<String, Long> res = new HashMap<>();
// res.put("id", authAdmin.getId());
// return ResultVOUtils.success(res);
// }
//
// /**
// * 修改
// *
// * @return
// */
// @AuthRuleAnnotation("admin/auth/admin/edit")
// @PostMapping("/admin/auth/admin/edit")
// public BaseResponse edit(@RequestBody @Valid AuthAdminSaveRequest authAdminSaveRequest,
// BindingResult bindingResult) {
//
// if (bindingResult.hasErrors()) {
// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
// }
//
// if (authAdminSaveRequest.getId() == null) {
// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数错误!");
// }
//
// // 检查是否存在除了当前管理员的其它名称的管理员
// AuthAdmin byUserName = authAdminService.findByUserName(authAdminSaveRequest.getUserName());
// if (byUserName != null && !authAdminSaveRequest.getId().equals(byUserName.getId())) {
// return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "当前管理员已存在");
// }
//
// AuthAdmin authAdmin = new AuthAdmin();
// BeanUtil.copyProperties(authAdminSaveRequest, authAdmin);
// if (authAdmin.getPassWord() != null) {
// authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord()));
// }
// authAdmin.setLastModifyTime(new Date());
// boolean b = authAdminService.updateAuthAdmin(authAdmin);
//
// if (!b) {
// return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
// }
//
// // 修改角色
// if (authAdminSaveRequest.getRoles() != null && authAdminSaveRequest.getRoles().size() > 0) {
// // 先删除之前的
// authRoleAdminService.deleteByAdminId(authAdmin.getId());
// authRoleAdminService.insertRolesAdminIdAll(authAdminSaveRequest.getRoles(), authAdmin.getId());
// }
//
// return ResultVOUtils.success();
// }
//
//
// @AuthRuleAnnotation("admin/auth/admin/updateInv")
// @PostMapping("/admin/auth/admin/updateInv")
// public BaseResponse updateInv(@RequestBody @Valid AuthAdminSaveRequest authAdminSaveRequest,
// BindingResult bindingResult) {
//
// if (bindingResult.hasErrors()) {
// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
// }
//
// if (authAdminSaveRequest.getId() == null) {
// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数错误!");
// }
// InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.filterGroupInvSubAndcode(authAdminSaveRequest.getLocSubInvCode());
// if (invSubWarehouseEntity != null) {
// authAdminSaveRequest.setLocInvCode(invSubWarehouseEntity.getParentId());
// }
// AuthAdmin authAdmin = new AuthAdmin();
// BeanUtil.copyProperties(authAdminSaveRequest, authAdmin);
// authAdmin.setLastModifyTime(new Date());
// boolean b = authAdminService.updateAuthAdmin(authAdmin);
// if (!b) {
// return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
// }
// return ResultVOUtils.success();
// }
//
// /**
// * 删除
// *
// * @return
// */
// @AuthRuleAnnotation("admin/auth/admin/delete")
// @PostMapping("/admin/auth/admin/delete")
// public BaseResponse delete(@RequestBody AuthAdminSaveRequest authAdminSaveRequest) {
//
//
// FilterInvUserRequest warehouseUser = new FilterInvUserRequest();
// warehouseUser.setUserid(authAdminSaveRequest.getId());
// List<WarehouseUserEntity> warehouseUserEntityList = warehouseUserService.filterWarehouseUsers(warehouseUser);
// if (warehouseUserEntityList.size() == 0) {
// FilterInvBusUserRequest invBusUserEntity = new FilterInvBusUserRequest();
// invBusUserEntity.setUserId(authAdminSaveRequest.getId() + "");
// List<InvBusUserEntity> invBusUserList = invBusUserService.filterInvBusUser(invBusUserEntity);
// if (invBusUserList.size() > 0) {
// return ResultVOUtils.error(999, "该用户存在关联单据信息,请先解除再删除");
// }
// } else {
// return ResultVOUtils.error(999, "该用户存在关联仓库信息,请先解除再删除");
// }
//
//
// if (authAdminSaveRequest.getId() == null) {
// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数错误!");
// }
//
// boolean b = authAdminService.deleteById(authAdminSaveRequest.getId());
// if (!b) {
// return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
// }
// // 先删除之前的角色
// authRoleAdminService.deleteByAdminId(authAdminSaveRequest.getId());
//
// return ResultVOUtils.success();
// }
//
//
// @GetMapping("/spms/getRouters")
// public BaseResponse getRouters() {
//
// List<Long> roleIds;
// AuthAdmin authAdmin = getCustomerId();
// if (!authAdmin.getCustomerId().equals("110")) {
// CustomerInfoEntity customerInfoEntity = customerInfoService.selectById(authAdmin.getCustomerId());
// roleIds = new ArrayList<>();
// roleIds.add(Long.parseLong(customerInfoEntity.getRoleId()));
// } else {
// List<AuthRoleAdmin> authRoleAdmins = authRoleAdminService.listByAdminId(authAdmin.getId());
// roleIds = authRoleAdmins.stream().map(AuthRoleAdmin::getRole_id).collect(Collectors.toList());
// }
//
//
// // 角色授权列表
// List<AuthPermission> authPermissions = authPermissionService.listByRoleIdIn(roleIds);
// List<Long> permissionRuleIds = authPermissions.stream().map(AuthPermission::getPermissionRuleId).collect(Collectors.toList());
//
// // 获取授权的规则
// List<AuthPermissionRule> authPermissionRules = authPermissionRuleService.listByIdIn(permissionRuleIds);
//
//
// if (authAdmin.getId() == 1) {//admin 用户获取所有菜单项
// authPermissionRules = authPermissionRuleService.listAll();
// } else {
//
// }
//
//
// List<AuthPermissionRule> menus = authPermissionRuleService.selectMenuTreeByUserId(authPermissionRules);
// List<RouterEntity> routerEntities = authPermissionRuleService.buildMenus(menus);
//
// return ResultVOUtils.success(routerEntities);
// }
//
//
// public AuthAdmin getCustomerId() {
// ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
//
// if (attributes == null) {
// throw new JsonException(ResultEnum.NOT_NETWORK);
// }
// HttpServletRequest request = attributes.getRequest();
// String userId = request.getHeader("ADMIN_ID");
// AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
// return authAdmin;
// }
//
// /**
// * 获取医院用户列表
// *
// * @return
// */
// @AuthRuleAnnotation("")
// @PostMapping("/admin/auth/admin/hospitalUserList")
// public BaseResponse getHospitalUserList() {
// List<AuthAdmin> hospitalUserList = authAdminService.getHospitalUserList();
// return ResultVOUtils.success(hospitalUserList);
// }
}

@ -77,9 +77,6 @@ public class AuthUserController extends BaseController {
if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
// 先删除之前的角色
//todo 记得删除用户关联角色表
// authRoleAdminService.deleteByAdminId(authAdminSaveRequest.getId());
warehouseUserService.deleteByCodeAndId(authUserSaveRequest.getId(), byId.getLocInvCode());
return ResultVOUtils.success();
}

@ -16,7 +16,6 @@ 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.purchase.PurDeliveryDetailEntity;
import com.glxp.api.entity.system.SystemParamConfigEntity;
import com.glxp.api.req.auth.FilterDeptUserReqeust;
import com.glxp.api.req.auth.FilterInvWarehouseRequest;
@ -367,12 +366,6 @@ public class DeptController extends BaseController {
if (request.getCode() == null) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
//todo 代码未迁移完,后续记得修改
// List<InvSubWarehouseEntity> invSubWarehouseEntities = invSubWarehouseService.findByParentId(request.getCode());
// if (CollUtil.isNotEmpty(invSubWarehouseEntities)) {
// return ResultVOUtils.error(500, "请先移除该仓库关联的分库!");
// }
return ResultVOUtils.success("禁用成功!");
}

@ -8,7 +8,6 @@ import com.glxp.api.entity.auth.DeptEntity;
import com.glxp.api.entity.auth.DeptUserEntity;
import com.glxp.api.entity.inout.IoOrderEntity;
import com.glxp.api.req.auth.FilterDeptUserReqeust;
import com.glxp.api.req.auth.FilterInvWarehouseRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.auth.DeptUserResponse;
import com.glxp.api.service.auth.DeptService;

@ -50,8 +50,6 @@ public class InvWarehouseController extends BaseController {
@Resource
private WarehouseUserService warehouseUserService;
@Resource
private SystemParamConfigService systemParamConfigService;
@Resource
private WarehouseBussinessTypeService warehouseBussinessTypeService;
@Resource
private IBasicBussinessTypeService basicBussinessTypeService;
@ -295,17 +293,6 @@ public class InvWarehouseController extends BaseController {
invWarehouseEntity.setUpdateTime(new Date());
boolean b = invWarehouseService.updateInvSubWarehouse(invWarehouseEntity);
// //如果要是一级仓库就吧全部子集都刷成一样的寄售仓库
// if (StrUtil.isBlank(invWarehouseEntity.getParentCode())) {
// List<InvWarehouseEntity> invWarehouseEntityList = invWarehouseService.selectLowWarehouseAll(invWarehouseEntity.getCode());
// for (InvWarehouseEntity obj : invWarehouseEntityList) {
// obj.setAdvanceType(invWarehouseEntity.getAdvanceType());
// obj.setUpdateTime(new Date());
// invWarehouseService.updateInvSubWarehouse(obj);
// }
// }
//更新部门信息
DeptEntity pEntity = deptService.selectByCode(invWarehouseEntity.getParentId());
pEntity.setUpdateTime(new Date());
@ -354,15 +341,6 @@ public class InvWarehouseController extends BaseController {
return ResultVOUtils.error(500, "请先移除该仓库关联用户和单据类型!");
}
//
// //判断此分库中是否还有库存
// InvWarehouseEntity invSubWarehouse = invWarehouseService.findById(deleteRequest.getId());
// Integer count = invProductService.countByWarehouseCode(null, invSubWarehouse.getCode());
// if (count > 0) {
// return ResultVOUtils.error(500, "此分库存在库存,不能删除!");
// }
//
// 判断此分库中是否还有库存
InvWarehouseEntity byWareId = invWarehouseService.getByWareId(deleteRequest.getId());
List<InvWarehouseEntity> byWarePcode = invWarehouseService.getByWarePcode(byWareId.getCode());
@ -533,14 +511,6 @@ public class InvWarehouseController extends BaseController {
for (WarehouseBussinessTypeEntity warehouseBussinessTypeEntity : removeLists) {
removeList.add(warehouseBussinessTypeEntity.getAction());
}
// if (CollUtil.isNotEmpty(removeList)) {
// FilterInvBusUserRequest filterInvBusUserRequest = new FilterInvBusUserRequest();
// filterInvBusUserRequest.setSubInvCode(relBusRequset.getInvCode());
// filterInvBusUserRequest.setSelectedCodes(relBusRequset.getSelectActions());
// List<InvBusUserEntity> invBusUserEntities = invBusUserService.filterInvBusUser(filterInvBusUserRequest);
// if (CollUtil.isNotEmpty(invBusUserEntities))
// return ResultVOUtils.error(999, "请先移除用户关联单据类型!");
// }
boolean b = warehouseBussinessTypeService.deleteByCode(relBusRequset.getInvCode());
@ -587,37 +557,6 @@ public class InvWarehouseController extends BaseController {
bussinessTypeFilterRequest.setActionList(idList);
}
// if (!StrUtil.isEmpty(bussinessTypeFilterRequest.getFilterAction())) {
// BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(bussinessTypeFilterRequest.getFilterAction());
// if (bussinessLocalTypeEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
// bussinessTypeFilterRequest.setMainAction(ConstantType.TYPE_OUT);
// } else {
// bussinessTypeFilterRequest.setMainAction(ConstantType.TYPE_PUT);
// }
//
// bussinessTypeFilterRequest.setAdvanceType(bussinessLocalTypeEntity.isAdvanceType());
// }
//
// //查询该仓库绑定的单据
// List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntityList = warehouseBussinessTypeService.getListByCode(bussinessTypeFilterRequest.getCode());
// List<BussinessTypResponse> bussinessTypeEntities;
// bussinessTypeEntities = bussinessTypeService.filterJoinList(bussinessTypeFilterRequest);
// for (BussinessTypResponse w1 : bussinessTypeEntities) {
// for (WarehouseBussinessTypeEntity w2 : warehouseBussinessTypeEntityList) {
// if (w1.getAction().equals(w2.getAction())) {
// w1.setCheckSelect(true);
// break;
// }
// }
// }
//
// PageInfo<BussinessTypResponse> pageInfo;
// pageInfo = new PageInfo<>(bussinessTypeEntities);
// PageSimpleResponse<BussinessTypResponse> pageSimpleResponse = new PageSimpleResponse<>();
// pageSimpleResponse.setTotal(pageInfo.getTotal());
// pageSimpleResponse.setList(bussinessTypeEntities);
// return ResultVOUtils.success(pageSimpleResponse);
return null;
}

@ -207,12 +207,7 @@ public class SysUserController extends BaseController {
if (authUserSaveRequest.getRoles().size() != 0) {
userService.insertUserAuth(authAdmin.getId(), authUserSaveRequest.getRoles());
}
//先获取角色id
// SysUserRole sysUserRole1 = userService.selectByAuthId(curUser.getId());
// SysUserRole sysUserRole = new SysUserRole();
// sysUserRole.setUserId(authAdmin.getId());
// sysUserRole.setRoleId(sysUserRole1.getRoleId());
// userService.insertUserAuth1(sysUserRole);
//默认插入第一部门
List<Long> deptCodeList = authUserSaveRequest.getDepts();
if (deptCodeList == null) {

@ -18,10 +18,8 @@ import com.glxp.api.constant.SocketMsgType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.controller.sync.SpsSyncWebSocket;
import com.glxp.api.dto.DictDto;
import com.glxp.api.entity.auth.WarehouseBussinessTypeEntity;
import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
import com.glxp.api.entity.sync.SocketMsgEntity;
import com.glxp.api.req.auth.FilterInvBusTypeRequest;
import com.glxp.api.req.basic.BasicDataRequest;
import com.glxp.api.req.basic.BusNoUserRequest;
import com.glxp.api.req.basic.BussinessTypeSaveRequest;
@ -39,7 +37,6 @@ import com.glxp.api.service.inout.IoOrderService;
import com.glxp.api.util.CustomUtil;
import com.glxp.api.util.FileUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@ -67,8 +64,6 @@ public class BasicBussinessTypeController extends BaseController {
private IBasicBussinessTypeService basicBussinessTypeService;
@Resource
private CustomerService customerService;
@Resource
WarehouseBussinessTypeService warehouseBussinessTypeService;
/**
*
@ -313,11 +308,6 @@ public class BasicBussinessTypeController extends BaseController {
}
@Resource
IoOrderService orderService;
@Resource
InvBusUserService invBusUserService;
@Resource
SpsSyncWebSocket webSocketServer;
@ -332,29 +322,7 @@ public class BasicBussinessTypeController extends BaseController {
@Log(title = "单据管理", businessType = BusinessType.DELETE)
public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest) {
// if (bindingResult.hasErrors()) {
// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
// }
String id = deleteRequest.getId();
BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.selectById(id);
//判断是否存在该单据类型单据
// boolean isExitOrder = orderService.isExitByAction(bussinessTypeEntity.getAction());
// if (isExitOrder) {
// return ResultVOUtils.error(500, "已存在该类型扫码单据,无法删除!");
// }
//
// //判断是否被仓库绑定
// boolean isExitUser = invBusUserService.isExitByAction(bussinessTypeEntity.getAction());
// if (isExitUser) {
// return ResultVOUtils.error(500, "该单据类型已被用户绑定,请先移除后删除!");
// }
//
// //判断是否被用户绑定
// boolean isExitInv = warehouseBussinessTypeService.isExitByAction(bussinessTypeEntity.getAction());
// if (isExitInv) {
// return ResultVOUtils.error(500, "该单据类型已被仓库绑定,请先移除后删除!");
// }
BasicDataRequest basicDataRequest = new BasicDataRequest();
basicDataRequest.setDeleteRequest(deleteRequest);

@ -65,14 +65,6 @@ public class BasicCorpController extends BaseController {
@Resource
ThrUnitImportService thrUnitImportService;
@Resource
private ThrCorpService thrCorpService;
@Resource
private CompanyService companyService;
// @Resource
// private OrderService orderService;
@Resource
private ErpBasicClient erpBasicClient;
@Resource
SpsSyncWebSocket webSocketServer;
@GetMapping("/udiwms/basic/unit/maintain/filter")
@ -365,19 +357,7 @@ public class BasicCorpController extends BaseController {
@Log(title = "往来单位信息", businessType = BusinessType.DELETE)
public BaseResponse deleteBasicUnitMaintain(@RequestBody DeleteRequest deleteRequest) {
// if (bindingResult.hasErrors()) {
// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
// }
String id = deleteRequest.getId();
BasicCorpEntity basicUnitMaintainEntity = basicUnitMaintainService.selectById(id);
//todo 该功能还未设计
// //判断是否被单据绑定
// OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
// orderFilterRequest.setFromCorpId(basicUnitMaintainEntity.getErpId());
// OrderEntity orderEntity = orderService.findOne(orderFilterRequest);
// if (orderEntity != null) {
// return ResultVOUtils.error(500, "已存在该供应商单据,无法删除!");
// }
basicUnitMaintainService.deleteById(id);
BasicDataRequest basicDataRequest = new BasicDataRequest();
basicDataRequest.setDeleteRequest(deleteRequest);
@ -389,70 +369,7 @@ public class BasicCorpController extends BaseController {
webSocketServer.sendMessage(SocketMsgEntity.builder().type(SocketMsgType.BASIC_CORP_MAINTAIN_DELETE).content(request).remark("往来单位信息").build(), null);
return ResultVOUtils.success("删除成功");
}
//
// //查询ERP往来单位
// @AuthRuleAnnotation("")
// @GetMapping("/udiwms/unitMaintain/filterErp")
// public BaseResponse filterErp(BasicUnitMaintainFilterRequest unitMaintainFilterRequest,
// BindingResult bindingResult) {
//
// if (bindingResult.hasErrors()) {
// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
// }
// BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("corpUrl", unitMaintainFilterRequest.getThirdSys());
// if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null)
// return ResultVOUtils.error(500, "往来单位接口地址未定义");
// if (basicThirdSysDetailEntity.getEnabled()) {
// if (basicThirdSysDetailEntity.getFromType() == 0 || (unitMaintainFilterRequest.getIsDownThrSys() != null && unitMaintainFilterRequest.getIsDownThrSys())) {
// BaseResponse<PageSimpleResponse<ErpUnitsResponse>> udiDlDeviceResponse =
// erpBasicClient.getErpCrop(unitMaintainFilterRequest);
//
// if (udiDlDeviceResponse.getCode() == 20000) {
// for (ErpUnitsResponse erpUnitsResponse : udiDlDeviceResponse.getData().getList()) {
// BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByThirdId(erpUnitsResponse.getId(), unitMaintainFilterRequest.getThirdSys());
// if (basicUnitMaintainEntity != null) {
// erpUnitsResponse.setChecked(true);
// } else {
// erpUnitsResponse.setChecked(false);
// }
// }
//
// return udiDlDeviceResponse;
// } else {
// return udiDlDeviceResponse;
// }
//
// } else {
// FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest();
// BeanUtil.copyProperties(unitMaintainFilterRequest, filterThrCorpRequest);
// filterThrCorpRequest.setThirdSysFk(unitMaintainFilterRequest.getThirdSys());
// List<ThrCorpEntity> thrCorpEntities
// = thrCorpService.filterThrCorps(filterThrCorpRequest);
// List<ThrCorpEntity> thrCorpEntityList = thrCorpEntities.stream().map(item ->
// {
// ThrCorpEntity thrCorpEntity = new ThrCorpEntity();
// BeanUtil.copyProperties(item, thrCorpEntity);
// BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByThirdId(item.getUnitId(), unitMaintainFilterRequest.getThirdSys());
// if (basicUnitMaintainEntity != null) {
// thrCorpEntity.setChecked(true);
// } else {
// thrCorpEntity.setChecked(false);
// }
// thrCorpEntity.setId(item.getUnitId());
// return thrCorpEntity;
// }).collect(Collectors.toList());
// PageInfo<ThrCorpEntity> pageInfo;
// pageInfo = new PageInfo<>(thrCorpEntities);
// PageSimpleResponse<ThrCorpEntity> pageSimpleResponse = new PageSimpleResponse<>();
// pageSimpleResponse.setTotal(pageInfo.getTotal());
// pageSimpleResponse.setList(thrCorpEntityList);
// return ResultVOUtils.success(pageSimpleResponse);
// }
// } else {
// return ResultVOUtils.error(500, "第三方系统往来单位服务接口未启用");
// }
// }
//
//获取产品信息详情(多平台)
@AuthRuleAnnotation("")
@GetMapping("/udiwms/unitMaintain/thirdSys/detail")
@ -525,17 +442,6 @@ public class BasicCorpController extends BaseController {
pageSimpleResponse.setList(basicProductThirdSysResponses);
return ResultVOUtils.success(pageSimpleResponse);
}
//
// public BasicThirdSysEntity filterThirdSys(String thirdId, List<BasicThirdSysEntity> basicThirdSysEntities) {
// if (basicThirdSysEntities != null && basicThirdSysEntities.size() > 0) {
// for (BasicThirdSysEntity basicThirdSysEntity : basicThirdSysEntities) {
// if (thirdId.equals(basicThirdSysEntity.getThirdId())) {
// return basicThirdSysEntity;
// }
// }
// }
// return null;
// }
@AuthRuleAnnotation("")

@ -37,23 +37,19 @@ public class BasicGenExcelService {
SyncDataSetService syncDataSetService;
@Resource
HttpOkClient httpOkClient;
//
public String getIpUrl() {
SyncDataSetEntity syncDataSetEntity = syncDataSetService.findSet();
return syncDataSetEntity.getSyncIp();
}
//
@Resource
BasicCorpExportLogService basicCorpExportLogService;
@Resource
BasicCorpService basicUnitMaintainService;
@Resource
BasicProductsExportLogService basicProductsExportLogService;
// @Resource
// UdiRelevanceService udiRelevanceService;
// @Resource
// SystemParamConfigService systemParamConfigService;
//
//往来单位导出excel文件
@Async
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
@ -119,70 +115,7 @@ public class BasicGenExcelService {
corpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
basicCorpExportLogService.updateCorpExportLog(corpExportLogEntity);
}
//
// //上传往来单位SMP
// @Async
// public void uploadCorpSmp(String genKey, CorpsExportRequest corpsExportRequest) {
// PostCorpsRequest postCorpsRequest = new PostCorpsRequest();
// postCorpsRequest.setGenKey(genKey);
// List<CorpImportDetailEntity> corpImportDetailEntities = new ArrayList<>();
// CorpExportLogEntity corpExportLogEntity = corpExportLogService.selectByGenKey(genKey);
// //选中导出
// if (corpsExportRequest.getIds() != null && corpsExportRequest.getIds().size() > 0) {
// List<Integer> ids = corpsExportRequest.getIds();
// for (Integer id : ids) {
// BasicUnitMaintainFilterRequest filterRequest = new BasicUnitMaintainFilterRequest();
// filterRequest.setId(id);
// List<BasicUnitMaintainEntity> unitMaintainEntities = basicUnitMaintainService.filterList(filterRequest);
// if (unitMaintainEntities != null && unitMaintainEntities.size() > 0) {
// for (BasicUnitMaintainEntity basicUnitMaintainEntity : unitMaintainEntities) {
// CorpImportDetailEntity corpImportDetailEntity = new CorpImportDetailEntity();
// BeanUtils.copyProperties(basicUnitMaintainEntity, corpImportDetailEntity);
// corpImportDetailEntities.add(corpImportDetailEntity);
// }
// postCorpsRequest.setDatas(corpImportDetailEntities);
//
// }
// }
//
//
// } else {//一键导出
// BasicUnitMaintainFilterRequest filterRequest = new BasicUnitMaintainFilterRequest();
// BeanUtils.copyProperties(corpsExportRequest, filterRequest);
//
// List<BasicUnitMaintainEntity> unitMaintainEntities = basicUnitMaintainService.filterList(filterRequest);
// if (unitMaintainEntities != null && unitMaintainEntities.size() > 0) {
// for (BasicUnitMaintainEntity basicUnitMaintainEntity : unitMaintainEntities) {
// CorpImportDetailEntity corpImportDetailEntity = new CorpImportDetailEntity();
// BeanUtils.copyProperties(basicUnitMaintainEntity, corpImportDetailEntity);
// corpImportDetailEntities.add(corpImportDetailEntity);
// }
// postCorpsRequest.setDatas(corpImportDetailEntities);
//
// }
// }
//
// //todo 上传SMP
//// SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("smp_service_ip");
//// if (systemParamConfigEntity != null) {
// String response = httpOkClient.uCloudPost(getIpUrl() + "/udiwms/basic/corps/upload", postCorpsRequest);
// BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
// });
// if (baseResponse.getCode() == 20000) {
// corpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
// } else {
// corpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
// }
//// } else {
//// corpExportLogEntity.setRemark("SMP服务IP地址未定义");
//// corpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
//// }
//
//
// corpExportLogService.updateCorpExportLog(corpExportLogEntity);
// }
//
//
@Async
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public void uploadCorpSmpJson(String genKey, BasicCorpExportLogResponse exportData) {
@ -199,60 +132,7 @@ public class BasicGenExcelService {
}
basicCorpExportLogService.updateCorpExportLog(corpExportLogEntity);
}
//
//
// @Async
// public void exportUdiInfo(String genKey, UdiInfoExportRequest udiInfoExportRequest) {
// BasicProductsExportLogEntity udiInfoExportLogEntity = udiInfoExportLogService.selectByGenKey(genKey);
// List<List<String>> excelData = new ArrayList<>();
// List<String> head = new ArrayList<>();
// head.add("udiCode");
// head.add("医保编码");
// head.add("商品条码");
// head.add("thirdId");
// head.add("thirdId1");
// head.add("thirdId2");
// head.add("thirdId3");
// head.add("thirdId4");
// head.add("是否以使用单元入库");
// excelData.add(head);
// //选中导出
// if (udiInfoExportRequest.getUuids() != null && udiInfoExportRequest.getUuids().size() > 0) {
// List<String> uuids = udiInfoExportRequest.getUuids();
// for (String uuid : uuids) {
// FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
// filterUdiInfoRequest.setUuid(uuid);
// List<List<String>> genDatas = genExcelData(filterUdiInfoRequest);
// if (genDatas != null && genDatas.size() > 0) {
// excelData.addAll(genDatas);
// }
// }
//
// } else {//一键导出
// FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
// BeanUtils.copyProperties(udiInfoExportRequest, filterUdiInfoRequest);
// filterUdiInfoRequest.setPage(null);
// List<List<String>> genDatas = genExcelData(filterUdiInfoRequest);
// if (genDatas != null && genDatas.size() > 0) {
// excelData.addAll(genDatas);
// }
// }
//
// String sheetName = "UDI产品信息对照";
//
// File file = new File(udiInfoExportLogEntity.getFilePath());
// if (!file.exists()) {
// try {
// file.createNewFile();
// } catch (IOException e) {
// e.printStackTrace();
// }
// }
// new ExcelUtil().exportExcel(excelData, sheetName, udiInfoExportLogEntity.getFilePath(), 20);
// udiInfoExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
// udiInfoExportLogService.updateUdiInfoExportLog(udiInfoExportLogEntity);
// }
//
@Async
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public void uploadProductsSmpJson(String genKey, UdiRelevanceExportJsonResponse exportData) {
@ -269,50 +149,7 @@ public class BasicGenExcelService {
}
basicProductsExportLogService.updateUdiInfoExportLog(basicProductsExportLogEntity);
}
//
//
// @Async
// public void uploadProductsSmp(String genKey, UdiInfoExportRequest udiInfoExportRequest) {
// BasicProductsExportLogEntity udiInfoExportLogEntity = udiInfoExportLogService.selectByGenKey(genKey);
// PostUdiInfoRequest postUdiInfoRequest = new PostUdiInfoRequest();
// postUdiInfoRequest.setGenKey(genKey);
// //选中导出
// if (udiInfoExportRequest.getUuids() != null && udiInfoExportRequest.getUuids().size() > 0) {
// List<BasicProductsImportDetailEntity> udiInfoImportDetailEntities = new ArrayList<>();
// List<String> uuids = udiInfoExportRequest.getUuids();
// for (String uuid : uuids) {
// FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
// filterUdiInfoRequest.setUuid(uuid);
// List<BasicProductsImportDetailEntity> genDatas = genSmpData(filterUdiInfoRequest);
// udiInfoImportDetailEntities.addAll(genDatas);
// }
// postUdiInfoRequest.setDatas(udiInfoImportDetailEntities);
//
// } else {//一键导出
// FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
// BeanUtils.copyProperties(udiInfoExportRequest, filterUdiInfoRequest);
// List<BasicProductsImportDetailEntity> genDatas = genSmpData(filterUdiInfoRequest);
// postUdiInfoRequest.setDatas(genDatas);
// }
// //todo 上传SMP
//// SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("smp_service_ip");
//// if (systemParamConfigEntity != null) {
// String response = httpOkClient.uCloudPost(getIpUrl() + "/udiwms/basic/products/upload", postUdiInfoRequest);
// BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
// });
// if (baseResponse.getCode() == 20000) {
// udiInfoExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
// } else {
// udiInfoExportLogEntity.setRemark(baseResponse.getMessage());
// udiInfoExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
// }
//// } else {
//// udiInfoExportLogEntity.setRemark("SMP服务IP地址未定义");
//// udiInfoExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
//// }
// udiInfoExportLogService.updateUdiInfoExportLog(udiInfoExportLogEntity);
// }
//
public List<List<String>> genExcelData(BasicUnitMaintainFilterRequest filterUdiInfoRequest) {
List<List<String>> excelData = new ArrayList<>();
@ -342,54 +179,5 @@ public class BasicGenExcelService {
}
return excelData;
}
//
// public List<List<String>> genExcelData(FilterUdiInfoRequest filterUdiInfoRequest) {
//
// List<List<String>> excelData = new ArrayList<>();
// List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
// for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {
// List<String> rows = new ArrayList<>();
// if (udiRelevanceResponse.getProductType() == ConstantStatus.PRODUCT_TYPE_THIRD)
// rows.add(null);
// else
// rows.add(udiRelevanceResponse.getNameCode());
// rows.add(udiRelevanceResponse.getYbbm());
// rows.add(udiRelevanceResponse.getSptm());
// rows.add(udiRelevanceResponse.getThirdId());
// rows.add(udiRelevanceResponse.getThirdId1());
// rows.add(udiRelevanceResponse.getThirdId2());
// rows.add(udiRelevanceResponse.getThirdId3());
// rows.add(udiRelevanceResponse.getThirdId4());
// if (udiRelevanceResponse.getIsUseDy() == 1) {
// rows.add("是");
// } else {
// rows.add("否");
// }
// excelData.add(rows);
// }
// return excelData;
// }
//
// public List<BasicProductsImportDetailEntity> genSmpData(FilterUdiInfoRequest filterUdiInfoRequest) {
// List<BasicProductsImportDetailEntity> udiInfoImportDetailEntities = new ArrayList<>();
// List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
// for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {
// BasicProductsImportDetailEntity udiInfoImportDetailEntity = new BasicProductsImportDetailEntity();
// udiInfoImportDetailEntity.setUdiCode(udiRelevanceResponse.getNameCode());
// udiInfoImportDetailEntity.setYbbm(udiRelevanceResponse.getYbbm());
// udiInfoImportDetailEntity.setSptm(udiRelevanceResponse.getSptm());
// udiInfoImportDetailEntity.setThirdId(udiRelevanceResponse.getThirdId());
// udiInfoImportDetailEntity.setThirdId1(udiRelevanceResponse.getThirdId1());
// udiInfoImportDetailEntity.setThirdId2(udiRelevanceResponse.getThirdId2());
// udiInfoImportDetailEntity.setThirdId3(udiRelevanceResponse.getThirdId3());
// udiInfoImportDetailEntity.setThirdId4(udiRelevanceResponse.getThirdId4());
// if (udiRelevanceResponse.getIsUseDy() == 1) {
// udiInfoImportDetailEntity.setIsUseDy("是");
// } else {
// udiInfoImportDetailEntity.setIsUseDy("否");
// }
// udiInfoImportDetailEntities.add(udiInfoImportDetailEntity);
// }
// return udiInfoImportDetailEntities;
// }
}

@ -67,7 +67,6 @@ public class BasicGenJsonService {
List<BasicCorpEntity> unitMaintainEntities = new ArrayList<>();
if (basicCorpsExportRequest.getIds() != null && basicCorpsExportRequest.getIds().size() > 0) {
// List<Integer> ids = basicCorpsExportRequest.getIds();
List<Long> ids = basicCorpsExportRequest.getIds();
ids.forEach(id -> {
BasicUnitMaintainFilterRequest request = new BasicUnitMaintainFilterRequest();
@ -98,7 +97,6 @@ public class BasicGenJsonService {
BasicCorpExportLogResponse exportData = new BasicCorpExportLogResponse();
List<BasicCorpEntity> unitMaintainEntities = new ArrayList<>();
if (corpsExportRequest.getIds() != null && corpsExportRequest.getIds().size() > 0) {
// List<Integer> ids = corpsExportRequest.getIds();
List<Long> ids = corpsExportRequest.getIds();
ids.forEach(id -> {
BasicUnitMaintainFilterRequest request = new BasicUnitMaintainFilterRequest();

@ -52,8 +52,6 @@ import java.util.stream.Collectors;
@RestController
public class BasicOrderPrintController {
@Resource
SystemPDFTemplateRelevanceService systemPDFTemplateRelevanceService;
@Resource
SystemPDFModuleService systemPDFModuleService;
@Resource

@ -162,47 +162,6 @@ public class BasicProductsImportLogController {
return ResultVOUtils.success("上传成功");
}
public boolean filterEmpty(Row row) {
if (row.getCell(0) != null) {
row.getCell(0).setCellType(CellType.STRING);
}
if (row.getCell(1) != null) {
row.getCell(1).setCellType(CellType.STRING);
}
if (row.getCell(2) != null) {
row.getCell(2).setCellType(CellType.STRING);
}
if (row.getCell(3) != null) {
row.getCell(3).setCellType(CellType.STRING);
}
if (row.getCell(4) != null) {
row.getCell(4).setCellType(CellType.STRING);
}
if (row.getCell(5) != null) {
row.getCell(5).setCellType(CellType.STRING);
}
if (row.getCell(6) != null) {
row.getCell(6).setCellType(CellType.STRING);
}
if ((row.getCell(0) == null && row.getCell(1) == null && row.getCell(2) == null
&& row.getCell(3) == null && row.getCell(4) == null && row.getCell(5) == null && row.getCell(6) == null) ||
(
(row.getCell(0) != null && row.getCell(1) != null && row.getCell(2) != null
&& row.getCell(3) != null && row.getCell(4) != null && row.getCell(5) != null && row.getCell(6) != null) &&
("".equals(row.getCell(0).getStringCellValue())
&& "".equals(row.getCell(1).getStringCellValue())
&& "".equals(row.getCell(2).getStringCellValue())
&& "".equals(row.getCell(3).getStringCellValue())
&& "".equals(row.getCell(4).getStringCellValue())
&& "".equals(row.getCell(5).getStringCellValue())
&& "".equals(row.getCell(6).getStringCellValue()))
)) {
return true;
}
return false;
}
//产品信息接口上传
@PostMapping("/udiwms/basic/products/upload")

@ -151,9 +151,6 @@ public class UdiContrastController extends BaseController{
@Log(title = "耗材字典", businessType = BusinessType.UPDATE)
public BaseResponse changeVersion(@RequestBody UdiCombineRequest udiCombineRequest) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(udiCombineRequest.getRelId());
// if (udiContrastService.isExit(udiCombineRequest.getKeys().get(0), udiRelevanceEntity.getMainId(), null)) {
// return ResultVOUtils.error(500, "已存在相同的对照关系,无法切换版本");
// }
List<UdiProductEntity> udiInfoEntities = udiDlHttpClient.getUdiByUuid(udiCombineRequest.getKeys().get(0));
udiProductService.deleteByUuid(udiRelevanceEntity.getUuid());

@ -357,16 +357,10 @@ public class UdiRelevanceController extends BaseController {
udiRelevanceEntity.setModifyTime(new Date());
udiRelevanceEntity.setUpdateUser(customerService.getUserId() + "");
udiRelevanceEntity.setUseMuti(udiRelevanceEntity.getUseMuti());
// udiRelevanceEntity.setUseLeverCount(udiRelevanceSaveRequest.getUseLeverCount());
udiRelevanceEntity.setSplitEnable(udiRelevanceSaveRequest.getSplitEnable());
udiRelevanceEntity.setAutoCode(udiRelevanceSaveRequest.getAutoCode());
// udiRelevanceEntity.setUseLevelDi(udiRelevanceSaveRequest.getUseLevelDi());
// udiRelevanceEntity.setUseLevelUnit(udiRelevanceSaveRequest.getUseLevelUnit());
udiRelevanceEntity.setUseLevel(udiRelevanceSaveRequest.getUseLevel());
udiRelevanceEntity.setUnpackUseTime(udiRelevanceSaveRequest.getUnpackUseTime());
// udiRelevanceEntity.setDistributeLevelDi(udiRelevanceSaveRequest.getDistributeLevelDi());
// udiRelevanceEntity.setDistributeLevelUnit(udiRelevanceSaveRequest.getDistributeLevelUnit());
// udiRelevanceEntity.setDistributeLevelCount(udiRelevanceSaveRequest.getDistributeLevelCount());
udiRelevanceEntity.setDistributeLevel(udiRelevanceSaveRequest.getDistributeLevel());
udiRelevanceEntity.setPayFeeCode(udiRelevanceSaveRequest.getPayFeeCode());
udiRelevanceEntity.setSplitEnable(udiRelevanceSaveRequest.getSplitEnable());
@ -407,7 +401,6 @@ public class UdiRelevanceController extends BaseController {
udiProductEntity.setWorkPlaceCount(udiRelevanceSaveRequest.getWorkPlaceCount());
udiProductEntity.setZczbhhzbapzbhSys(udiRelevanceSaveRequest.getZczbhhzbapzbhSys());
udiProductEntity.setUpdateTime(new Date());
// udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity);
if (StrUtil.isNotEmpty(udiRelevanceSaveRequest.getOriginUuid())) {
udiProductEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI);
}
@ -456,7 +449,6 @@ public class UdiRelevanceController extends BaseController {
//单独更新DI
UdiProductEntity diEntity = new UdiProductEntity();
// diEntity.setMeasname(udiRelevanceSaveRequest.getMeasname());
diEntity.setPackUnit(udiRelevanceSaveRequest.getPackUnit());
diEntity.setSptm(udiRelevanceSaveRequest.getSptm());
diEntity.setUuid(udiRelevanceSaveRequest.getUuid());
@ -787,10 +779,7 @@ public class UdiRelevanceController extends BaseController {
}
boolean falg = udiProductService.updateUdiInfoById(udiProductEntity);
UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
// udiRelevanceEntity.setId(udiProductEntity.getUid());
// udiRelevanceEntity.setGroupBuy(IntUtil.value(udiProductEntity.getGroupBuy()));
udiRelevanceEntity.setPurType(udiProductEntity.getPurType());
// udiRelevanceEntity.setAttributeType(udiProductEntity.getAttributeType());
udiRelevanceEntity.setHcType(udiProductEntity.getHcType());
udiRelevanceEntity.setIsStack(udiProductEntity.getIsStack());
udiRelevanceEntity.setUpdateTime(new Date());
@ -821,13 +810,6 @@ public class UdiRelevanceController extends BaseController {
}
boolean falg = udiProductService.updateUdiInfoById(udiProductEntity);
UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
// udiRelevanceEntity.setId(udiProductEntity.getUid());
// udiRelevanceEntity.setUseLeverCount(udiProductEntity.getUseLeverCount());
// udiRelevanceEntity.setUseLevelDi(udiProductEntity.getUseLevelDi());
// udiRelevanceEntity.setUseLevelUnit(udiProductEntity.getUseLevelUnit());
// udiRelevanceEntity.setDistributeLevelDi(udiProductEntity.getDistributeLevelDi());
// udiRelevanceEntity.setDistributeLevelUnit(udiProductEntity.getDistributeLevelUnit());
// udiRelevanceEntity.setDistributeLevelCount(udiProductEntity.getDistributeLevelCount());
udiRelevanceEntity.setUpdateTime(new Date());
boolean b = udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
if (udiProductEntity.getRelSupId() != null) {
@ -844,8 +826,6 @@ public class UdiRelevanceController extends BaseController {
}
}
//业务单据选入耗材字典查询列表
/**
*

@ -181,7 +181,6 @@ public class DeviceInfoController extends BaseController {
@AuthRuleAnnotation("")
@PostMapping("/udi/device/info/detail/page")
public BaseResponse detail(@RequestBody @Valid DeviceInfoDetailQuery query) {
// AuthAdmin user = super.getUser();
List<DeviceInfoVo> list = deviceInfoService.detail(query);
PageInfo pageInfo = new PageInfo<>(list);
PageSimpleResponse page = new PageSimpleResponse();

@ -944,11 +944,6 @@ public class IoCodeTempController extends BaseController {
}
@Resource
RelCodeBatchService relCodeBatchService;
@Resource
RelCodeDetailService relCodeDetailService;
//前端扫码提交(药品)
@AuthRuleAnnotation("")
@PostMapping("warehouse/inout/drug/addOrderWeb")

@ -126,12 +126,8 @@ public class IoOrderDetailBizController extends BaseController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Resource
SupProductService supProductService;
@Resource
SystemParamConfigService systemParamConfigService;
@Resource
SupCertService supCertService;
//录入业务单据详情
@AuthRuleAnnotation("")
@ -483,14 +479,6 @@ public class IoOrderDetailBizController extends BaseController {
return ResultVOUtils.page(pageInfo);
}
// @GetMapping("/udiwms/inout/bizDetail/filterListInv")
// public BaseResponse filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest) {
// List<IoOrderDetailBizResponse> list = orderDetailBizService.getfilterList(orderDetailBizRequest);
// List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(orderDetailBizRequest.getOrderIdFk());
// ioCheckInoutService.bizOrderCheck2(list, orderDetailCodeEntities);
// PageInfo<IoOrderDetailBizResponse> pageInfo = new PageInfo<>(list);
// return ResultVOUtils.page(pageInfo);
// }
@GetMapping("/udiwms/inout/bizDetail/filterListInvoice")
public BaseResponse filterListInvoice(FilterOrderDetailBizRequest orderDetailBizRequest) {
@ -708,8 +696,6 @@ public class IoOrderDetailBizController extends BaseController {
UdiRelevanceDao udiRelevanceDao;
@Resource
IoCodeLostService ioCodeLostService;
@Resource
UdiCalCountUtil udiCalCountUtil;
//录入阿里送货单的业务单据详情

@ -130,12 +130,8 @@ public class IoOrderReviewController extends BaseController {
@Resource
private AlihealthYljgUtils alihealthYljgUtils;
@Resource
private IoCodeService ioCodeService;
@Resource
private RelCodeBatchService relCodeBatchService;
@Resource
private RelCodeDetailService relCodeDetailService;
@Resource
private IoCodeDao ioCodeDao;
//前端二次审核
@ -473,10 +469,6 @@ public class IoOrderReviewController extends BaseController {
return ResultVOUtils.success("更新成功");
}
@Value("${REL_CODE_DELAY_SECONDS:7200}")
private Integer relCodeDelaySeconds;
@Resource
private RedisDelayedQueue redisDelayedQueue;
@Resource
private BasicProductsDao basicProductsDao;

@ -33,10 +33,6 @@ import java.util.List;
@RequiredArgsConstructor
public class IoStatDataController extends BaseController {
// @Resource
// RestTemplate restTemplate;
@Resource
IoStatDataService ioStatDataService;
@ -44,11 +40,6 @@ public class IoStatDataController extends BaseController {
@GetMapping("/udiwms/inout/stat/filter")
public void filterList(FilterStatDataRequest statDataRequest) {
ioStatDataService.getData(statDataRequest);
// BasicDataRequest request = webSocketServer.insert(basicDataRequest,userId+"");
// request.setFilterOrderDetailResultRequest(orderDetailResultRequest);
// webSocketServer.sendMessage(SocketMsgEntity.builder().type(SocketMsgType.STAT_DATA_REQUEST).content(request).remark("汇总日报").build(), null);
}
}

@ -143,7 +143,6 @@ public class InnerOrderController {
}
}
return ResultVOUtils.success("删除成功");
}

@ -63,7 +63,7 @@ public class InvMAOrderController {
/**
*
*
* @param invMaintenanceOrder
* @param invMAOrderEntity
* @param bindingResult
* @return
*/

@ -63,23 +63,6 @@ public class InvMAOrderDetailController {
}
return invMAOrderDetailService.addOrderDetail(invMAOrderDetailEntity);
}
//TODO 120241022 养护记录注释
// /**
// * 选中库存详情批量添加养护记录详情
// *
// * @param invProductIds
// * @return
// */
// @PostMapping("/inv/MA/order/detail/batchAddDetail")
// public BaseResponse batchAddDetail(@RequestBody AddInvMAOrderDetailRequest addMAOrderDetailRequest, BindingResult bindingResult) {
// if (bindingResult.hasErrors()) {
// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
// }
// if (null == addMAOrderDetailRequest || CollUtil.isEmpty(addMAOrderDetailRequest.getInvProductIds()) || StrUtil.isBlank(addMAOrderDetailRequest.getOrderIdFk())) {
// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数不能为空!");
// }
// return invMAOrderDetailService.batchAddDetail(addMAOrderDetailRequest);
// }
/**
*

@ -146,18 +146,6 @@ public class InvProductController extends BaseController {
});
}
// //根据单据日期排序
// list.sort((o1, o2) -> {
// long o1OrderTime = DateUtil.parseDate(o1.getOrderTime()).getTime();
// long o2OrderTime = DateUtil.parseDate(o2.getOrderTime()).getTime();
// if (o1OrderTime > o2OrderTime) {
// return 1;
// } else if (o1OrderTime < o2OrderTime) {
// return -1;
// }
// return 0;
// });
PageSimpleResponse<InvProductDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(list);

@ -47,10 +47,8 @@ public class UdiTraceController {
@Resource
IoOrderService orderService;
@Resource
InvProductServiceNew invProductServiceNew;
@Resource
IoCodeDao ioCodeDao;
//TODO 20241017 先把这个接口注释了
@AuthRuleAnnotation("")
@GetMapping("udiwarehouse/trace/filter")
public BaseResponse list(FilterCodeTraceRequest filterCodeTraceRequest) {
@ -74,7 +72,6 @@ public class UdiTraceController {
filterCodeRequest.setCode(filterCodeTraceRequest.getCode());
}
// IoCodeEntity;
filterCodeRequest.setSupId(filterCodeTraceRequest.getSupId());
List<IoCodeEntity> invProductDetailEntities = ioCodeDao.filterCodeList(filterCodeRequest);
if (invProductDetailEntities.size() > 0) {

@ -209,9 +209,7 @@ public class PurOrderController {
ioOrderDetailBizEntity.setPrice(obj.getPrice());
ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname());
ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh());
// if (basicProductsEntity.getPrice() != null) {
// ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(basicProductsEntity.getPrice()));
// }
ioOrderDetailBizEntity.setSupId(obj.getSupId());
ioOrderDetailBizService.insert(ioOrderDetailBizEntity);
}

@ -99,11 +99,6 @@ public class SupProductController {
//判断是否上级供应商是否审核通过
SupManufacturerEntity supManufacturerEntity = supManufacturerService.findManufacturer(supProductEntity.getManufacturerIdFk());
// if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_UN
// || supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_DRAFT) {
// return ResultVOUtils.error(500, "所属生产企业资质未通过审核,暂时无法提交!");
// }
if (supManufacturerEntity == null) {
return ResultVOUtils.error(500, "所属生产企业资质未维护!");
}
@ -169,11 +164,7 @@ public class SupProductController {
public BaseResponse selectBind(@RequestBody SelectProductBindRequest selectProductBindRequest) {
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectUdiId(Long.valueOf(selectProductBindRequest.getRelIdFk()));
SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(), selectProductBindRequest.getManufacturerId());
// if (supProductEntity != null) {
// return ResultVOUtils.error(500, "该产品资质已存在,请勿重复添加!");
// } else {
supProductEntity = new SupProductEntity();
SupProductEntity supProductEntity = new SupProductEntity();
BeanUtils.copyProperties(udiRelevanceResponse, supProductEntity);
supProductEntity.setProductId(selectProductBindRequest.getProductId());
supProductEntity.setRecordCode(udiRelevanceResponse.getZczbhhzbapzbh());
@ -191,16 +182,8 @@ public class SupProductController {
supProductEntity.setHchzsb(udiRelevanceResponse.getCplb());
supProductEntity.setCompanyName(selectProductBindRequest.getCompanyName());
supProductEntity.setAuditStatus(selectProductBindRequest.getAuditStatus());
// }
return ResultVOUtils.success(supProductEntity);
// boolean b = supProductService.insertRegistration(supProductEntity);
// if (b) {
// return ResultVOUtils.success(supProductEntity);
// } else {
// return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
// }
}
@ -225,12 +208,7 @@ public class SupProductController {
}
//判断是否上级供应商是否审核通过
SupManufacturerEntity supManufacturerEntity = supManufacturerService.findManufacturer(supProductEntity.getManufacturerIdFk());
// if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_UN
// || supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_DRAFT) {
// return ResultVOUtils.error(500, "所属生产企业资质未通过审核,暂时无法提交!");
// }
if (supManufacturerEntity == null) {
return ResultVOUtils.error(500, "所属生产企业资质未维护!");
}
@ -373,78 +351,8 @@ public class SupProductController {
udiRelevanceEntity.setDispatch(true);
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
}
}
// if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS) {
// SupProductResponse supProductResponse = supProductService.findJoinRegistration(supProductEntity.getId());
//
// //步骤1先添加到主系统第三方产品信息
// BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
// ThrProductsEntity thrProductsEntity = new ThrProductsEntity();
// thrProductsEntity.setCode(gennerOrderUtils.getRelId() + "");
// thrProductsEntity.setThirdSys(basicThirdSysEntity.getThirdId());
// thrProductsEntity.setThirdSysFk(basicThirdSysEntity.getThirdId());
// thrProductsEntity.setName(supProductEntity.getRecordProductName());
// thrProductsEntity.setSpec(supProductEntity.getSpecification());
// thrProductsEntity.setStandard(supProductEntity.getSpecification());
// thrProductsEntity.setManufactory(supProductResponse.getManufacturerName());
// thrProductsService.insertThrProducts(thrProductsEntity);
//
//
// //步骤2添加到关联表
// String uuid = CustomUtil.getUUId();
// UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
// udiRelevanceEntity.setThirdId(thrProductsEntity.getCode());
// udiRelevanceEntity.setThirdName(thrProductsEntity.getName());
// udiRelevanceEntity.setMainId(thrProductsEntity.getCode());
// udiRelevanceEntity.setMainName(thrProductsEntity.getName());
// udiRelevanceEntity.setMeasname(thrProductsEntity.getMeasname());
// String time = DateUtil.getDateTime();
// udiRelevanceEntity.setUpdateTime(time);
// udiRelevanceEntity.setModifyTime(time);
// udiRelevanceEntity.setUuid(uuid);
// udiRelevanceEntity.setManufactory(supProductResponse.getManufacturerName());
// udiRelevanceEntity.setSupName(supProductResponse.getSupName());
// udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + "");
// udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
//
//
// //步骤3添加基础信息表
// UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
// udiInfoEntity.setNameCode(thrProductsEntity.getCode());
// udiInfoEntity.setCpmctymc(thrProductsEntity.getName());
// udiInfoEntity.setManufactory(thrProductsEntity.getManufactory());
// udiInfoEntity.setYlqxzcrbarmc(supProductEntity.getRecordPeopleName());
// udiInfoEntity.setGgxh(thrProductsEntity.getSpec());
// udiInfoEntity.setZczbhhzbapzbh(supProductEntity.getRecordCode());
// udiInfoEntity.setUuid(udiRelevanceEntity.getUuid());
// udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
// udiInfoEntity.setDiType(1);
// udiInfoEntity.setScbssfbhph("是");
// udiInfoEntity.setScbssfbhscrq("是");
// udiInfoEntity.setScbssfbhsxrq("是");
// udiInfoEntity.setScbssfbhxlh("否");
// udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity);
// udiInfoService.insertUdiInfo(udiInfoEntity);
//
//
// //步骤4添加供应商关联表
// CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity();
// companyProductRelevanceEntity.setCreate_time(new Date());
// companyProductRelevanceEntity.setUpdate_time(new Date());
// companyProductRelevanceEntity.setAuditStatus("3");
// companyProductRelevanceEntity.setUnitFk(supProductResponse.getCustomerId());
// companyProductRelevanceEntity.setUdiRlIdFk(udiRelevanceEntity.getId());
// companyProductRelevanceEntity.setCustomerId(supProductResponse.getCustomerId());
// companyProductRelevanceEntity.setProductId(supProductEntity.getProductId());
// companyProductRelevanceEntity.setRegistrationId(supProductEntity.getProductId());
// companyProductRelevanceEntity.setEnterpriseId(supProductEntity.getManufacturerIdFk());
// companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity);
//
//
// }
if (b) {
return ResultVOUtils.success("审核通过!");
} else {

@ -52,8 +52,6 @@ public class CustomerController {
private CustomerInfoService customerInfoService;
@Resource
private CustomerContactService customerContactService;
// @Resource
// private UserRegisterService userRegisterService;
@Resource
private AuthAdminService authAdminService;
@Resource
@ -211,7 +209,6 @@ public class CustomerController {
String id = deleteRequest.getId();
customerInfoService.deleteById(id);
customerContactService.deleteById(id);
// userRegisterService.deleteByCustomerId(Long.parseLong(id));
authAdminService.deleteByCustomerId(id);
companyService.deleteCompany(Long.parseLong(id));

@ -62,7 +62,6 @@ public class SpsSyncBasicController {
//入院申请无DI的数据需更新产品编码
if (IntUtil.value(udiRelevanceEntity.getNewNeedUpload())) {
UdiProductEntity udiProductEntity = udiProductService.findByUuid(udiRelevanceEntity.getUuid());
// udiProductEntity.setRemark(udiProductEntity.getNameCode());
udiProductEntity.setNameCode(udiRelevanceEntity.getMainId());
udiProductService.updateUdiInfoByUuid(udiProductEntity);
ThrProductsAddDiEntity thrProductsAddDiEntity = thrProductsAddDiDao.selectOne(new QueryWrapper<ThrProductsAddDiEntity>().eq("code", udiProductEntity.getRemark()).last("limit 1"));

@ -174,12 +174,6 @@ public class SpsSyncDownloadController {
String logs = "";
if (basicExportStatusEntity != null) {
baseResponse = spsSyncDownloadService.syncUdi(spsSyncDataRequest);
// if (CollUtil.isNotEmpty(baseResponse.getData().getProductInfoEntityList()))
// logs = logs + "DI信息" + baseResponse.getData().getProductInfoEntityList().size() + "条\n";
// if (CollUtil.isNotEmpty(baseResponse.getData().getUdiCompanyEntities()))
// logs = logs + "医疗器械注册人:" + baseResponse.getData().getUdiCompanyEntities().size() + "条\n";
// basicExportStatusEntity.setRemark(logs);
// basicExportService.updateExportStatus(basicExportStatusEntity);
SpSyncUdiResponse spSyncUdiResponse = baseResponse.getData();
spSyncUdiResponse.setTaskId(basicExportStatusEntity.getId());
@ -221,7 +215,6 @@ public class SpsSyncDownloadController {
.build();
}
}
// log.error("下发的基础数据是什么呢????????{}",relaySyncResponse);
baseResponse.setCode(ResultEnum.SUCCESS.getCode());
baseResponse.setData(relaySyncResponse);
return baseResponse;
@ -434,11 +427,6 @@ public class SpsSyncDownloadController {
}
@Resource
RelCodeDetailMapper relCodeDetailMapper;
@Resource
RelCodeBatchMapper relCodeBatchMapper;
private String writeFile(String filePath, String fileDesc, String content) throws IOException {
filePath = String.format("%s/%s", filePath, DateUtil.getDate());
@ -582,22 +570,6 @@ public class SpsSyncDownloadController {
private final IoCodeLostMapper ioCodeLostMapper;
private final IoCodeRelMapper ioCodeRelMapper;
/**
*
*
* @param bean
*/
private void saveUploadOtherData(SpsSyncOtherDataResponse bean) {
if (CollectionUtil.isNotEmpty(bean.getIoCodeLostList())) {
ioCodeLostMapper.replaceBatchs(bean.getIoCodeLostList());
}
if (CollectionUtil.isNotEmpty(bean.getIoCodeRelList())) {
ioCodeRelMapper.replaceBatchs(bean.getIoCodeRelList());
}
}
private final BasicHospTypeDao basicHospTypeDao;
private final UdiRelevanceDao udiRelevanceDao;
private final BasicProductsDao basicProductsDao;
@ -609,45 +581,6 @@ public class SpsSyncDownloadController {
private final SupManufacturerDao supManufacturerDao;
private final SupProductDao supProductDao;
/**
*
*
* @param bean
*/
private void saveUploadBasicData(SpsSyncBasicDataResponse bean) {
if (CollectionUtil.isNotEmpty(bean.getHospTypeList())) {
basicHospTypeDao.replaceBatchs(bean.getHospTypeList());
}
if (CollectionUtil.isNotEmpty(bean.getUdiRelevanceList())) {
udiRelevanceDao.replaceBatchs(bean.getUdiRelevanceList());
}
if (CollectionUtil.isNotEmpty(bean.getProductsList())) {
basicProductsDao.replaceBatchs(bean.getProductsList());
}
if (CollectionUtil.isNotEmpty(bean.getRelevanceList())) {
relevanceDao.replaceBatchs(bean.getRelevanceList());
}
if (CollectionUtil.isNotEmpty(bean.getCorpList())) {
corpDao.replaceBatchs(bean.getCorpList());
}
if (CollectionUtil.isNotEmpty(bean.getSupCertList())) {
supCertDao.replaceBatchs(bean.getSupCertList());
}
if (CollectionUtil.isNotEmpty(bean.getSupCertSetList())) {
supCertSetDao.replaceBatchs(bean.getSupCertSetList());
}
if (CollectionUtil.isNotEmpty(bean.getSupCompanyList())) {
supCompanyDao.replaceBatchs(bean.getSupCompanyList());
}
if (CollectionUtil.isNotEmpty(bean.getSupManufacturerList())) {
supManufacturerDao.replaceBatchs(bean.getSupManufacturerList());
}
if (CollectionUtil.isNotEmpty(bean.getSupProductList())) {
supProductDao.replaceBatchs(bean.getSupProductList());
}
}
@Resource
DeviceInspectTaskMapper deviceInspectTaskMapper;
@Resource
@ -939,9 +872,6 @@ public class SpsSyncDownloadController {
}
}
} else {
// 更新业务详情
// if (orderEntity.getCheckStatus() != null)
// orderService.update(orderEntity);
//更新业务详情
if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailBizEntities())) {
List<IoOrderDetailBizEntity> orderDetailBizEntities = syncDataResponse.getOrderDetailBizEntities();

@ -196,9 +196,6 @@ public class SyncDelController extends BaseController {
public BaseResponse deleteBussinessType(DeleteRequest deleteRequest) {
// if (bindingResult.hasErrors()) {
// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
// }
String id = deleteRequest.getId();
BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.selectById(id);

@ -63,7 +63,6 @@ public class TestController {
public BaseResponse testWebSocket(String message) {
SocketMsgEntity socketMsgEntity = SocketMsgEntity.builder().type(SocketMsgType.DL_ALL_DATA).content(message).remark("下载基础信息").build();
spsSyncWebSocket.sendMessage(socketMsgEntity, "1:" + socketToken);
// spsSyncWebSocket.sendMessage(message, "1:07rKFDFkQvBkbxgc7aUBlONo4gWNdx8b");
return ResultVOUtils.success(socketMsgEntity);
}

@ -27,14 +27,9 @@ import java.util.List;
@Slf4j
@RestController
public class DeviceKeyController {
// @Value("${spring.mail.username}")
// private String mail;
// @Value("${toMail}")
// private String toMail;
@Resource
SysPdaKeyService sysPdaKeyService;
// @Resource
// private JavaMailSender javaMailSender;
@GetMapping("sale/device/registerList")
public BaseResponse registerList(FilterDeviceKeyRequest filterDeviceKeyRequest) {
@ -101,14 +96,6 @@ public class DeviceKeyController {
return ResultVOUtils.success("1");
}
// public void sendMail(String title, String content, String to) {
// SimpleMailMessage message = new SimpleMailMessage();
// message.setFrom(mail);
// message.setTo(to);
// message.setSubject(title);
// message.setText(content);
// javaMailSender.send(message);
// }
public String md5(String password) {
try {

@ -90,7 +90,6 @@ public class SysParamConfigController {
@AuthRuleAnnotation("system/param/config/update")
@PostMapping("/system/param/config/update")
public BaseResponse update(@RequestBody SysParamConfigSaveRequest sysParamConfigSaveRequest) {
// systemParamConfigSaveRequest.setId(1);
systemParamConfigService.updateById(sysParamConfigSaveRequest);
if (sysParamConfigSaveRequest.getParentId() == 0) {
SysParamConfigSaveRequest sysParamConfigSaveRequest1 = new SysParamConfigSaveRequest();

@ -43,8 +43,6 @@ public class SysPdfModuleController {
private SystemPDFTemplateRelevanceService systemPDFTemplateRelevanceService;
@Resource
private SystemPDFTemplateService systemPDFTemplateService;
// @Resource
// BussinessLocalTypeService bussinessLocalTypeService;
@AuthRuleAnnotation("system/pdf/module/list")
@GetMapping("/system/pdf/module/list")

@ -48,7 +48,6 @@ public class SysPdfTemplateController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
// systemPDFTemplateRequest.setType(2);
List<SystemPDFTemplateEntity> systemPDFTemplateEntityList = systemPDFTemplateService.queryPage(filterPdfTemplateRequest);
List<SystemPDFTemplateResponse> systemPDFTemplateResponseList = systemPDFTemplateEntityList.stream().map(item -> {
SystemPDFTemplateResponse systemPDFTemplateResponse = new SystemPDFTemplateResponse();

@ -124,7 +124,6 @@ public class ThirdAliDrugController extends BaseController {
log.error("获取阿里和国家库码段信息出现错误===" + e.getMessage());
}
PageInfo<ThirdAliDrug> pageInfo = new PageInfo<>(list);
PageSimpleResponse<ThirdAliDrug> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(Long.valueOf(total));
pageSimpleResponse.setList(list);

@ -107,11 +107,6 @@ public class ThrBusTypeOriginController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (thrBusTypeOriginEntity != null) {
//校验单据类型代码是否重复
// boolean exists = thrBusTypeOriginService.checkActionExists(thrBusTypeOriginEntity.getAction(), thrBusTypeOriginEntity.getThirdSys());
// if (exists) {
// return ResultVOUtils.error(500, "单据类型已存在!");
// }
thrBusTypeOriginService.updateBusOriginType(thrBusTypeOriginEntity);
} else {
ResultVOUtils.error(999, "参数错误");

@ -129,8 +129,6 @@ public class ThrCorpExportLogController {
@PostMapping("/udiwms/thrCorp/importLog/export")
@Log(title = "第三方数据往来单位导出日志", businessType = BusinessType.INSERT)
public BaseResponse excelDownload(@RequestBody ThrCorpExportRequest thrCorpExportRequest) {
//String fileName = "D:\\udiwms\\exportFile\\" + "第三方往来单位信息导出" + System.currentTimeMillis() + ".xls";
String fileName = "D:\\udiwms\\exportFile\\" + "第三方往来单位信息导出" + System.currentTimeMillis() + ".udi";
File file = new File(fileName);
if (!file.exists()) {
@ -164,8 +162,6 @@ public class ThrCorpExportLogController {
@PostMapping("/udiwms/thrCorp/importLog/upload")
@Log(title = "第三方数据往来单位导出日志", businessType = BusinessType.INSERT)
public BaseResponse uploadSmp(@RequestBody ThrCorpExportRequest thrCorpExportRequest) {
//String fileName = "D:\\udiwms\\exportFile\\" + "第三方往来单位信息导出" + System.currentTimeMillis() + ".xls";
String fileName = "D:\\udiwms\\exportFile\\" + "第三方往来单位信息导出" + System.currentTimeMillis() + ".udi";
File file = new File(fileName);
if (!file.exists()) {

@ -177,7 +177,6 @@ public class ThrCorpsController {
thrCorpsDlService.importCorps(genKey,thrUnitMaintainFilterRequest, thrUnitMaintainFilterRequest.getThirdSysFk());
}
// thrCorpsDlService.importCorps(genKey, filterThrCorpRequest.getThirdSysFk());
return ResultVOUtils.success("后台开始下载更新,请稍后刷新查看");
}
}

@ -154,13 +154,6 @@ public class ThrDeptController {
@GetMapping("/spms/sub/inv/warehouse/filterThridInv")
public BaseResponse filterInvWarehouse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest) {
// todo
// InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(filterThrSubInvWarehouseRequest.getParentId());
// Object thirdId = ReflectUtil.getFieldValue(invWarehouseEntity, filterThrSubInvWarehouseRequest.getThirdSysFk());
// if (thirdId == null) {
// return ResultVOUtils.error(500, "请先关联仓库对应的第三方仓库,再关联分库!");
// }
// filterThrSubInvWarehouseRequest.setParentId((String) thirdId);
filterThrSubInvWarehouseRequest.setStatus(0);
List<ThrInvWarehouseEntity> thrInvWarehouseEntities = thrInvWarehouseService.selectByThrDeptCode(filterThrSubInvWarehouseRequest);
PageInfo<ThrInvWarehouseEntity> pageInfo;

@ -205,14 +205,12 @@ public class ThrOrderController {
}
String id = deleteRequest.getId();
ThrOrderEntity thrOrderEntity = thrOrderService.findById(Integer.parseInt(id));
String msg = selectDelect(thrOrderEntity);
if (msg == null) {
boolean b = thrOrderService.deleteById(id);
thrOrderDetailService.deleteByOrderIdFk(thrOrderEntity.getBillNo() + "");
if (b)
return ResultVOUtils.success("删除成功");
else return ResultVOUtils.error(500, "无法删除!");
} else return ResultVOUtils.error(500, msg);
else
return ResultVOUtils.error(500, "无法删除!");
}
@ -232,19 +230,6 @@ public class ThrOrderController {
}
public String selectDelect(ThrOrderEntity thrOrderEntity) {
FilterThrOrderRequest filterErpOrderRequest = new FilterThrOrderRequest();
//todo 单据类型还没设计好
// filterErpOrderRequest.setErpOrderId(thrOrderEntity.getBillNo());
// List<ThrErpOrderResponse> erpOrderEntities = myErpOrderService.filterAllMyErpOrder(filterErpOrderRequest);
// if (erpOrderEntities != null && erpOrderEntities.size() > 0) {
// return "单据" + thrOrderEntity.getBillNo() + "已于出入库单据关联,无法删除";
// } else {
// return null;
// }
return null;
}
@AuthRuleAnnotation("")
@RequestMapping("/udiwms/thrsys/order/delAll")
@Log(title = "第三方", businessType = BusinessType.DELETE)
@ -367,12 +352,6 @@ public class ThrOrderController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
//
// if (filterErpOrderRequest.getIsDownThrSys()) {
// BaseResponse<PageSimpleResponse<ErpOrderResponse>> responseBaseResponse = erpOrderClient.getErpOrderResponse(filterErpOrderRequest);
// return responseBaseResponse;
// }
ThrSystemDetailEntity thrSystemDetailEntity = iThrBusTypeOriginService.findSysByAction(filterErpOrderRequest.getBillAction(), "orderQueryUrl");
filterErpOrderRequest.setThirdOrderFk(thrSystemDetailEntity.getThirdSysFk());
@ -410,11 +389,6 @@ public class ThrOrderController {
erpOrderResponses.add(erpOrderResponse);
}
}
//todo 单据表还未设计好
// if (thrSystemDetailEntity.getLocalAction() != null) {
// BaseResponse<PageSimpleResponse<ThrOrderResponse>> loca = getLoaclData(filterErpOrderRequest);
// erpOrderResponses.addAll(loca.getData().getList());
// }
PageInfo<ThrOrderEntity> pageInfo;
pageInfo = new PageInfo<>(data);
PageSimpleResponse<ThrOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();

@ -122,7 +122,6 @@ public class ThrOrderExportLogController {
@Log(title = "业务单据导出", businessType = BusinessType.INSERT)
public BaseResponse excelDownload(@RequestBody ThrOrderExportRequest thrOrderExportRequest) {
String fileName = "D:\\udiwms\\exportFile\\" + "业务单据导出" + System.currentTimeMillis() + ".xls";
File file = new File(fileName);
if (!file.exists()) {
@ -173,14 +172,7 @@ public class ThrOrderExportLogController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
//todo关联表未涉及好
// BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(filterErpOrderRequest.getBillAction(), "orderQueryUrl");
// if (!basicThirdSysDetailEntity.getEnabled() || basicThirdSysDetailEntity.getThirdSysFk() == null) {
// return ResultVOUtils.error(500, "第三方系统业务单据接口服务未启用");
// }
// if (basicThirdSysDetailEntity.getValue() == null) {
// return ResultVOUtils.error(500, "业务单据查询接口未定义");
// }
ThrSystemDetailEntity thrSystemDetailEntity=new ThrSystemDetailEntity();
if (thrSystemDetailEntity.getFromType() != null && thrSystemDetailEntity.getFromType() == 0) {
return erpOrderClientImpl.getThrOrderResponse(filterErpOrderRequest);

@ -199,14 +199,6 @@ public class ThrOrderImportLogController {
if (cell5 != null) {
cell5.setCellType(CellType.STRING);
String billType = cell5.getStringCellValue();
//todo 表功能还未设计好
// BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByName(billType);
// if (bussinessTypeEntity != null) {
// corpImportDetailEntity.setBillType(bussinessTypeEntity.getAction());
// } else
// corpImportDetailEntity.setBillType(billType);
}
Cell cell6 = row.getCell(5);
if (cell6 != null) {

@ -106,9 +106,6 @@ public class ThrProductsAddController {
}
ThrProductsAddEntity tempEntity = thrProductsAddService.selectById(thrProductsAddEntity.getId() + "");
// if (thrProductsService.isExit(tempEntity.getCode(), tempEntity.getThirdSysFk())) {
// return ResultVOUtils.error(500, "已存在相同产品编码,无法添加!");
// }
thrProductsAddService.updateThrProducts(thrProductsAddEntity);
if (thrProductsAddEntity.getCheckStatus() == 2) {
ThrProductsEntity thrProductsEntity = new ThrProductsEntity();
@ -141,13 +138,6 @@ public class ThrProductsAddController {
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity1);
}
//审核通过后直接加到耗材字典里---todo 暂时不加到耗材字典里
// BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
// if (basicThirdSysEntity.getThirdId().equals(thrProductsAddEntity.getThirdSysFk()))
// if (!udiContrastService.isExit(null, thrProductsAddEntity.getCode(), null)) {
// udiContrastService.createOnlyMainId(thrProductsAddEntity.getCode());
// }
} else if (thrProductsAddEntity.getCheckStatus().equals(3)) {
//不通过,删除第三方产品信息表中此产品数据
thrProductsService.deleteById(thrProductsAddEntity.getId().toString());

@ -225,7 +225,6 @@ public class ThrProductsAddDiController {
udiProductEntity.setBasicPrductRemak6(thrProductsAddDiEntity.getBasicPrductRemak6());
udiProductEntity.setBasicPrductRemak7(thrProductsAddDiEntity.getBasicPrductRemak7());
udiProductEntity.setBasicPrductRemak8(thrProductsAddDiEntity.getBasicPrductRemak8());
// udiProductEntity.setGroupBuy(thrProductsAddDiEntity.getGroupBuy());
udiProductEntity.setCatalogname1(thrProductsAddDiEntity.getCatalogname1());
udiProductEntity.setCatalogname2(thrProductsAddDiEntity.getCatalogname2());
udiProductEntity.setCatalogname3(thrProductsAddDiEntity.getCatalogname3());
@ -243,13 +242,10 @@ public class ThrProductsAddDiController {
udiRelevanceEntity.setHcType(thrProductsAddDiEntity.getHcType());
udiRelevanceEntity.setId(udiRelIdFk);
udiRelevanceEntity.setModifyTime(new Date());
// udiRelevanceEntity.setThirdId(udiProductEntity.getCode());
// udiRelevanceEntity.setMainId(udiProductEntity.getCode());
udiRelevanceEntity.setUpdateTime(new Date());
udiRelevanceEntity.setUuid(udiProductEntity.getUuid());
udiRelevanceEntity.setSupName(thrProductsAddDiEntity.getSupName());
udiRelevanceEntity.setIsDisable(false);
// udiProductEntity.setNameCode(null);
udiProductService.insertUdiInfo(udiProductEntity);
udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
//回填关联关系到关联表
@ -280,9 +276,6 @@ public class ThrProductsAddDiController {
thrProductsAddDiEntity.setStatus(status);
thrProductsAddDiService.updateDiProduct(thrProductsAddDiEntity);
} else {
// ThrProductsEntity thrProductsEntity = new ThrProductsEntity();
// BeanUtil.copyProperties(thrProductsAddDiEntity, thrProductsEntity);
// thrProductsService.insertThrProducts(thrProductsEntity);
thrProductsAddDiEntity.setCode(gennerOrderUtils.getRelId() + "x");
ThrSystemEntity basicThirdSysEntity = thrSystemService.selectMainThrSys();
if (basicThirdSysEntity.getThirdId().equals(thrProductsAddDiEntity.getThirdSysFk()))
@ -304,7 +297,6 @@ public class ThrProductsAddDiController {
//字段更新
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(udiRelIdFk);
//更新产品信息
// UdiProductEntity udiProductEntity = udiProductService.findByUuid(udiRelevanceEntity.getUuid());
UdiProductEntity udiProductEntity = new UdiProductEntity();
udiProductEntity.setUuid(udiRelevanceEntity.getUuid());
udiProductEntity.setSptm(thrProductsAddDiResponse.getSptm());
@ -323,7 +315,6 @@ public class ThrProductsAddDiController {
udiProductEntity.setBasicPrductRemak7(thrProductsAddDiResponse.getBasicPrductRemak7());
udiProductEntity.setBasicPrductRemak8(thrProductsAddDiResponse.getBasicPrductRemak8());
udiProductEntity.setProductsType(thrProductsAddDiResponse.getProductsType());
// udiProductEntity.setGroupBuy(thrProductsAddDiResponse.getGroupBuy());
udiProductEntity.setCatalogname1(thrProductsAddDiResponse.getCatalogname1());
udiProductEntity.setCatalogname2(thrProductsAddDiResponse.getCatalogname2());
udiProductEntity.setCatalogname3(thrProductsAddDiResponse.getCatalogname3());
@ -349,7 +340,6 @@ public class ThrProductsAddDiController {
UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity();
BeanUtil.copyProperties(udiRelevanceEntity, udiRelevanceEntity1);
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity1);
// udiInfoService.updateUdiInfo(udiInfoEntity);
//回填关联关系到关联表
CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity();
companyProductRelevanceEntity.setCustomerId(thrProductsAddDiEntity.getCustomerId() + "");
@ -493,7 +483,6 @@ public class ThrProductsAddDiController {
}
thrProductsAddDiService.insertThrProducts(thrProductsAdddiEntity);
try {
CodeRel codeRel = new CodeRel();
if (thrProductsAdddiEntity.getProductsType() == null || thrProductsAdddiEntity.getProductsType() == 1) {
@ -544,9 +533,6 @@ public class ThrProductsAddDiController {
if (thrProductsAddDiEntity.getStatus() == 2) { //审核通过
//第三方产品审核通过
if (thrProductsAddDiEntity.getType() == 2) {
// ThrProductsEntity thrProductsEntity = new ThrProductsEntity();
// BeanUtil.copyProperties(thrProductsAddDiEntity, thrProductsEntity);
// thrProductsService.insertThrProducts(thrProductsEntity);
thrProductsAddDiEntity.setCode(gennerOrderUtils.getRelId() + "");
ThrSystemEntity basicThirdSysEntity = thrSystemService.selectMainThrSys();
if (basicThirdSysEntity.getThirdId().equals(thrProductsAddDiEntity.getThirdSysFk()))
@ -576,43 +562,7 @@ public class ThrProductsAddDiController {
companyProductRelevanceEntity.setPrice(new BigDecimal(thrProductsAddDiEntity.getPrice()));
companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity);
} else {
// Long udiRelIdFk = udiContrastService.createOnlyUuid(combineRequest, thrProductsAddDiEntity.getUuid());
// //字段更新
// UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(udiRelIdFk);
// //更新产品信息
// UdiProductEntity udiProductEntity = udiProductService.findByUuid(udiRelevanceEntity.getUuid());
// udiProductEntity.setSptm(thrProductsAddDiResponse.getSptm());
// udiProductEntity.setYbbm(thrProductsAddDiResponse.getYbbm());
// udiProductEntity.setMeasname(thrProductsAddDiResponse.getMeasname());
// udiProductEntity.setManufactory(thrProductsAddDiResponse.getManufactory());
// udiProductEntity.setSpmc(thrProductsAddDiResponse.getSpmc());
// udiProductEntity.setCpms(thrProductsAddDiResponse.getCpms());
// udiProductEntity.setPrice(thrProductsAddDiResponse.getPrice());
// udiProductEntity.setBasicPrductRemak1(thrProductsAddDiResponse.getBasicPrductRemak1());
// udiProductEntity.setBasicPrductRemak2(thrProductsAddDiResponse.getBasicPrductRemak2());
// udiProductEntity.setBasicPrductRemak3(thrProductsAddDiResponse.getBasicPrductRemak3());
// udiProductEntity.setBasicPrductRemak4(thrProductsAddDiResponse.getBasicPrductRemak4());
// udiProductEntity.setBasicPrductRemak5(thrProductsAddDiResponse.getBasicPrductRemak5());
// udiProductEntity.setBasicPrductRemak6(thrProductsAddDiResponse.getBasicPrductRemak6());
// udiProductEntity.setBasicPrductRemak7(thrProductsAddDiResponse.getBasicPrductRemak7());
// udiProductEntity.setBasicPrductRemak8(thrProductsAddDiResponse.getBasicPrductRemak8());
// udiProductEntity.setNameCode(null);
// udiProductService.updateUdiInfoByUuid(udiProductEntity);
// UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity();
// BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceEntity1);
// udiRelevanceService.updateUdiRelevance(udiRelevanceEntity1);
// udiInfoService.updateUdiInfo(udiInfoEntity);
//回填关联关系到关联表
// CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity();
// companyProductRelevanceEntity.setCustomerId(thrProductsAddDiEntity.getCustomerId());
// companyProductRelevanceEntity.setUdiRlIdFk(udiRelIdFk);
// companyProductRelevanceEntity.setCreateTime(new Date());
// companyProductRelevanceEntity.setUpdateTime(new Date());
// companyProductRelevanceEntity.setUnitFk(thrProductsAddDiEntity.getCustomerId().toString());
// companyProductRelevanceEntity.setAuditStatus("1");
// if (StrUtil.isNotEmpty(thrProductsAddDiEntity.getPrice()))
// companyProductRelevanceEntity.setPrice(new BigDecimal(thrProductsAddDiEntity.getPrice()));
// companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity);
}
}
}
@ -624,14 +574,6 @@ public class ThrProductsAddDiController {
@Log(title = "入院物资申请导入", businessType = BusinessType.UPDATE)
@PostMapping("/spms/thrAddDi/excel/upload")
public BaseResponse uploadCorp(@RequestParam("file") MultipartFile file) {
// String filePath = "D:\\udiwms\\filePath\\";
// File createFile = new File(filePath);
// if (!createFile.exists()) {
// createFile.mkdirs();
// }
// if (file.isEmpty()) {
// return ResultVOUtils.error(500, "上传第" + (i++) + "个文件失败");
// }
String customerId = getCustomerId();
String fileName = file.getOriginalFilename();
//解析数据

@ -97,26 +97,6 @@ public class ThrProductsController {
//删除产品信息
public String selectDetale(String id) {
ThrProductsEntity thrProductsEntity = thrProductsService.selectById(id);
//todo 耗材字典未设计好
// if (thrProductsEntity != null) {
// FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
// if ("thirdId".equals(thrProductsEntity.getThirdSysFk())) {
// filterUdiInfoRequest.setThirdId(thrProductsEntity.getCode());
// } else if ("thirdId1".equals(thrProductsEntity.getThirdSysFk())) {
// filterUdiInfoRequest.setThirdId(thrProductsEntity.getCode());
// } else if ("thirdId2".equals(thrProductsEntity.getThirdSysFk())) {
// filterUdiInfoRequest.setThirdId(thrProductsEntity.getCode());
// } else if ("thirdId3".equals(thrProductsEntity.getThirdSysFk())) {
// filterUdiInfoRequest.setThirdId(thrProductsEntity.getCode());
// } else if ("thirdId4".equals(thrProductsEntity.getThirdSysFk())) {
// filterUdiInfoRequest.setThirdId(thrProductsEntity.getCode());
// }
// List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
// if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) {
// return "改产品已被选入耗材字典请先移除!";
// }
// }
boolean b = thrProductsService.deleteById(id);
if (b)
return null;
@ -132,8 +112,6 @@ public class ThrProductsController {
@PostMapping("/udiwms/udiinfo/erp/products/saveProduct")
@Log(title = "第三方产品信息", businessType = BusinessType.INSERT)
public BaseResponse saveProduct(@RequestBody ThrProductsEntity thrProductsEntity, FilterThrProductsRequest filterThrProductsRequest) {
if (null == thrProductsEntity)
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);;
BeanUtil.copyProperties(thrProductsEntity, filterThrProductsRequest);
@ -148,15 +126,6 @@ public class ThrProductsController {
return ResultVOUtils.success();
}
return ResultVOUtils.error(999, "数据已存在!");
// //新增主系统产品信息直接加到耗材字典里
// BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
// if (basicThirdSysEntity.getThirdId().equals(thrProductsEntity.getThirdSysFk()))
// if (!udiContrastService.isExit(null, thrProductsEntity.getCode(), null)) {
// udiContrastService.createOnlyMainId(thrProductsEntity.getCode());
// }
}
@Resource
@ -211,17 +180,9 @@ public class ThrProductsController {
udiProductEntity.setYlqxzcrbarmc(thrProductsEntity.getYlqxzcrbarmc());
if (StrUtil.isNotEmpty(thrProductsEntity.getCpms()))
udiProductEntity.setCpms(thrProductsEntity.getCpms());
// if (StrUtil.isNotEmpty(thrProductsEntity.getBzgg()))
// udiProductEntity.setBzgg(thrProductsEntity.getBzgg());
// if (StrUtil.isNotEmpty(thrProductsEntity.getStandard()))
// udiProductEntity.setGgxh(thrProductsEntity.getStandard());
udiProductService.updateUdiInfo(udiProductEntity);
}
}
//todo 若产品信息
return ResultVOUtils.success("修改成功!");
}

@ -144,7 +144,6 @@ public class ThrProductsExportLogController {
thrProductsExportLogEntity.setUpdateTime(new Date());
thrProductsExportLogEntity.setCreateTime(new Date());
thrProductsExportLogService.insertThrProductsExportLog(thrProductsExportLogEntity);
//thrProductsDlService.genExcel(genKey, thrProductsExportRequest);
//修改为导出json文件
thrProductsDlService.genJsonFile(genKey, thrProductsExportRequest);

@ -41,10 +41,6 @@ public class ThrSystemController {
private ThrSystemService thrSystemService;
@Resource
private ThrSystemDetailService thrSystemDetailService;
// @Resource
// UdiRelevanceService udiRelevanceService;
// @Resource
// UnitMaintainService unitMaintainService;
@Resource
ThrSystemBusApiService thrSystemBusApiService;
@Resource
@ -142,20 +138,6 @@ public class ThrSystemController {
return ResultVOUtils.error(500, "主系统必须启用");
}
//todo 耗材字典还未完成
// if (!temp.getMainSys().equals(basicThirdSysEntity.getMainSys())) {
// if (udiRelevanceService.isExit() || unitMaintainService.isExit()) {
// return ResultVOUtils.error(999, "产品信息已经关联,无法取消主系统!");
// }
// if ((!temp.getEnabled()) && basicThirdSysEntity.getMainSys()) {
// if (!basicThirdSysEntity.getEnabled()) {
// return ResultVOUtils.error(999, "请先启用系统!");
// }
// }
// if (!basicThirdSysEntity.getEnabled() && basicThirdSysEntity.getMainSys()) {
// return ResultVOUtils.error(999, "请先启用系统!");
// }
// }
if (thrSystemEntity.getMainSys()) {
List<ThrSystemEntity> basicThirdSysEntities = thrSystemService.filterBasicThiSys(new FilterBasicThirdSysRequest());
for (ThrSystemEntity thrSystemEntity1 : basicThirdSysEntities) {

@ -6,24 +6,19 @@ import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.excel.read.listener.ReadListener;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.dao.basic.CompanyProductRelevanceDao;
import com.glxp.api.dao.inout.IoOrderDao;
import com.glxp.api.entity.alihealth.*;
import com.glxp.api.entity.basic.CompanyProductRelevanceEntity;
import com.glxp.api.entity.basic.UdiEntity;
import com.glxp.api.entity.inout.IoCodeLostEntity;
import com.glxp.api.entity.inout.IoOrderEntity;
import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
import com.glxp.api.exception.JsonException;
import com.glxp.api.req.alihealth.AliYljgSearchbillReqeust;
import com.glxp.api.req.alihealth.AlihealthYljgListupoutDetailReqeust;
import com.glxp.api.req.alihealth.AlihealthYljgListupoutReqeust;
import com.glxp.api.req.basic.FilterUdiRelRequest;
import com.glxp.api.req.inout.AddBizProductReqeust;
import com.glxp.api.req.inout.AddOrderRequest;
import com.glxp.api.req.inout.FilterOrderRequest;
@ -43,10 +38,7 @@ import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import com.alibaba.excel.EasyExcel;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.IOException;
@ -63,8 +55,6 @@ public class AlihealthBusServiceImpl implements AlihealthBusService {
@Resource
IoOrderService ioOrderService;
@Resource
IoOrderDao ioOrderDao;
@Resource
CompanyProductRelevanceDao companyProductRelevanceDao;
@Override

Loading…
Cancel
Save