feat: 控制层优化

src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java

@@ -49,7 +49,7 @@ public class AlihealthBusController extends BaseController {
     public BaseResponse getAliCode() {
 
         List<IoCollectCodeBackup>  list = ioCollectCodeBackMapper.filterNotRelCode(new IoCollectCodeRequest());
-        if(list!=null && list.size() >1){
+        if(CollUtil.isNotEmpty(list)){
             AlihealthGetRelCodeReqeust alihealthGetRelCodeReqeust = new AlihealthGetRelCodeReqeust();
             alihealthGetRelCodeReqeust.setIoCollectCodeBackupList(list);
             BaseResponse baseResponse = spGetHttpClient.getAliCode(alihealthGetRelCodeReqeust);

src/main/java/com/glxp/api/controller/auth/AuthUserController.java

@@ -153,7 +153,6 @@ public class AuthUserController extends BaseController {
                     bindingResult.getFieldError().getDefaultMessage());
         }
         AuthAdmin authAdmin = customerService.getUserBean();
-        System.out.println(updateUserRequset.toString());
         if (StringUtils.isBlank(updateUserRequset.getNewPassword())) {
             return ResultVOUtils.error(500, "请输入新密码！");
         }
@@ -179,40 +178,6 @@ public class AuthUserController extends BaseController {
 
     }
 
-    //    @AuthRuleAnnotation("")
-//    @PostMapping("/admin/auth/admin/force/updateUser")
-//    public BaseResponse forceUpdateUser(@RequestBody @Valid UpdateUserRequset updateUserRequset, BindingResult bindingResult) {
-//        if (bindingResult.hasErrors()) {
-//            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        AuthAdmin authAdmin = customerService.getUserBean();
-//        if (StringUtils.isBlank(updateUserRequset.getNewPassword())) {
-//            return ResultVOUtils.error(500, "请输入新密码！");
-//        }
-//        if (StringUtils.isBlank(updateUserRequset.getConfirmPassword())) {
-//            return ResultVOUtils.error(500, "请输入确认密码！");
-//        }
-//
-//        if (updateUserRequset.getNewPassword().equals(updateUserRequset.getOldPassword())) {
-//            return ResultVOUtils.error(500, "新密码与旧密码重复！请重新修改！");
-//        }
-//        if (updateUserRequset.getNewPassword().equals(updateUserRequset.getConfirmPassword())
-//                &&
-//                (
-//                        PasswordUtils.authAdminPwd(updateUserRequset.getOldPassword()).equals(PasswordUtils.authAdminPwd(authAdmin.getPassWord()))
-//                                || updateUserRequset.getOldPassword().equals(authAdmin.getPassWord())
-//                                || updateUserRequset.getOldPassword().equals(PasswordUtils.authAdminPwd(authAdmin.getPassWord()))
-//                )) {
-//            String newPwd = PasswordUtils.authAdminPwd(updateUserRequset.getNewPassword());
-//            authAdmin.setPassWord(newPwd);
-//            authAdmin.setLastUpdatePwdTime(new Date());
-//            authAdminService.updateAuthAdmin(authAdmin);
-//            return ResultVOUtils.success("修改成功");
-//        } else {
-//            return ResultVOUtils.error(500, "新密码与确认密码不相同！请重新修改！");
-//        }
-//
-//    }
     @AuthRuleAnnotation("")
     @PostMapping("/admin/auth/admin/force/updateUser")
     public BaseResponse forceUpdateUser(@RequestBody @Valid UpdateUserRequset updateUserRequest, BindingResult bindingResult) {

src/main/java/com/glxp/api/controller/auth/DeptController.java

@@ -8,6 +8,7 @@ import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
 import com.glxp.api.dto.DictDto;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.auth.DeptEntity;
@@ -35,7 +36,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @RestController
-public class DeptController {
+public class DeptController extends BaseController {
 
     @Resource
     DeptService deptService;
@@ -43,7 +44,6 @@ public class DeptController {
     CustomerService customerService;
     @Resource
     SystemParamConfigService systemParamConfigService;
-
     @Resource
     InvWarehouseService invWarehouseService;
 
@@ -181,13 +181,10 @@ public class DeptController {
     @AuthRuleAnnotation("")
     @GetMapping("spms/inv/warehouse/filterAllByUser")
     public BaseResponse filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) {
-        List<DeptEntity> deptEntities;
+        filterInvWarehouseRequest.setUserId(getUserId());
-        AuthAdmin authAdmin = customerService.getUserBean();
-        filterInvWarehouseRequest.setUserId(authAdmin.getId());
         filterInvWarehouseRequest.setPid(0L);
-        deptEntities = deptService.filterAllByUser(filterInvWarehouseRequest);
+        List<DeptEntity> deptEntities = deptService.filterAllByUser(filterInvWarehouseRequest);
         return ResultVOUtils.success(deptEntities);
-
     }
 
 

src/main/java/com/glxp/api/controller/auth/DeptUserController.java

@@ -30,10 +30,8 @@ public class DeptUserController {
     DeptUserService deptUserService;
     @Resource
     DeptService deptService;
-
     @Resource
     IoOrderService ioOrderService;
-
     @Resource
     WarehouseUserService warehouseUserService;
 

src/main/java/com/glxp/api/controller/auth/InvBusUserController.java

@@ -88,10 +88,7 @@ public class InvBusUserController {
     public BaseResponse filterUnSelectInvUser(FilterInvBusUserRequest filterInvBusUserRequest) {
         List<InvBusUserEntity> responses = invBusUserService.filterInvBusUser(filterInvBusUserRequest);
         List<String> selectedCodes = new ArrayList<>();
-        responses.forEach(invBusUserEntity ->
+        responses.forEach(invBusUserEntity -> selectedCodes.add(invBusUserEntity.getScAction()));
-        {
-            selectedCodes.add(invBusUserEntity.getScAction());
-        });
         filterInvBusUserRequest.setSelectedCodes(selectedCodes);
         List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntityList = invBusUserService.filterUnSelect(filterInvBusUserRequest);
 

src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java

@@ -100,8 +100,7 @@ public class InvWarehouseController extends BaseController {
     @AuthRuleAnnotation("")
     @GetMapping("spms/inv/warehouse/findByDeptUser")
     public BaseResponse findByDept(FilterInvWarehouseRequest filterInvWarehouseRequest) {
-        AuthAdmin authAdmin = getUser();
+        filterInvWarehouseRequest.setUserId(getUserId());
-        filterInvWarehouseRequest.setUserId(authAdmin.getId());
         if (StrUtil.isEmpty(filterInvWarehouseRequest.getDeptCode())) {
             return ResultVOUtils.error(500, "部门不能为空");
         }
@@ -348,7 +347,6 @@ public class InvWarehouseController extends BaseController {
                 invWarehouseEntities.add(invWarehouseEntity1);
         }
         return ResultVOUtils.success(invWarehouseEntities);
-//        return ResultVOUtils.error(500, "未找到！");
     }
 
     /**
@@ -384,7 +382,6 @@ public class InvWarehouseController extends BaseController {
     @AuthRuleAnnotation("")
     @GetMapping("spms/sub/inv/warehouse/filterSub")
     public BaseResponse filterSub(FilterInvWarehouseRequest filterInvWarehouseRequest) {
-
         InvWarehouseEntity invWarehouseEntity = invWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode());
         filterInvWarehouseRequest.setSubordinateCode(invWarehouseEntity.getParentId());
         filterInvWarehouseRequest.setCode(null);
@@ -397,8 +394,6 @@ public class InvWarehouseController extends BaseController {
     @PostMapping("/spms/sub/inv/warehouse/save")
     public BaseResponse save(@RequestBody @Valid InvWarehouseEntity invWarehouseEntity,
                              BindingResult bindingResult) {
-
-
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
@@ -418,7 +413,6 @@ public class InvWarehouseController extends BaseController {
             invWarehouseEntity.setCode(Integer.parseInt(codeEntity.getCode()) + 1 + "");
         }
 
-
         DeptEntity updateEntity = new DeptEntity();
         updateEntity.setId(pEntity.getId());
         updateEntity.setUpdateTime(new Date());
@@ -461,17 +455,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());
@@ -492,10 +475,7 @@ public class InvWarehouseController extends BaseController {
         if (!b) {
             return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
         }
-
         return ResultVOUtils.success("修改成功！");
-
-
     }
 
     @AuthRuleAnnotation("")
@@ -508,8 +488,6 @@ public class InvWarehouseController extends BaseController {
 
         InvWarehouseEntity invWarehouseEntity = invWarehouseService.findById(deleteRequest.getId());
 
-        //todo 代码未迁移完，记得回来修改
-
         Integer userCount = warehouseUserService.countUserBySubInvCode(invWarehouseEntity.getCode());
         if (userCount > 0) {
             return ResultVOUtils.error(500, "请先移除该仓库关联用户！");
@@ -520,16 +498,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());
@@ -561,8 +529,7 @@ public class InvWarehouseController extends BaseController {
         FilterBasicThirdSysRequest sysRequest = new FilterBasicThirdSysRequest();
         sysRequest.setEnabled(true);
         List<InvWarehouseThirdSysResponse> list = invWarehouseService.getThirdSysDetail(request.getId());
-        PageInfo<InvWarehouseThirdSysResponse> pageInfo;
+        PageInfo<InvWarehouseThirdSysResponse> pageInfo = new PageInfo<>(list);
-        pageInfo = new PageInfo<>(list);
         PageSimpleResponse<InvWarehouseThirdSysResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(list);
@@ -650,11 +617,7 @@ public class InvWarehouseController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-
-
         InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(filterInvLinkDataRequest.getCode());
-
-
         //1.获取所有单据类型
         FilterBussinessTypeRequest filterBussinessTypeRequest = new FilterBussinessTypeRequest();
         filterBussinessTypeRequest.setEnable(true);
@@ -701,15 +664,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());
         if (CollUtil.isNotEmpty(relBusRequset.getSelectActions())) {

src/main/java/com/glxp/api/controller/auth/SysMenuController.java

@@ -30,7 +30,6 @@ public class SysMenuController extends BaseController {
 
     @Resource
     ISysMenuService menuService;
-
     @Resource
     CustomerService customerService;
 
@@ -40,8 +39,7 @@ public class SysMenuController extends BaseController {
      */
     @GetMapping("/list")
     public BaseResponse list(SysMenu menu) {
-        AuthAdmin authAdmin = customerService.getUserBean();
+        List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
-        List<SysMenu> menus = menuService.selectMenuList(menu, authAdmin.getId());
         return ResultVOUtils.success(menus);
     }
 
@@ -60,8 +58,7 @@ public class SysMenuController extends BaseController {
      */
     @GetMapping("/treeselect")
     public BaseResponse treeselect(SysMenu menu) {
-        AuthAdmin authAdmin = customerService.getUserBean();
+        List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
-        List<SysMenu> menus = menuService.selectMenuList(menu, authAdmin.getId());
         List<Tree<Long>> data = menuService.buildMenuTreeSelect(menus);
         return ResultVOUtils.success(data);
     }
@@ -73,8 +70,7 @@ public class SysMenuController extends BaseController {
      */
     @GetMapping(value = "/roleMenuTreeselect/{roleId}")
     public BaseResponse roleMenuTreeselect(@PathVariable("roleId") Long roleId) {
-        AuthAdmin authAdmin = customerService.getUserBean();
+        List<SysMenu> menus = menuService.selectMenuList(getUserId());
-        List<SysMenu> menus = menuService.selectMenuList(authAdmin.getId());
         Map<String, Object> ajax = new HashMap<>();
         ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
         ajax.put("menus", menuService.buildMenuTreeSelect(menus));

src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java

@@ -79,31 +79,19 @@ public class SysWorkplaceController extends BaseController {
 
     @Resource
     SysWorkplaceService sysWorkplaceService;
-
     @Resource
     private BasicCollectUserService basicCollectUserService;
-
-
-    @Resource
-    private SysWorkplaceDocumentService sysWorkplaceDocumentService;
     @Resource
     DeptService deptService;
-
     @Resource
     SysWorkplaceQueueService sysWorkplaceQueueService;
-
     @Resource
     SysWorkplaceFreightService sysWorkplaceFreightService;
 
 
     @PostMapping("/udiwms/sysWorkplace/page")
     public BaseResponse page(@RequestBody SysWorkplaceRequest request) {
-//        Page<SystemWorkplace> page = sysWorkplaceService.page(new Page<>(request.getPage(), request.getLimit()), Wrappers.lambdaQuery(SystemWorkplace.class)
+
-//                .eq(StrUtil.isNotBlank(request.getInvCode()),SystemWorkplace::getInvCode,request.getInvCode())
-//                .like(StrUtil.isNotBlank(request.getKey()),SystemWorkplace::getWorkplaceId,request.getKey())
-//                .or()
-//                .like(StrUtil.isNotBlank(request.getKey()),SystemWorkplace::getWorkplaceName,request.getKey())
-//        );
         DeptEntity deptEntity = deptService.selectByCode(request.getDeptCode());
         if (deptEntity.getPid() == 0){
             request.setDeptCode(null);
@@ -185,10 +173,7 @@ public class SysWorkplaceController extends BaseController {
         }
         WorkBindBusTypeRequest workBindBusTypeRequest = new WorkBindBusTypeRequest();
         workBindBusTypeRequest.setWorkplaceCode(sysWorkplace.getWorkplaceId());
-//        List<SysWorkplaceDocumentResponse> sysWorkplaceDocumentResponses = sysWorkplaceDocumentService.filterList(workBindBusTypeRequest);
+
-//        if (sysWorkplaceDocumentResponses.size() > 0) {
-//            return ResultVOUtils.error("当前工位已绑定单据类型,请解绑之后在删除");
-//        }
         boolean save = sysWorkplaceService.removeById(sysWorkplace);
         if (!save) {
             return ResultVOUtils.error("删除错误");
@@ -283,11 +268,6 @@ public class SysWorkplaceController extends BaseController {
     }
 
 
-    @Resource
-    private WarehouseUserService warehouseUserService;
-
-
-
     @Resource
     private AuthAdminService authAdminService;
 
@@ -324,12 +304,6 @@ public class SysWorkplaceController extends BaseController {
 
     @PostMapping("/udiwms/sysWorkplace/getListByBusType")
     public BaseResponse getListByBusType(@RequestBody SysWorkplaceRequest request) {
-//        Page<SystemWorkplace> page = sysWorkplaceService.page(new Page<>(request.getPage(), request.getLimit()), Wrappers.lambdaQuery(SystemWorkplace.class)
-//                .eq(StrUtil.isNotBlank(request.getInvCode()),SystemWorkplace::getInvCode,request.getInvCode())
-//                .like(StrUtil.isNotBlank(request.getKey()),SystemWorkplace::getWorkplaceId,request.getKey())
-//                .or()
-//                .like(StrUtil.isNotBlank(request.getKey()),SystemWorkplace::getWorkplaceName,request.getKey())
-//        );
         request.setUserId(getUserId() + "");
         DeptEntity deptEntity = deptService.selectByCode(request.getDeptCode());
         if (deptEntity.getPid() == 0){
@@ -361,7 +335,7 @@ public class SysWorkplaceController extends BaseController {
         List<SysWorkplaceQueue> sysWorkplaceQueues = sysWorkplaceQueueService.list(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getWorkPlaceIdFk, sysWorkplace.getWorkplaceId()));
         Map<String, Object> data = new HashMap<>(1);
         List<Object> list = new ArrayList<>();
-        int i = 1;
+
         if (sysWorkplaceQueues != null && sysWorkplaceQueues.size() > 0) {
             for (SysWorkplaceQueue obj : sysWorkplaceQueues) {
                 Map<String, Object> supData = new HashMap<>();
@@ -369,7 +343,7 @@ public class SysWorkplaceController extends BaseController {
                 supData.put("code", obj.getCode());
                 supData.put("workplaceName", sysWorkplace.getWorkplaceName());
                 list.add(supData);
-                i++;
+
             }
         }
 

src/main/java/com/glxp/api/controller/auth/SysWorkplaceFreightController.java

@@ -1,6 +1,7 @@
 package com.glxp.api.controller.auth;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.EasyExcel;
@@ -57,7 +58,6 @@ public class SysWorkplaceFreightController extends BaseController {
 
     @Resource
     SysWorkplaceFreightService sysWorkplaceFreightService;
-
     @Resource
     private SystemPDFModuleService systemPDFModuleService;
     @Resource
@@ -130,13 +130,12 @@ public class SysWorkplaceFreightController extends BaseController {
             return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误");
         }
 
-//        List<SysWorkplaceQueue> sysWorkplaceQueues = sysWorkplaceQueueService.list(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getWorkPlaceIdFk, sysWorkplaceFreightRequest.getWorkplaceId()));
         List<SysWorkplaceFreightPrintResponse> responses =  sysWorkplaceFreightService.getList(sysWorkplaceFreightRequest);
 
         Map<String, Object> data = new HashMap<>(1);
         List<Object> list = new ArrayList<>();
-        int i = 1;
+
-        if (responses != null && responses.size() > 0) {
+        if (CollUtil.isNotEmpty(responses)) {
             for (SysWorkplaceFreightPrintResponse obj : responses) {
                 if (obj.getQueueCode() != null && obj.getQueueCode()!= ""){
                     Map<String, Object> supData = new HashMap<>();
@@ -144,7 +143,6 @@ public class SysWorkplaceFreightController extends BaseController {
                     supData.put("code", obj.getQueueCode());
                     supData.put("workplaceName", obj.getWorkPlaceName());
                     list.add(supData);
-                    i++;
                 }
             }
         }

src/main/java/com/glxp/api/controller/auth/SysWorkplaceLayerController.java

@@ -38,7 +38,6 @@ public class SysWorkplaceLayerController  extends BaseController {
 
     @Resource
     SysWorkplaceLayerService sysWorkplaceLayerService;
-
     @Resource
     SysWorkplaceQueueService sysWorkplaceQueueService;
 

src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java

@@ -63,17 +63,14 @@ public class SysWorkplaceQueueController extends BaseController {
 
     @Resource
     SysWorkplaceQueueService sysWorkplaceQueueService;
-
     @Resource
     private SystemPDFModuleService systemPDFModuleService;
     @Resource
     private SystemPDFTemplateService systemPDFTemplateService;
     @Value("${file_path}")
     private String filePath;
-
     @Resource
     SysWorkplaceService sysWorkplaceService;
-
     @Resource
     IoCollectLedGroupService ioCollectLedGroupService;
 
@@ -81,7 +78,6 @@ public class SysWorkplaceQueueController extends BaseController {
     @GetMapping("/udiwms/sysWorkplaceQueue/getQueueList")
     public BaseResponse getQueueList(SysWorkplaceQueueRequest request) {
 
-
         String scanCode = request.getScanCode();
         if (StrUtil.isNotEmpty(scanCode)) {
             UdiEntity udi = FilterUdiUtils.getUdi(scanCode);
@@ -132,8 +128,6 @@ public class SysWorkplaceQueueController extends BaseController {
 
     @PostMapping("/udiwms/sysWorkplaceQueue/addQueue")
     public BaseResponse addQueue(@RequestBody SysWorkplaceQueue sysWorkplaceQueue) {
-        // 创建时间 更新时间
-//        sysWorkplaceQueue.setCreateTime(new Date());
         sysWorkplaceQueue.setCreateUser(getUserId() + "");
         sysWorkplaceQueue.setUpdateUser(getUserId() + "");
         sysWorkplaceQueue.setUpdateTime(new Date());
@@ -266,7 +260,6 @@ public class SysWorkplaceQueueController extends BaseController {
             return ResultVOUtils.error("UDI码不能为空");
         }
 
-
         UdiEntity udiEntity = FilterUdiUtils.getUdi(request.getUdiCode());
         if (udiEntity != null && StrUtil.isNotEmpty(udiEntity.getUdi())) {
             udiCode = udiEntity.getUdi();

src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java

@@ -47,8 +47,7 @@ public class BasicBusTypeChangeController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        List<BasicBusTypeChangeResponse> basicBusTypeChangeEntities;
+        List<BasicBusTypeChangeResponse> basicBusTypeChangeEntities = basicBusTypeChangeService.filterList(basicBusTypeChangeRequest);
-        basicBusTypeChangeEntities = basicBusTypeChangeService.filterList(basicBusTypeChangeRequest);
         PageInfo<BasicBusTypeChangeResponse> pageInfo = new PageInfo<>(basicBusTypeChangeEntities);
         return ResultVOUtils.page(pageInfo);
     }

src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java

@@ -213,8 +213,7 @@ public class BasicBussinessTypeController extends BaseController {
             bussinessTypeRequest.setCode(invWarehouseEntity.getCode());
         }
         bussinessTypeResponses = basicBussinessTypeService.filterJoinByInv(bussinessTypeRequest);
-        PageInfo<BasicBussinessTypeResponse> pageInfo;
+        PageInfo<BasicBussinessTypeResponse> pageInfo = new PageInfo<>(bussinessTypeResponses);
-        pageInfo = new PageInfo<>(bussinessTypeResponses);
         PageSimpleResponse<BasicBussinessTypeResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(bussinessTypeResponses);
@@ -234,7 +233,6 @@ public class BasicBussinessTypeController extends BaseController {
                                                     BindingResult bindingResult) {
 
         String detailType = bussinessTypeRequest.getDetailType();
-        List<BasicBussinessTypeResponse> bussinessTypeResponses = new ArrayList<>();
         if (detailType.equals("norDetail")) {
         } else if (detailType.equals("preDetail")) {
             InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByPreInv();
@@ -243,14 +241,13 @@ public class BasicBussinessTypeController extends BaseController {
             InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByPreInInv();
             bussinessTypeRequest.setCode(invWarehouseEntity.getCode());
         }
-        bussinessTypeResponses = basicBussinessTypeService.filterJoinByInv(bussinessTypeRequest);
+        List<BasicBussinessTypeResponse> bussinessTypeResponses = basicBussinessTypeService.filterJoinByInv(bussinessTypeRequest);
         List<DictDto> reList = bussinessTypeResponses.stream().map(s -> {
             DictDto dictDto = new DictDto(s.getAction(), s.getName());
             return dictDto;
         }).collect(Collectors.toList());
 
-        PageInfo<DictDto> pageInfo;
+        PageInfo<DictDto> pageInfo = new PageInfo<>(reList);
-        pageInfo = new PageInfo<>(reList);
         PageSimpleResponse<DictDto> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(reList);
@@ -285,8 +282,7 @@ public class BasicBussinessTypeController extends BaseController {
                 result.addAll(bussinessTypeEntities);
             }
 
-            PageInfo<BasicBussinessTypeEntity> pageInfo;
+            PageInfo<BasicBussinessTypeEntity> pageInfo = new PageInfo<>(result);
-            pageInfo = new PageInfo<>(result);
             PageSimpleResponse<BasicBussinessTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
             pageSimpleResponse.setTotal(pageInfo.getTotal());
             pageSimpleResponse.setList(result);
@@ -299,16 +295,13 @@ public class BasicBussinessTypeController extends BaseController {
             bussinessTypeEntities = basicBussinessTypeService.filterJoinByUser(
                     bussinessTypeFilterRequest);
 
-
+            PageInfo<BasicBussinessTypeResponse> pageInfo = new PageInfo<>(bussinessTypeEntities);
-            PageInfo<BasicBussinessTypeResponse> pageInfo;
-            pageInfo = new PageInfo<>(bussinessTypeEntities);
             PageSimpleResponse<BasicBussinessTypeResponse> pageSimpleResponse = new PageSimpleResponse<>();
             pageSimpleResponse.setTotal(pageInfo.getTotal());
             pageSimpleResponse.setList(bussinessTypeEntities);
             return ResultVOUtils.success(pageSimpleResponse);
         }
 
-
     }
 
 
@@ -375,27 +368,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);
-
-        //TODO 单据使用绑定和仓库绑定校验未做，等其他模块功能做完之后进行完善
-        /*OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
-        orderFilterRequest.setAction(bussinessTypeEntity.getAction());
-        OrderEntity orderEntity = orderService.findOne(orderFilterRequest);
-        if (orderEntity != null) {
-            return ResultVOUtils.error(500, "已存在该类型扫码单据，无法删除！");
-        }
-
-
-        FilterInvBusTypeRequest filterInvBusTypeRequest = new FilterInvBusTypeRequest();
-        filterInvBusTypeRequest.setAction(bussinessTypeEntity.getAction());
-        List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities = warehouseBussinessTypeService.filterList(filterInvBusTypeRequest);
-        if (CollUtil.isNotEmpty(warehouseBussinessTypeEntities)) {
-            return ResultVOUtils.error(500, "单据类型已被仓库分库绑定，无法删除");
-        }*/
         //调用同步删除方法
         BasicDataRequest basicDataRequest = new BasicDataRequest();
         basicDataRequest.setDeleteRequest(deleteRequest);
@@ -421,7 +394,6 @@ public class BasicBussinessTypeController extends BaseController {
             cookie = cookie.substring(9);
         }
 
-
         for (int i = 0; i < files.size(); i++) {
             MultipartFile file = files.get(i);
             if (file.isEmpty()) {
@@ -514,8 +486,7 @@ public class BasicBussinessTypeController extends BaseController {
         FilterBussinessTypeRequest bussinessTypeFilterRequest = new FilterBussinessTypeRequest();
         bussinessTypeFilterRequest.setEnable(true);
 
-        List<BasicBussinessTypeEntity> bussinessTypeEntities;
+        List<BasicBussinessTypeEntity> bussinessTypeEntities = basicBussinessTypeService.selectIgnoreSelf(busNoUserRequest.getCurAction());
-        bussinessTypeEntities = basicBussinessTypeService.selectIgnoreSelf(busNoUserRequest.getCurAction());
         PageSimpleResponse<BasicBussinessTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setList(bussinessTypeEntities);
         return ResultVOUtils.success(pageSimpleResponse);
@@ -532,8 +503,7 @@ public class BasicBussinessTypeController extends BaseController {
         }
         bussinessTypeFilterRequest.setEnable(true);
 
-        List<BasicBussinessTypeResponse> bussinessTypeEntities;
+        List<BasicBussinessTypeResponse> bussinessTypeEntities = basicBussinessTypeService.filterList(bussinessTypeFilterRequest);
-        bussinessTypeEntities = basicBussinessTypeService.filterList(bussinessTypeFilterRequest);
         PageSimpleResponse<BasicBussinessTypeResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setList(bussinessTypeEntities);
         return ResultVOUtils.success(pageSimpleResponse);
@@ -549,7 +519,6 @@ public class BasicBussinessTypeController extends BaseController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         bussinessTypeFilterRequest.setEnable(true);
-        //bussinessTypeFilterRequest.setMainAction(ConstantType.TYPE_PUT);
         List<BasicBussinessTypeResponse> bussinessTypeEntities;
 
         if (StrUtil.isNotEmpty(bussinessTypeFilterRequest.getInvCode())) {
@@ -558,7 +527,6 @@ public class BasicBussinessTypeController extends BaseController {
             bussinessTypeEntities = basicBussinessTypeService.filterList(bussinessTypeFilterRequest);
         }
 
-
         PageSimpleResponse<BasicBussinessTypeResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setList(bussinessTypeEntities);
         return ResultVOUtils.success(pageSimpleResponse);

src/main/java/com/glxp/api/controller/basic/BasicCollectPointController.java

@@ -45,26 +45,16 @@ import java.util.List;
 @RestController
 public class BasicCollectPointController extends BaseController {
 
-
     @Resource
     private BasicCollectPointService basicCollectPointService;
-
     @Resource
     private BasicCollectUserService basicCollectUserService;
-
-
-
     @Resource
     private WarehouseUserService warehouseUserService;
-
     @Resource
     private AuthAdminService authAdminService;
 
 
-
-
-
-
     @GetMapping("/udiwms/basic/collectPoints/getList")
     public BaseResponse page(BasicCollectRequest request) {
         List<BasicCollectPointEntity> page = basicCollectPointService.filterList(request);
@@ -88,7 +78,6 @@ public class BasicCollectPointController extends BaseController {
         }
         BasicCollectUserEntity basicCollectUserEntity = new BasicCollectUserEntity();
         basicCollectUserEntity.setId(IdUtil.getSnowflakeNextId());
-//        basicCollectUserEntity.setCollectCode(entity.getCode());
         basicCollectUserEntity.setUserId(Long.valueOf(entity.getChargeUser()));
         basicCollectUserEntity.setCreateTime(new Date());
         basicCollectUserEntity.setUpdateTime(new Date());
@@ -96,7 +85,7 @@ public class BasicCollectPointController extends BaseController {
         basicCollectUserEntity.setCreateUser(this.getUserId() + "");
         boolean save1 = basicCollectUserService.save(basicCollectUserEntity);
         if (!save1){
-            return ResultVOUtils.error("不好意思错误");
+            return ResultVOUtils.error("新增错误");
         }
         return ResultVOUtils.success("成功!!!!!");
     }

src/main/java/com/glxp/api/controller/basic/BasicCorpController.java

@@ -71,8 +71,6 @@ public class BasicCorpController extends BaseController {
     private ThrCorpService thrCorpService;
     @Resource
     private CompanyService companyService;
-    //    @Resource
-//    private OrderService orderService;
     @Resource
     private ErpBasicClient erpBasicClient;
     @Resource
@@ -85,8 +83,7 @@ public class BasicCorpController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        List<BasicCorpEntity> basicUnitMaintainEntities;
+        List<BasicCorpEntity> basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
-        basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
         PageInfo<BasicCorpEntity> pageInfo = new PageInfo<>(basicUnitMaintainEntities);
         PageSimpleResponse<BasicCorpEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
@@ -113,7 +110,6 @@ public class BasicCorpController extends BaseController {
 
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(reList);
-
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
@@ -126,8 +122,7 @@ public class BasicCorpController extends BaseController {
         }
         List<BasicCorpEntity> basicUnitMaintainEntities;
         basicUnitMaintainEntities = basicUnitMaintainService.filterList2(basicUnitMaintainFilterRequest);
-        PageInfo<BasicCorpEntity> pageInfo;
+        PageInfo<BasicCorpEntity> pageInfo = new PageInfo<>(basicUnitMaintainEntities);
-        pageInfo = new PageInfo<>(basicUnitMaintainEntities);
         PageSimpleResponse<BasicCorpEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(basicUnitMaintainEntities);
@@ -202,15 +197,12 @@ public class BasicCorpController extends BaseController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<Integer> corpTypeLists = new ArrayList<>();
-//        corpTypeLists.add(1);
         corpTypeLists.add(2);
         corpTypeLists.add(4);
         basicUnitMaintainFilterRequest.setCorpTypeLists(corpTypeLists);
-//        basicUnitMaintainFilterRequest.setOutType(0);
         List<BasicCorpEntity> basicUnitMaintainEntities;
         basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
-        PageInfo<BasicCorpEntity> pageInfo;
+        PageInfo<BasicCorpEntity> pageInfo = new PageInfo<>(basicUnitMaintainEntities);
-        pageInfo = new PageInfo<>(basicUnitMaintainEntities);
         PageSimpleResponse<BasicCorpEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(basicUnitMaintainEntities);
@@ -236,8 +228,7 @@ public class BasicCorpController extends BaseController {
             basicUnitMaintainResponse.setUnitId(item.getErpId());
             return basicUnitMaintainResponse;
         }).collect(Collectors.toList());
-        PageInfo<BasicUnitMaintainResponse> pageInfo;
+        PageInfo<BasicUnitMaintainResponse> pageInfo = new PageInfo<>(basicUnitMaintainResponses);
-        pageInfo = new PageInfo<>(basicUnitMaintainResponses);
         PageSimpleResponse<BasicUnitMaintainResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(basicUnitMaintainResponses);
@@ -370,21 +361,7 @@ public class BasicCorpController extends BaseController {
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/basic/unit/maintain/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();
@@ -395,70 +372,6 @@ public class BasicCorpController extends BaseController {
         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();
-//                BeanUtils.copyProperties(unitMaintainFilterRequest, filterThrCorpRequest);
-//                filterThrCorpRequest.setThirdSysFk(unitMaintainFilterRequest.getThirdSys());
-//                List<ThrCorpEntity> thrCorpEntities
-//                        = thrCorpService.filterThrCorps(filterThrCorpRequest);
-//                List<ThrCorpEntity> thrCorpEntityList = thrCorpEntities.stream().map(item ->
-//                {
-//                    ThrCorpEntity thrCorpEntity = new ThrCorpEntity();
-//                    BeanUtils.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")
@@ -524,24 +437,12 @@ public class BasicCorpController extends BaseController {
                 basicProductThirdSysResponses.add(basicProductThirdSysResponse);
             }
         }
-        PageInfo<BasicProductThirdSysResponse> pageInfo;
+        PageInfo<BasicProductThirdSysResponse> pageInfo = new PageInfo<>(basicProductThirdSysResponses);
-        pageInfo = new PageInfo<>(basicProductThirdSysResponses);
         PageSimpleResponse<BasicProductThirdSysResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         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("")
@@ -562,7 +463,6 @@ public class BasicCorpController extends BaseController {
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/basic/unit/maintain/getCorpList")
     public BaseResponse getCorpList() {
-
         List<BasicCorpEntity> getCorpList = basicUnitMaintainService.getCorpList();
         return ResultVOUtils.success(getCorpList);
     }
@@ -570,7 +470,6 @@ public class BasicCorpController extends BaseController {
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/basic/unit/maintain/selectCorpList")
     public BaseResponse selectCorpList(@RequestBody BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest) {
-
         List<BasicCorpEntity> getCorpList = basicUnitMaintainService.selectCorpList(basicUnitMaintainFilterRequest);
         return ResultVOUtils.success(getCorpList);
     }
@@ -578,7 +477,6 @@ public class BasicCorpController extends BaseController {
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/basic/unit/maintain/selectCorpListOptimize")
     public BaseResponse selectCorpListOptimize(@RequestBody BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest) {
-
         List<BasicCorpEntity> getCorpList = basicUnitMaintainService.selectCorpList(basicUnitMaintainFilterRequest);
         List<DictDto> reList = getCorpList.stream().map(s -> {
             DictDto dictDto = new DictDto(s.getErpId(), s.getName());

src/main/java/com/glxp/api/controller/basic/BasicCorpExportLogController.java

@@ -40,7 +40,6 @@ public class BasicCorpExportLogController {
     private BasicCorpService basicUnitMaintainService;
     @Resource
     private BasicGenJsonService basicGenJsonService;
-    ;
 
     @GetMapping("/udiwms/corps/exportLog/filter")
     public BaseResponse filter(FilterCorpExportLogRequest filterCorpExportLogRequest,
@@ -51,8 +50,7 @@ public class BasicCorpExportLogController {
         }
         List<BasicCorpsExportLogEntity> corpExportLogEntities
                 = basicCorpExportLogService.filterCorpExportLog(filterCorpExportLogRequest);
-        PageInfo<BasicCorpsExportLogEntity> pageInfo;
+        PageInfo<BasicCorpsExportLogEntity> pageInfo = new PageInfo<>(corpExportLogEntities);
-        pageInfo = new PageInfo<>(corpExportLogEntities);
         PageSimpleResponse<BasicCorpsExportLogEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(corpExportLogEntities);
@@ -149,8 +147,7 @@ public class BasicCorpExportLogController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        List<BasicCorpEntity> basicUnitMaintainEntities;
+        List<BasicCorpEntity> basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
-        basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
         PageInfo<BasicCorpEntity> pageInfo = new PageInfo<>(basicUnitMaintainEntities);
         PageSimpleResponse<BasicCorpEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());

src/main/java/com/glxp/api/controller/basic/BasicCorpImportLogController.java

@@ -47,8 +47,7 @@ public class BasicCorpImportLogController {
         }
         List<BasicCorpsImportLogEntity> udiInfoImportLogEntities
                 = basicCorpImportLogService.filterImportLog(filterCorpImportLogRequest);
-        PageInfo<BasicCorpsImportLogEntity> pageInfo;
+        PageInfo<BasicCorpsImportLogEntity> pageInfo = new PageInfo<>(udiInfoImportLogEntities);
-        pageInfo = new PageInfo<>(udiInfoImportLogEntities);
         PageSimpleResponse<BasicCorpsImportLogEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(udiInfoImportLogEntities);
@@ -101,8 +100,6 @@ public class BasicCorpImportLogController {
                     corpImportLogEntity.setFromType("文件导入");
                     corpImportLogEntity.setUpdateTime(new Date());
                     corpImportLogEntity.setCreateTime(new Date());
-//                    corpImportLogEntity.setCreateUser(String.valueOf(customerService.getUserId()));
-//                    corpImportLogEntity.setUpdateUser(String.valueOf(customerService.getUserId()));
                     corpImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_UNPROCESS);
                     corpImportLogEntity.setUpdateTime(new Date(System.currentTimeMillis()));
                     basicCorpImportLogService.insertImportLog(corpImportLogEntity);

src/main/java/com/glxp/api/controller/basic/BasicDestinyRelController.java

@@ -12,6 +12,7 @@ import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.RedissonCacheKey;
+import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.basic.BasicSkProjectEntity;
 import com.glxp.api.entity.basic.UdiEntity;
@@ -42,11 +43,10 @@ import java.util.Date;
 import java.util.List;
 
 @RestController
-public class BasicDestinyRelController {
+public class BasicDestinyRelController extends BaseController {
 
     @Resource
     BasicSkProjectService basicSkProjectService;
-
     @Resource
     private CustomerService customerService;
     @Resource
@@ -64,14 +64,7 @@ public class BasicDestinyRelController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<BasicSkProjectResponse> basicSkProjectResponses = basicSkProjectService.filterList(basicSkProjectRequest);
-//        if (CollectionUtil.isNotEmpty(basicSkProjectResponses)) {
+
-//            List<Long> pId = basicSkProjectResponses.stream().map(BasicSkProjectResponse::getId).collect(Collectors.toList());
-//            Map<Long, BigDecimal> priceMap = basicDestinyRelService.sumPriceByRedIds(pId);
-//            basicSkProjectResponses.forEach(x -> {
-//                BigDecimal price = priceMap.get(x.getId());
-//                x.setPrice(String.valueOf(price));
-//            });
-//        }
         PageInfo<BasicSkProjectResponse> pageInfo = new PageInfo<>(basicSkProjectResponses);
         PageSimpleResponse<BasicSkProjectResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
@@ -116,25 +109,8 @@ public class BasicDestinyRelController {
     @PostMapping("/udiwms/basic/destiny/model/editModeldestiny")
     public BaseResponse editModeldestiny(@RequestBody BasicSkProjectEntity basicSkProjectEntity) {
 
-        //判断名字和编号不能重复
-//        QueryWrapper<BasicSkProjectEntity> ew = new QueryWrapper<>();
-//        ew.eq("name", basicSkProjectEntity.getName());
-////        ew.eq("type", 2);
-//        BasicSkProjectEntity thrProductsEntity1 = basicSkProjectService.getOne(ew);
-//        if (thrProductsEntity1 != null && !thrProductsEntity1.getId().equals(basicSkProjectEntity.getId())) {
-//            return ResultVOUtils.error(999, "名称已存在！");
-//        }
-//        ew.clear();
-//        ew.eq("code", basicSkProjectEntity.getCode());
-////        ew.eq("type", 2);
-//        thrProductsEntity1 = basicSkProjectService.getOne(ew);
-//        if (thrProductsEntity1 != null && !thrProductsEntity1.getId().equals(basicSkProjectEntity.getId())) {
-//            return ResultVOUtils.error(999, "编号已存在！");
-//        }
-
-        AuthAdmin authAdmin = customerService.getUserBean();
         basicSkProjectEntity.setUpdateTime(new Date());
-        basicSkProjectEntity.setUpdateUser(authAdmin.getId() + "");
+        basicSkProjectEntity.setUpdateUser(String.valueOf(getUserId()));
 
         Boolean falg = basicSkProjectService.updateById(basicSkProjectEntity);
         if (!falg) {
@@ -201,8 +177,7 @@ public class BasicDestinyRelController {
             filterUdiRelRequest.setIds(idList);
         }
         basicInstrumentMaintainRelevanceResponses = basicDestinyRelService.filterUdiJoinSup(filterUdiRelRequest);
-        PageInfo<UdiRelevanceResponse> pageInfo;
+        PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses);
-        pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses);
         PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(basicInstrumentMaintainRelevanceResponses);

src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java

@@ -37,13 +37,11 @@ public class BasicGenExcelService {
     @Resource
     HttpOkClient httpOkClient;
 
-    //
     public String getIpUrl() {
         SyncDataSetEntity syncDataSetEntity = syncDataSetService.findSet();
         return syncDataSetEntity.getSyncIp();
     }
 
-    //
     @Resource
     BasicCorpExportLogService basicCorpExportLogService;
     @Resource
@@ -51,11 +49,6 @@ public class BasicGenExcelService {
     @Resource
     BasicProductsExportLogService basicProductsExportLogService;
 
-    //    @Resource
-//    UdiRelevanceService udiRelevanceService;
-//    @Resource
-//    SystemParamConfigService systemParamConfigService;
-//
     //往来单位导出excel文件
     @Async
     public void exportCorp(String genKey, BasicCorpsExportRequest basicCorpsExportRequest) {
@@ -119,70 +112,7 @@ public class BasicGenExcelService {
         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
     public void uploadCorpSmpJson(String genKey, BasicCorpExportLogResponse exportData) {
 
@@ -199,60 +129,6 @@ 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
     public void uploadProductsSmpJson(String genKey, UdiRelevanceExportJsonResponse exportData) {
         BasicProductsExportLogEntity basicProductsExportLogEntity = basicProductsExportLogService.selectByGenKey(genKey);
@@ -269,50 +145,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 +175,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;
-//    }
 }

src/main/java/com/glxp/api/controller/basic/BasicInCodeController.java

@@ -36,10 +36,8 @@ public class BasicInCodeController {
 
     @Resource
     IoOrderService ioOrderService;
-
     @Resource
     IoOrderDetailBizService ioOrderDetailBizService;
-
     @Resource
     InvInnerOrderPrintService invInnerOrderPrintService;
 
@@ -47,9 +45,7 @@ public class BasicInCodeController {
     @GetMapping("/udiwms/stock/order/filter")
     public BaseResponse filterOrder(FilterOrderRequest filterOrderRequest) {
 
-
         List<IoOrderResponse> ioOrderEntityList = ioOrderService.filterList(filterOrderRequest);
-
         PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(ioOrderEntityList);
         PageSimpleResponse<IoOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
@@ -62,7 +58,6 @@ public class BasicInCodeController {
     public BaseResponse filterStockOrderDetail(FilterOrderDetailBizRequest filterOrderDetailBizRequest) {
 
         List<IoOrderDetailBizResponse> ioOrderDetailBizResponseList = ioOrderDetailBizService.filterList(filterOrderDetailBizRequest);
-
         PageInfo<IoOrderDetailBizResponse> pageInfo = new PageInfo<>(ioOrderDetailBizResponseList);
         PageSimpleResponse<IoOrderDetailBizResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());

src/main/java/com/glxp/api/controller/basic/BasicManufacturerController.java

@@ -61,8 +61,7 @@ public class BasicManufacturerController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        List<BasicManufacturerEntity> basicUnitMaintainEntities;
+        List<BasicManufacturerEntity> basicUnitMaintainEntities = manufacturerService.filterList(basicUnitMaintainFilterRequest);
-        basicUnitMaintainEntities = manufacturerService.filterList(basicUnitMaintainFilterRequest);
         PageInfo<BasicManufacturerEntity> pageInfo = new PageInfo<>(basicUnitMaintainEntities);
         PageSimpleResponse<BasicManufacturerEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
@@ -125,12 +124,6 @@ public class BasicManufacturerController extends BaseController {
 
         String id = deleteRequest.getId();
         manufacturerService.removeById(id);
-//        //调用同步删除的方法
-//        BasicDataRequest basicDataRequest = new BasicDataRequest();
-//        basicDataRequest.setDeleteRequest(deleteRequest);
-//        basicDataRequest.setKey(SyncDelType.BASIC_CORP_MAINTAIN);
-//        Long userId = getUserId();
-//        spGetHttpClient.deleteBasicData(basicDataRequest, userId + "");
         return ResultVOUtils.success("删除成功");
     }
 
@@ -304,8 +297,7 @@ public class BasicManufacturerController extends BaseController {
                 basicProductThirdSysResponses.add(basicProductThirdSysResponse);
             }
         }
-        PageInfo<BasicProductThirdSysResponse> pageInfo;
+        PageInfo<BasicProductThirdSysResponse> pageInfo = new PageInfo<>(basicProductThirdSysResponses);
-        pageInfo = new PageInfo<>(basicProductThirdSysResponses);
         PageSimpleResponse<BasicProductThirdSysResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(basicProductThirdSysResponses);

src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java

@@ -79,7 +79,6 @@ public class BasicOrderPrintController {
     @PostMapping("/udiwms/pdf/template/inspection/order/file")
     public BaseResponse inspectionStockOrderPDFFromTemplateFile(@RequestBody FilterOrderPrintRequest filterOrderPrintRequest) {
 
-
         String name = getStatusName(filterOrderPrintRequest.getStatus());
         SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity = systemPDFTemplateRelevanceCodeService.selectNameAndAction(name, filterOrderPrintRequest.getAction());
         if (sysPdfTemplateRelevanceCodeEntity != null) {
@@ -153,19 +152,7 @@ public class BasicOrderPrintController {
                     bizData.put("zczbhhzbapzbh", obj.getCertCode() == null ? ' ' : obj.getCertCode());
                     bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc());
                     bizData.put("fromSpmsOrders", ioOrderResponse.getFromSpmsOrders() == null ? ' ' : ioOrderResponse.getFromSpmsOrders());
-//                    bizData.put("cplb", udiProductEntity.getCplb() == null ? ' ' : udiProductEntity.getCplb());
+
-//                    if(ioOrderInvoiceResponses != null && ioOrderInvoiceResponses.size()>0){
-//                        String encode="";
-//                        for (IoOrderInvoiceResponse respons : ioOrderInvoiceResponses) {
-//                            encode+=respons.getInvoiceEncode()+",";
-//                        }
-//                        encode = encode.substring(0,encode.length()-1);
-//                        bizData.put("invoiceEncode", encode == null ? ' ' : encode);
-//                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//                        String dateStr = sdf.format(ioOrderInvoiceResponses.get(0).getCreateTime());
-//                        bizData.put("createTime", dateStr == null ? ' ' : dateStr);
-//
-//                    }
                     //添加发票号
                     String fphm = "";
                     String fprq = null;
@@ -212,7 +199,6 @@ public class BasicOrderPrintController {
                     }
                     //查询产品表
                     UdiRelevanceResponse udiProductEntity = udiRelevanceService.selectByRelId(ioOrderDetailBizEntity.getBindRlFk() + "");
-//                    List<IoOrderInvoiceResponse> ioOrderInvoiceResponses = ioOrderDetailBizService.selectByorderIdFk(ioOrderDetailBizEntity.getOrderIdFk());
                     //组装数据
                     Map<String, Object> bizData = new HashMap<>();
                     bizData.put("index", i);
@@ -240,18 +226,7 @@ public class BasicOrderPrintController {
                     bizData.put("zczbhhzbapzbh", ioOrderDetailBizEntity.getCertCode() == null ? ' ' : ioOrderDetailBizEntity.getCertCode());
                     bizData.put("udiCode", obj.getCode().replaceAll("\u001D", ""));
                     bizData.put("fromSpmsOrders", ioOrderResponse.getFromSpmsOrders() == null ? ' ' : ioOrderResponse.getFromSpmsOrders());
-//                    bizData.put("cplb", udiProductEntity.getCplb() == null ? ' ' : udiProductEntity.getCplb());
+
-//                    if(ioOrderInvoiceResponses != null && ioOrderInvoiceResponses.size()>0){
-//                        String encode="";
-//                        for (IoOrderInvoiceResponse respons : ioOrderInvoiceResponses) {
-//                            encode+=respons.getInvoiceEncode()+",";
-//                        }
-//                        encode = encode.substring(0,encode.length()-1);
-//                        bizData.put("invoiceEncode", encode == null ? ' ' : encode);
-//                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//                        String dateStr = sdf.format(ioOrderInvoiceResponses.get(0).getCreateTime());
-//                        bizData.put("createTime", dateStr == null ? ' ' : dateStr);
-//                    }
                     //添加发票号
                     String fphm = "";
                     String fprq = null;
@@ -331,7 +306,6 @@ public class BasicOrderPrintController {
         //查询单据表
         FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
         filterOrderRequest.setBillNo(filterOrderPrintRequest.getOrderIdFk());
-        IoOrderResponse ioOrderResponse = ioOrderService.filterList(filterOrderRequest).get(0);
         //查询业务单详情
         List<IoCodeEntity> ioCodeEntityList = ioCodeService.findByOrderId(filterOrderPrintRequest.getOrderIdFk());
         int i = 1;

src/main/java/com/glxp/api/controller/basic/BasicProductSetController.java

@@ -29,8 +29,7 @@ public class BasicProductSetController {
     @GetMapping("/spms/basicProduct/setup/filter")
     public BaseResponse filterSetUps(FilterBasicProductSetrequest filterBasicProductSetrequest) {
         List<BasicProductSetEntity> basicProductSetEntities = basicProductSetService.filterSetup(filterBasicProductSetrequest);
-        PageInfo<BasicProductSetEntity> pageInfo;
+        PageInfo<BasicProductSetEntity> pageInfo = new PageInfo<>(basicProductSetEntities);
-        pageInfo = new PageInfo<>(basicProductSetEntities);
         PageSimpleResponse<BasicProductSetEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(basicProductSetEntities);

src/main/java/com/glxp/api/controller/basic/BasicProductsExportLogController.java

@@ -58,8 +58,7 @@ public class BasicProductsExportLogController {
         }
         List<BasicProductsExportLogEntity> udiInfoExportLogEntities
                 = basicProductsExportLogService.filterUdiInfoExportLog(filterUdiEpLogReques);
-        PageInfo<BasicProductsExportLogEntity> pageInfo;
+        PageInfo<BasicProductsExportLogEntity> pageInfo = new PageInfo<>(udiInfoExportLogEntities);
-        pageInfo = new PageInfo<>(udiInfoExportLogEntities);
         PageSimpleResponse<BasicProductsExportLogEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(udiInfoExportLogEntities);
@@ -146,7 +145,6 @@ public class BasicProductsExportLogController {
         basicProductsExportLogService.insertUdiInfoExportLog(basicProductsExportLogEntity);
         UdiRelevanceExportJsonResponse exportData = basicGenJsonService.paresDataJson(udiInfoExportRequest);
         basicGenExcelService.uploadProductsSmpJson(genKey, exportData);
-//        basicGenExcelService.uploadProductsSmp(genKey, udiInfoExportRequest);
         return ResultVOUtils.success("后台正在上传，请稍后刷新查看!");
 
     }
@@ -175,16 +173,14 @@ public class BasicProductsExportLogController {
             }
         }
 
-        List<UdiRelevanceResponse> udiRelevanceResponses = null;
+        List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiRelRequest);
-        udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiRelRequest);
         List<UdiRlDlResponse> udiRlDlResponses = udiRelevanceResponses.stream().map(item ->
         {
             UdiRlDlResponse udiRlDlResponse = new UdiRlDlResponse();
             BeanUtils.copyProperties(item, udiRlDlResponse);
             return udiRlDlResponse;
         }).collect(Collectors.toList());
-        PageInfo<UdiRelevanceResponse> pageInfo;
+        PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(udiRelevanceResponses);
-        pageInfo = new PageInfo<>(udiRelevanceResponses);
         PageSimpleResponse<UdiRlDlResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(udiRlDlResponses);
@@ -214,16 +210,14 @@ public class BasicProductsExportLogController {
             }
         }
 
-        List<UdiRelevanceResponse> udiRelevanceResponses = null;
+        List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
-        udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
         List<UdiRlDlResponse> udiRlDlResponses = udiRelevanceResponses.stream().map(item ->
         {
             UdiRlDlResponse udiRlDlResponse = new UdiRlDlResponse();
             BeanUtils.copyProperties(item, udiRlDlResponse);
             return udiRlDlResponse;
         }).collect(Collectors.toList());
-        PageInfo<UdiRelevanceResponse> pageInfo;
+        PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(udiRelevanceResponses);
-        pageInfo = new PageInfo<>(udiRelevanceResponses);
         PageSimpleResponse<UdiRlDlResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(udiRlDlResponses);

src/main/java/com/glxp/api/controller/basic/BasicProductsImportLogController.java

@@ -56,8 +56,7 @@ public class BasicProductsImportLogController {
         }
         List<BasicProductsImportLogEntity> udiInfoImportLogEntities
                 = basicProductsImportLogService.filterImportLog(filterUdiIpLogRequest);
-        PageInfo<BasicProductsImportLogEntity> pageInfo;
+        PageInfo<BasicProductsImportLogEntity> pageInfo = new PageInfo<>(udiInfoImportLogEntities);
-        pageInfo = new PageInfo<>(udiInfoImportLogEntities);
         PageSimpleResponse<BasicProductsImportLogEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(udiInfoImportLogEntities);
@@ -73,8 +72,7 @@ public class BasicProductsImportLogController {
         }
         List<BasicProductsImportDetailEntity> udiInfoImportEntities
                 = basicProductsImportDetailService.filterUdiInfoImport(filterUdiIpLogRequest);
-        PageInfo<BasicProductsImportDetailEntity> pageInfo;
+        PageInfo<BasicProductsImportDetailEntity> pageInfo = new PageInfo<>(udiInfoImportEntities);
-        pageInfo = new PageInfo<>(udiInfoImportEntities);
         PageSimpleResponse<BasicProductsImportDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(udiInfoImportEntities);

src/main/java/com/glxp/api/controller/basic/BasicSickerController.java

@@ -73,12 +73,6 @@ public class BasicSickerController extends BaseController {
             BaseResponse<PageSimpleResponse<BasicSkSickerResponse>> baseResponse = erpBasicClient.getSicker(getSickRequest);
             if (CollUtil.isNotEmpty(baseResponse.getData().getList())) {
                 List<BasicSkSickerResponse> list = baseResponse.getData().getList();
-//                List<BasicSkSickerEntity> basicSkSickerEntities = new ArrayList<>();
-//                list.forEach(item -> {
-//                    BasicSkSickerEntity basicSkSickerEntity = new BasicSkSickerEntity();
-//                    BeanUtil.copyProperties(item, basicSkSickerEntity);
-//                    basicSkSickerEntities.add(basicSkSickerEntity);
-//                });
                 basicSkSickerService.replaceBatchs(list);
             }
             return baseResponse;

src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java

@@ -44,10 +44,8 @@ public class BasicSkPrescribeController extends BaseController {
 
     @Resource
     BasicSkSickerService basicSkSickerService;
-
     @Resource
     BasicSkPrescribeService basicSkPrescribeService;
-
     @Resource
     BasicSkPrescribeItemService basicSkPrescribeItemService;
     @Resource

src/main/java/com/glxp/api/controller/basic/EntrustReceController.java

@@ -40,8 +40,7 @@ public class EntrustReceController extends BaseController {
     @GetMapping("/spms/entrust/rece/filter")
     public BaseResponse getEntrustRece(BasicEntrustRecRequest basicExportStatusRequest) {
         List<EntrustReceResponse> entrustReceEntities = entrustReceService.filterJoinEntrustRec(basicExportStatusRequest);
-        PageInfo<EntrustReceResponse> pageInfo;
+        PageInfo<EntrustReceResponse> pageInfo = new PageInfo<>(entrustReceEntities);
-        pageInfo = new PageInfo<>(entrustReceEntities);
         PageSimpleResponse<EntrustReceResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(entrustReceEntities);
@@ -53,8 +52,7 @@ public class EntrustReceController extends BaseController {
     public BaseResponse downloadEntrust(BasicEntrustRecRequest basicExportStatusRequest) {
         basicExportStatusRequest.setEntrustUser(getUserId());
         List<DlEntrustReceEntity> entrustReceEntities = entrustReceService.downloadEntrustRec(basicExportStatusRequest);
-        PageInfo<DlEntrustReceEntity> pageInfo;
+        PageInfo<DlEntrustReceEntity> pageInfo = new PageInfo<>(entrustReceEntities);
-        pageInfo = new PageInfo<>(entrustReceEntities);
         PageSimpleResponse<DlEntrustReceEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(entrustReceEntities);

src/main/java/com/glxp/api/controller/basic/UdiContrastController.java

@@ -132,9 +132,7 @@ public class UdiContrastController {
     @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());
@@ -312,8 +310,7 @@ public class UdiContrastController {
 
         }
 
-        PageInfo<ProductInfoEntity> pageInfo;
+        PageInfo<ProductInfoEntity> pageInfo = new PageInfo<>(productInfoEntityList);
-        pageInfo = new PageInfo<>(productInfoEntityList);
         PageSimpleResponse<ProductInfoEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(productInfoEntityList);
@@ -328,7 +325,6 @@ public class UdiContrastController {
     public BaseResponse addProduct(@RequestBody @Valid AddProductRequest addProductRequest) {
         udiProductService.addProduct(addProductRequest);
         return ResultVOUtils.success();
-
     }
 
     /**
@@ -342,7 +338,6 @@ public class UdiContrastController {
     public BaseResponse addDrug(@RequestBody AddProductRequest addProductRequest) {
         AddProductRequest udiRelevanceEntity = udiProductService.addDrug(addProductRequest);
         return ResultVOUtils.success(udiRelevanceEntity);
-
     }
 
     @AuthRuleAnnotation("")

src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java

@@ -101,10 +101,8 @@ public class UdiRelevanceController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        List<UdiRelevanceResponse> udiRelevanceResponses = null;
+        List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceDao.pdaDlUdiRel(filterUdiRelRequest);
-        udiRelevanceResponses = udiRelevanceDao.pdaDlUdiRel(filterUdiRelRequest);
+        PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(udiRelevanceResponses);
-        PageInfo<UdiRelevanceResponse> pageInfo;
-        pageInfo = new PageInfo<>(udiRelevanceResponses);
         PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(udiRelevanceResponses);
@@ -119,8 +117,6 @@ public class UdiRelevanceController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        List<UdiRelevanceResponse> udiRelevanceResponses = null;
-
         if (StrUtil.isNotEmpty(filterUdiRelRequest.getUdiCode())) {
             filterUdiRelRequest.setNameCode(FilterUdiUtils.getUdi(filterUdiRelRequest.getUdiCode()).getUdi());
         }
@@ -132,9 +128,8 @@ public class UdiRelevanceController extends BaseController {
             filterUdiRelRequest.setRelIds(list);
         }
 
-        udiRelevanceResponses = udiRelevanceService.filterUdiJoinSup(filterUdiRelRequest);
+        List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiJoinSup(filterUdiRelRequest);
-        PageInfo<UdiRelevanceResponse> pageInfo;
+        PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(udiRelevanceResponses);
-        pageInfo = new PageInfo<>(udiRelevanceResponses);
         PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(udiRelevanceResponses);
@@ -216,8 +211,7 @@ public class UdiRelevanceController extends BaseController {
             }
         }
 
-        PageInfo<UdiRelevanceResponse> pageInfo;
+        PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(udiRelevanceResponses);
-        pageInfo = new PageInfo<>(udiRelevanceResponses);
         PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(udiRelevanceResponses);
@@ -230,8 +224,7 @@ public class UdiRelevanceController extends BaseController {
     @GetMapping("/udi/cert/filterUdi")
     public BaseResponse filterCertUdi(FilterUdiRelRequest filterUdiRelRequest) {
         List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterCertUdi(filterUdiRelRequest);
-        PageInfo<UdiRelevanceResponse> pageInfo;
+        PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(udiRelevanceResponses);
-        pageInfo = new PageInfo<>(udiRelevanceResponses);
         PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(udiRelevanceResponses);
@@ -250,9 +243,7 @@ public class UdiRelevanceController extends BaseController {
         }
         UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(filterUdiRelRequest.getId());
         FilterUdiRelRequest tempRequest = new FilterUdiRelRequest();
-        tempRequest.setUuid(udiRelevanceEntity.getUuid());//        if (filterUdiRelRequest.getProductsType() == 2) {
+        tempRequest.setUuid(udiRelevanceEntity.getUuid());
-//            tempRequest.setNameCode(filterUdiRelRequest.getNameCode());
-//        }
 
         List<UdiProductEntity> udiInfoEntities = udiProductService.filterAllUdiInfo(tempRequest);
         List<UdiRelevanceResponse> udiRelevanceResponses = new ArrayList<>();
@@ -277,8 +268,7 @@ public class UdiRelevanceController extends BaseController {
         List<UdiRelevanceResponse> udiRelevanceResponses = null;
         filterUdiRelRequest.setKey("1");
         udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiRelRequest);
-        PageInfo<UdiRelevanceResponse> pageInfo;
+        PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(udiRelevanceResponses);
-        pageInfo = new PageInfo<>(udiRelevanceResponses);
         PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(udiRelevanceResponses);
@@ -304,8 +294,7 @@ public class UdiRelevanceController extends BaseController {
     IoCodeService codeService;
     @Resource
     CompanyProductRelevanceService companyProductRelevanceService;
-    @Resource
+
-    SpGetHttpClient spGetHttpClient;
 
     @AuthRuleAnnotation("")
     @PostMapping("/udi/udirel/deleteById")
@@ -323,18 +312,12 @@ public class UdiRelevanceController extends BaseController {
             }
         }
 
-
         udiRelevanceService.deleteById(ids);
         List<UdiRelevanceEntity> udiRelevanceEntities = udiRelevanceService.selectByUuid(udiRelevanceEntity.getUuid());
         if (udiRelevanceEntities == null || udiRelevanceEntities.isEmpty()) {
             udiProductService.deleteByUuid(udiRelevanceEntity.getUuid());
         }
-//        //调用同步删除的方法
+
-//        BasicDataRequest basicDataRequest = new BasicDataRequest();
-//        basicDataRequest.setDeleteRequest(deleteRequest);
-//        basicDataRequest.setKey(SyncDelType.BASIC_MAINTAIN);
-//        Long userId = getUserId();
-//        spGetHttpClient.deleteBasicData(basicDataRequest, userId + "");
         return ResultVOUtils.success("删除成功");
     }
 
@@ -366,16 +349,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());
@@ -413,7 +390,6 @@ public class UdiRelevanceController extends BaseController {
         udiProductEntity.setRequireScanCode(udiRelevanceSaveRequest.getRequireScanCode());
         udiProductEntity.setFlbm(udiRelevanceSaveRequest.getFlbm());
         udiProductEntity.setWorkPlaceCount(udiRelevanceSaveRequest.getWorkPlaceCount());
-//        udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity);
         if (StrUtil.isNotEmpty(udiRelevanceSaveRequest.getOriginUuid())) {
             udiProductEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI);
         }
@@ -464,7 +440,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());
@@ -506,7 +481,7 @@ public class UdiRelevanceController extends BaseController {
     @Resource
     InvPreProductService invPreProductService;
 
-    //查询产品是否可以被禁用   todo 库存还未完成
+    //查询产品是否可以被禁用
     @AuthRuleAnnotation("")
     @PostMapping("/udi/udirel/disable")
     public BaseResponse disable(@RequestBody UdiCombineRequest udiCombineRequest) {
@@ -523,20 +498,6 @@ public class UdiRelevanceController extends BaseController {
     }
 
 
-    public UdiProductEntity getUdiInfo(UdiCombineRequest udiCombineRequest) {
-        UdiRelevanceEntity temp = udiRelevanceService.selectById(udiCombineRequest.getRelId());
-        FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
-        filterUdiRelRequest.setNameCode(udiCombineRequest.getThirdId());
-        filterUdiRelRequest.setUuid(temp.getUuid());
-        List<UdiProductEntity> udiInfoEntities = udiProductService.filterUdiInfo(filterUdiRelRequest);
-        if (udiInfoEntities != null && udiInfoEntities.size() > 0) {
-            UdiProductEntity udiProductEntity = udiInfoEntities.get(0);
-            return udiProductEntity;
-        }
-        return null;
-    }
-
-
     //单独选入ERP产品
     @AuthRuleAnnotation("")
     @PostMapping("/udi/udirel/addErp")
@@ -594,8 +555,7 @@ public class UdiRelevanceController extends BaseController {
             }
         }
         filterSysEntityList.add(new FilterSysEntity(10, "最新同步"));
-        PageInfo<FilterSysEntity> pageInfo;
+        PageInfo<FilterSysEntity> pageInfo = new PageInfo<>(filterSysEntityList);
-        pageInfo = new PageInfo<>(filterSysEntityList);
         PageSimpleResponse<FilterSysEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(filterSysEntityList);
@@ -625,8 +585,7 @@ public class UdiRelevanceController extends BaseController {
             }
         }
         filterSysEntityList.add(new DictDto(10, "最新同步"));
-        PageInfo<DictDto> pageInfo;
+        PageInfo<DictDto> pageInfo = new PageInfo<>(filterSysEntityList);
-        pageInfo = new PageInfo<>(filterSysEntityList);
         PageSimpleResponse<DictDto> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(filterSysEntityList);
@@ -751,8 +710,7 @@ public class UdiRelevanceController extends BaseController {
                 }
             }
         }
-        PageInfo<BasicProductThirdSysResponse> pageInfo;
+        PageInfo<BasicProductThirdSysResponse> pageInfo = new PageInfo<>(basicProductThirdSysResponses);
-        pageInfo = new PageInfo<>(basicProductThirdSysResponses);
         PageSimpleResponse<BasicProductThirdSysResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(basicProductThirdSysResponses);
@@ -810,9 +768,6 @@ public class UdiRelevanceController extends BaseController {
 
     }
 
-    //业务单据选入耗材字典查询列表
-
-
     /**
      * 查询产品规格型号列表
      *

src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java

@@ -58,7 +58,6 @@ public class UdiRlSupController extends BaseController {
     private CompanyProductsRelService companyProductsRelService;
     @Resource
     private BasicCorpService basicUnitMaintainService;
-
     @Resource
     private UdiRelevanceService udiRelevanceService;
     @Resource
@@ -67,8 +66,6 @@ public class UdiRlSupController extends BaseController {
     SpGetHttpClient spGetHttpClient;
     @Resource
     private IBasicBussinessTypeService basicBussinessTypeService;
-    @Resource
-    private com.glxp.api.service.system.ClassifyCodeService classifyCodeService;
 
     @AuthRuleAnnotation("")
     @GetMapping("/sale/info/company/product/relevance/filter")
@@ -125,8 +122,7 @@ public class UdiRlSupController extends BaseController {
         }
         List<UdiRlSupResponse> basicInstrumentMaintainRelevanceResponses = null;
         basicInstrumentMaintainRelevanceResponses = udiRlSupService.filterUdiGp(companyProductRelevanceRequest);
-        PageInfo<UdiRlSupResponse> pageInfo;
+        PageInfo<UdiRlSupResponse> pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses);
-        pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses);
         PageSimpleResponse<UdiRlSupResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(basicInstrumentMaintainRelevanceResponses);
@@ -180,8 +176,7 @@ public class UdiRlSupController extends BaseController {
         BeanCopyUtils.copy(companyProductRelevanceRequest, filterUdiRelRequest);
         filterUdiRelRequest.setIds(idList);
         basicInstrumentMaintainRelevanceResponses = udiRelevanceService.filterUdiJoinSup(filterUdiRelRequest);
-        PageInfo<UdiRelevanceResponse> pageInfo;
+        PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses);
-        pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses);
         PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(basicInstrumentMaintainRelevanceResponses);
@@ -231,8 +226,7 @@ public class UdiRlSupController extends BaseController {
         FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
         BeanCopyUtils.copy(companyProductRelevanceRequest, filterUdiRelRequest);
         udiRelevanceResponses = udiRelevanceService.filterUdiJoinSup(filterUdiRelRequest);
-        PageInfo<UdiRelevanceResponse> pageInfo;
+        PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(udiRelevanceResponses);
-        pageInfo = new PageInfo<>(udiRelevanceResponses);
         PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(udiRelevanceResponses);
@@ -284,8 +278,7 @@ public class UdiRlSupController extends BaseController {
         }
         List<UdiRlSupEntity> companyProductRelevanceEntities =
                 udiRlSupService.filterCompanyProductRelevance(filterCompanyProductRelevanceRequest);
-        PageInfo<UdiRlSupEntity> pageInfo;
+        PageInfo<UdiRlSupEntity> pageInfo = new PageInfo<>(companyProductRelevanceEntities);
-        pageInfo = new PageInfo<>(companyProductRelevanceEntities);
         PageSimpleResponse<UdiRlSupEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(companyProductRelevanceEntities);
@@ -307,7 +300,6 @@ public class UdiRlSupController extends BaseController {
     @AuthRuleAnnotation("")
     @GetMapping("/sale/info/getCompanyProductRelevance")
     public BaseResponse getCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest) {
-//        filterCompanyProductRelevanceRequest.setCustomerId(getCustomerId());
         List<UdiRlSupEntity> companyProductRelevanceEntities = udiRlSupService.getCompanyProductRelevance(filterCompanyProductRelevanceRequest);
         PageInfo<UdiRlSupEntity> pageInfo = new PageInfo<>(companyProductRelevanceEntities);
         PageSimpleResponse<UdiRlSupEntity> pageSimpleResponse = new PageSimpleResponse<>();
@@ -340,12 +332,9 @@ public class UdiRlSupController extends BaseController {
         }
         //查询本企业有没有选择该产品有选择不能选择
         CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest();
-//        companyProductRelevanceRequest.setCustomerId(udiInfoExportRequest.getCustomerId() + "");
         companyProductRelevanceRequest.setCustomerId(udiInfoExportRequest.getUnitFk() + "");
-//        List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
         List<UdiRlSupResponse> basicInstrumentMaintainRelevanceResponses = null;
         companyProductRelevanceRequest.setDiType(1);
-//        basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
         basicInstrumentMaintainRelevanceResponses = udiRlSupService.filterUdiGp(companyProductRelevanceRequest);
         String rlidStr = udiInfoExportRequest.getRlIds().get(0);
         for (UdiRlSupResponse obj : basicInstrumentMaintainRelevanceResponses) {

src/main/java/com/glxp/api/controller/basic/UdiSyncController.java

@@ -211,8 +211,7 @@ public class UdiSyncController {
     public BaseResponse filterProduct(FilterUdiRelRequest filterUdiRelRequest) {
         List<UdiProductEntity> udiInfoEntities
                 = udiProductService.filterAllUdiInfo(filterUdiRelRequest);
-        PageInfo<UdiProductEntity> pageInfo;
+        PageInfo<UdiProductEntity> pageInfo = new PageInfo<>(udiInfoEntities);
-        pageInfo = new PageInfo<>(udiInfoEntities);
         PageSimpleResponse<UdiProductEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(udiInfoEntities);
@@ -252,7 +251,6 @@ public class UdiSyncController {
 
     @GetMapping("udiwms/test")
     public void filterUdi() {
-        FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
         List<BasicProductsEntity> data = basicProductsDao.selectList();
         int i = 0;
         try {
@@ -261,11 +259,10 @@ public class UdiSyncController {
                     i++;
                     String a = datum.getCpmctymc().substring(0, 1);
                     datum.setPinyinInitial(converterToFirstSpell(datum.getCpmctymc()));
-                    System.out.println("-----------------------------------------------------" + i);
                 }
             }
         } catch (Exception e) {
-            System.out.println("|||||||||||||||||||||||" + e.getMessage());
+
         }
         basicProductsDao.updateBatchById(data);
     }

src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java

@@ -47,15 +47,12 @@ public class IoCollectCodeBackupController extends BaseController {
 
     @Resource
     IoCollectCodeBackService ioCollectCodeBackService;
-
     @Resource
     IoCollectOrderService collectOrderService;
     @Resource
     IoCollectOrderBackupService ioCollectOrderBackupService;
-
     @Resource
     IoCollectOrderCodeAutoService ioCollectOrderCodeAutoService;
-
     @Resource
     IoCollectOrderCodeManService ioCollectOrderCodeManService;
     @Resource
@@ -162,25 +159,7 @@ public class IoCollectCodeBackupController extends BaseController {
             ioCollectCodeResponse.setProductDate(udiEntity.getProduceDate());
             ioCollectCodeResponse.setExpireDate(udiEntity.getExpireDate());
         }
-//        for (IoCollectCodeResponse ioCollectCodeResponse : ioCollectCodeResponses){
+
-//            CollectOrderCodeAutoRequest collectOrderCodeAutoRequest = new CollectOrderCodeAutoRequest();
-//            collectOrderCodeAutoRequest.setOrderIdFk(request.getBillNo());
-//            collectOrderCodeAutoRequest.setUdiCode(ioCollectCodeResponse.getCode());
-//            List<CollectOrderCodeAutoResponse> collectOrderCodeAutoResponses = ioCollectOrderCodeAutoService.filterList(collectOrderCodeAutoRequest);
-//            if (collectOrderCodeAutoResponses.size() >0){
-//                CollectOrderCodeAutoResponse collectOrderCodeAutoResponse = collectOrderCodeAutoResponses.get(0);
-//                ioCollectCodeResponse.setSerialNo(collectOrderCodeAutoResponse.getSerialNo());
-//            }else {
-//                CollectOrderCodeManRequest collectOrderCodeManRequest = new CollectOrderCodeManRequest();
-//                collectOrderCodeManRequest.setUdiCode(ioCollectCodeResponse.getCode());
-//                collectOrderCodeManRequest.setOrderIdFk(request.getBillNo());
-//                List<CollectOrderCodeManResponse> collectOrderCodeManResponses = ioCollectOrderCodeManService.filterList(collectOrderCodeManRequest);
-//                if (collectOrderCodeManResponses.size() > 0){
-//                    CollectOrderCodeManResponse collectOrderCodeManResponse = collectOrderCodeManResponses.get(0);
-//                    ioCollectCodeResponse.setSerialNo(collectOrderCodeManResponse.getSerialNo());
-//                }
-//            }
-//        }
         PageInfo<IoCollectCodeResponse> pageInfo = new PageInfo<>(ioCollectCodeResponses);
         PageSimpleResponse<IoCollectCodeResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());

src/main/java/com/glxp/api/controller/collect/IoCollectLedGroupController.java

@@ -66,9 +66,6 @@ public class IoCollectLedGroupController extends BaseController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
-
-    @Resource
-    IoCollectOrderBizService ioCollectOrderBizService;
     @Resource
     SysWorkplaceQueueService sysWorkplaceQueueService;
 

src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java

@@ -40,10 +40,8 @@ public class IoCollectOrderBackupController extends BaseController {
 
     @Resource
     private IoCollectOrderBackupService ioCollectOrderBackupService;
-
     @Resource
     private BasicCollectUserService basicCollectUserService;
-
     @Resource
     private IoCollectOrderBizBackupService ioCollectOrderBizBackupService;
 
@@ -84,7 +82,6 @@ public class IoCollectOrderBackupController extends BaseController {
         if (collectOrder == null) {
             return ResultVOUtils.error(500, "未找到单据");
         }
-//        List<CollectOrderBizResponse> collectOrderBizResponses = ioCollectOrderBackupService.combieOrderDetail(collectOrderBizRequest);
         List<CollectOrderBizResponse> collectOrderBizResponses = ioCollectOrderBackupService.setScanCodeOrderDetail(collectOrderBizRequest);
         for (CollectOrderBizResponse response : collectOrderBizResponses) {
             if (response.getGgxh() == null) {

src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java

@@ -54,14 +54,6 @@ import java.util.List;
 @Service
 @Slf4j
 public class IoCollectOriginService {
-    @Resource
-    private ErpBasicClient erpBasicClient;
-    @Resource
-    private BasicSkPrescribeService basicSkPrescribeService;
-    @Resource
-    private BasicSkPrescirbeDetailService basicSkPrescirbeDetailService;
-    @Resource
-    private IoCollectOrderService ioCollectOrderService;
 
     @Resource
     IoCollectOrderService collectOrderService;
@@ -70,8 +62,6 @@ public class IoCollectOriginService {
     @Resource
     private DownloadFactory downloadFactory;
     @Resource
-    private SysWorkplaceDocumentDao sysWorkplaceDocumentDao;
-    @Resource
     private SysWorkplaceDocumentService sysWorkplaceDocumentService;
     @Resource
     private IoCollectOrderOriginService collectOrderOriginService;