feat: 控制层优化

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

@@ -38,11 +38,9 @@ import java.util.*;
 @RestController
 public class SysWorkplaceRegionController extends BaseController {
 
-
     @Resource
     SysWorkplaceRegionService SysWorkplaceRegionService;
 
-
     @GetMapping("/udiwms/sysWorkplaceRegion/getList")
     public BaseResponse getUserBindWork(SysWorkplaceRegionRequest request) {
         List<SysWorkplaceRegionResponse> regionResponses = SysWorkplaceRegionService.filterList(request);
@@ -94,38 +92,7 @@ public class SysWorkplaceRegionController extends BaseController {
 
     @PostMapping("/udiwms/WorkplaceFreight/printRegion")
     public BaseResponse printFreight(@RequestBody SysWorkplaceRegionRequest sysWorkplaceRegionRequest, HttpServletRequest request, HttpServletResponse response) throws Exception {
-//        SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity = systemPDFModuleService.selectByLabelId(sysWorkplaceFreightRequest.getLabelId() + "");
+
-//        if (null == sysPdfTemplateRelevanceLabelEntity) {
-//            return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误");
-//        }
-//
-//        SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(String.valueOf(sysPdfTemplateRelevanceLabelEntity.getTemplateId()));
-//        if (null == systemPDFTemplateEntity) {
-//            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) {
-//            for (SysWorkplaceFreightPrintResponse obj : responses) {
-//                if (obj.getQueueCode() != null && obj.getQueueCode()!= ""){
-//                    Map<String, Object> supData = new HashMap<>();
-//                    supData.put("name", obj.getRemark() + "");
-//                    supData.put("code", obj.getQueueCode());
-//                    supData.put("workplaceName", obj.getWorkPlaceName());
-//                    list.add(supData);
-//                    i++;
-//                }
-//            }
-//        }
-//        data.put("data",list);
-//        String param = JSON.toJSONString(data);
-//        JasperUtils.jasperReport(request, response, param, filePath + "pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf");
-//
         return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误");
     }
 

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

@@ -183,7 +183,6 @@ public class UdiContrastController {
             }
         }
 
-
         //关联第三方产品信息若无值则由第三方产品信息带过来
         UdiProductEntity udiProductEntity = udiProductService.findByUuid(udiRelevanceEntity.getUuid());
         if (StrUtil.isEmpty(udiProductEntity.getManufactory())) {
@@ -315,7 +314,6 @@ public class UdiContrastController {
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(productInfoEntityList);
         return ResultVOUtils.success(pageSimpleResponse);
-
     }
 
 

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

@@ -157,9 +157,6 @@ public class UdiSyncController {
         }
     }
 
-    @Resource
-    SpGetHttpClient spGetHttpClient;
-
     @AuthRuleAnnotation("")
     @GetMapping("udiwms/udiinfo/superSearch")
     public BaseResponse superSearch(FilterUdiInfoRequest filterUdiInfoRequest) {

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

@@ -239,34 +239,6 @@ public class IoCollectOrderCodeManController extends BaseController {
 
 
         return ResultVOUtils.error("扫码不能为空！");
-
-//        if (CollUtil.isNotEmpty(addTagCodeReqeust.getCodeList())) {
-//            List<String> codeList = addTagCodeReqeust.getCodeList();
-//            String billNo = addTagCodeReqeust.getBillNo();
-//            List<IoCollectOrderCodeMan> ioCollectOrderCodeMEN = collectOrderCodeManService.listByBillNo(billNo);
-//            Map<String, IoCollectOrderCodeMan> codeManMap = ioCollectOrderCodeMEN.stream().collect(Collectors.toMap(IoCollectOrderCodeMan::getUdiCode, x -> x));
-//            List<Long> bizIdFks = new ArrayList<>();
-//            //codeList 拆零确认码 对 单据的biz进行匹配 匹配上标记是拆零码
-//            for (int i = 0; i < codeList.size(); i++) {
-//                String code = codeList.get(i);
-//                IoCollectOrderCodeMan ioCollectOrderCodeMan = codeManMap.get(code);
-//                if (ioCollectOrderCodeMan != null) {
-//                    //更新业务表为无需确认拆零码、码明细确认拆零字段为true
-//                    ioCollectOrderCodeMan.setIsSplitCode(true);
-//                    collectOrderCodeManService.updateById(ioCollectOrderCodeMan);
-//                    bizIdFks.add(ioCollectOrderCodeMan.getBizIdFk());
-//                }
-//            }
-//            if (bizIdFks.size() > 0) {
-//                UpdateWrapper<IoCollectOrderBiz> updateWrapper = new UpdateWrapper<>();
-//                updateWrapper.set("splitUnCheck", false);
-//                updateWrapper.in("id", bizIdFks);
-//                collectOrderBizService.update(updateWrapper);
-//            }
-//            return ResultVOUtils.success("更新成功");
-//        } else {
-//            return ResultVOUtils.error("数据不能为空");
-//        }
     }
 
     public String countSameErrMsg(List<VailCodeResultResponse> vailCodeResultResponses) {

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

@@ -63,17 +63,14 @@ public class IoCollectOrderController extends BaseController {
 
     @Resource
     IoCollectOrderService collectOrderService;
-
     @Resource
     IoCollectOrderOriginService collectOrderOriginService;
     @Resource
     IoCollectOrderBizOriginService collectOrderBizOriginService;
-
     @Resource
     IoCollectOrderBizService collectOrderBizService;
     @Resource
     IoCollectOrderBizBackupService collectOrderBizBackupService;
-
     @Resource
     private BasicCollectUserService basicCollectUserService;
 
@@ -102,11 +99,9 @@ public class IoCollectOrderController extends BaseController {
         } else {
             workBindBusTypeRequest.setWorkplaceCode(collectOrderRequest.getWorkPlaceCode());
             sysWorkplaceDocumentResponses = sysWorkplaceDocumentService.filterListByWorkplace(workBindBusTypeRequest);
-//            collectOrderRequest.setWorkPlaceCode(null);
         }
 
         if (collectOrderRequest.getTagStatus() != null && collectOrderRequest.getTagStatus() == -2) {
-//            collectOrderRequest.setExcludeWorkCode(String.valueOf(collectOrderRequest.getWorkPlaceCode()));
             collectOrderRequest.setWorkPlaceCode(null);
             collectOrderRequest.setTagStatus(1);
         }
@@ -136,9 +131,6 @@ public class IoCollectOrderController extends BaseController {
      */
     @GetMapping("/udiwms/basic/collect/order/next")
     public BaseResponse getNextOrder(CollectOrderRequest collectOrderRequest) {
-//        if (collectOrderRequest.getWorkPlaceCode() == null) {
-//            return ResultVOUtils.error(500, "工位不能为空！");
-//        }
         CollectOrderRequest request = new CollectOrderRequest();
         request.setLimit(1);
         request.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode());
@@ -162,9 +154,6 @@ public class IoCollectOrderController extends BaseController {
      */
     @GetMapping("/udiwms/basic/collect/order/current")
     public BaseResponse getCurrentOrder(CollectOrderRequest collectOrderRequest) {
-//        if (collectOrderRequest.getWorkPlaceCode() == null) {
-//            return ResultVOUtils.error(500, "工位不能为空！");
-//        }
         CollectOrderRequest request = new CollectOrderRequest();
         request.setPage(1);
         request.setLimit(1);
@@ -395,12 +384,6 @@ public class IoCollectOrderController extends BaseController {
         collectOrder.setUpdateTime(new Date());
         collectOrder.setUpdateUser(getUserId());
 
-//        collectOrderService.list(Wrappers.lambdaQuery(IoCollectOrder.class)
-//                .eq(IoCollectOrder::getBusType, collectOrder.getBusType())
-//                .eq(IoCollectOrder::getTagStatus, 1)
-//                .orderByAsc(true,"orderTime").last("limit 1"));
-
-
         collectOrderService.updateById(collectOrder);
         collectOrderCodeManService.removeByBillNo(collectOrder.getBillNo());
 
@@ -529,7 +512,7 @@ public class IoCollectOrderController extends BaseController {
         List<CollectOrderBizResponse> collectOrderBizResponses = collectOrderService.combieOrderDetail(collectOrderBizRequest);
         boolean isAllTag = collectOrderBizResponses.stream()
                 .allMatch(obj -> obj.getAutoTagStatus() == 2);
-//        StrUtil.isNotEmpty(obj.getFinishUdiCode()) ||
+
         boolean isAllTag2 = collectOrderBizResponses.stream()
                 .allMatch(obj -> IntUtil.value(obj.getScanActCount()) >= IntUtil.value(obj.getCount()));
         return ResultVOUtils.success(isAllTag || isAllTag2);
@@ -606,19 +589,7 @@ public class IoCollectOrderController extends BaseController {
         return ResultVOUtils.success();
     }
 
-    /**
+
-     * 单据上传
-     *
-     * @param
-     * @return
-     */
-//    @PostMapping("/udiwms/basic/collect/order/upload")
-//    public BaseResponse orderUpload(@RequestBody CollectOrderRequest collectOrderRequest) {
-//        if (StrUtil.isEmpty(collectOrderRequest.getBillNo()))
-//            return ResultVOUtils.error(500, "单据号不能为空");
-//        collectOrderService.orderUpload(collectOrderRequest.getBillNo());
-//        return ResultVOUtils.success();
-//    }
     @PostMapping("/udiwms/basic/collect/decideOrder")
     public BaseResponse decideOrder(@RequestBody CollectOrderRequest request) {
         Boolean isExis = collectOrderService.decideOrder(request, getUserId());

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

@@ -1,14 +0,0 @@
-package com.glxp.api.controller.collect;
-
-import com.glxp.api.controller.BaseController;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author : zhangsan
- * @date : 2024/9/27 10:25
- * @modyified By :
- */
-
-@RestController
-public class IoSplitFifoInvRelController extends BaseController {
-}

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

@@ -81,8 +81,6 @@ public class RelCodeBatchController extends BaseController {
 
     @GetMapping("/udiwms/relCode/batch/filter")
     public BaseResponse list(RelCodeBatchRequest relCodeBatchRequest, BindingResult bindingResult) {
-        String customerId = getCustomerId();
-//        relCodeBatchRequest.setErpId(customerId);
         List<RelCodeBatchResponse> relCodeBatchResponses = relCodeBatchService.filterList(relCodeBatchRequest);
         PageInfo<RelCodeBatchResponse> pageInfo = new PageInfo<>(relCodeBatchResponses);
         PageSimpleResponse<RelCodeBatchResponse> pageSimpleResponse = new PageSimpleResponse<>();

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

@@ -32,8 +32,6 @@ public class RelCodeDetailController extends BaseController {
     @Resource
     private RelCodeDetailService relCodeDetailService;
 
-
-
     /**
      * 扫码
      * @param relCodeDetailRequest

src/main/java/com/glxp/api/controller/dev/DeviceAssetLoacationController.java

@@ -1,12 +0,0 @@
-package com.glxp.api.controller.dev;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 设备位置字典
- */
-@Slf4j
-@RestController
-public class DeviceAssetLoacationController {
-}

src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java

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

src/main/java/com/glxp/api/controller/dev/DeviceInspectPlanDelectController.java

@@ -67,8 +67,6 @@ public class DeviceInspectPlanDelectController {
      */
     @PostMapping("/udiwms/inv/device/inspect/plan/uploadDeviceInspectPlanDelect")
     public BaseResponse uploadDeviceInspectPlanDelect(@RequestBody DeviceInspectPlanDelectEntity deviceInspectPlanDelectEntity) {
-
-
         AuthAdmin authAdmin=customerService.getUserBean();
         deviceInspectPlanDelectEntity.setUpdateTime(new Date());
         deviceInspectPlanDelectEntity.setUpdateUser(authAdmin.getId() + "");

src/main/java/com/glxp/api/controller/dev/DeviceInspectTakeController.java

@@ -39,7 +39,6 @@ public class DeviceInspectTakeController extends BaseController {
 
     @Resource
     DeviceInspectTaskService deviceInspectTaskService;
-
     @Resource
     DeviceInspectTaskDetailService deviceInspectTaskDetailService;
     @Resource
@@ -118,19 +117,7 @@ public class DeviceInspectTakeController extends BaseController {
     SyncHeartService syncHeartService;
 
     void UploadDeviceTake(Long id, Integer type) {
-        //提交上传到自助
-        //查询任务表
-//        DeviceInspectTaskEntity deviceInspectTaskEntity = deviceInspectTaskService.getById(id);
-//        List<DeviceInspectTaskDetailEntity> deviceInspectTaskDetailEntityList = deviceInspectTaskDetailService
-//                .list(new QueryWrapper<DeviceInspectTaskDetailEntity>().eq("taskOrderIdFk", deviceInspectTaskEntity.getOrderId()));
-//        SpsSyncDeviceTakeResponse spsSyncDeviceTakeResponse = new SpsSyncDeviceTakeResponse();
-//        spsSyncDeviceTakeResponse.setDeviceInspectTaskEntity(deviceInspectTaskEntity);
-//        spsSyncDeviceTakeResponse.setDeviceInspectTaskDetailEntityList(deviceInspectTaskDetailEntityList);
-//        spsSyncDeviceTakeResponse.setType(type);
-//        spGetHttpClient.postAllDeviceTake(spsSyncDeviceTakeResponse);
-
         syncHeartService.customPushData(BasicExportTypeEnum.DEVICE_TASK);
-
     }
 
 

src/main/java/com/glxp/api/controller/dev/DeviceReceiveOrderController.java

@@ -45,7 +45,6 @@ public class DeviceReceiveOrderController {
 
     @Resource
     private DeviceReceiveOrderService deviceReceiveOrderService;
-
     @Resource
     private SystemParamConfigService systemParamConfigService;
     @Resource
@@ -54,8 +53,6 @@ public class DeviceReceiveOrderController {
     private SystemPDFTemplateService systemPDFTemplateService;
     @Resource
     private DeviceReceiveOrderDetailService deviceReceiveOrderDetailService;
-    @Resource
-    private DeptDeviceDetailService deptDeviceDetailService;
     @Value("${file_path}")
     private String filePath;
 
@@ -179,8 +176,8 @@ public class DeviceReceiveOrderController {
         if (null == inspectionPDFTemplateRequest) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数不能为空！");
         }
-        //查询模板文件是否存在
 
+        //查询模板文件是否存在
         SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity = systemPDFModuleService.selectByStatemenId(inspectionPDFTemplateRequest.getId());
         if (null == sysPdfTemplateRelevanceStatemenEntity) {
             return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误");
@@ -208,10 +205,6 @@ public class DeviceReceiveOrderController {
         //打印单号标签
         Map<String, Object> data = new HashMap<>(1);
         List<Object> list = new ArrayList<>();
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");//定义新的日期格式
-        FilterDeptDeviceRequest filterDeptDeviceRequest=new FilterDeptDeviceRequest();
-        //查询主表
-        DeviceReceiveOrderEntity deviceReceiveOrderEntity = deviceReceiveOrderService.selectDeviceOrder(filterDeviceReceiveOrderRequest.getOrderId());
         FilterDeviceReceiveOrderDetailRequest filterDeviceReceiveOrderDetailRequest =new FilterDeviceReceiveOrderDetailRequest();
         filterDeviceReceiveOrderDetailRequest.setOrderIdFk(filterDeviceReceiveOrderRequest.getOrderId());
         List<DeviceReceiveOrderDetailResponse> deviceReceiveOrderDetailResponses = deviceReceiveOrderDetailService.selectByorderIdFk(filterDeviceReceiveOrderDetailRequest);

src/main/java/com/glxp/api/controller/dev/DeviceUpkeepDetailController.java

@@ -61,8 +61,6 @@ public class DeviceUpkeepDetailController extends BaseController {
     @AuthRuleAnnotation("")
     @PostMapping("/udi/device/upkeep/detail/add")
     public BaseResponse add(@RequestBody @Valid DevicePlanDetailParam param) {
-
-
         DevicePlanEntity entity = null;
         if (!param.valid(devicePlanService)) {
             AuthAdmin user = super.getUser();

src/main/java/com/glxp/api/controller/dev/InvMAOrderController.java

@@ -60,7 +60,7 @@ public class InvMAOrderController {
     /**
      * 更新养护记录
      *
-     * @param invMaintenanceOrder
+     * @param invMAOrderEntity
      * @param bindingResult
      * @return
      */

src/main/java/com/glxp/api/controller/dev/InvMAOrderDetailController.java

@@ -65,7 +65,7 @@ public class InvMAOrderDetailController {
     /**
      * 选中库存详情批量添加养护记录详情
      *
-     * @param invProductIds
+     * @param addMAOrderDetailRequest
      * @return
      */
     @PostMapping("/inv/MA/order/detail/batchAddDetail")

src/main/java/com/glxp/api/controller/inout/IoCodeController.java

@@ -69,11 +69,8 @@ public class IoCodeController extends BaseController {
     @AuthRuleAnnotation("")
     @GetMapping("spms/inout/dlcode/findByOrderId")
     public BaseResponse downloadCodesByOrderId(String orderId) {
-
-
         List<IoCodeEntity> codeEntityList = ioCodeService.findByOrderId(orderId);
-        PageInfo<IoCodeEntity> pageInfo;
+        PageInfo<IoCodeEntity> pageInfo = new PageInfo<>(codeEntityList);
-        pageInfo = new PageInfo<>(codeEntityList);
         PageSimpleResponse<IoCodeEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(codeEntityList);

src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java

@@ -41,8 +41,7 @@ public class IoCodeLostController extends BaseController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<IoCodeLostResponse> list = codeLostService.selectLost(ioCodeLostEntity);
-        PageInfo<IoCodeLostResponse> pageInfo;
+        PageInfo<IoCodeLostResponse> pageInfo = new PageInfo<>(list);
-        pageInfo = new PageInfo<>(list);
         PageSimpleResponse<IoCodeLostResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(list);
@@ -56,59 +55,10 @@ public class IoCodeLostController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-
-
         codeLostService.update(ioCodeLostEntity);
-
         return ResultVOUtils.success("成功");
     }
 
-
-//    @AuthRuleAnnotation("")
-//    @PostMapping("warehouse/inout/saveTabCode")
-//    public BaseResponse saveCode(@RequestBody IoCodeTempEntity codeTempEntity) {
-//
-//        if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo()) && codeTempEntity.getSerialNo().length() > 20) {
-//            return ResultVOUtils.error(500, "无效条码！序列号超出最大范围，不予缓存");
-//        }
-//
-//        if (StrUtil.isNotEmpty(codeTempEntity.getBatchNo()) && codeTempEntity.getBatchNo().length() > 20) {
-//            return ResultVOUtils.error(500, "无效条码！批次号超出最大范围，不予缓存");
-//        }
-//
-//        if (StrUtil.isBlank(codeTempEntity.getSerialNo()) && StrUtil.isBlank(codeTempEntity.getBatchNo())) {
-//            return ResultVOUtils.error(500, "批次号不能为空！，不予缓存");
-//        }
-//        if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) {
-//            return ResultVOUtils.error(500, "有序列号不予缓存");
-//        }
-//
-//        IoCodeLostEntity codeLostEntity = codeLostService.findByCode(codeTempEntity.getCode());
-//        IoCodeLostEntity insertEntity = null;
-//        if (codeLostEntity == null) {
-//            insertEntity = new IoCodeLostEntity();
-//            insertEntity.setCreateTime(new Date());
-//        } else {
-//            insertEntity = codeLostEntity;
-//        }
-//        insertEntity.setCode(codeTempEntity.getCode());
-//        insertEntity.setBatchNo(codeTempEntity.getBatchNo());
-//        insertEntity.setProduceDate(codeTempEntity.getProduceDate());
-//        insertEntity.setExpireDate(codeTempEntity.getExpireDate());
-//        insertEntity.setSerialNo(codeTempEntity.getSerialNo());
-//        insertEntity.setSupId(codeTempEntity.getSupId());
-//        insertEntity.setUpdateTime(new Date());
-//        insertEntity.setCreateTime(new Date());
-//        if (codeLostEntity != null) {
-//            codeLostService.update(insertEntity);
-//        } else {
-//            insertEntity.setId(IdUtil.getSnowflakeNextId());
-//            codeLostService.insert(insertEntity);
-//        }
-//        return ResultVOUtils.success("修改成功！");
-//    }
-
-
     //获取验收单据业务详情
     @AuthRuleAnnotation("")
     @GetMapping("/warehouse/inout/getTabCode")

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -122,27 +122,20 @@ public class IoCodeTempController extends BaseController {
     IoCollectCodeService ioCollectCodeService;
     @Autowired
     IoSplitFifoInvService ioSplitFifoInvService;
-
     @Autowired
     SysWorkplaceQueueService sysWorkplaceQueueService;
-
     @Autowired
     IoCollectOrderBackupService ioCollectOrderBackupService;
     @Autowired
     IoCollectSetService collectSetService;
-
     @Autowired
     SysWorkplaceFreightService sysWorkplaceFreightService;
-
     @Autowired
     IoCollectOrderCodeManService ioCollectOrderCodeManService;
-
     @Autowired
     SysWorkplaceService sysWorkplaceService;
-
     @Resource
     SysOrderLedService sysOrderLedService;
-
     @Autowired
     IoSplitFifoCodeService ioSplitFifoCodeService;
 
@@ -707,8 +700,6 @@ public class IoCodeTempController extends BaseController {
     IoSplitFifoCodeService fifoCodeService;
     @Autowired
     IoSplitCodeService splitCodeService;
-    @Autowired
-    private IoOrderDetailCodeDao orderDetailCodeDao;
 
     @Transactional(rollbackFor = Exception.class)
     public BaseResponse addMaterOrder(AddOrderRequest addOrderRequest, UdiEntity udiEntity, String code,Integer groupNumber) {
@@ -726,7 +717,6 @@ public class IoCodeTempController extends BaseController {
             return ResultVOUtils.error(500, "无效条码！批次号超出最大范围");
         }
 
-
         //批次号校验
         //判断此产品是否开启允许无批次号
         UdiProductEntity udiInfoEntity = udiProductService.findByNameCode(udiEntity.getUdi());
@@ -928,7 +918,6 @@ public class IoCodeTempController extends BaseController {
             }
         }
 
-
         //校验工位存量是否存在
         if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT)) {
             IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, null);
@@ -1019,7 +1008,6 @@ public class IoCodeTempController extends BaseController {
             addOrderRequest.setFromCorp(fromCorp);
         }
 
-
         //先生成扫码单据
         IoOrderEntity orderEntity = orderService.findByBillNo(orderId);
         String inBatch = "";
@@ -1053,7 +1041,6 @@ public class IoCodeTempController extends BaseController {
                     genDetaiEntity.setReCount(udiCalCountUtil.getCirActCount(udiRelevanceResponses.get(0)));
                 }
 
-
                 exitLocalEntity.setCount(exitLocalEntity.getMyCount() + 1);
 
                 if (bussinessTypeEntity.isUse()) {
@@ -1065,7 +1052,7 @@ public class IoCodeTempController extends BaseController {
                 if (!StringUtils.isBlank(exitLocalEntity.getSerialNo())) {
                     return ResultVOUtils.error(500, "重复扫码！");
                 }
-//                IoCodeTempEntity codeTempEntity = isExitToatal(code, codeEnttitys);
+
                 //校验库存
                 BaseResponse invRes = null;
                 if (IntUtil.value(bussinessTypeEntity.getUseDyCount()) == 2) {
@@ -1123,7 +1110,6 @@ public class IoCodeTempController extends BaseController {
                                 }
                             }
 
-//                            checkPrice();
                         }
                     }
                     if (update) {
@@ -1206,12 +1192,6 @@ public class IoCodeTempController extends BaseController {
                     return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "单只允许录入非集采产品！");
                 }
 
-//                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 2 && IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
-//                    return ResultVOUtils.error(500, "当前上货只允许录入整取产品！");
-//                }
-//                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 1 && !IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
-//                    return ResultVOUtils.error(500, "当前上货只允许录入拆零产品！");
-//                }
                 //计算实际数量
                 if (bussinessTypeEntity.isUse()) {
                     codeEnttity.setReCount(IntUtil.value(codeEnttity.getMyReCount()) + udiCalCountUtil.getUseActCount(udiRelevanceResponse));
@@ -1638,7 +1618,6 @@ public class IoCodeTempController extends BaseController {
                                 }
                             }
 
-//                            checkPrice();
                         }
                     }
                     if (update) {
@@ -1706,7 +1685,6 @@ public class IoCodeTempController extends BaseController {
             codeEnttity.setGroupNumber(groupNumber);
             codeEnttity.setQueueCode(queueCode);
 
-
             //如果是阿里拉的单据会有批次号
             IoCollectOrderCodeMan codeMan = ioCollectOrderCodeManService.getOne(new LambdaQueryWrapper<IoCollectOrderCodeMan>().eq(IoCollectOrderCodeMan::getUdiCode, code));
             if (codeMan != null) {
@@ -1722,12 +1700,9 @@ public class IoCodeTempController extends BaseController {
                 if (relCodeDetail != null) {
                     codeEnttity.setGrantPaCode(relCodeDetail.getParentCode());
                 }
-//           if (StrUtil.isEmpty(codeEnttity.getBatchNo())) {
-                //当关联关系存在的时候 以关联关系的批次号为准
                 codeEnttity.setBatchNo(codeRelEntity.getBatchNo());
                 codeEnttity.setProduceDate(MsDateUtil.formatDate(codeRelEntity.getMadeDate(), "yyMMdd"));
                 codeEnttity.setExpireDate(MsDateUtil.formatDate(codeRelEntity.getValidateDate(), "yyMMdd"));
-//                }
             }
 
             String unitFk = null;
@@ -1758,14 +1733,8 @@ public class IoCodeTempController extends BaseController {
                 if (bussinessTypeEntity.getVailGroupBuy() == 2 && udiRelevanceResponse.isGroupBuy()) {        //只采集非集采产品
                     return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "单只允许录入非集采产品！");
                 }
-//                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 2 && IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
-//                    return ResultVOUtils.error(500, "当前上货只允许录入整取产品！");
-//                }
-//                if (IntUtil.value(addOrderRequest.getFifoSplit()) == 1 && !IntUtil.value(udiRelevanceResponse.getSplitEnable())) {
-//                    return ResultVOUtils.error(500, "当前上货只允许录入拆零产品！");
-//                }
-                //计算实际数量
 
+                //计算实际数量
                 if (bussinessTypeEntity.isUse()) {
                     codeEnttity.setReCount(codeEnttity.getMyReCount() + udiCalCountUtil.getUseActCount(udiRelevanceResponses.get(0)));
                 } else {
@@ -1846,7 +1815,6 @@ public class IoCodeTempController extends BaseController {
                                 Integer isSingQueue = one.getIsSingQueue();
                                 if (workplaceQueue1 != null && isSingQueue == 1) {
                                     if (!orderEntity.getWorkPlaceQueueCode().equals(workplaceQueue1.getCode())) {
-//                                orderService.deleteByBillNo(orderId);
                                         return ResultVOUtils.error(507, "当前货架已启用单品种槽位且产品已绑定在" + workplaceQueue1.getCode() + "取货槽");
                                     }
                                 }
@@ -1863,7 +1831,6 @@ public class IoCodeTempController extends BaseController {
                             }
                         }
                         if (!isSame)
-//                            orderService.deleteByBillNo(orderId);
                             return ResultVOUtils.error(507, "上货产品不符！");
                     }
                     //校验完成 获取当前槽位 绑定产品

src/main/java/com/glxp/api/controller/inout/IoDestinyProcessController.java

@@ -65,8 +65,7 @@ public class IoDestinyProcessController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<UdiRelevanceResponse> udiRelevanceResponseList = ioDestinyProcessDetailService.filterProcessDetail(filterUdiRelRequest);
-        PageInfo<UdiRelevanceResponse> pageInfo;
+        PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(udiRelevanceResponseList);
-        pageInfo = new PageInfo<>(udiRelevanceResponseList);
         PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(udiRelevanceResponseList);
@@ -81,8 +80,7 @@ public class IoDestinyProcessController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<IodestinyProcessResponse> iodestinyProcessResponseList = ioDestinyProcessDetailService.filterDestinyProcess(iodestinyProcessRequest);
-        PageInfo<IodestinyProcessResponse> pageInfo;
+        PageInfo<IodestinyProcessResponse> pageInfo = new PageInfo<>(iodestinyProcessResponseList);
-        pageInfo = new PageInfo<>(iodestinyProcessResponseList);
         PageSimpleResponse<IodestinyProcessResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(iodestinyProcessResponseList);
@@ -98,7 +96,6 @@ public class IoDestinyProcessController {
         }
         BaseResponse baseResponse = ioDestinyProcessDetailService.checkDestinyProcess(iodestinyProcessRequest);
 
-
         return baseResponse;
     }
 
@@ -109,8 +106,7 @@ public class IoDestinyProcessController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<IodestinyProcessResponse> iodestinyProcessResponseList = ioDestinyProcessCodeService.filterDestinyProcessCode(iodestinyProcessRequest);
-        PageInfo<IodestinyProcessResponse> pageInfo;
+        PageInfo<IodestinyProcessResponse> pageInfo = new PageInfo<>(iodestinyProcessResponseList);
-        pageInfo = new PageInfo<>(iodestinyProcessResponseList);
         PageSimpleResponse<IodestinyProcessResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(iodestinyProcessResponseList);

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -195,7 +195,6 @@ public class IoOrderController extends BaseController {
             if (ioOrderResponse.getCheckStatus() == null) {
                 ioOrderResponse.setCheckStatus(0 + "");
             }
-            ioOrderResponse = orderInvoiceService.findRegStausByBillNo(ioOrderResponse);
         }
         PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(list);
         return ResultVOUtils.page(pageInfo);
@@ -234,10 +233,6 @@ public class IoOrderController extends BaseController {
     @Log(title = "单据管理", businessType = BusinessType.UPDATE)
     public BaseResponse delmitBiz(@RequestBody AddOrderRequest addOrderRequest) {
 
-        IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo());
-//        BaseResponse tempResponse = checkSubmitEnable(orderEntity);
-//        if (tempResponse != null)
-//            return tempResponse;
         //校验单据是否已完成
         int b = orderDetailBizService.deleteByOrderId(addOrderRequest.getBillNo());
 
@@ -288,8 +283,6 @@ public class IoOrderController extends BaseController {
         return ResultVOUtils.success("提交成功！");
     }
 
-    @Resource
-    IoCheckInvService checkInvService;
 
     //新增扫码单据-立即提交
     @RepeatSubmit()
@@ -417,7 +410,6 @@ public class IoOrderController extends BaseController {
         if (baseResponse != null)
             return baseResponse;
 
-
         //上货校验追溯码是否重复
         if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT)) {
             for (IoCodeTempEntity codeTempEntity : codeTempEntities) {
@@ -671,45 +663,9 @@ public class IoOrderController extends BaseController {
         IoOrderPdaResponse orderPdaResponse = new IoOrderPdaResponse();
         orderPdaResponse.setOrderResponse(list.get(0));
         orderPdaResponse.setOrderDetailBizResponses(orderDetailBizResponses);
-//        PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(list);
         return ResultVOUtils.success(orderPdaResponse);
     }
 
-
-    public List<IoCodeTempEntity> getOtherCode(String billNo, List<IoCodeTempEntity> codeEntities) {
-        List<IoOrderDetailBizEntity> orderDetailBizEntities = orderDetailBizService.findByOrderId(billNo);
-
-        for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) {
-            bizEntity.setCheckSuccess(false);
-            bizEntity.setScanCount(0);
-        }
-        for (IoCodeTempEntity codeTempEntity : codeEntities) {
-            codeTempEntity.setCheckSuccess(false);
-        }
-        List<IoCodeTempEntity> otherCodes = new ArrayList<>();
-        for (IoCodeTempEntity codeEntity : codeEntities) {
-            for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) {
-                if (checkId(bizEntity, codeEntity) == null
-                        && checkBatchNo(bizEntity, codeEntity) == null
-                        && checkProductDate(bizEntity, codeEntity) == null
-                        && checkExpireDate(bizEntity, codeEntity) == null) {
-                    int curCount = IntUtil.value(codeEntity.getReCount()) + bizEntity.getScanCount();
-                    if (bizEntity.getCount() < curCount) {
-                        otherCodes.add(codeEntity);
-                    } else {
-                        bizEntity.setScanCount(curCount);
-                    }
-                    codeEntity.setCheckSuccess(true);
-                    break;
-                }
-            }
-            if (!codeEntity.isCheckSuccess()) {
-                otherCodes.add(codeEntity);
-            }
-        }
-        return otherCodes;
-    }
-
     public List<IoCodeResponse> getCheckRusultCode(String billNo, List<IoCodeResponse> codeEntities) {
         List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(billNo);
         List<IoOrderDetailBizEntity> orderDetailBizEntities = orderDetailBizService.findByOrderId(billNo);
@@ -828,10 +784,7 @@ public class IoOrderController extends BaseController {
             codeTempService.deleteByBillNo(billNo);
             codeService.deleteCodeByOrderId(billNo);
         }
-//        ThreadUtil.execAsync(() -> {
+
-//            BaseResponse response = spGetHttpClient.postDelOrder(deleteRequest);
-//            log.info("删除单据：" + "结果：" + response.getMessage());
-//        });
         return ResultVOUtils.success("删除成功！");
     }
 
@@ -1055,8 +1008,7 @@ public class IoOrderController extends BaseController {
         }
 
         List<IoOrderResponse> orderEntityList = orderService.filterList(filterOrderRequest);
-        PageInfo<IoOrderResponse> pageInfo;
+        PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(orderEntityList);
-        pageInfo = new PageInfo<>(orderEntityList);
         PageSimpleResponse<IoOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(orderEntityList);
@@ -1132,7 +1084,6 @@ public class IoOrderController extends BaseController {
         if (null == ioOrderDetailBizEntity) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
-//        ioOrderDetailBizEntity.setCheckFileName(ioOrderDetailBizEntity.getCheckFileName().substring(0,ioOrderDetailBizEntity.getCheckFileName().length() - 4));
         orderDetailBizService.updateOrderDetailBiz(ioOrderDetailBizEntity);
         return ResultVOUtils.success();
     }
@@ -1319,7 +1270,6 @@ public class IoOrderController extends BaseController {
             }
         }
 
-
         if (StrUtil.isNotBlank(filterOrderRequest.getStatusType())) {
             orderService.setFilterStatus(filterOrderRequest);
         }
@@ -1388,25 +1338,6 @@ public class IoOrderController extends BaseController {
         return ResultVOUtils.success(order);
     }
 
-
-    public String checkId(IoOrderDetailBizEntity bizEntity, IoCodeTempEntity codeEntity) {
-
-        if (bizEntity.getBindRlFk().longValue() == codeEntity.getRelId().longValue()) {
-            return null;
-        } else {
-            return "产品ID不匹配";
-        }
-    }
-
-    public String checkBatchNo(IoOrderDetailBizEntity bizEntity, IoCodeTempEntity codeEntity) {
-
-        if (StrUtil.nullToEmpty(bizEntity.getBatchNo()).equals(StrUtil.nullToEmpty(codeEntity.getBatchNo()))) {
-            return null;
-        } else {
-            return bizEntity.getCoName() + "批次号不匹配";
-        }
-    }
-
     public String checkProductDate(IoOrderDetailBizEntity bizEntity, IoCodeTempEntity codeEntity) {
         if (StrUtil.nullToEmpty(bizEntity.getProductDate()).equals(StrUtil.nullToEmpty(codeEntity.getProduceDate()))) {
             return null;

src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java

@@ -142,8 +142,6 @@ public class IoOrderDetailBizController extends BaseController {
     @PostMapping("/udiwms/inout/order/addBizProduct")
     @Log(title = "单据管理", businessType = BusinessType.INSERT)
     public BaseResponse addBizProduct(@RequestBody AddBizProductReqeust addBizProductReqeust) {
-        SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("vail_product_cert");
-//        boolean isVailCert = systemParamConfigEntity.getParamValue().equals("1") ? true : false;
         AuthAdmin authAdmin = getUser();
         if (addBizProductReqeust.getRelId() == null && CollUtil.isEmpty(addBizProductReqeust.getDatas()))
             return ResultVOUtils.error(500, "未选择产品信息");
@@ -180,7 +178,6 @@ public class IoOrderDetailBizController extends BaseController {
                 orderEntity.setProductType(addBizProductReqeust.getProductType());
             }
 
-
             orderService.insertOrder(orderEntity);
         }
 
@@ -228,18 +225,6 @@ public class IoOrderDetailBizController extends BaseController {
                 }
             }
 
-//            if (bussinessTypeEntity.getCheckVailDate() != 4) {
-//                if (bussinessTypeEntity.getRequireScanCode() == 1) {
-//                    if (udiRelevanceResponse.getRequireScanCode() != 1){
-//                        return ResultVOUtils.error(500, "单据只允许录入需要扫码耗材" + ",请检查后重试！");
-//                    }
-//                }else if (bussinessTypeEntity.getRequireScanCode() == 0){
-//                    if (udiRelevanceResponse.getRequireScanCode() != 0){
-//                        return ResultVOUtils.error(500, "单据只允许录入不需要扫码耗材" + ",请检查后重试！");
-//                    }
-//                }
-//            }
-
             if (bussinessTypeEntity != null && udiRelevanceResponse != null) {
                 //是否校验耗材材质  1：高值耗材；2.普通耗材
                 if (IntUtil.value(bussinessTypeEntity.getVailHcType()) == 1) {
@@ -264,17 +249,6 @@ public class IoOrderDetailBizController extends BaseController {
                 }
             }
 
-//            todo 查询产品是否已经通过认证
-//            BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
-//            if (bussinessTypeEntity.getCheckCertExpire() == 2 && udiRelevanceResponse.isNeedCert()) {
-//                SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(), "");
-//                if (supProductEntity != null && (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS)) {
-//
-//                } else {
-//                    return ResultVOUtils.error(500, "产品资质证书未通过审核！");
-//                }
-//            }
-
             IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
             ioOrderDetailBizEntity.setOrderIdFk(orderEntity.getBillNo());
             ioOrderDetailBizEntity.setBindRlFk(udiRelevanceResponse.getId());
@@ -718,15 +692,6 @@ public class IoOrderDetailBizController extends BaseController {
         return ResultVOUtils.page(pageInfo);
     }
 
-//    @GetMapping("/udiwms/inout/bizDetail/filterListInv")
-//    public BaseResponse filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest) {
-//        List<IoOrderDetailBizResponse> list = orderDetailBizService.getfilterList(orderDetailBizRequest);
-//        List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(orderDetailBizRequest.getOrderIdFk());
-//        ioCheckInoutService.bizOrderCheck2(list, orderDetailCodeEntities);
-//        PageInfo<IoOrderDetailBizResponse> pageInfo = new PageInfo<>(list);
-//        return ResultVOUtils.page(pageInfo);
-//    }
-
     @GetMapping("/udiwms/inout/bizDetail/filterListInvoice")
     public BaseResponse filterListInvoice(FilterOrderDetailBizRequest orderDetailBizRequest) {
         List<IoOrderInvoiceResponse> list = orderDetailBizService.filterListInv(orderDetailBizRequest);

src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java

@@ -74,8 +74,6 @@ public class IoOrderDetailResultController extends BaseController {
     @Resource
     IBasicBussinessTypeService basicBussinessTypeService;
     @Resource
-    IoCodeService codeService;
-    @Resource
     CustomerService customerService;
     @Resource
     private SystemPDFTemplateService systemPDFTemplateService;
@@ -172,9 +170,7 @@ public class IoOrderDetailResultController extends BaseController {
 
 
     public List<IoOrderDetailResultResponse> getOrderResultProductOut(FilterOrderDetailResultRequest orderDetailResultRequest) {
-
         List<IoOrderDetailResultResponse> list = orderDetailResultService.filterOrderProductOutList(orderDetailResultRequest);
-
         return list;
     }
 
@@ -221,7 +217,6 @@ public class IoOrderDetailResultController extends BaseController {
             return ResultVOUtils.error(500, "单据号不能为空！");
         }
         IoOrderEntity orderEntity = orderService.findByBillNo(filterErpOrderRequest.getOrderIdFk());
-        BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
         filterErpOrderRequest.setPage(null);
         filterErpOrderRequest.setLimit(null);
         List<IoOrderDetailResultResponse> list = orderDetailResultService.filterList(filterErpOrderRequest);
@@ -336,7 +331,6 @@ public class IoOrderDetailResultController extends BaseController {
                 }
             }
         }
-        List<IoOrderDetailResultEntity> updatePrints = new ArrayList<>();
         int i = 1;
         for (IoOrderDetailResultResponse ioOrderDetailResultResponse : ioOrderDetailResultResponseList) {
             //查询第三方产品产品类别
@@ -443,24 +437,9 @@ public class IoOrderDetailResultController extends BaseController {
             deviceInfoData.put("index", String.valueOf(i));
             deviceInfoData.put("deviceCode", item.getDeviceCode() == null ? ' ' : item.getDeviceCode());
             deviceInfoData.put("deptName", item.getDeptName() == null ? ' ' : item.getDeptName());
-//            deviceInfoData.put("statusName", item.getStatusName() == null ? ' ' : item.getStatusName());
-//            deviceInfoData.put("udi", item.getUdi() == null ? ' ' : item.getUdi());
-//            deviceInfoData.put("nameCode", item.getNameCode() == null ? ' ' : item.getNameCode());
             deviceInfoData.put("productName", item.getProductName() == null ? ' ' : item.getProductName());
             deviceInfoData.put("ggxh", item.getGgxh() == null ? ' ' : item.getGgxh());
             deviceInfoData.put("assetValue", item.getAssetValue() == null ? "0.00" : String.valueOf(item.getAssetValue().setScale(2, RoundingMode.HALF_UP)));
-//            deviceInfoData.put("batchNo", item.getBatchNo() == null ? ' ' : item.getBatchNo());
-//            deviceInfoData.put("serialNo", item.getSerialNo() == null ? ' ' : item.getSerialNo());
-//            deviceInfoData.put("productionDate", item.getProductionDate() == null ? ' ' : item.getProductionDate());
-//            deviceInfoData.put("expireDate", item.getExpireDate() == null ? ' ' : item.getExpireDate());
-//            deviceInfoData.put("manufactory", item.getManufactory() == null ? ' ' : item.getManufactory());
-//            deviceInfoData.put("measname", item.getMeasname() == null ? ' ' : item.getMeasname());
-//            deviceInfoData.put("zczbhhzbapzbh", item.getZczbhhzbapzbh() == null ? ' ' : item.getZczbhhzbapzbh());
-//            deviceInfoData.put("supName", item.getSupName() == null ? ' ' : item.getSupName());
-//            deviceInfoData.put("changeCount", item.getChangeCount() == null ? '0' : item.getChangeCount());
-//            deviceInfoData.put("repairApplyCount", item.getRepairApplyCount() == null ? '0' : item.getRepairApplyCount());
-//            deviceInfoData.put("repairCount", item.getRepairCount() == null ? '0' : item.getRepairCount());
-//            deviceInfoData.put("checkCount", item.getCheckCount() == null ? '0' : item.getCheckCount());
 
             list.add(deviceInfoData);
             i++;
@@ -500,12 +479,6 @@ public class IoOrderDetailResultController extends BaseController {
                     cptTraceResultResponse.setFromCorpCreditNum(authCompany.getCreditCode());
                     cptTraceResultResponse.setToCorp(cptTraceOrderResponse.getFromCorpName());
                     cptTraceResultResponse.setToCorpCreditNum(cptTraceOrderResponse.getCreditNo());
-//                    //往来单位为病人
-//                    if (cptTraceOrderResponse.getCorpType() == 1 && cptTraceOrderResponse.getOutType() == 1) {
-//                        cptTraceResultResponse.setToUserInfo(cptTraceOrderResponse.getFromCorpName());
-//                    } else {
-//
-//                    }
                 } else {
                     cptTraceResultResponse.setInOutType(1);
                     cptTraceResultResponse.setFromCorp(cptTraceOrderResponse.getFromCorpName());

src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java

@@ -52,8 +52,6 @@ public class IoOrderInvoiceController {
     @Resource
     IoOrderInvoiceService ioOrderInvoiceService;
     @Resource
-    IoOrderDetailCodeService orderDetailCodeService;
-    @Resource
     CustomerService customerService;
     @Resource
     IoOrderDetailBizService orderDetailBizService;

src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java

@@ -43,23 +43,9 @@ public class IoOrderMutiController {
     @Resource
     private IoOrderMutiSetService ioOrderMutiSetService;
     @Resource
-    RedisUtil redisUtil;
-    @Resource
     CustomerService customerService;
     @Resource
     GennerOrderUtils gennerOrderUtils;
-    @Resource
-    private IoOrderService orderService;
-    @Resource
-    IoCodeTempService codeTempService;
-    @Resource
-    IBasicBussinessTypeService basicBussinessTypeService;
-    @Resource
-    InvWarehouseService invWarehouseService;
-    @Resource
-    UdiRelevanceService udiRelevanceService;
-    @Resource
-    IoOrderDetailCodeService ioOrderDetailCodeService;
 
 
     @PostMapping("/udiwms/inout/order/muti/checkUdi")
@@ -253,7 +239,6 @@ public class IoOrderMutiController {
             orderNo = ioOrderMutiService.insterOrder(ioOrderMutiEntity, ioOrderMutiSetEntity);
         }
 
-
         ioOrderMutiEntity.setReCount(ioOrderMutiEntity.getTotalCount() - ioOrderMutiEntity.getUseCount());
         ioOrderMutiEntity.setOrderIdFk(orderNo);
         ioOrderMutiEntity.setCreateTime(new Date());
@@ -326,7 +311,6 @@ public class IoOrderMutiController {
     @PostMapping("/udiwms/inout/order/muti/addMutiDetail")
     public BaseResponse addMutiDetail(@RequestBody IoOrderMutiUseEntity ioOrderMutiUseEntity) {
 
-
         if (ioOrderMutiUseEntity.getCheckType() != null && ioOrderMutiUseEntity.getCheckType() == 1) {
             IoOrderMutiRequest ioOrderMutiRequest = new IoOrderMutiRequest();
             ioOrderMutiRequest.setStatus(0);

src/main/java/com/glxp/api/controller/inout/IoOrderMutiSetController.java

@@ -33,7 +33,6 @@ public class IoOrderMutiSetController {
         return ResultVOUtils.page(pageInfo);
     }
 
-
     @PostMapping("/udiwms/inout/muti/add")
     public BaseResponse addIoOrderMuti(@RequestBody IoOrderMutiSetEntity ioOrderMutiSetEntity) {
 

src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java

@@ -289,10 +289,6 @@ public class IoOrderReviewController extends BaseController {
             return ResultVOUtils.error(500, "单据已验收！");
         }
         if (updateExportStatusRequest.isEntrust()) {
-//            EntrustReceEntity entrustReceEntity = entrustReceService.findById(updateExportStatusRequest.getEntrustId());
-//            if (entrustReceEntity == null) {
-//                return ResultVOUtils.error(500, "无验收权限！");
-//            } else {
             EntrustReceEntity entrustReceEntity = entrustReceService.findByUnique(orderEntity.getAction(), getUserId());
             if (orderEntity.getFromType().intValue() != ConstantStatus.FROM_CHANGE && orderEntity.getFromType().intValue() != ConstantStatus.FROM_PEACE_CHANGE) {
                 if (StrUtil.isNotEmpty(entrustReceEntity.getEntrustAction())) {
@@ -310,7 +306,6 @@ public class IoOrderReviewController extends BaseController {
                 updateSpmsStauts(reviewFinishRequest, authAdmin.getId() + "");
                 return updateReview(authAdmin, orderEntity);
             }
-//            }
         } else {
             ReviewFinishRequest reviewFinishRequest = new ReviewFinishRequest();
             BeanUtils.copyProperties(updateExportStatusRequest, reviewFinishRequest);
@@ -380,9 +375,6 @@ public class IoOrderReviewController extends BaseController {
         orderEntity.setUllageSupNo(supplementOrder.getBillNo());
         orderService.update(orderEntity);
         codeTempService.insertBatch(supplementCodes);
-//        for (IoCodeTempEntity codeTempEntity : supplementCodes) {
-//            addInoutService.genOrderDetailCode(supplementOrder, codeTempEntity);
-//        }
         addInoutService.dealProcess(supplementOrder);
         if (!ioCheckInoutService.checkManual(supplementOrder.getBillNo())) {
             ioCheckInoutService.check(supplementOrder.getBillNo());

src/main/java/com/glxp/api/controller/inout/IoPdaCodeController.java

@@ -1,4 +0,0 @@
-package com.glxp.api.controller.inout;
-
-public class IoPdaCodeController {
-}

src/main/java/com/glxp/api/controller/inout/IoSplitController.java

@@ -51,7 +51,6 @@ public class IoSplitController extends BaseController {
     IoSplitCodeService splitCodeService;
     @Resource
     IoSplitCodeDetailService splitCodeDetailService;
-
     @Resource
     BasicSkPrescribeDiService basicSkPrescribeDiService;
     @Resource
@@ -138,26 +137,20 @@ public class IoSplitController extends BaseController {
         if (collectOrder == null) {
             return ResultVOUtils.error(500, "未找到单据");
         }
-//        if (collectOrder.getTagStatus() == 2) {
-//            return ResultVOUtils.error(501, "当前单据正在处理中,请重新选择单据");
-//        }
         SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByWorkplaceCode(collectOrder.getWorkPlaceCode(), collectOrder.getBusType());
         if (IntUtil.value(sysWorkplaceDocumentEntity.getAutoTag()) == 1) {
             collectOrder.setWorkPlaceCode(addTagCodeReqeust.getWorkPlaceCode());
-            //todo 后面改
             if (sysWorkplaceDocumentEntity.getProductType() == 1) {
                 splitCodeService.preQxAutoTagCode(collectOrder, null);
             } else {
                 splitCodeService.preAutoTagCode(collectOrder, null);
             }
-
             collectOrderService.updateById(collectOrder);
             return ResultVOUtils.success("后台已开始赋码，请稍后刷新查看");
         } else {
             return ResultVOUtils.success("无需自动赋码");
         }
 
-
     }
 
     /**
@@ -256,7 +249,6 @@ public class IoSplitController extends BaseController {
                 ) {
                     return basicSkPrescribeDiEntity;
                 }
-
             }
         }
         return null;

src/main/java/com/glxp/api/controller/inout/IoSplitFifoController.java

@@ -30,7 +30,6 @@ import java.util.List;
 @RestController
 public class IoSplitFifoController extends BaseController {
 
-
     @Resource
     IoSplitFifoCodeService splitFifoCodeService;
 

src/main/java/com/glxp/api/controller/inout/IoSplitFifoInvController.java

@@ -79,7 +79,6 @@ public class IoSplitFifoInvController extends BaseController {
             }
         }
 
-
         List<IoSplitInvResponse> splitCodeEntities = splitFifoInvService.filterKcyjList(ioSplitFifoInvRequest);
         for (IoSplitInvResponse ioSplitCodeResponse : splitCodeEntities) {
             if (StrUtil.isEmpty(ioSplitCodeResponse.getGgxh())) {

src/main/java/com/glxp/api/controller/inout/WorkPutController.java

@@ -75,10 +75,6 @@ public class WorkPutController extends BaseController {
     @Resource
     IoOrderDetailBizService orderDetailBizService;
     @Resource
-    IoAddInoutService ioAddInoutService;
-    @Resource
-    IoOrderDetailCodeService ioOrderDetailCodeService;
-    @Resource
     IoSplitFifoCodeService splitFifoCodeService;
 
     //前端扫码提交(耗材器械）
@@ -120,7 +116,6 @@ public class WorkPutController extends BaseController {
         }
         //TODO 退货校验是否有库存 提示产品不存在
         if (StrUtil.equals("return", addOrderRequest.getSplitType())) {
-            //ioSplitFifoInvService.getOne(new LambdaQueryWrapper<IoSplitFifoInv>().eq(IoSplitFifoInv::getInvCode,"").last("limit 1"));
         }
         if (IntUtil.value(udiEntity.getProductType()) == 2) {
             return orderDetailBizService.adddDrugOrder(addOrderRequest, udiEntity, code);
@@ -288,7 +283,6 @@ public class WorkPutController extends BaseController {
             }
         }
 
-
         //过期提醒：
         if (IntUtil.value(bussinessTypeEntity.getCheckExpire()) == 1 && !addOrderRequest.isIgnoreExpire()) {
             if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) {
@@ -323,7 +317,6 @@ public class WorkPutController extends BaseController {
 
                 if (resultTime > 0) {
                     long time = resultTime / (60 * 60 * 1000);
-//                    long time = resultTime / (24 * 60 * 60 * 1000);
                     if (resultTime < recentTieme) {
                         return ResultVOUtils.error(505, "当前产品临近过期，距过期还剩" + time + "时,是否确定继续添加?");
                     }
@@ -347,7 +340,6 @@ public class WorkPutController extends BaseController {
             }
         }
 
-
         //校验工位存量是否存在
         if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT)) {
             IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, null);
@@ -356,7 +348,6 @@ public class WorkPutController extends BaseController {
             }
         }
 
-
         //先生成扫码单据
         IoOrderEntity orderEntity = orderService.findByBillNo(orderId);
         if (StringUtils.isBlank(orderId) || orderEntity == null) {
@@ -385,7 +376,6 @@ public class WorkPutController extends BaseController {
                     genDetaiEntity.setReCount(udiCalCountUtil.getCirActCount(udiRelevanceResponses.get(0)));
                 }
 
-
                 exitLocalEntity.setCount(exitLocalEntity.getMyCount() + 1);
 
                 if (bussinessTypeEntity.isUse()) {

src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java

@@ -37,8 +37,7 @@ public class ioCodeRelController {
     public BaseResponse list(IoOrderRelRequest ioOrderRelRequest) {
 
         List<IoCodeRelResponse> list = ioCodeRelServicec.selectIoCodeRelList(ioOrderRelRequest);
-        PageInfo<IoCodeRelResponse> pageInfo;
+        PageInfo<IoCodeRelResponse> pageInfo = new PageInfo<>(list);
-        pageInfo = new PageInfo<>(list);
         PageSimpleResponse<IoCodeRelResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(list);
@@ -48,7 +47,6 @@ public class ioCodeRelController {
     @GetMapping("/udi/ioCode/Rel/checkUpProduct")
     public BaseResponse checkUpProduct(String code) {
 
-
         //判断码有没有重复
         List<IoCodeRelEntity> list = ioCodeRelServicec.selectIoCodeRelByCode("", code);
         if (list.size() > 0) {
@@ -125,8 +123,7 @@ public class ioCodeRelController {
     public BaseResponse delectList(IoOrderRelRequest ioOrderRelRequest) {
 
         List<IoCodeRelResponse> list = ioCodeRelServicec.selectIoCodeRelDetailList(ioOrderRelRequest);
-        PageInfo<IoCodeRelResponse> pageInfo;
+        PageInfo<IoCodeRelResponse> pageInfo = new PageInfo<>(list);
-        pageInfo = new PageInfo<>(list);
         PageSimpleResponse<IoCodeRelResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(list);

src/main/java/com/glxp/api/controller/inv/ApiExcelController.java

@@ -47,7 +47,6 @@ public class ApiExcelController {
      */
     @GetMapping("/udiwms/inv/excelExportOut")
     public void export(HttpServletResponse response,String billNo,String key) {
-
         excelService.excelExport(response,billNo,key);
     }
 
@@ -83,7 +82,6 @@ public class ApiExcelController {
     @ApiOperation(value = "excel模板导出", httpMethod = "GET")
     @GetMapping("/excelTemplate")
     public void excelTemplate(HttpServletResponse response) {
-
         excelService.excelTemplate(response);
     }
 

src/main/java/com/glxp/api/controller/inv/BadDbController.java

@@ -25,7 +25,6 @@ public class BadDbController extends BaseController {
      */
     @GetMapping("udi/trace/badDb/search")
     public BaseResponse badDbSearch(TraceRecordRequest traceRecordRequest) {
-
         UdiEntity udiEntity = FilterUdiUtils.getUdi(traceRecordRequest.getUdiCode());
         AnncmntProductEntity anncmntProductEntity = anncmntProductService.getOne(new QueryWrapper<AnncmntProductEntity>().eq("nameCode", udiEntity.getUdi()).last("limit 1"));
         if (anncmntProductEntity != null) {

src/main/java/com/glxp/api/controller/inv/InvCountOrderController.java

@@ -54,14 +54,13 @@ import java.util.*;
  */
 @RestController
 public class InvCountOrderController extends BaseController {
+
     @Value("${file_path}")
     private String filePath;
-
     @Resource
     private InvCountOrderService invCountOrderService;
     @Resource
     private InvCountOrderDetailService invCountOrderDetailService;
-
     @Resource
     private SystemPDFTemplateService systemPDFTemplateService;
     @Resource
@@ -108,7 +107,6 @@ public class InvCountOrderController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-
         if (null == invCountOrder) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }

src/main/java/com/glxp/api/controller/inv/InvCountSettingController.java

@@ -79,12 +79,7 @@ public class InvCountSettingController {
     @Log(title = "判断是否可以新增盘点设置")
     @GetMapping("/invCount/setting/verifyAdd")
     public BaseResponse verifyAdd() {
-//        boolean verify = invCountSettingService.verifyAdd();
-//        if (verify) {
-//            return ResultVOUtils.success();
-//        }
         return ResultVOUtils.success();
-//        return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "已经存在盘点设置，无法添加");
     }
 
 }

src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java

@@ -52,7 +52,6 @@ public class InvInnerOrderPrintController {
 
     @Resource
     private InvInnerOrderPrintService invInnerOrderPrintService;
-
     @Resource
     SystemPDFModuleService systemPDFModuleService;
     @Resource
@@ -84,7 +83,6 @@ public class InvInnerOrderPrintController {
     @PostMapping("/udiwms/innerOrderPrint/addOrderPrint")
     @Log(title = "内部码", businessType = BusinessType.INSERT)
     public BaseResponse addOrderPrint(@RequestBody invInnerOrderprintReques invInnerOrderprintReques) {
-
         if (invInnerOrderprintReques.getOrderIdFk() != null) {
             invInnerOrderPrintService.addOrderList(invInnerOrderprintReques.getOrderIdFk());
         } else {
@@ -101,13 +99,10 @@ public class InvInnerOrderPrintController {
             @RequestBody InspectionPDFTemplateRequest inspectionPDFTemplateRequest) throws Exception {
 
         SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity = systemPDFModuleService.selectByLabelId(inspectionPDFTemplateRequest.getLabelId() + "");
-
         if (sysPdfTemplateRelevanceLabelEntity == null) return ResultVOUtils.error(500, "未找到单据模板模块设置，请检查");
-
         SystemPDFTemplateEntity systemPDFTemplateEntity =
                 systemPDFTemplateService.selectById(String.valueOf(sysPdfTemplateRelevanceLabelEntity.getTemplateId()));
         if (systemPDFTemplateEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误");
-
         return ResultVOUtils.success();
     }
 
@@ -118,13 +113,10 @@ public class InvInnerOrderPrintController {
             HttpServletRequest request, HttpServletResponse response) throws Exception {
 
         SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity = systemPDFModuleService.selectByLabelId(stockQRCodeTextPDFTemplateRequest.getLabelId() + "");
-
         if (sysPdfTemplateRelevanceLabelEntity == null) return ResultVOUtils.error(500, "未找到单据模板模块设置，请检查");
-
         SystemPDFTemplateEntity systemPDFTemplateEntity =
                 systemPDFTemplateService.selectById(String.valueOf(sysPdfTemplateRelevanceLabelEntity.getTemplateId()));
         if (systemPDFTemplateEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误");
-
         List<InnerOrderPrintResponse> printEntities = new ArrayList<>();
         List<InnerOrderPrintResponse> mStockPrintEntities = new ArrayList<>();
         FilterinnerOrderprintRequest filterinnerOrderprintRequest = new FilterinnerOrderprintRequest();
@@ -190,8 +182,6 @@ public class InvInnerOrderPrintController {
             Map<String, Object> data = new HashMap<String, Object>();
             data.put("data", printEntities);
             JasperUtils.jasperReport(request, response, data, filePath + "/pdf/template/" + FileUtils.getLastFileName(systemPDFTemplateEntity.getPath()), "pdf");
-
-
         }
         String orderId = "";
         for (InnerOrderPrintResponse InnerOrderPrintResponse : mStockPrintEntities) {
@@ -205,9 +195,7 @@ public class InvInnerOrderPrintController {
         //查询订单id
         InvInnerOrderPrintEntity innerOrderPrintEntity = invInnerOrderPrintService.selectById(orderId);
 
-
         //更新内部码状态
-
         InnerOrderEntity innerOrderEntity = innerOrderService.findByRecordKey(innerOrderPrintEntity.getOrderIdFk());
         if (innerOrderEntity != null) {
             innerOrderEntity.setGenStatus(2);
@@ -215,7 +203,6 @@ public class InvInnerOrderPrintController {
             innerOrderService.update(innerOrderEntity);
         }
 
-
         IoOrderEntity ioOrderEntity = new IoOrderEntity();
         ioOrderEntity.setInCodeStatus(1);
         ioOrderEntity.setBillNo(innerOrderPrintEntity.getOrderIdFk());
@@ -342,8 +329,7 @@ public class InvInnerOrderPrintController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<InvInnerOrderPdfTempEntity> stockQRCodeTextEntityList = innerOrderPdfTempService.filterStockPrintTempEntity(deleteStPrintTempRequest);
-        PageInfo<InvInnerOrderPdfTempEntity> pageInfo;
+        PageInfo<InvInnerOrderPdfTempEntity> pageInfo = new PageInfo<>(stockQRCodeTextEntityList);
-        pageInfo = new PageInfo<>(stockQRCodeTextEntityList);
         PageSimpleResponse<InvInnerOrderPdfTempEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(stockQRCodeTextEntityList);
@@ -355,8 +341,7 @@ public class InvInnerOrderPrintController {
     @GetMapping("/udiwms/invInnerOrderPdfTemp/filter")
     public BaseResponse filterTemp(FilterStPrintTempRequest filterStPrintTempRequest){
         List<InvInnerOrderPdfTempEntity> invInnerOrderPdfTempEntities = innerOrderPdfTempService.filterList(filterStPrintTempRequest);
-        PageInfo<InvInnerOrderPdfTempEntity> pageInfo;
+        PageInfo<InvInnerOrderPdfTempEntity> pageInfo = new PageInfo<>(invInnerOrderPdfTempEntities);
-        pageInfo = new PageInfo<>(invInnerOrderPdfTempEntities);
         PageSimpleResponse<InvInnerOrderPdfTempEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(invInnerOrderPdfTempEntities);

src/main/java/com/glxp/api/controller/inv/InvPlaceController.java

@@ -40,7 +40,6 @@ public class InvPlaceController {
     @Resource
     private InvPlaceOrderService invPlaceOrderService;
 
-
     /**
      * 查询库存摆放记录
      *
@@ -147,7 +146,6 @@ public class InvPlaceController {
      */
     @GetMapping("/spms/inv/product/getInvProductInfo")
     private BaseResponse getInvProductInfo(BindInvSpaceRequest bindInvSpaceRequest) {
-        List<InvPlaceDetailResponse> list = new ArrayList<>();
         //判断有没有库存
         String msg = invPlaceService.checkCount(bindInvSpaceRequest);
         if (StrUtil.isEmpty(msg)) {
@@ -156,7 +154,6 @@ public class InvPlaceController {
         } else {
             return ResultVOUtils.error(500, msg);
         }
-
     }
 
 
@@ -198,7 +195,6 @@ public class InvPlaceController {
      */
     @GetMapping("/spms/inv/product/getInvProductOutInfo")
     private BaseResponse getInvProductOutInfo(BindInvSpaceRequest bindInvSpaceRequest) {
-        List<InvPlaceDetailResponse> list = new ArrayList<>();
         //判断有没有库存
         String msg = invPlaceService.checkOutCount(bindInvSpaceRequest);
         if (StrUtil.isEmpty(msg)) {
@@ -207,7 +203,6 @@ public class InvPlaceController {
         } else {
             return ResultVOUtils.error(500, msg);
         }
-
     }
 
     /**
@@ -265,7 +260,6 @@ public class InvPlaceController {
                 }
             }
         }
-
         PageInfo<InvPlaceDetailResponse> pageInfo = new PageInfo<>(invPlaceDetailResponseList);
         return ResultVOUtils.page(pageInfo);
     }

src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java

@@ -50,8 +50,6 @@ public class InvPreinOrderController extends BaseController {
 
     @GetMapping("/udiwms/inv/prein/filter")
     public BaseResponse filterOrder(FilterInvPreinRequest filterInvPreinRequest) {
-
-
         List<InvPreinOrderResponse> list = invPreinOrderService.filterList(filterInvPreinRequest);
         PageInfo<InvPreinOrderResponse> pageInfo = new PageInfo<>(list);
         return ResultVOUtils.page(pageInfo);
@@ -69,17 +67,12 @@ public class InvPreinOrderController extends BaseController {
     @AuthRuleAnnotation("")
     @PostMapping("udiwms/inv/prein/delete")
     public BaseResponse deletById(@RequestBody DeleteRequest deleteRequest) {
-
+        if (StrUtil.isEmpty(deleteRequest.getBillNo())) return ResultVOUtils.error(500, "单据号不能为空");
-        if (StrUtil.isEmpty(deleteRequest.getBillNo()))
-            return ResultVOUtils.error(500, "单据号不能为空");
         invPreinOrderService.deleteByOrderId(deleteRequest.getBillNo());
         invPreinDetailService.deleteByOrderId(deleteRequest.getBillNo());
         return ResultVOUtils.success("删除成功！");
-
     }
 
-    @Resource
-    IoCodeTempService codeTempService;
     @Resource
     IoCodeService codeService;
 
@@ -137,15 +130,10 @@ public class InvPreinOrderController extends BaseController {
             }
         }
 
-//        InvPreInProductDetailEntity invPreinDetailEntity = invPreinProductDetailService.findUseOneByCode(checkPreInInvRequest.getCode());
         if (count <= 0) {
             return ResultVOUtils.error(500, "预验收库存数量不足！");
-        } else {
-//            if (invPreinDetailEntity != null && StrUtil.isNotEmpty(invPreinDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(checkPreInInvRequest.getBatchNo())
-//                    && !invPreinDetailEntity.getBatchNo().equals(checkPreInInvRequest.getBatchNo())) {
-//                return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配！");
-//            }
         }
+
         return ResultVOUtils.success(count);
     }
 

src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java

@@ -33,6 +33,7 @@ import java.util.List;
 @Slf4j
 @RestController
 public class InvPreinProductController extends BaseController {
+
     @Resource
     private InvPreinProductDetailService invPreinProductDetailService;
     @Resource

src/main/java/com/glxp/api/controller/inv/InvProductController.java

@@ -186,18 +186,6 @@ public class InvProductController extends BaseController {
             });
         }
 
-//        //根据单据日期排序
-//        list.sort((o1, o2) -> {
-//            long o1OrderTime = DateUtil.parseDate(o1.getOrderTime()).getTime();
-//            long o2OrderTime = DateUtil.parseDate(o2.getOrderTime()).getTime();
-//            if (o1OrderTime > o2OrderTime) {
-//                return 1;
-//            } else if (o1OrderTime < o2OrderTime) {
-//                return -1;
-//            }
-//            return 0;
-//        });
-
         PageSimpleResponse<InvProductDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(list);
@@ -252,7 +240,6 @@ public class InvProductController extends BaseController {
                 detailRequest.setBatchNo(invProductEntity.getBatchNo());
             }
             invProductService.deleteById(id);
-//            invProductServiceNew.deleteInvProductDetail(detailRequest);
             return ResultVOUtils.success("删除成功");
         } else {
             return ResultVOUtils.error(500, "删除失败");

src/main/java/com/glxp/api/controller/inv/InvProductRationController.java

@@ -139,8 +139,6 @@ public class InvProductRationController extends BaseController {
         if (CollUtil.isNotEmpty(invAddRationRequest.getRationEntities())) {
             invProductRationService.genOrder(invAddRationRequest.getRationEntities());
         }
-
-
         return ResultVOUtils.success("修改成功");
     }
 

src/main/java/com/glxp/api/controller/inv/InvSickTraceController.java

@@ -48,8 +48,7 @@ public class InvSickTraceController {
         FilterOrderRequest orderFilterRequest = new FilterOrderRequest();
         orderFilterRequest.setFromCorpList(names);
         List<IoOrderResponse> orderEntityList = orderService.filterList(orderFilterRequest);
-        PageInfo<IoOrderResponse> pageInfo;
+        PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(orderEntityList);
-        pageInfo = new PageInfo<>(orderEntityList);
         PageSimpleResponse<IoOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(orderEntityList);

src/main/java/com/glxp/api/controller/inv/InvUserProductDetailController.java

@@ -1,17 +0,0 @@
-package com.glxp.api.controller.inv;
-
-import com.glxp.api.controller.BaseController;
-import groovy.util.logging.Slf4j;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 用户库存查询接口
- */
-@Slf4j
-@RestController
-public class InvUserProductDetailController{
-
-
-
-
-}

src/main/java/com/glxp/api/controller/inv/StockCompareController.java

@@ -58,8 +58,7 @@ public class StockCompareController extends BaseController {
 
         Page<StockCompareVo> page = stockCompareService.pageVo(query);
 
-        PageInfo<StockCompareVo> pageInfo;
+        PageInfo<StockCompareVo> pageInfo = new PageInfo<>(page.getRecords());
-        pageInfo = new PageInfo<>(page.getRecords());
         PageSimpleResponse<StockCompareVo> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(page.getRecords());
@@ -152,8 +151,7 @@ public class StockCompareController extends BaseController {
         );
 
 
-        PageInfo<StockCompareDetailEntity> pageInfo;
+        PageInfo<StockCompareDetailEntity> pageInfo = new PageInfo<>(page.getRecords());
-        pageInfo = new PageInfo<>(page.getRecords());
         PageSimpleResponse<StockCompareDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(page.getRecords());
@@ -162,8 +160,6 @@ public class StockCompareController extends BaseController {
 
     @Resource
     InvCpLocalProductService localProductService;
-    @Resource
-    InvCpThrProuductService thrProuductService;
 
     @PostMapping("/udiwms/stockCompare/detail/result")
     public BaseResponse realDeatilPage(@RequestBody @Valid InvProductDetailSelectRequest param) {
@@ -189,12 +185,6 @@ public class StockCompareController extends BaseController {
                 .eq(InvCpLocalProductEntity::getCompareId, param.getCompareId())
                 .eq(InvCpLocalProductEntity::getProductId, param.getProductId())
                 .eq(InvCpLocalProductEntity::getBatchNo, param.getBatchNo()));
-
-//        stockCompareDetailService.remove(Wrappers.lambdaQuery(StockCompareDetailEntity.class)
-//                .eq(StockCompareDetailEntity::getCompareId, param.getCompareId())
-//                .eq(StockCompareDetailEntity::getProductId, param.getProductId())
-//                .eq(StockCompareDetailEntity::getMainAction, param.getMainAction())
-//        );
         return ResultVOUtils.successMsg("移除成功");
     }
 

src/main/java/com/glxp/api/controller/inv/UdiTraceController.java

@@ -75,7 +75,6 @@ public class UdiTraceController {
             filterCodeRequest.setCode(filterCodeTraceRequest.getCode());
         }
 
-//        IoCodeEntity;
         filterCodeRequest.setSupId(filterCodeTraceRequest.getSupId());
         List<IoCodeEntity> invProductDetailEntities = ioCodeDao.filterCodeList(filterCodeRequest);
         if (invProductDetailEntities.size() > 0) {
@@ -92,7 +91,6 @@ public class UdiTraceController {
             filterOrderRequest.setOrderIds(orderIds);
             List<IoOrderResponse> orderEntities = orderService.filterList(filterOrderRequest);
 
-
             FilterUdiRelRequest filterUdiInfoRequest = new FilterUdiRelRequest();
             filterUdiInfoRequest.setNameCode(udiEntity.getUdi());
             List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
@@ -124,8 +122,7 @@ public class UdiTraceController {
             }).collect(Collectors.toList());
 
 
-            PageInfo<UdiTraceResponse> pageInfo;
+            PageInfo<UdiTraceResponse> pageInfo = new PageInfo<>(udiTraceResponseList);
-            pageInfo = new PageInfo<>(udiTraceResponseList);
             PageSimpleResponse<UdiTraceResponse> pageSimpleResponse = new PageSimpleResponse<>();
             pageSimpleResponse.setTotal(pageInfo.getTotal());
             pageSimpleResponse.setList(udiTraceResponseList);
@@ -136,7 +133,6 @@ public class UdiTraceController {
 
     }
 
-    //    TODO 20241017先把这个接口注释了
     @AuthRuleAnnotation("")
     @GetMapping("spms/inv/products/order/trace")
 

src/main/java/com/glxp/api/controller/monitor/SysLogininforController.java

@@ -37,8 +37,7 @@ public class SysLogininforController extends BaseController {
     public BaseResponse list(FilterLoginLogRequest filterLoginLogRequest) {
 
         List<SysLogininfor> selectLogininforList = logininforService.selectLogininforList(filterLoginLogRequest);
-        PageInfo<SysLogininfor> pageInfo;
+        PageInfo<SysLogininfor> pageInfo = new PageInfo<>(selectLogininforList);
-        pageInfo = new PageInfo<>(selectLogininforList);
         PageSimpleResponse<SysLogininfor> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(selectLogininforList);

src/main/java/com/glxp/api/controller/monitor/SysOperlogController.java

@@ -34,10 +34,8 @@ public class SysOperlogController extends BaseController {
     @SaCheckPermission("monitor:operlog:list")
     @GetMapping("/list")
     public BaseResponse list(FilterOperLogRequest filterOperLogRequest) {
-
         List<SysOperLog> selectOperLogList = operLogService.selectOperLogList(filterOperLogRequest);
-        PageInfo<SysOperLog> pageInfo;
+        PageInfo<SysOperLog> pageInfo = new PageInfo<>(selectOperLogList);
-        pageInfo = new PageInfo<>(selectOperLogList);
         PageSimpleResponse<SysOperLog> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(selectOperLogList);
@@ -54,7 +52,6 @@ public class SysOperlogController extends BaseController {
     @SaCheckPermission("monitor:operlog:remove")
     @DeleteMapping("/{operIds}")
     public BaseResponse remove(@PathVariable Long[] operIds) {
-
         int i = operLogService.deleteOperLogByIds(operIds);
         return ResultVOUtils.success("删除成功！");
     }

src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java

@@ -166,10 +166,7 @@ public class IoPurChangeService {
                 purApplyEntity1.setGeneratePlan(true);
                 purApplyService.update(purApplyEntity1);
             }
-//            if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
+
-//                purApplyGen(purApplyEntity);
-//                System.out.println("6666666666666666666999999999999999");
-//            }
         }
     }
 

src/main/java/com/glxp/api/controller/purchase/PurApplyArgumentController.java

@@ -52,8 +52,7 @@ public class PurApplyArgumentController {
     public BaseResponse list(PurApplyArgumentRequest purApplyArgumentRequest) {
 
         List<PurApplyArgument> list = purApplyArgumentService.queryPageList(purApplyArgumentRequest);
-        PageInfo<PurApplyArgument> pageInfo;
+        PageInfo<PurApplyArgument> pageInfo = new PageInfo<>(list);
-        pageInfo = new PageInfo<>(list);
         PageSimpleResponse<PurApplyArgument> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(list);

src/main/java/com/glxp/api/controller/purchase/PurApplyController.java

@@ -64,7 +64,6 @@ public class PurApplyController {
     PurPlanService purPlanService;
     @Resource
     PurPlanDetailService purPlanDetailService;
-
     @Resource
     IBasicBusTypeChangeService basicBusTypeChangeService;
     @Resource
@@ -152,8 +151,7 @@ public class PurApplyController {
         purApplyRequest.setSysApprovalFlow(sys_approval_flow);
 
         List<PurApplyResponse> purApplyEntities = purApplyService.queryPageList(purApplyRequest);
-        PageInfo<PurApplyResponse> pageInfo;
+        PageInfo<PurApplyResponse> pageInfo = new PageInfo<>(purApplyEntities);
-        pageInfo = new PageInfo<>(purApplyEntities);
         PageSimpleResponse<PurApplyResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purApplyEntities);
@@ -171,18 +169,13 @@ public class PurApplyController {
         if (purApplyRequest.getStatus() == null) {
             purApplyRequest.setStatus(12);  //查询已审核状态
         }
-//        if (purApplyRequest.getIsInvCode() != null && purApplyRequest.getIsInvCode()) {
-//            AuthAdmin authAdmin = customerService.getUserBean();
-//            purApplyRequest.setTargetInvCode(authAdmin.getLocInvCode() + ""); //查询自己仓库
-//        }
 
         Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow"));
         purApplyRequest.setSysApprovalFlow(sys_approval_flow);
 
 
         List<PurApplyResponse> purApplyEntities = purApplyService.queryPageList(purApplyRequest);
-        PageInfo<PurApplyResponse> pageInfo;
+        PageInfo<PurApplyResponse> pageInfo = new PageInfo<>(purApplyEntities);
-        pageInfo = new PageInfo<>(purApplyEntities);
         PageSimpleResponse<PurApplyResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purApplyEntities);
@@ -209,40 +202,6 @@ public class PurApplyController {
         if (purApplyRequest.getStatus() == 3) {
             purChangeService.purApplyChange(purApplyEntity);
         }
-//        //审核通过后转换成采购计划单
-//        if (purApplyEntity.getStatus() == ConstantStatus.APPLY_AUDIT_ED && purApplyRequest.isAudtoPlan()) {
-//            PurPlanEntity purPlanEntity = new PurPlanEntity();
-//            String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.JH_ORDER, "yyyyMMdd"));
-//            purPlanEntity.setBillNo(billNo);
-//            purPlanEntity.setBillDate(new Date());
-//            purPlanEntity.setInvCode(purApplyEntity.getInvCode());
-//            purPlanEntity.setDeptCode(purApplyEntity.getDeptCode());
-//            purApplyEntity.setCreateUser(customerService.getUserId()+"");
-//            purPlanEntity.setUpdateUser(purApplyEntity.getUpdateUser());
-//            purPlanEntity.setStatus(ConstantStatus.APPLY_DRAFT);
-//            purPlanEntity.setBillType("purPlan");
-//            purPlanEntity.setCreateTime(new Date());
-//            purPlanEntity.setUpdateTime(new Date());
-//            purPlanEntity.setApplyBillNo(purApplyEntity.getBillNo());
-//            purPlanEntity.setApplyCreateUser(purApplyEntity.getCreateUser());
-//            purPlanEntity.setApplyRemark(purApplyEntity.getRemark());
-//            purPlanEntity.setApplyAuditUser(purApplyEntity.getAuditUser());
-//            purPlanEntity.setRemark("申购科室：" + purApplyRequest.getTargetInvCode() +
-//                    ";申购人：" + purApplyRequest.getCreateByName() + ";申购原因：" + purApplyRequest.getRemark());
-//            purApplyEntity.setPlanBillNo(purPlanEntity.getBillNo());
-//            purApplyEntity.setGeneratePlan(true);
-//            purApplyService.update(purApplyEntity);
-//            purPlanService.insert(purPlanEntity);
-//            List<PurApplyDetailEntity> purApplyDetailEntities = purApplyDetailService.findByOrderId(purApplyEntity.getId() + "");
-//            if (CollUtil.isNotEmpty(purApplyDetailEntities)) {
-//                for (PurApplyDetailEntity purApplyDetailEntity : purApplyDetailEntities) {
-//                    PurPlanDetailEntity purPlanDetailEntity = new PurPlanDetailEntity();
-//                    BeanUtils.copyProperties(purApplyDetailEntity, purPlanDetailEntity);
-//                    purPlanDetailEntity.setOrderIdFk(purPlanEntity.getId() + "");
-//                    purPlanDetailService.insert(purPlanDetailEntity);
-//                }
-//            }
-//        }
         return ResultVOUtils.success("更新成功！");
     }
 
@@ -457,8 +416,7 @@ public class PurApplyController {
     public BaseResponse detailList(PurApplyDetailRequest purApplyDetailRequest) {
 
         List<PurOrderDetailResponse> purApplyDetailEntities = purApplyDetailService.joinQueryList(purApplyDetailRequest);
-        PageInfo<PurOrderDetailResponse> pageInfo;
+        PageInfo<PurOrderDetailResponse> pageInfo = new PageInfo<>(purApplyDetailEntities);
-        pageInfo = new PageInfo<>(purApplyDetailEntities);
         PageSimpleResponse<PurOrderDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purApplyDetailEntities);
@@ -580,8 +538,7 @@ public class PurApplyController {
     @GetMapping("/purchase/apply/drug/list/detail")
     public BaseResponse drugDetailList(PurApplyDetailRequest purApplyDetailRequest) {
         List<PurOrderDetailResponse> purApplyDetailEntities = purApplyDetailService.joinQueryListDrug(purApplyDetailRequest);
-        PageInfo<PurOrderDetailResponse> pageInfo;
+        PageInfo<PurOrderDetailResponse> pageInfo = new PageInfo<>(purApplyDetailEntities);
-        pageInfo = new PageInfo<>(purApplyDetailEntities);
         PageSimpleResponse<PurOrderDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purApplyDetailEntities);

src/main/java/com/glxp/api/controller/purchase/PurContractController.java

@@ -101,8 +101,7 @@ public class PurContractController {
         purContractRequest.setSysApprovalFlow(sys_approval_flow);
 
         List<PurContractEntityResponse> purContractEntityResponses = purContractService.queryPageList(purContractRequest);
-        PageInfo<PurContractEntityResponse> pageInfo;
+        PageInfo<PurContractEntityResponse> pageInfo = new PageInfo<>(purContractEntityResponses);
-        pageInfo = new PageInfo<>(purContractEntityResponses);
         PageSimpleResponse<PurContractEntityResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purContractEntityResponses);

src/main/java/com/glxp/api/controller/purchase/PurInquiryController.java

@@ -59,8 +59,7 @@ public class PurInquiryController {
         Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow"));
         purInquiryRequest.setSysApprovalFlow(sys_approval_flow);
         List<PurInquiryEntityResponse> purInquiryEntityResponses = purInquiryService.queryPageList(purInquiryRequest);
-        PageInfo<PurInquiryEntityResponse> pageInfo;
+        PageInfo<PurInquiryEntityResponse> pageInfo = new PageInfo<>(purInquiryEntityResponses);
-        pageInfo = new PageInfo<>(purInquiryEntityResponses);
         PageSimpleResponse<PurInquiryEntityResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purInquiryEntityResponses);
@@ -107,8 +106,7 @@ public class PurInquiryController {
     @GetMapping("/purchase/purInquiry/list/detail")
     public BaseResponse getDetailList(PurContractDetailRequest purContractDetailRequest) {
         List<PurInquiryItemEntity> page = purInquiryItemService.queryPageList(purContractDetailRequest);
-        PageInfo<PurInquiryItemEntity> pageInfo;
+        PageInfo<PurInquiryItemEntity> pageInfo = new PageInfo<>(page);
-        pageInfo = new PageInfo<>(page);
         PageSimpleResponse<PurInquiryItemEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(page);
@@ -123,8 +121,7 @@ public class PurInquiryController {
     @GetMapping("/purchase/purInquiry/list/itemDetail")
     public BaseResponse getItemDetailList(PurContractDetailRequest purContractDetailRequest) {
         List<PurInquiryItemDetailEntity> page = purInquiryItemDetailService.queryPageList(purContractDetailRequest);
-        PageInfo<PurInquiryItemDetailEntity> pageInfo;
+        PageInfo<PurInquiryItemDetailEntity> pageInfo = new PageInfo<>(page);
-        pageInfo = new PageInfo<>(page);
         PageSimpleResponse<PurInquiryItemDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(page);

src/main/java/com/glxp/api/controller/purchase/PurInquiryOfferController.java

@@ -62,8 +62,7 @@ public class PurInquiryOfferController {
         Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow"));
         purInquiryOfferRequest.setSysApprovalFlow(sys_approval_flow);
         List<PurInquiryOfferEntityResponse> purInquiryOfferEntityResponses = purInquiryOfferService.queryPageList(purInquiryOfferRequest);
-        PageInfo<PurInquiryOfferEntityResponse> pageInfo;
+        PageInfo<PurInquiryOfferEntityResponse> pageInfo = new PageInfo<>(purInquiryOfferEntityResponses);
-        pageInfo = new PageInfo<>(purInquiryOfferEntityResponses);
         PageSimpleResponse<PurInquiryOfferEntityResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purInquiryOfferEntityResponses);
@@ -110,8 +109,7 @@ public class PurInquiryOfferController {
     @GetMapping("/purchase/purInquiryOffer/list/detail")
     public BaseResponse getDetailList(PurContractDetailRequest purContractDetailRequest) {
         List<PurInquiryOfferItemEntity> page = purInquiryOfferItemService.queryPageList(purContractDetailRequest);
-        PageInfo<PurInquiryOfferItemEntity> pageInfo;
+        PageInfo<PurInquiryOfferItemEntity> pageInfo = new PageInfo<>(page);
-        pageInfo = new PageInfo<>(page);
         PageSimpleResponse<PurInquiryOfferItemEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(page);
@@ -126,8 +124,7 @@ public class PurInquiryOfferController {
     @GetMapping("/purchase/purInquiryOffer/list/itemDetail")
     public BaseResponse getItemDetailList(PurContractDetailRequest purContractDetailRequest) {
         List<PurInquiryOfferItemDetailEntity> page = purInquiryOfferItemDetailService.queryPageList(purContractDetailRequest);
-        PageInfo<PurInquiryOfferItemDetailEntity> pageInfo;
+        PageInfo<PurInquiryOfferItemDetailEntity> pageInfo = new PageInfo<>(page);
-        pageInfo = new PageInfo<>(page);
         PageSimpleResponse<PurInquiryOfferItemDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(page);

src/main/java/com/glxp/api/controller/purchase/PurOrderController.java

@@ -52,15 +52,12 @@ import java.util.stream.Collectors;
 @RestController
 public class PurOrderController {
 
-
     @Resource
     PurOrderService purOrderService;
-
     @Resource
     PurPlanDetailService purPlanDetailService;
     @Resource
     PurOrderDetailService purOrderDetailService;
-
     @Resource
     CustomerService customerService;
     @Resource
@@ -136,8 +133,7 @@ public class PurOrderController {
         purOrderRequest.setSysApprovalFlow(sys_approval_flow);
 
         List<PurOrderResponse> purApplyEntities = purOrderService.queryPageList(purOrderRequest);
-        PageInfo<PurOrderResponse> pageInfo;
+        PageInfo<PurOrderResponse> pageInfo = new PageInfo<>(purApplyEntities);
-        pageInfo = new PageInfo<>(purApplyEntities);
         PageSimpleResponse<PurOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purApplyEntities);
@@ -160,8 +156,7 @@ public class PurOrderController {
         purOrderRequest.setSysApprovalFlow(sys_approval_flow);
 
         List<PurOrderResponse> purApplyEntities = purOrderService.queryPageList(purOrderRequest);
-        PageInfo<PurOrderResponse> pageInfo;
+        PageInfo<PurOrderResponse> pageInfo = new PageInfo<>(purApplyEntities);
-        pageInfo = new PageInfo<>(purApplyEntities);
         PageSimpleResponse<PurOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purApplyEntities);
@@ -177,7 +172,6 @@ public class PurOrderController {
     @PostMapping("/purchase/order/auditOrder")
     public BaseResponse auditOrder(@RequestBody PostPurOrderRequest postPurOrderRequest) {
 
-
         Long userId = customerService.getUserId();
         PurOrderEntity purOrderEntity = postPurOrderRequest.getPurOrderEntity();
         purOrderEntity.setUpdateTime(new Date());
@@ -223,64 +217,6 @@ public class PurOrderController {
         }
         purChangeService.purOrderChange(purOrderEntity);
 
-//        String billNo = "";
-//        List<PurOrderDetailEntity> purOrderDetailEntities = purOrderDetailService.findByOrderId(purOrderEntity.getId() + "");
-//
-//        //对计划单里面的供应商进行分组
-//        Map<String, List<PurOrderDetailEntity>> map = purOrderDetailEntities.stream().collect(Collectors.groupingBy(PurOrderDetailEntity::getSupId));
-//
-//        if (postPurOrderRequest.getEditStatus() == ConstantStatus.APPLY_AUDIT_ED) {
-//
-//            if (CollUtil.isNotEmpty(purOrderDetailEntities) && postPurOrderRequest.isAutoPurchase() == true
-//                    && StrUtil.isNotEmpty(postPurOrderRequest.getTargetSubInv()) && StrUtil.isNotEmpty(postPurOrderRequest.getTargetBillAction())) {
-//
-//                for (Map.Entry<String, List<PurOrderDetailEntity>> m : map.entrySet()) {
-//                    //生产单据表信息
-//                    IoOrderEntity ioOrderEntity = new IoOrderEntity();
-//                    ioOrderEntity.setBillNo(gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd")));
-//                    ioOrderEntity.setCorpOrderId(CustomUtil.getDate());
-//                    ioOrderEntity.setMainAction(ConstantType.TYPE_PUT);
-//                    ioOrderEntity.setAction(postPurOrderRequest.getTargetBillAction());
-//                    ioOrderEntity.setFromCorp(m.getKey());
-//                    ioOrderEntity.setFromType(ConstantStatus.FROM_Order);
-//                    ioOrderEntity.setStatus(1);
-//                    ioOrderEntity.setDealStatus(1);
-//                    ioOrderEntity.setOrderType(1);
-//                    ioOrderEntity.setCreateTime(new Date());
-//                    ioOrderEntity.setCreateUser(postPurOrderRequest.getPurOrderEntity().getAuditUser());
-//                    ioOrderEntity.setUpdateTime(new Date());
-//                    ioOrderEntity.setUpdateUser(postPurOrderRequest.getPurOrderEntity().getAuditUser());
-//                    ioOrderEntity.setCustomerId("110");
-//                    ioOrderEntity.setDeptCode(postPurOrderRequest.getTargetDeptCode());
-//                    ioOrderEntity.setInvCode(postPurOrderRequest.getTargetSubInv());
-//                    ioOrderService.insertOrder(ioOrderEntity);
-//                    billNo += ioOrderEntity.getBillNo() + ",";
-//                    //插入业务单表
-//                    for (PurOrderDetailEntity obj : m.getValue()) {
-//                        BasicProductsEntity basicProductsEntity = purOrderDetailService.selectIoOrderDetailBiz(obj.getId());
-//                        IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
-//                        ioOrderDetailBizEntity.setOrderIdFk(ioOrderEntity.getBillNo());
-//                        ioOrderDetailBizEntity.setBindRlFk(Long.valueOf(obj.getProductId()));
-//                        ioOrderDetailBizEntity.setCount(obj.getCount());
-//                        ioOrderDetailBizEntity.setUuidFk(basicProductsEntity.getUuid());
-//                        ioOrderDetailBizEntity.setNameCode(basicProductsEntity.getNameCode());
-//                        ioOrderDetailBizEntity.setCoName(basicProductsEntity.getCpmctymc());
-//                        ioOrderDetailBizEntity.setCertCode(basicProductsEntity.getZczbhhzbapzbh());
-//                        ioOrderDetailBizEntity.setYlqxzcrbarmc(basicProductsEntity.getYlqxzcrbarmc());
-//                        ioOrderDetailBizEntity.setManufacturer(basicProductsEntity.getManufactory());
-//                        ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname());
-//                        ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh());
-//                        if (basicProductsEntity.getPrice() != null) {
-//                            ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(basicProductsEntity.getPrice()));
-//                        }
-//                        ioOrderDetailBizEntity.setSupId(obj.getSupId());
-//                        ioOrderDetailBizService.insert(ioOrderDetailBizEntity);
-//                    }
-//                }
-//                purOrderEntity.setStockOrderNo(billNo.substring(0, billNo.length() - 1));
-//                purOrderService.update(purOrderEntity);
-//            }
-//        }
         return ResultVOUtils.success("更新成功！");
     }
 
@@ -292,8 +228,7 @@ public class PurOrderController {
     public BaseResponse detailList(PurOrderDetailRequest purApplyDetailRequest) {
 
         List<PurOrderDetailResponse> purOrderDetailResponseList = purOrderDetailService.joinQueryList(purApplyDetailRequest);
-        PageInfo<PurOrderDetailResponse> pageInfo;
+        PageInfo<PurOrderDetailResponse> pageInfo = new PageInfo<>(purOrderDetailResponseList);
-        pageInfo = new PageInfo<>(purOrderDetailResponseList);
         PageSimpleResponse<PurOrderDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purOrderDetailResponseList);
@@ -345,7 +280,6 @@ public class PurOrderController {
         PurOrderDetailRequest.setOrderIdFk(purOrderRequest.getId() + "");
         List<PurOrderDetailEntity> purOrderDetailEntities = purOrderDetailService.getPurOrderDetailEntityList(PurOrderDetailRequest);
 
-
         List<Long> ids = new ArrayList<>();
         for (PurOrderDetailEntity obj : purOrderDetailEntities) {
             for (PurOrderDetailEntity obj1 : purOrderDetailEntityList) {
@@ -481,8 +415,7 @@ public class PurOrderController {
         PurOrderRequest purOrderRequest = new PurOrderRequest();
         purOrderRequest.setBillNo(billNo);
         List<PurOrderResponse> purApplyEntities = purOrderService.queryPageList(purOrderRequest);
-        PageInfo<PurOrderResponse> pageInfo;
+        PageInfo<PurOrderResponse> pageInfo = new PageInfo<>(purApplyEntities);
-        pageInfo = new PageInfo<>(purApplyEntities);
         PageSimpleResponse<PurOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purApplyEntities);
@@ -498,8 +431,7 @@ public class PurOrderController {
     public BaseResponse drugDetailList(PurOrderDetailRequest purApplyDetailRequest) {
 
         List<PurOrderDetailResponse> purOrderDetailResponseList = purOrderDetailService.joinDrugQueryList(purApplyDetailRequest);
-        PageInfo<PurOrderDetailResponse> pageInfo;
+        PageInfo<PurOrderDetailResponse> pageInfo = new PageInfo<>(purOrderDetailResponseList);
-        pageInfo = new PageInfo<>(purOrderDetailResponseList);
         PageSimpleResponse<PurOrderDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purOrderDetailResponseList);

src/main/java/com/glxp/api/controller/purchase/PurOrderPrintController.java

@@ -68,7 +68,6 @@ public class PurOrderPrintController {
     ReceiveService receiveService;
     @Resource
     ReceiveDetailService receivedetailService;
-
     @Resource
     PurApplyService purApplyService;
     @Resource
@@ -198,7 +197,6 @@ public class PurOrderPrintController {
                 supData.put("auditUserName", purApplyResponse.getAuditByName());
                 supData.put("billDate", MsDateUtil.formatDate(purApplyResponse.getBillDate(), "yyyy-MM-dd"));
                 supData.put("auditTime", MsDateUtil.formatDate(purApplyResponse.getAuditTime(), "yyyy-MM-dd"));
-
                 supData.put("count", obj.getCount());
                 supData.put("cpmctymc", obj.getProductName());
                 supData.put("ggxh", obj.getSpec());

src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java

@@ -175,14 +175,9 @@ public class PurOrderReceiveController extends BaseController {
     @GetMapping("/udiwms/receive/order/filter")
     public BaseResponse filterReceive(FilterReceiveRequest filterReceiveRequest) {
 
-//        if (filterReceiveRequest.getIsUser() != null && filterReceiveRequest.getIsUser()) {
-//            AuthAdmin authAdmin = customerService.getUserBean();
-//                                         filterReceiveRequest.setCreateUser(authAdmin.getId() + ""); //查询自己
-//        }
         if (filterReceiveRequest.getIsInvCode() != null && filterReceiveRequest.getIsInvCode()) {
             AuthAdmin authAdmin = customerService.getUserBean();
             filterReceiveRequest.setTargetInvCode(authAdmin.getLocInvCode());
-//            filterReceiveRequest.setTargetInvCode("1000000");
         }
 
         Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow"));
@@ -201,8 +196,7 @@ public class PurOrderReceiveController extends BaseController {
     @GetMapping("/udiwms/receive/order/detail")
     public BaseResponse filterReceiveDetail(FilterReceiveDetailRequest filterReceiveDetailRequest) {
         List<ReceiveDetailResponse> data = receivedetailService.filterList(filterReceiveDetailRequest);
-        PageInfo<ReceiveDetailResponse> pageInfo;
+        PageInfo<ReceiveDetailResponse> pageInfo = new PageInfo<>(data);
-        pageInfo = new PageInfo<>(data);
         PageSimpleResponse<ReceiveDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(data);
@@ -213,8 +207,7 @@ public class PurOrderReceiveController extends BaseController {
     @GetMapping("/udiwms/receive/drug/order/detail")
     public BaseResponse filterReceiveDrugDetail(FilterReceiveDetailRequest filterReceiveDetailRequest) {
         List<ReceiveDetailResponse> data = receivedetailService.filterDrugList(filterReceiveDetailRequest);
-        PageInfo<ReceiveDetailResponse> pageInfo;
+        PageInfo<ReceiveDetailResponse> pageInfo = new PageInfo<>(data);
-        pageInfo = new PageInfo<>(data);
         PageSimpleResponse<ReceiveDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(data);
@@ -476,197 +469,6 @@ public class PurOrderReceiveController extends BaseController {
         return ResultVOUtils.success("成功");
     }
 
-    //根据单据生成新单据
-    public Boolean generateDocument(PurReceiveEntity purReceiveEntity) {
-        //查询耗材表
-        purReceiveEntity = receiveService.selectById(purReceiveEntity.getId());
-        //查询耗材详情
-        List<PurReceiveDetailEntity> purReceiveDetailEntityList = receivedetailService.selectByOrderId(purReceiveEntity.getBillNo());
-        PurApplyEntity purApplyEntity = new PurApplyEntity();
-        //查询耗材要生成的业务单
-        BasicBusTypeChangeEntity basicBusTypeChangeEntity = new BasicBusTypeChangeEntity();
-        basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("HCLY");
-        if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
-            purApplyEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SG_ORDER, "yyyyMMdd")));
-            purApplyEntity.setBillDate(purReceiveEntity.getBillDate());
-            purApplyEntity.setStatus(basicBusTypeChangeEntity.getBusAuditStatus());
-            purApplyEntity.setRemark(purReceiveEntity.getRemark());
-            purApplyEntity.setInvCode(purReceiveEntity.getTargetInvCode());
-            purApplyEntity.setDeptCode(purReceiveEntity.getTargetDeptCode());
-            purApplyEntity.setTargetInvCode(purReceiveEntity.getInvCode());
-            purApplyEntity.setTargetDeptCode(purReceiveEntity.getDeptCode());
-            purApplyEntity.setCreateUser(purReceiveEntity.getAuditUser());
-            purApplyEntity.setCreateTime(timeProcess(purReceiveEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
-            purApplyEntity.setUpdateUser(purReceiveEntity.getAuditUser());
-            purApplyEntity.setUpdateTime(timeProcess(purReceiveEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
-            if (purApplyEntity.getStatus() == 3) {
-                purApplyEntity.setAuditUser("");
-                purApplyEntity.setAuditTime(new Date());
-            }
-            //插入申购主表
-            purApplyService.insert(purApplyEntity);
-            //用stream流复制list
-            List<PurApplyDetailEntity> purApplyDetailEntityList = purReceiveDetailEntityList.stream().map(e -> {
-                PurApplyDetailEntity d = new PurApplyDetailEntity();
-                d.setOrderIdFk(purApplyEntity.getId() + "");
-                d.setProductId(e.getRelIdFk());
-                UdiProductEntity udiProductEntity = udiProductService.findByNameCode(e.getNameCode());
-                d.setProductName(udiProductEntity.getCpmctymc());
-                d.setCount(e.getCount());
-                d.setSupId(e.getSupId());
-                d.setZczbhhzbapzbh(udiProductEntity.getZczbhhzbapzbh());
-                return d;
-            })
-                    .collect(Collectors.toList());
-            purApplyDetailService.insertPurApplyDetailEntity(purApplyDetailEntityList);
-
-            //---------------------------------判断申购为已审核就生成计划单-------------------------------------------//
-            PurPlanEntity purPlanEntity = new PurPlanEntity();
-            List<PurPlanDetailEntity> purPlanDetailEntityList = new ArrayList<>();
-            if (purApplyEntity.getStatus() == 3) {
-                basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CPSG);
-                if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
-                    purPlanEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.JH_ORDER, "yyyyMMdd")));
-                    purPlanEntity.setBillDate(purReceiveEntity.getBillDate());
-                    purPlanEntity.setStatus(basicBusTypeChangeEntity.getBusAuditStatus());
-                    purPlanEntity.setRemark(purReceiveEntity.getRemark());
-                    purPlanEntity.setInvCode(purReceiveEntity.getInvCode());
-                    purPlanEntity.setDeptCode(purReceiveEntity.getDeptCode());
-                    purPlanEntity.setCreateUser(purReceiveEntity.getAuditUser());
-                    purPlanEntity.setCreateTime(timeProcess(purReceiveEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
-                    purPlanEntity.setUpdateUser(purReceiveEntity.getAuditUser());
-                    purPlanEntity.setUpdateTime(timeProcess(purReceiveEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
-                    if (purPlanEntity.getStatus() == 3) {
-                        purPlanEntity.setAuditUser("");
-                        purPlanEntity.setAuditTime(new Date());
-                    }
-                    //插入计划主表
-                    purPlanService.insert(purPlanEntity);
-                    //用stream流复制list
-                    purPlanDetailEntityList = purReceiveDetailEntityList.stream().map(e -> {
-                        PurPlanDetailEntity d = new PurPlanDetailEntity();
-                        d.setOrderIdFk(purPlanEntity.getId() + "");
-                        d.setProductId(e.getRelIdFk());
-                        UdiProductEntity udiProductEntity = udiProductService.findByNameCode(e.getNameCode());
-                        d.setProductName(udiProductEntity.getCpmctymc());
-                        d.setCount(e.getCount());
-                        d.setSupId(e.getSupId());
-                        d.setZczbhhzbapzbh(udiProductEntity.getZczbhhzbapzbh());
-                        return d;
-                    }).collect(Collectors.toList());
-                    purPlanDetailService.insertPurPlanDetailEntity(purPlanDetailEntityList);
-                    //更新申购表信息插入计划单号
-                    PurApplyEntity purApplyEntity1 = new PurApplyEntity();
-                    purApplyEntity1.setId(purApplyEntity.getId());
-                    purApplyEntity1.setPlanBillNo(purPlanEntity.getBillNo());
-                    purApplyEntity1.setGeneratePlan(true);
-                    purApplyService.update(purApplyEntity1);
-                    //---------------------------------判断计划为已审核就生成计划单-------------------------------------------//\
-                    PurOrderEntity purOrderEntity = new PurOrderEntity();
-                    if (purPlanEntity.getStatus() == 3) {
-                        basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CGJH);
-                        if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
-                            purOrderEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd")));
-                            purOrderEntity.setBillDate(purReceiveEntity.getBillDate());
-                            purOrderEntity.setStatus(basicBusTypeChangeEntity.getBusAuditStatus());
-                            purOrderEntity.setRemark(purReceiveEntity.getRemark());
-                            purOrderEntity.setInvCode(purReceiveEntity.getInvCode());
-                            purOrderEntity.setDeptCode(purReceiveEntity.getDeptCode());
-                            purOrderEntity.setCreateUser(purReceiveEntity.getAuditUser());
-                            purOrderEntity.setCreateTime(timeProcess(purReceiveEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
-                            purOrderEntity.setUpdateUser(purReceiveEntity.getAuditUser());
-                            purOrderEntity.setUpdateTime(new Date());
-                            if (purOrderEntity.getStatus() == 3) {
-                                purOrderEntity.setAuditUser("");
-                                purOrderEntity.setAuditTime(new Date());
-                            }
-                            //插入订单主表
-                            purOrderService.insert(purOrderEntity);
-                            //用stream流复制list
-                            List<PurOrderDetailEntity> purOrderDetailEntityList = purReceiveDetailEntityList.stream().map(e -> {
-                                PurOrderDetailEntity d = new PurOrderDetailEntity();
-                                d.setOrderIdFk(purOrderEntity.getId() + "");
-                                d.setProductId(e.getRelIdFk());
-                                UdiProductEntity udiProductEntity = udiProductService.findByNameCode(e.getNameCode());
-                                d.setProductName(udiProductEntity.getCpmctymc());
-                                d.setCount(e.getCount());
-                                d.setSupId(e.getSupId());
-                                d.setZczbhhzbapzbh(udiProductEntity.getZczbhhzbapzbh());
-                                return d;
-                            }).collect(Collectors.toList());
-                            purOrderDetailService.insertPurOrderDetailEntity(purOrderDetailEntityList);
-                            //                           更新计划表信息插入订单单号
-                            PurPlanEntity purPlanEntity1 = new PurPlanEntity();
-                            purPlanEntity1.setId(purPlanEntity.getId());
-                            purPlanEntity1.setStockOrderNo(purOrderEntity.getBillNo());
-//                            purPlanEntity.sets(true);
-                            purPlanService.update(purPlanEntity1);
-                        }
-                        //---------------------------------判断计划为已审核就生成采购入库单-------------------------------------------//\
-                        //查询申购单详情
-                        List<PurPlanDetailEntity> purPlanDetailEntities = purPlanDetailService.findByOrderId(purPlanEntity.getId() + "");
-                        //对计划单里面的供应商进行分组
-                        Map<String, List<PurPlanDetailEntity>> map = purPlanDetailEntities.stream().collect(Collectors.groupingBy(PurPlanDetailEntity::getSupId));
-                        String billNo = "";
-                        if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetAction()) && basicBusTypeChangeEntity.isEnable() == true) {
-                            for (Map.Entry<String, List<PurPlanDetailEntity>> m : map.entrySet()) {
-                                //生产单据表信息
-                                IoOrderEntity ioOrderEntity = new IoOrderEntity();
-                                ioOrderEntity.setBillNo(gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd")));
-                                ioOrderEntity.setCorpOrderId(CustomUtil.getDate());
-                                ioOrderEntity.setMainAction(ConstantType.TYPE_PUT);
-                                ioOrderEntity.setAction(basicBusTypeChangeEntity.getTargetAction());
-                                ioOrderEntity.setFromCorp(m.getKey());
-                                ioOrderEntity.setFromType(ConstantStatus.FROM_PLAN);
-                                ioOrderEntity.setStatus(1);
-                                ioOrderEntity.setDealStatus(1);
-                                ioOrderEntity.setOrderType(1);
-                                ioOrderEntity.setCreateTime(new Date());
-                                ioOrderEntity.setCreateUser(purReceiveEntity.getCreateUser());
-                                ioOrderEntity.setUpdateTime(new Date());
-                                ioOrderEntity.setUpdateUser(purReceiveEntity.getCreateUser());
-                                ioOrderEntity.setCustomerId("110");
-                                ioOrderEntity.setDeptCode(purReceiveEntity.getInvCode());
-                                ioOrderEntity.setInvCode(purReceiveEntity.getDeptCode());
-                                ioOrderService.insertOrder(ioOrderEntity);
-                                billNo += ioOrderEntity.getBillNo() + ",";
-                                //插入业务单表
-                                for (PurPlanDetailEntity obj : m.getValue()) {
-                                    BasicProductsEntity basicProductsEntity = purPlanDetailService.selectIoOrderDetailBiz(obj.getId());
-                                    IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
-                                    ioOrderDetailBizEntity.setOrderIdFk(ioOrderEntity.getBillNo());
-                                    ioOrderDetailBizEntity.setBindRlFk(Long.valueOf(obj.getProductId()));
-                                    ioOrderDetailBizEntity.setCount(obj.getCount());
-                                    ioOrderDetailBizEntity.setUuidFk(basicProductsEntity.getUuid());
-                                    ioOrderDetailBizEntity.setNameCode(basicProductsEntity.getNameCode());
-                                    ioOrderDetailBizEntity.setCoName(basicProductsEntity.getCpmctymc());
-                                    ioOrderDetailBizEntity.setCertCode(basicProductsEntity.getZczbhhzbapzbh());
-                                    ioOrderDetailBizEntity.setYlqxzcrbarmc(basicProductsEntity.getYlqxzcrbarmc());
-                                    ioOrderDetailBizEntity.setManufacturer(basicProductsEntity.getManufactory());
-                                    ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname());
-                                    ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh());
-                                    if (basicProductsEntity.getPrice() != null) {
-                                        ioOrderDetailBizEntity.setPrice(basicProductsEntity.getPrice());
-                                    }
-                                    ioOrderDetailBizEntity.setSupId(obj.getSupId());
-                                    ioOrderDetailBizService.insert(ioOrderDetailBizEntity);
-                                }
-                            }
-                            PurPlanEntity purPlanEntity1 = new PurPlanEntity();
-                            purPlanEntity1.setId(purPlanEntity.getId());
-                            purPlanEntity1.setStockOrderNo(billNo.substring(0, billNo.length() - 1));
-                            purPlanService.update(purPlanEntity1);
-                        }
-
-
-                    }
-
-                }
-            }
-        }
-        return true;
-    }
-
 
     /**
      * 添加申购单到采购单里面
@@ -791,15 +593,4 @@ public class PurOrderReceiveController extends BaseController {
         receiveService.updateOrder(purReceiveEntity);
         return ResultVOUtils.success(orderNo);
     }
-
-
-    public Date timeProcess(Date date, Integer timeCount) {
-        Calendar rightNow = Calendar.getInstance();
-        rightNow.setTime(date);
-        rightNow.add(Calendar.HOUR, timeCount);
-        Date dt1 = rightNow.getTime();
-        return dt1;
-    }
-
-
 }

src/main/java/com/glxp/api/controller/purchase/PurPlanController.java

@@ -55,7 +55,6 @@ import java.util.stream.Collectors;
 @RestController
 public class PurPlanController {
 
-
     @Resource
     PurPlanService purPlanService;
     @Resource
@@ -123,7 +122,6 @@ public class PurPlanController {
             purPlanService.update(purPlanEntity);
         }
 
-
         return ResultVOUtils.success("提交成功！");
     }
 
@@ -142,8 +140,7 @@ public class PurPlanController {
         purApplyRequest.setSysApprovalFlow(sys_approval_flow);
 
         List<PurPlanResponse> purApplyEntities = purPlanService.queryPageList(purApplyRequest);
-        PageInfo<PurPlanResponse> pageInfo;
+        PageInfo<PurPlanResponse> pageInfo = new PageInfo<>(purApplyEntities);
-        pageInfo = new PageInfo<>(purApplyEntities);
         PageSimpleResponse<PurPlanResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purApplyEntities);
@@ -166,8 +163,7 @@ public class PurPlanController {
         purApplyRequest.setSysApprovalFlow(sys_approval_flow);
 
         List<PurPlanResponse> purApplyEntities = purPlanService.queryPageList(purApplyRequest);
-        PageInfo<PurPlanResponse> pageInfo;
+        PageInfo<PurPlanResponse> pageInfo = new PageInfo<>(purApplyEntities);
-        pageInfo = new PageInfo<>(purApplyEntities);
         PageSimpleResponse<PurPlanResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purApplyEntities);
@@ -189,8 +185,7 @@ public class PurPlanController {
         purApplyRequest.setSysApprovalFlow(sys_approval_flow);
 
         List<PurPlanResponse> purApplyEntities = purPlanService.queryPageList(purApplyRequest);
-        PageInfo<PurPlanResponse> pageInfo;
+        PageInfo<PurPlanResponse> pageInfo = new PageInfo<>(purApplyEntities);
-        pageInfo = new PageInfo<>(purApplyEntities);
         PageSimpleResponse<PurPlanResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purApplyEntities);
@@ -217,186 +212,12 @@ public class PurPlanController {
         if (purPlanEntity.getStatus() == 3) {
             purPlanEntity = purPlanService.selectById(purPlanEntity.getId());
             purChangeService.purPlanChange(purPlanEntity);
-//            generateDocument(purPlanEntity);
         }
 
 
-//        String billNo="";
-//        List<PurPlanDetailEntity> purPlanDetailEntities = purPlanDetailService.findByOrderId(purApplyEntity.getId() + "");
-//
-//        //对计划单里面的供应商进行分组
-//        Map<String, List<PurPlanDetailEntity>> map = purPlanDetailEntities.stream().collect(Collectors.groupingBy(PurPlanDetailEntity::getSupId));
-//
-//        if (postPurPlanRequest.getEditStatus() == ConstantStatus.APPLY_AUDIT_ED) {
-//
-//            if (CollUtil.isNotEmpty(purPlanDetailEntities) && postPurPlanRequest.isAutoPurchase()==true
-//                    && StrUtil.isNotEmpty(postPurPlanRequest.getTargetSubInv())  && StrUtil.isNotEmpty(postPurPlanRequest.getTargetBillAction()) ) {
-//
-//                for (Map.Entry<String, List<PurPlanDetailEntity>> m:map.entrySet()) {
-//                    //生产单据表信息
-//                    IoOrderEntity ioOrderEntity=new IoOrderEntity();
-//                    ioOrderEntity.setBillNo(gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER ,"yyyyMMdd")));
-//                    ioOrderEntity.setCorpOrderId(CustomUtil.getDate());
-//                    ioOrderEntity.setMainAction(ConstantType.TYPE_PUT);
-//                    ioOrderEntity.setAction(postPurPlanRequest.getTargetBillAction());
-//                    ioOrderEntity.setFromCorp(m.getKey());
-//                    ioOrderEntity.setFromType(ConstantStatus.FROM_PLAN);
-//                    ioOrderEntity.setStatus(1);
-//                    ioOrderEntity.setDealStatus(1);
-//                    ioOrderEntity.setOrderType(1);
-//                    ioOrderEntity.setCreateTime(new Date());
-//                    ioOrderEntity.setCreateUser(postPurPlanRequest.getPurPlanEntity().getAuditUser());
-//                    ioOrderEntity.setUpdateTime(new Date());
-//                    ioOrderEntity.setUpdateUser(postPurPlanRequest.getPurPlanEntity().getAuditUser());
-//                    ioOrderEntity.setCustomerId("110");
-//                    ioOrderEntity.setDeptCode(postPurPlanRequest.getTargetDeptCode());
-//                    ioOrderEntity.setInvCode(postPurPlanRequest.getTargetSubInv());
-//                    ioOrderService.insertOrder(ioOrderEntity);
-//                    billNo+=ioOrderEntity.getBillNo()+",";
-//                   //插入业务单表
-//                    for (PurPlanDetailEntity obj:m.getValue()) {
-//                        BasicProductsEntity basicProductsEntity = purPlanDetailService.selectIoOrderDetailBiz(obj.getId());
-//                        IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
-//                        ioOrderDetailBizEntity.setOrderIdFk(ioOrderEntity.getBillNo());
-//                        ioOrderDetailBizEntity.setBindRlFk(Long.valueOf(obj.getProductId()));
-//                        ioOrderDetailBizEntity.setCount(obj.getCount());
-//                        ioOrderDetailBizEntity.setUuidFk(basicProductsEntity.getUuid());
-//                        ioOrderDetailBizEntity.setNameCode(basicProductsEntity.getNameCode());
-//                        ioOrderDetailBizEntity.setCoName(basicProductsEntity.getCpmctymc());
-//                        ioOrderDetailBizEntity.setCertCode(basicProductsEntity.getZczbhhzbapzbh());
-//                        ioOrderDetailBizEntity.setYlqxzcrbarmc(basicProductsEntity.getYlqxzcrbarmc());
-//                        ioOrderDetailBizEntity.setManufacturer(basicProductsEntity.getManufactory());
-//                        ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname());
-//                        ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh());
-//                        if (basicProductsEntity.getPrice() != null) {
-//                            ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(basicProductsEntity.getPrice()));
-//                        }
-//                        ioOrderDetailBizEntity.setSupId(obj.getSupId());
-//                        ioOrderDetailBizService.insert(ioOrderDetailBizEntity);
-//                    }
-//                }
-//                purApplyEntity.setStockOrderNo(billNo.substring(0,billNo.length()-1));
-//                purPlanService.update(purApplyEntity);
-//            }
-//        }
         return ResultVOUtils.success("更新成功！");
     }
 
-    //根据单据生成新单据
-    public Boolean generateDocument(PurPlanEntity purPlanEntity) {
-        BasicBusTypeChangeEntity basicBusTypeChangeEntity = new BasicBusTypeChangeEntity();
-        //查询计划详情
-        List<PurPlanDetailEntity> purPlanDetailEntityList = purPlanDetailService.findByOrderId(purPlanEntity.getId() + "");
-        //---------------------------------判断计划为已审核就生成计划单-------------------------------------------//\
-        PurOrderEntity purOrderEntity = new PurOrderEntity();
-        if (purPlanEntity.getStatus() == 3) {
-            basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CGJH);
-            if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
-                purOrderEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd")));
-                purOrderEntity.setBillDate(purPlanEntity.getBillDate());
-                purOrderEntity.setStatus(basicBusTypeChangeEntity.getBusAuditStatus());
-                purOrderEntity.setRemark(purPlanEntity.getRemark());
-                purOrderEntity.setEmergency(purPlanEntity.getEmergency());
-                purOrderEntity.setArrivalTime(purPlanEntity.getArrivalTime());
-                purOrderEntity.setInvCode(purPlanEntity.getInvCode());
-                purOrderEntity.setDeptCode(purPlanEntity.getDeptCode());
-                purOrderEntity.setCreateUser(purPlanEntity.getAuditUser());
-                purOrderEntity.setCreateTime(timeProcess(purPlanEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
-                purOrderEntity.setUpdateUser(purPlanEntity.getAuditUser());
-                purOrderEntity.setUpdateTime(new Date());
-                if (purOrderEntity.getStatus() == 3) {
-                    purOrderEntity.setAuditUser("");
-                    purOrderEntity.setAuditTime(new Date());
-                }
-                //插入订单主表
-                purOrderService.insert(purOrderEntity);
-                //用stream流复制list
-                List<PurOrderDetailEntity> purOrderDetailEntityList = purPlanDetailEntityList.stream().map(e -> {
-                    PurOrderDetailEntity d = new PurOrderDetailEntity();
-                    d.setOrderIdFk(purOrderEntity.getId() + "");
-                    d.setProductId(e.getProductId());
-                    d.setProductName(e.getProductName());
-                    d.setCount(e.getCount());
-                    d.setSupId(e.getSupId());
-                    d.setZczbhhzbapzbh(e.getZczbhhzbapzbh());
-                    return d;
-                }).collect(Collectors.toList());
-                purOrderDetailService.insertPurOrderDetailEntity(purOrderDetailEntityList);
-                //                           更新计划表信息插入订单单号
-                PurPlanEntity purPlanEntity1 = new PurPlanEntity();
-                purPlanEntity1.setId(purPlanEntity.getId());
-                purPlanEntity1.setStockOrderNo(purOrderEntity.getBillNo());
-//                            purPlanEntity.sets(true);
-                purPlanService.update(purPlanEntity1);
-            }
-            //---------------------------------判断计划为已审核就生成采购入库单-------------------------------------------//\
-            //查询申购单详情
-            List<PurPlanDetailEntity> purPlanDetailEntities = purPlanDetailService.findByOrderId(purPlanEntity.getId() + "");
-            //对计划单里面的供应商进行分组
-            Map<String, List<PurPlanDetailEntity>> map = purPlanDetailEntities.stream().collect(Collectors.groupingBy(PurPlanDetailEntity::getSupId));
-            String billNo = "";
-            if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetAction()) && basicBusTypeChangeEntity.isEnable() == true) {
-                for (Map.Entry<String, List<PurPlanDetailEntity>> m : map.entrySet()) {
-                    //生产单据表信息
-                    IoOrderEntity ioOrderEntity = new IoOrderEntity();
-                    ioOrderEntity.setBillNo(gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd")));
-                    ioOrderEntity.setCorpOrderId(CustomUtil.getDate());
-                    ioOrderEntity.setMainAction(ConstantType.TYPE_PUT);
-                    ioOrderEntity.setAction(basicBusTypeChangeEntity.getTargetAction());
-                    ioOrderEntity.setFromCorp(m.getKey());
-                    ioOrderEntity.setFromType(ConstantStatus.FROM_PLAN);
-                    ioOrderEntity.setStatus(1);
-                    ioOrderEntity.setDealStatus(1);
-                    ioOrderEntity.setOrderType(1);
-                    ioOrderEntity.setCreateTime(new Date());
-                    ioOrderEntity.setCreateUser(purPlanEntity.getCreateUser());
-                    ioOrderEntity.setUpdateTime(new Date());
-                    ioOrderEntity.setUpdateUser(purPlanEntity.getCreateUser());
-                    ioOrderEntity.setCustomerId("110");
-                    ioOrderEntity.setDeptCode(purPlanEntity.getInvCode());
-                    ioOrderEntity.setInvCode(purPlanEntity.getDeptCode());
-                    ioOrderService.insertOrder(ioOrderEntity);
-                    billNo += ioOrderEntity.getBillNo() + ",";
-                    //插入业务单表
-                    for (PurPlanDetailEntity obj : m.getValue()) {
-                        BasicProductsEntity basicProductsEntity = purPlanDetailService.selectIoOrderDetailBiz(obj.getId());
-                        IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
-                        ioOrderDetailBizEntity.setOrderIdFk(ioOrderEntity.getBillNo());
-                        ioOrderDetailBizEntity.setBindRlFk(Long.valueOf(obj.getProductId()));
-                        ioOrderDetailBizEntity.setCount(obj.getCount());
-                        ioOrderDetailBizEntity.setUuidFk(basicProductsEntity.getUuid());
-                        ioOrderDetailBizEntity.setNameCode(basicProductsEntity.getNameCode());
-                        ioOrderDetailBizEntity.setCoName(basicProductsEntity.getCpmctymc());
-                        ioOrderDetailBizEntity.setCertCode(basicProductsEntity.getZczbhhzbapzbh());
-                        ioOrderDetailBizEntity.setYlqxzcrbarmc(basicProductsEntity.getYlqxzcrbarmc());
-                        ioOrderDetailBizEntity.setManufacturer(basicProductsEntity.getManufactory());
-                        ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname());
-                        ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh());
-                        if (basicProductsEntity.getPrice() != null) {
-                            ioOrderDetailBizEntity.setPrice(basicProductsEntity.getPrice());
-                        }
-                        ioOrderDetailBizEntity.setSupId(obj.getSupId());
-                        ioOrderDetailBizService.insert(ioOrderDetailBizEntity);
-                    }
-                }
-                PurPlanEntity purPlanEntity1 = new PurPlanEntity();
-                purPlanEntity1.setId(purPlanEntity.getId());
-                purPlanEntity1.setStockOrderNo(billNo.substring(0, billNo.length() - 1));
-                purPlanService.update(purPlanEntity1);
-            }
-        }
-        return true;
-    }
-
-    public Date timeProcess(Date date, Integer timeCount) {
-        Calendar rightNow = Calendar.getInstance();
-        rightNow.setTime(date);
-        rightNow.add(Calendar.HOUR, timeCount);
-        Date dt1 = rightNow.getTime();
-        return dt1;
-    }
-
-
     /**
      * 查询采购计划列表
      */
@@ -404,8 +225,7 @@ public class PurPlanController {
     public BaseResponse detailList(PurPlanDetailRequest purApplyDetailRequest) {
 
         List<PurOrderDetailResponse> purApplyDetailEntities = purPlanDetailService.joinQueryList(purApplyDetailRequest);
-        PageInfo<PurOrderDetailResponse> pageInfo;
+        PageInfo<PurOrderDetailResponse> pageInfo = new PageInfo<>(purApplyDetailEntities);
-        pageInfo = new PageInfo<>(purApplyDetailEntities);
         PageSimpleResponse<PurOrderDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purApplyDetailEntities);
@@ -421,8 +241,7 @@ public class PurPlanController {
     public BaseResponse drugDetailList(PurPlanDetailRequest purApplyDetailRequest) {
 
         List<PurOrderDetailResponse> purApplyDetailEntities = purPlanDetailService.joinDrugQueryList(purApplyDetailRequest);
-        PageInfo<PurOrderDetailResponse> pageInfo;
+        PageInfo<PurOrderDetailResponse> pageInfo = new PageInfo<>(purApplyDetailEntities);
-        pageInfo = new PageInfo<>(purApplyDetailEntities);
         PageSimpleResponse<PurOrderDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purApplyDetailEntities);
@@ -474,7 +293,6 @@ public class PurPlanController {
         purPlanDetailRequest.setOrderIdFk(purPlanRequest.getId() + "");
         List<PurPlanDetailEntity> purApplyDetailEntities = purPlanDetailService.getPurPlanDetailEntityList(purPlanDetailRequest);
 
-
         List<Long> ids = new ArrayList<>();
         for (PurPlanDetailEntity obj : purApplyDetailEntities) {
             for (PurPlanDetailEntity obj1 : purPlanDetailEntityList) {
@@ -578,7 +396,6 @@ public class PurPlanController {
     @DeleteMapping("/purchase/plan/detail/{ids}")
     public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空")
                                      @PathVariable Long[] ids) {
-
         purPlanDetailService.deleteByIds(Arrays.asList(ids));
         return ResultVOUtils.success("删除成功");
     }

src/main/java/com/glxp/api/controller/purchase/SupCertController.java

@@ -55,17 +55,14 @@ public class SupCertController {
     private AuthAdminService authAdminService;
     @Resource
     private SupCertService supCertService;
-
     @Value("${file_path}")
     private String filePath;
-
     @Resource
     private SystemPDFTemplateService systemPDFTemplateService;
     @Resource
     private SystemPDFModuleService systemPDFModuleService;
 
 
-//    @AuthRuleAnnotation("")
     @GetMapping("/sup/company/cert/filter")
     public BaseResponse filterCompanyCert(FilterSupCertRequest filterSupCertRequest,
                                           BindingResult bindingResult) {
@@ -74,8 +71,7 @@ public class SupCertController {
         }
         List<SupCertEntity> supCertEntityList
                 = supCertService.filterCompanyCert(filterSupCertRequest);
-        PageInfo<SupCertEntity> pageInfo;
+        PageInfo<SupCertEntity> pageInfo = new PageInfo<>(supCertEntityList);
-        pageInfo = new PageInfo<>(supCertEntityList);
         PageSimpleResponse<SupCertEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(supCertEntityList);

src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java

@@ -48,9 +48,6 @@ import java.util.ListIterator;
 @RestController
 public class SupCompanyController {
 
-    @Value("${file_path}")
-    private String filePath;
-
     @Resource
     private AuthAdminService authAdminService;
     @Resource
@@ -85,7 +82,6 @@ public class SupCompanyController {
     @Log(title = "资质证书", businessType = BusinessType.INSERT)
     public BaseResponse insertCompany(@RequestBody SupCompanyEntity companyEntity) {
 
-
         //判断是不是存在草稿
         if (companyEntity.getAuditStatus() == 6) {
             List<SupCertEntity> supCertEntityList = supCertService.findAll(companyEntity.getCustomerId());
@@ -263,9 +259,6 @@ public class SupCompanyController {
             }
         }
 
-
-
-
         AuthAdmin authAdmin = getUser();
         companyEntity.setAuditor(authAdmin.getId() + "");
         companyEntity.setAuditTime(new Date());

src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java

@@ -303,7 +303,6 @@ public class SupManufacturerController {
             return ResultVOUtils.error(500, "参数错误！");
         }
 
-
         if (supManufacturerEntity.getAuditStatus() == 1 || supManufacturerEntity.getAuditStatus() == 4) {
             //查询上传的资质证书
             FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest();

src/main/java/com/glxp/api/controller/purchase/SupProductController.java

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

src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java

@@ -106,8 +106,6 @@ public class SyncDataSetController {
             return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
         }
 
-        //todo 请立即同步至UDI管理系统
-
         BaseResponse<String> baseResponse = spGetHttpClient.updateSynsSet(syncDataSetResponse);
         if (baseResponse.getCode() == 20000) {
             return baseResponse;

src/main/java/com/glxp/api/controller/system/ClassifyCodeController.java

@@ -22,8 +22,7 @@ public class ClassifyCodeController {
     @GetMapping("spms/classify/code/filter")
     public BaseResponse filterList(FilterClassifyCodeRequest filterDeviceKeyRequest) {
         List<ClassifyCodeEntity> classifyCodeEntities = classifyCodeService.filteClassifyCode(filterDeviceKeyRequest);
-        PageInfo<ClassifyCodeEntity> pageInfo;
+        PageInfo<ClassifyCodeEntity> pageInfo = new PageInfo<>(classifyCodeEntities);
-        pageInfo = new PageInfo<>(classifyCodeEntities);
         PageSimpleResponse<ClassifyCodeEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(classifyCodeEntities);

src/main/java/com/glxp/api/controller/system/DeviceKeyController.java

@@ -25,20 +25,14 @@ import java.util.List;
 @Slf4j
 @RestController
 public class DeviceKeyController {
-    //    @Value("${spring.mail.username}")
+
-//    private String mail;
-//    @Value("${toMail}")
-//    private String toMail;
     @Resource
     SysPdaKeyService sysPdaKeyService;
-//    @Resource
-//    private JavaMailSender javaMailSender;
 
     @GetMapping("sale/device/registerList")
     public BaseResponse registerList(FilterDeviceKeyRequest filterDeviceKeyRequest) {
         List<SysPdaKeyEntity> deviceKeyEntities = sysPdaKeyService.findDeviceKey(filterDeviceKeyRequest);
-        PageInfo<SysPdaKeyEntity> pageInfo;
+        PageInfo<SysPdaKeyEntity> pageInfo = new PageInfo<>(deviceKeyEntities);
-        pageInfo = new PageInfo<>(deviceKeyEntities);
         PageSimpleResponse<SysPdaKeyEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(deviceKeyEntities);
@@ -77,7 +71,6 @@ public class DeviceKeyController {
 
     @PostMapping("/sale/info/deleterKey")
     public BaseResponse deleterKey(@RequestBody DeleteRequest deleteRequest) {
-
         sysPdaKeyService.deleteDeviceKey(deleteRequest);
         return ResultVOUtils.success("删除成功");
 
@@ -97,14 +90,6 @@ public class DeviceKeyController {
         return ResultVOUtils.success("1");
     }
 
-//    public void sendMail(String title, String content, String to) {
-//        SimpleMailMessage message = new SimpleMailMessage();
-//        message.setFrom(mail);
-//        message.setTo(to);
-//        message.setSubject(title);
-//        message.setText(content);
-//        javaMailSender.send(message);
-//    }
 
     public String md5(String password) {
         try {

src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java

@@ -38,7 +38,6 @@ public class SysMenuHelpController {
     private ISysMenuService iSysMenuService;
 
 
-
     @AuthRuleAnnotation("system/param/help/list")
     @GetMapping("/system/param/help/list")
     public BaseResponse list(@Valid SysMenuHelpRequest sysMenuHelpRequest,
@@ -48,8 +47,7 @@ public class SysMenuHelpController {
         }
 
         List<SysMenuHelpEntity> list = sysMenuHelpService.MenuHelpList(sysMenuHelpRequest);
-        PageInfo<SysMenuHelpEntity> pageInfo;
+        PageInfo<SysMenuHelpEntity> pageInfo = new PageInfo<>(list);
-        pageInfo = new PageInfo<>(list);
         PageSimpleResponse<SysMenuHelpEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(list);

src/main/java/com/glxp/api/controller/system/SysParamConfigController.java

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

src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java

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

src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java

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

src/main/java/com/glxp/api/controller/thrsys/ForThirdSysApiController.java

@@ -85,39 +85,7 @@ public class ForThirdSysApiController {
         if (checkUdi == null) {
             return ResultVOUtils.error(500, "收费项目未对照！");
         }
-//        boolean checkSuccess = true;
+
-//        String lostMsg = "";
-//        //校验条码完整性
-//        if ("是".equals(checkUdi.getScbssfbhph()) && StrUtil.isEmpty(udiEntity.getBatchNo())) {
-//            checkSuccess = false;
-//            lostMsg = lostMsg + ",批次号";
-//        }
-//        if ("是".equals(checkUdi.getScbssfbhscrq()) && StrUtil.isEmpty(udiEntity.getProduceDate())) {
-//            checkSuccess = false;
-//            lostMsg = lostMsg + ",生产日期";
-//        }
-//
-//        if ("是".equals(checkUdi.getScbssfbhsxrq()) && StrUtil.isEmpty(udiEntity.getExpireDate())) {
-//            checkSuccess = false;
-//            lostMsg = lostMsg + ",失效日期";
-//        }
-//
-//        if ("是".equals(checkUdi.getScbssfbhxlh()) && StrUtil.isEmpty(udiEntity.getSerialNo())) {
-//            checkSuccess = false;
-//            lostMsg = lostMsg + ",序列号";
-//        }
-//        if (StrUtil.isNotEmpty(udiEntity.getSerialNo()) && udiEntity.getSerialNo().length() > 20) {
-//            return ResultVOUtils.error(504, "序列号超出20位！");
-//        }
-//        if (StrUtil.isNotEmpty(udiEntity.getBatchNo()) && udiEntity.getBatchNo().length() > 20) {
-//            return ResultVOUtils.error(504, "批次号超出20位！");
-//        }
-//        if (StrUtil.isEmpty(udiEntity.getSerialNo()) && StrUtil.isEmpty(udiEntity.getBatchNo())) {
-//            checkSuccess = false;
-//        }
-//        if (!checkSuccess) {
-//            return ResultVOUtils.error("UDI码格式错误：缺少" + lostMsg);
-//        }
         IoCodeEntity codeEntity = codeService.getOne(new QueryWrapper<IoCodeEntity>().likeLeft("code", filterInvProductRequest.getUdiCode()).last("limit 1"));
         if (codeEntity == null) {
             codeEntity = codeService.getOne(new QueryWrapper<IoCodeEntity>().likeLeft("errUdiCode", filterInvProductRequest.getUdiCode()).last("limit 1"));

src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java

@@ -1,5 +1,6 @@
 package com.glxp.api.controller.thrsys;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageInfo;
@@ -41,12 +42,10 @@ public class ThirdAliDrugController extends BaseController {
 
     @Resource
     private ThirdAliDrugService thirdAliDrugService;
-
     @Resource
     private AuthAliUserService authAliUserService;
     @Resource
     private UdiProductService udiProductService;
-
     @Resource
     private SpGetHttpClient spGetHttpClient;
 
@@ -57,7 +56,6 @@ public class ThirdAliDrugController extends BaseController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
 
-
         if (StrUtil.isEmpty(thirdAliDrug.getApprovalNum()) && StrUtil.isEmpty(thirdAliDrug.getNameCode()) &&
                 StrUtil.isEmpty(thirdAliDrug.getCpmctymc()) && StrUtil.isEmpty(thirdAliDrug.getManufacturer())
         ) {
@@ -73,11 +71,10 @@ public class ThirdAliDrugController extends BaseController {
                     nameCodeIn.add(udiInfoEntity.getNameCode());
                 }
             }
-
         }
         thirdAliDrug.setNameCodeIn(nameCodeIn);
         List<ThirdAliDrug> list = thirdAliDrugService.filterList(thirdAliDrug);
-        if(list == null || list.size() == 0){
+        if(CollUtil.isEmpty(list)){
             AuthAliUser authAliUser = authAliUserService.getOne();
             AlihealthThirdAliDrugInsertReqeust alihealthThirdAliDrugInsertReqeust = new AlihealthThirdAliDrugInsertReqeust();
             alihealthThirdAliDrugInsertReqeust.setErpId(authAliUser.getErpid());
@@ -95,29 +92,17 @@ public class ThirdAliDrugController extends BaseController {
             try {
                 BaseResponse baseResponse = spGetHttpClient.thirdAliDrugList(alihealthThirdAliDrugInsertReqeust);
                 if (baseResponse.getCode() == 20000) {
-
-
                     if (thirdAliDrugService.addOrUpdate((List) baseResponse.getData())) {
                         list = thirdAliDrugService.filterList(thirdAliDrug);
-
                     } else {
                         log.info("供应商平台获取阿里和国家库码段信息===未查到产品信息");
-
                     }
-
-
                 } else {
                     log.info("供应商平台获取阿里和国家库码段信息出现错误===" + baseResponse.getMessage());
-//                        udiProductEntity.setBasicPrductRemak8("供应商平台获取阿里和国家库码段信息出现错误===" + baseResponse.getMessage());
-//                        error = "供应商平台获取阿里和国家库码段信息出现错误===" + baseResponse.getMessage();
-
-
                 }
-
             } catch (Exception e) {
                 e.printStackTrace();
                 log.info("供应商平台获取阿里和国家库码段信息出现错误===" + e.getMessage());
-
             }
         }
         PageInfo<ThirdAliDrug> pageInfo = new PageInfo<>(list);

src/main/java/com/glxp/api/controller/thrsys/ThirdSysApiController.java

@@ -25,8 +25,7 @@ public class ThirdSysApiController {
     @GetMapping("/sys/api/findAll")
     public BaseResponse findAll(FilterSysApiRequest filterSysApiRequest) {
         List<ThirdSysApiEntity> thirdSysApiEntities = thirdSysApiService.findSysApi(filterSysApiRequest);
-        PageInfo<ThirdSysApiEntity> pageInfo;
+        PageInfo<ThirdSysApiEntity> pageInfo = new PageInfo<>(thirdSysApiEntities);
-        pageInfo = new PageInfo<>(thirdSysApiEntities);
         PageSimpleResponse<ThirdSysApiEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thirdSysApiEntities);

src/main/java/com/glxp/api/controller/thrsys/ThrBusTypeOriginController.java

@@ -60,12 +60,6 @@ public class ThrBusTypeOriginController {
             filterThrBusTypeOriginRequest.setThirdSys(thrSystemEntity.getThirdId());
         }
 
-        /**
-         * else if (StrUtil.isEmpty(filterThrBusTypeOriginRequest.getThirdSys())) {
-         *             ThrSystemEntity thrSystemEntity = thrSystemService.selectMainThrSys();
-         *             filterThrBusTypeOriginRequest.setThirdSys(thrSystemEntity.getThirdId());
-         *         }
-         */
         List<ThrBusTypeOriginEntity> thrBusTypeOriginEntityEntities = thrBusTypeOriginService.filterEnableList(filterThrBusTypeOriginRequest);
         PageInfo<ThrBusTypeOriginEntity> pageInfo = new PageInfo<>(thrBusTypeOriginEntityEntities);
         return ResultVOUtils.page(pageInfo);

src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java

@@ -52,7 +52,6 @@ public class ThrCorpExportLogController {
     private ThrCorpService thrCorpService;
     @Resource
     ThrCorpsDlService thrCorpsDlService;
-
     @Resource
     private ErpBasicClient erpBasicClient;
     @Resource
@@ -67,8 +66,7 @@ public class ThrCorpExportLogController {
         }
         List<ThrCorpExportLogEntity> thrCorpExportLogEntities
                 = thrCorpExportLogService.filterThrCorpExportLog(filterThrCorpExportLogRequest);
-        PageInfo<ThrCorpExportLogEntity> pageInfo;
+        PageInfo<ThrCorpExportLogEntity> pageInfo = new PageInfo<>(thrCorpExportLogEntities);
-        pageInfo = new PageInfo<>(thrCorpExportLogEntities);
         PageSimpleResponse<ThrCorpExportLogEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrCorpExportLogEntities);
@@ -215,8 +213,7 @@ public class ThrCorpExportLogController {
                     BeanUtils.copyProperties(item, thrCorpEntity);
                     return thrCorpEntity;
                 }).collect(Collectors.toList());
-                PageInfo<ThrCorpEntity> pageInfo;
+                PageInfo<ThrCorpEntity> pageInfo = new PageInfo<>(thrCorpEntityList);
-                pageInfo = new PageInfo<>(thrCorpEntityList);
                 PageSimpleResponse<ThrCorpEntity> pageSimpleResponse = new PageSimpleResponse<>();
                 pageSimpleResponse.setTotal(pageInfo.getTotal());
                 pageSimpleResponse.setList(thrCorpEntityList);

src/main/java/com/glxp/api/controller/thrsys/ThrCorpImportLogController.java

@@ -39,8 +39,7 @@ public class ThrCorpImportLogController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<ThrCorpImportLogEntity> thrCorpImportLogEntities = thrCorpImportLogService.filterThrCorpImportLog(filterThrCorpImportLogRequest);
-        PageInfo<ThrCorpImportLogEntity> pageInfo;
+        PageInfo<ThrCorpImportLogEntity> pageInfo = new PageInfo<>(thrCorpImportLogEntities);
-        pageInfo = new PageInfo<>(thrCorpImportLogEntities);
         PageSimpleResponse<ThrCorpImportLogEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrCorpImportLogEntities);
@@ -56,8 +55,7 @@ public class ThrCorpImportLogController {
         }
         List<ThrCorpImportDetailEntity> thrCorpImportDetailEntities
                 = thrCorpImportDetailService.filterCorpDetailImport(filterThrCorpImportLogRequest);
-        PageInfo<ThrCorpImportDetailEntity> pageInfo;
+        PageInfo<ThrCorpImportDetailEntity> pageInfo = new PageInfo<>(thrCorpImportDetailEntities);
-        pageInfo = new PageInfo<>(thrCorpImportDetailEntities);
         PageSimpleResponse<ThrCorpImportDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrCorpImportDetailEntities);

src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java

@@ -60,8 +60,7 @@ public class ThrCorpsController {
         }
         List<ThrCorpsResponse> thrCorpEntities
                 = thrCorpService.filterThrCorps(filterThrCorpRequest);
-        PageInfo<ThrCorpsResponse> pageInfo;
+        PageInfo<ThrCorpsResponse> pageInfo = new PageInfo<>(thrCorpEntities);
-        pageInfo = new PageInfo<>(thrCorpEntities);
         PageSimpleResponse<ThrCorpsResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrCorpEntities);
@@ -213,8 +212,7 @@ public class ThrCorpsController {
                     thrCorpEntity.setId(item.getUnitId());
                     return thrCorpEntity;
                 }).collect(Collectors.toList());
-                PageInfo<ThrCorpsResponse> pageInfo;
+                PageInfo<ThrCorpsResponse> pageInfo = new PageInfo<>(thrCorpEntities);
-                pageInfo = new PageInfo<>(thrCorpEntities);
                 PageSimpleResponse<ThrCorpsResponse> pageSimpleResponse = new PageSimpleResponse<>();
                 pageSimpleResponse.setTotal(pageInfo.getTotal());
                 pageSimpleResponse.setList(thrCorpEntityList);

src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java

@@ -41,8 +41,7 @@ public class ThrDeptController {
     @GetMapping("spms/thrsys/warehouse/filter")
     public BaseResponse filterInvWarehouse(FilterThrDeptRequest filterThrDeptRequest) {
         List<ThrDeptEntity> thrInvWarehouseEntities = thrDeptService.filterThrInvWarehouse(filterThrDeptRequest);
-        PageInfo<ThrDeptEntity> pageInfo;
+        PageInfo<ThrDeptEntity> pageInfo = new PageInfo<>(thrInvWarehouseEntities);
-        pageInfo = new PageInfo<>(thrInvWarehouseEntities);
         PageSimpleResponse<ThrDeptEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrInvWarehouseEntities);
@@ -152,17 +151,9 @@ public class ThrDeptController {
 
     @GetMapping("/spms/sub/inv/warehouse/filterThridInv")
     public BaseResponse filterInvWarehouse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest) {
-//          todo
-//        InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(filterThrSubInvWarehouseRequest.getParentId());
-//        Object thirdId = ReflectUtil.getFieldValue(invWarehouseEntity, filterThrSubInvWarehouseRequest.getThirdSysFk());
-//        if (thirdId == null) {
-//            return ResultVOUtils.error(500, "请先关联仓库对应的第三方仓库，再关联分库！");
-//        }
-//        filterThrSubInvWarehouseRequest.setParentId((String) thirdId);
         filterThrSubInvWarehouseRequest.setStatus(0);
         List<ThrInvWarehouseEntity> thrInvWarehouseEntities = thrInvWarehouseService.selectByThrDeptCode(filterThrSubInvWarehouseRequest);
-        PageInfo<ThrInvWarehouseEntity> pageInfo;
+        PageInfo<ThrInvWarehouseEntity> pageInfo = new PageInfo<>(thrInvWarehouseEntities);
-        pageInfo = new PageInfo<>(thrInvWarehouseEntities);
         PageSimpleResponse<ThrInvWarehouseEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrInvWarehouseEntities);

src/main/java/com/glxp/api/controller/thrsys/ThrHslbController.java

@@ -34,8 +34,7 @@ public class ThrHslbController {
         }
         List<ThrHslbEntity> thrHslbEntities
                 = thrHslbService.getHslbs(filterThrHslbRequest);
-        PageInfo<ThrHslbEntity> pageInfo;
+        PageInfo<ThrHslbEntity> pageInfo = new PageInfo<>(thrHslbEntities);
-        pageInfo = new PageInfo<>(thrHslbEntities);
         PageSimpleResponse<ThrHslbEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrHslbEntities);

src/main/java/com/glxp/api/controller/thrsys/ThrInvOrderController.java

@@ -41,8 +41,7 @@ public class ThrInvOrderController {
         }
         List<ThrInvOrderResponse> thrInvOrders
                 = thrInvOrderService.filterThrInvOrder(filterThrInvOrderRequest);
-        PageInfo<ThrInvOrderResponse> pageInfo;
+        PageInfo<ThrInvOrderResponse> pageInfo = new PageInfo<>(thrInvOrders);
-        pageInfo = new PageInfo<>(thrInvOrders);
         PageSimpleResponse<ThrInvOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrInvOrders);
@@ -59,8 +58,7 @@ public class ThrInvOrderController {
         }
         List<ThrInvOrderDetail> thrInvOrderDetails
                 = thrInvOrderDetailService.filterThrInvOrderDetails(filterThrInvOrderDetailRequest);
-        PageInfo<ThrInvOrderDetail> pageInfo;
+        PageInfo<ThrInvOrderDetail> pageInfo = new PageInfo<>(thrInvOrderDetails);
-        pageInfo = new PageInfo<>(thrInvOrderDetails);
         PageSimpleResponse<ThrInvOrderDetail> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrInvOrderDetails);

src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsController.java

@@ -59,8 +59,7 @@ public class ThrInvProductsController {
         }
         List<ThrInvProductsEntity> thrInvProductsEntities
                 = thrInvProductsService.filterThrInvProductss(filterThrInvProductsRequest);
-        PageInfo<ThrInvProductsEntity> pageInfo;
+        PageInfo<ThrInvProductsEntity> pageInfo = new PageInfo<>(thrInvProductsEntities);
-        pageInfo = new PageInfo<>(thrInvProductsEntities);
         PageSimpleResponse<ThrInvProductsEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrInvProductsEntities);

src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java

@@ -57,8 +57,7 @@ public class ThrInvProductsExportLogController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<ThrInvProductsExportLogEntity> thrInvProductsExportLogEntities = thrInvProductsExportLogService.filterThrInvProductsExportLog(filterThrProductsExportLogRequest);
-        PageInfo<ThrInvProductsExportLogEntity> pageInfo;
+        PageInfo<ThrInvProductsExportLogEntity> pageInfo = new PageInfo<>(thrInvProductsExportLogEntities);
-        pageInfo = new PageInfo<>(thrInvProductsExportLogEntities);
         PageSimpleResponse<ThrInvProductsExportLogEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrInvProductsExportLogEntities);
@@ -174,8 +173,7 @@ public class ThrInvProductsExportLogController {
                 erpInvProductResponse.setName(item.getInventoryName());
                 return erpInvProductResponse;
             }).collect(Collectors.toList());
-            PageInfo<ThrInvProductResponse> pageInfo;
+            PageInfo<ThrInvProductResponse> pageInfo = new PageInfo<>(erpInvProductResponseList);
-            pageInfo = new PageInfo<>(erpInvProductResponseList);
             PageSimpleResponse<ThrInvProductResponse> pageSimpleResponse = new PageSimpleResponse<>();
             pageSimpleResponse.setTotal(pageInfo.getTotal());
             pageSimpleResponse.setList(erpInvProductResponseList);

src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsImportLogController.java

@@ -40,8 +40,7 @@ public class ThrInvProductsImportLogController {
         }
         List<ThrInvProductsImportLogEntity> thrInvProductsImportLogEntities
                 = thrInvProductsImportLogService.filterThrInvProductsImportLog(filterThrCorpImportLogRequest);
-        PageInfo<ThrInvProductsImportLogEntity> pageInfo;
+        PageInfo<ThrInvProductsImportLogEntity> pageInfo = new PageInfo<>(thrInvProductsImportLogEntities);
-        pageInfo = new PageInfo<>(thrInvProductsImportLogEntities);
         PageSimpleResponse<ThrInvProductsImportLogEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrInvProductsImportLogEntities);
@@ -57,8 +56,7 @@ public class ThrInvProductsImportLogController {
         }
         List<ThrInvProductsImportDetailEntity> thrInvProductsImportDetailEntities
                 = thrInvProductsDetailService.filterInvProductsDetailImport(filterThrCorpImportLogRequest);
-        PageInfo<ThrInvProductsImportDetailEntity> pageInfo;
+        PageInfo<ThrInvProductsImportDetailEntity> pageInfo = new PageInfo<>(thrInvProductsImportDetailEntities);
-        pageInfo = new PageInfo<>(thrInvProductsImportDetailEntities);
         PageSimpleResponse<ThrInvProductsImportDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrInvProductsImportDetailEntities);

src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java

@@ -42,8 +42,7 @@ public class ThrInvWarehouseController {
         for (ThrInvWarehouseEntity thrInvWarehouseEntity : thrInvWarehouseEntities) {
             thrInvWarehouseEntity.setParentName(thrDeptEntity.getName());
         }
-        PageInfo<ThrInvWarehouseEntity> pageInfo;
+        PageInfo<ThrInvWarehouseEntity> pageInfo = new PageInfo<>(thrInvWarehouseEntities);
-        pageInfo = new PageInfo<>(thrInvWarehouseEntities);
         PageSimpleResponse<ThrInvWarehouseEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrInvWarehouseEntities);

src/main/java/com/glxp/api/controller/thrsys/ThrManusController.java

@@ -54,8 +54,7 @@ public class ThrManusController {
         }
         List<ThrManufacturerEntity> thrManufacturerEntities
                 = thrManufacturerService.filterThrManu(filterThrCorpRequest);
-        PageInfo<ThrManufacturerEntity> pageInfo;
+        PageInfo<ThrManufacturerEntity> pageInfo = new PageInfo<>(thrManufacturerEntities);
-        pageInfo = new PageInfo<>(thrManufacturerEntities);
         PageSimpleResponse<ThrManufacturerEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrManufacturerEntities);
@@ -138,8 +137,7 @@ public class ThrManusController {
         }
         List<ThrManufacturerEntity> thrManufacturerEntities
                 = thrManufacturerService.getProductTypes(basicProducstRequest);
-        PageInfo<ThrManufacturerEntity> pageInfo;
+        PageInfo<ThrManufacturerEntity> pageInfo = new PageInfo<>(thrManufacturerEntities);
-        pageInfo = new PageInfo<ThrManufacturerEntity>(thrManufacturerEntities);
         PageSimpleResponse<ThrManufacturerEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrManufacturerEntities);

src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java

@@ -1,5 +1,6 @@
 package com.glxp.api.controller.thrsys;
 
+import cn.hutool.core.collection.CollUtil;
 import org.springframework.beans.BeanUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
@@ -65,8 +66,7 @@ public class ThrOrderController {
         }
         List<ThrOrderEntity> thrOrderEntities
                 = thrOrderService.filterThrOrder(filterThrOrderRequest);
-        PageInfo<ThrOrderEntity> pageInfo;
+        PageInfo<ThrOrderEntity> pageInfo = new PageInfo<>(thrOrderEntities);
-        pageInfo = new PageInfo<>(thrOrderEntities);
         PageSimpleResponse<ThrOrderEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrOrderEntities);
@@ -83,8 +83,7 @@ public class ThrOrderController {
         }
         List<ThrOrderDetailEntity> thrOrderDetailEntities
                 = thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest);
-        PageInfo<ThrOrderDetailEntity> pageInfo;
+        PageInfo<ThrOrderDetailEntity> pageInfo = new PageInfo<>(thrOrderDetailEntities);
-        pageInfo = new PageInfo<>(thrOrderDetailEntities);
         PageSimpleResponse<ThrOrderDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrOrderDetailEntities);
@@ -205,14 +204,11 @@ public class ThrOrderController {
         }
         String id = deleteRequest.getId();
         ThrOrderEntity thrOrderEntity = thrOrderService.findById(Integer.parseInt(id));
-        String msg = selectDelect(thrOrderEntity);
+        boolean b = thrOrderService.deleteById(id);
-        if (msg == null) {
+        thrOrderDetailService.deleteByOrderIdFk(thrOrderEntity.getBillNo() + "");
-            boolean b = thrOrderService.deleteById(id);
+        if (b)
-            thrOrderDetailService.deleteByOrderIdFk(thrOrderEntity.getBillNo() + "");
+            return ResultVOUtils.success("删除成功");
-            if (b)
+        else return ResultVOUtils.error(500, "无法删除！");
-                return ResultVOUtils.success("删除成功");
-            else return ResultVOUtils.error(500, "无法删除！");
-        } else return ResultVOUtils.error(500, msg);
 
     }
 
@@ -231,19 +227,6 @@ public class ThrOrderController {
 
     }
 
-    public String selectDelect(ThrOrderEntity thrOrderEntity) {
-        FilterThrOrderRequest filterErpOrderRequest = new FilterThrOrderRequest();
-        //todo  单据类型还没设计好
-//        filterErpOrderRequest.setErpOrderId(thrOrderEntity.getBillNo());
-//        List<ThrErpOrderResponse> erpOrderEntities = myErpOrderService.filterAllMyErpOrder(filterErpOrderRequest);
-//        if (erpOrderEntities != null && erpOrderEntities.size() > 0) {
-//            return "单据" + thrOrderEntity.getBillNo() + "已于出入库单据关联，无法删除";
-//        } else {
-//            return null;
-//        }
-        return null;
-    }
-
     @AuthRuleAnnotation("")
     @RequestMapping("/udiwms/thrsys/order/delAll")
     public BaseResponse delAll() {
@@ -255,11 +238,6 @@ public class ThrOrderController {
     @AuthRuleAnnotation("")
     @RequestMapping("/udiwms/thrsys/orders/downloadAll")
     public BaseResponse downloadAll(FilterThrOrderRequest filterThrProductsRequest) {
-        String data = (String) redisUtil.get(Constant.dlThrOrders);
-        if (false) {//(data != null && data.equals("true")) {
-            return ResultVOUtils.error(500, "当前任务正在下载更新业务单据信息，请稍后重试！");
-        } else {
-            redisUtil.set(Constant.dlThrOrders, "true", 10 * 30);
             if (filterThrProductsRequest.getBillAction() == null) {
                 return ResultVOUtils.error(500, "未选择业务类型！");
             }
@@ -278,7 +256,6 @@ public class ThrOrderController {
                 thrOrdersDlService.importOrders(genKey, filterThrProductsRequest.getBillAction(), null);
             }
             return ResultVOUtils.success("后台开始下载更新，请稍后刷新查看");
-        }
     }
 
     @AuthRuleAnnotation("")
@@ -371,7 +348,6 @@ public class ThrOrderController {
             return responseBaseResponse;
         }
 
-
         ThrSystemDetailEntity thrSystemDetailEntity = iThrBusTypeOriginService.findSysByAction(filterErpOrderRequest.getBillAction(), "orderQueryUrl");
         filterErpOrderRequest.setThirdOrderFk(thrSystemDetailEntity.getThirdSysFk());
         if (thrSystemDetailEntity == null || !thrSystemDetailEntity.getEnabled()) {
@@ -382,14 +358,13 @@ public class ThrOrderController {
             return ResultVOUtils.error(500, "第三方业务单据服务未关联");
         }
 
-
         FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
         BeanUtils.copyProperties(filterErpOrderRequest, filterThrOrderRequest);
         filterThrOrderRequest.setPage(filterErpOrderRequest.getPage());
         filterThrOrderRequest.setLimit(filterErpOrderRequest.getLimit());
         List<ThrOrderResponse> erpOrderResponses = new ArrayList<>();
         List<ThrOrderEntity> data = thrOrderService.filterThrOrder(filterThrOrderRequest);
-        if (data != null && data.size() > 0) {
+        if (CollUtil.isNotEmpty(data)) {
             for (ThrOrderEntity thrOrderEntity : data) {
                 FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest();
                 filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getBillNo() + "");
@@ -408,13 +383,8 @@ public class ThrOrderController {
                 erpOrderResponses.add(erpOrderResponse);
             }
         }
-        //todo 单据表还未设计好
+
-//        if (thrSystemDetailEntity.getLocalAction() != null) {
+        PageInfo<ThrOrderEntity> pageInfo = new PageInfo<>(data);
-//            BaseResponse<PageSimpleResponse<ThrOrderResponse>> loca = getLoaclData(filterErpOrderRequest);
-//            erpOrderResponses.addAll(loca.getData().getList());
-//        }
-        PageInfo<ThrOrderEntity> pageInfo;
-        pageInfo = new PageInfo<>(data);
         PageSimpleResponse<ThrOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(erpOrderResponses);
@@ -438,7 +408,7 @@ public class ThrOrderController {
 
         List<ThrOrderResponse> erpOrderResponses = new ArrayList<>();
         List<ThrOrderEntity> data = thrOrderService.filterThrOrder(filterThrOrderRequest);
-        if (data != null && data.size() > 0) {
+        if (CollUtil.isNotEmpty(data)) {
             for (ThrOrderEntity thrOrderEntity : data) {
                 FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest();
                 filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + "");
@@ -460,8 +430,7 @@ public class ThrOrderController {
                 erpOrderResponses.add(erpOrderResponse);
             }
         }
-        PageInfo<ThrOrderEntity> pageInfo;
+        PageInfo<ThrOrderEntity> pageInfo = new PageInfo<>(data);
-        pageInfo = new PageInfo<>(data);
         PageSimpleResponse<ThrOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(erpOrderResponses);

src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java

@@ -60,8 +60,7 @@ public class ThrOrderExportLogController {
         }
         List<ThrOrderExportLogEntity> udiInfoExportLogEntities
                 = thrOrderExportLogService.filterThrOrderExportLog(filterUdiEpLogReques);
-        PageInfo<ThrOrderExportLogEntity> pageInfo;
+        PageInfo<ThrOrderExportLogEntity> pageInfo = new PageInfo<>(udiInfoExportLogEntities);
-        pageInfo = new PageInfo<>(udiInfoExportLogEntities);
         PageSimpleResponse<ThrOrderExportLogEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(udiInfoExportLogEntities);
@@ -169,14 +168,7 @@ public class ThrOrderExportLogController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        //todo关联表未涉及好
+
-//        BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(filterErpOrderRequest.getBillAction(), "orderQueryUrl");
-//        if (!basicThirdSysDetailEntity.getEnabled() || basicThirdSysDetailEntity.getThirdSysFk() == null) {
-//            return ResultVOUtils.error(500, "第三方系统业务单据接口服务未启用");
-//        }
-//        if (basicThirdSysDetailEntity.getValue() == null) {
-//            return ResultVOUtils.error(500, "业务单据查询接口未定义");
-//        }
         ThrSystemDetailEntity thrSystemDetailEntity=new ThrSystemDetailEntity();
         if (thrSystemDetailEntity.getFromType() != null && thrSystemDetailEntity.getFromType() == 0) {
             return erpOrderClient.getThrOrderResponse(filterErpOrderRequest);
@@ -207,8 +199,7 @@ public class ThrOrderExportLogController {
                     erpOrderResponses.add(erpOrderResponse);
                 }
             }
-            PageInfo<ThrOrderEntity> pageInfo;
+            PageInfo<ThrOrderEntity> pageInfo = new PageInfo<>(data);
-            pageInfo = new PageInfo<>(data);
             PageSimpleResponse<ThrOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
             pageSimpleResponse.setTotal(pageInfo.getTotal());
             pageSimpleResponse.setList(erpOrderResponses);

src/main/java/com/glxp/api/controller/thrsys/ThrOrderImportLogController.java

@@ -47,8 +47,7 @@ public class ThrOrderImportLogController {
         }
         List<ThrOrderImportLogEntity> udiInfoImportLogEntities
                 = thrOrderImportLogService.filterThrOrderImportLog(filterThrCorpImportLogRequest);
-        PageInfo<ThrOrderImportLogEntity> pageInfo;
+        PageInfo<ThrOrderImportLogEntity> pageInfo = new PageInfo<>(udiInfoImportLogEntities);
-        pageInfo = new PageInfo<>(udiInfoImportLogEntities);
         PageSimpleResponse<ThrOrderImportLogEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(udiInfoImportLogEntities);
@@ -64,8 +63,7 @@ public class ThrOrderImportLogController {
         }
         List<ThrOrderImportDetailEntity> thrOrderImportDetailEntities
                 = thrOrderImportDetailService.filterOrderImportDetail(filterThrCorpImportLogRequest);
-        PageInfo<ThrOrderImportDetailEntity> pageInfo;
+        PageInfo<ThrOrderImportDetailEntity> pageInfo = new PageInfo<>(thrOrderImportDetailEntities);
-        pageInfo = new PageInfo<>(thrOrderImportDetailEntities);
         PageSimpleResponse<ThrOrderImportDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrOrderImportDetailEntities);
@@ -194,13 +192,6 @@ public class ThrOrderImportLogController {
                         Cell cell5 = row.getCell(4);
                         if (cell5 != null) {
                             cell5.setCellType(CellType.STRING);
-                            String billType = cell5.getStringCellValue();
-                            //todo 表功能还未设计好
-//                            BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByName(billType);
-//                            if (bussinessTypeEntity != null) {
-//                                corpImportDetailEntity.setBillType(bussinessTypeEntity.getAction());
-//                            } else
-//                                corpImportDetailEntity.setBillType(billType);
 
 
                         }

src/main/java/com/glxp/api/controller/thrsys/ThrProductTypeCotroller.java

@@ -37,8 +37,7 @@ public class ThrProductTypeCotroller {
         }
         List<ThrProductTypeEntity> thrProductTypeEntityList
                 = thrProductTypeService.getProductTypes(filterThrProductTypeRequest);
-        PageInfo<ThrProductTypeEntity> pageInfo;
+        PageInfo<ThrProductTypeEntity> pageInfo = new PageInfo<>(thrProductTypeEntityList);
-        pageInfo = new PageInfo<ThrProductTypeEntity>(thrProductTypeEntityList);
         PageSimpleResponse<ThrProductTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrProductTypeEntityList);

src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java

@@ -81,12 +81,8 @@ public class ThrProductsController {
                 BaseResponse<PageSimpleResponse<ThrProductsResponse>> udiDlDeviceResponse = erpBasicClient.getErpProducts(filterThrProductsRequest);
                 return udiDlDeviceResponse;
             } else {
-//                if (filterThrProductsRequest.getProductType() == null) {
-//                    filterThrProductsRequest.setProductType(1);
-//                }
                 List<ThrProductsResponse> thrCorpEntities = thrProductsService.filterJoinThrProducts(filterThrProductsRequest);
-                PageInfo<ThrProductsResponse> pageInfo;
+                PageInfo<ThrProductsResponse> pageInfo = new PageInfo<>(thrCorpEntities);
-                pageInfo = new PageInfo<>(thrCorpEntities);
                 PageSimpleResponse<ThrProductsResponse> pageSimpleResponse = new PageSimpleResponse<>();
                 pageSimpleResponse.setTotal(pageInfo.getTotal());
                 pageSimpleResponse.setList(thrCorpEntities);
@@ -120,26 +116,6 @@ public class ThrProductsController {
 
     //删除产品信息
     public String selectDetale(String id) {
-        ThrProductsEntity thrProductsEntity = thrProductsService.selectById(id);
-        //todo 耗材字典未设计好
-//        if (thrProductsEntity != null) {
-//            FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
-//            if ("thirdId".equals(thrProductsEntity.getThirdSysFk())) {
-//                filterUdiInfoRequest.setThirdId(thrProductsEntity.getCode());
-//            } else if ("thirdId1".equals(thrProductsEntity.getThirdSysFk())) {
-//                filterUdiInfoRequest.setThirdId(thrProductsEntity.getCode());
-//            } else if ("thirdId2".equals(thrProductsEntity.getThirdSysFk())) {
-//                filterUdiInfoRequest.setThirdId(thrProductsEntity.getCode());
-//            } else if ("thirdId3".equals(thrProductsEntity.getThirdSysFk())) {
-//                filterUdiInfoRequest.setThirdId(thrProductsEntity.getCode());
-//            } else if ("thirdId4".equals(thrProductsEntity.getThirdSysFk())) {
-//                filterUdiInfoRequest.setThirdId(thrProductsEntity.getCode());
-//            }
-//            List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
-//            if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) {
-//                return "改产品已被选入耗材字典请先移除！";
-//            }
-//        }
         boolean b = thrProductsService.deleteById(id);
         if (b)
             return null;
@@ -171,14 +147,6 @@ public class ThrProductsController {
         }
         return ResultVOUtils.error(999, "数据已存在!");
 
-
-//        //新增主系统产品信息直接加到耗材字典里
-//        BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
-//        if (basicThirdSysEntity.getThirdId().equals(thrProductsEntity.getThirdSysFk()))
-//            if (!udiContrastService.isExit(null, thrProductsEntity.getCode(), null)) {
-//                udiContrastService.createOnlyMainId(thrProductsEntity.getCode());
-//            }
-
     }
 
     @Resource
@@ -321,9 +289,6 @@ public class ThrProductsController {
         if (null == udiRelevanceResponse) {
             return ResultVOUtils.error(500, "参数不能为空");
         }
-//        if (!IntUtil.value(udiRelevanceResponse.getNewNeedUpload()) ) {
-//            return ResultVOUtils.error(500, "产品未关联DI");
-//        }
 
         return thrProductsService.postThrProduct(udiRelevanceResponse, "thirdId");
     }

src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java

@@ -61,8 +61,7 @@ public class ThrProductsExportLogController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<ThrProductsExportLogEntity> thrProductsExportLogEntities = thrProductsExportLogService.filterThrProductsExportLog(filterThrProductsExportLogRequest);
-        PageInfo<ThrProductsExportLogEntity> pageInfo;
+        PageInfo<ThrProductsExportLogEntity> pageInfo = new PageInfo<>(thrProductsExportLogEntities);
-        pageInfo = new PageInfo<>(thrProductsExportLogEntities);
         PageSimpleResponse<ThrProductsExportLogEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrProductsExportLogEntities);
@@ -123,8 +122,6 @@ public class ThrProductsExportLogController {
         FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest();
         filterThrProductsRequest.setThirdSysFk(thrProductsExportRequest.getThirdSys());
         filterThrProductsRequest.setThirdSys(thrProductsExportRequest.getThirdSys());
-        //List<ThrProductsEntity> thrProductsEntities = thrProductsService.filterThrProducts1(filterThrProductsRequest);
-        //thrProductsExportRequest.setThrProductsEntities(thrProductsEntities);
         thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS);
         String genKey = CustomUtil.getId();
         String fileName = "D:\\udiwms\\exportFile\\" + "第三方产品信息" + genKey + ".UpperIn";
@@ -148,7 +145,6 @@ public class ThrProductsExportLogController {
         thrProductsExportLogEntity.setCreateTime(new Date());
         thrProductsExportLogEntity.setRemark("本次导出数据" + thrProductsEntityList.size() + "条");
         thrProductsExportLogService.insertThrProductsExportLog(thrProductsExportLogEntity);
-        //thrProductsDlService.genExcel(genKey, thrProductsExportRequest);
         //修改为导出json文件
         thrProductsDlService.genJsonFile(genKey, thrProductsExportRequest);
 
@@ -187,7 +183,6 @@ public class ThrProductsExportLogController {
         thrProductsExportLogEntity.setCreateTime(new Date());
         thrProductsExportLogEntity.setRemark("本次导出数据" + thrProductsEntityList.size() + "条");
         thrProductsExportLogService.insertThrProductsExportLog(thrProductsExportLogEntity);
-        //thrProductsDlService.genExcel(genKey, thrProductsExportRequest);
         //修改为导出json文件
         thrProductsDlService.genJsonFile(genKey, thrProductsExportRequest);
 
@@ -239,8 +234,7 @@ public class ThrProductsExportLogController {
                 FilterThrProductsRequest filterThrProductsRequest1 = new FilterThrProductsRequest();
                 BeanUtils.copyProperties(filterThrProductsRequest, filterThrProductsRequest1);
                 List<ThrProductsResponse> thrCorpEntities = thrProductsService.filterJoinThrProducts(filterThrProductsRequest);
-                PageInfo<ThrProductsResponse> pageInfo;
+                PageInfo<ThrProductsResponse> pageInfo = new PageInfo<>(thrCorpEntities);
-                pageInfo = new PageInfo<>(thrCorpEntities);
                 PageSimpleResponse<ThrProductsResponse> pageSimpleResponse = new PageSimpleResponse<>();
                 pageSimpleResponse.setTotal(pageInfo.getTotal());
                 pageSimpleResponse.setList(thrCorpEntities);

src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java

@@ -40,8 +40,7 @@ public class ThrProductsImportLogController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<ThrProductsImportLogEntity> thrProductsImportLogEntities = thrProductsImportLogService.filterThrPorductsImportLog(filterThrProductsImportLogRequest);
-        PageInfo<ThrProductsImportLogEntity> pageInfo;
+        PageInfo<ThrProductsImportLogEntity> pageInfo = new PageInfo<>(thrProductsImportLogEntities);
-        pageInfo = new PageInfo<>(thrProductsImportLogEntities);
         PageSimpleResponse<ThrProductsImportLogEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrProductsImportLogEntities);
@@ -56,8 +55,7 @@ public class ThrProductsImportLogController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<ThrProductsImportDetailEntity> thrProductsImportDetailEntities = thrProductsImportDetailService.filterProductsDetailImport(filterThrProductsImportLogRequest);
-        PageInfo<ThrProductsImportDetailEntity> pageInfo;
+        PageInfo<ThrProductsImportDetailEntity> pageInfo = new PageInfo<>(thrProductsImportDetailEntities);
-        pageInfo = new PageInfo<>(thrProductsImportDetailEntities);
         PageSimpleResponse<ThrProductsImportDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrProductsImportDetailEntities);

src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java

@@ -40,10 +40,6 @@ public class ThrSystemController {
     private ThrSystemService thrSystemService;
     @Resource
     private ThrSystemDetailService thrSystemDetailService;
-    //    @Resource
-//    UdiRelevanceService udiRelevanceService;
-//    @Resource
-//    UnitMaintainService unitMaintainService;
     @Resource
     ThrSystemBusApiService thrSystemBusApiService;
     @Resource
@@ -61,8 +57,7 @@ public class ThrSystemController {
 
         basicThirdSysEntities = thrSystemService.filterBasicThiSys(filterBasicThirdSysRequest);
 
-        PageInfo<ThrSystemEntity> pageInfo;
+        PageInfo<ThrSystemEntity> pageInfo = new PageInfo<>(basicThirdSysEntities);
-        pageInfo = new PageInfo<>(basicThirdSysEntities);
         PageSimpleResponse<ThrSystemEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(basicThirdSysEntities);
@@ -141,20 +136,6 @@ public class ThrSystemController {
                 return ResultVOUtils.error(500, "主系统必须启用");
             }
 
-            //todo 耗材字典还未完成
-//            if (!temp.getMainSys().equals(basicThirdSysEntity.getMainSys())) {
-//                if (udiRelevanceService.isExit() || unitMaintainService.isExit()) {
-//                    return ResultVOUtils.error(999, "产品信息已经关联，无法取消主系统！");
-//                }
-//                if ((!temp.getEnabled()) && basicThirdSysEntity.getMainSys()) {
-//                    if (!basicThirdSysEntity.getEnabled()) {
-//                        return ResultVOUtils.error(999, "请先启用系统！");
-//                    }
-//                }
-//                if (!basicThirdSysEntity.getEnabled() && basicThirdSysEntity.getMainSys()) {
-//                    return ResultVOUtils.error(999, "请先启用系统！");
-//                }
-//            }
             if (thrSystemEntity.getMainSys()) {
                 List<ThrSystemEntity> basicThirdSysEntities = thrSystemService.filterBasicThiSys(new FilterBasicThirdSysRequest());
                 for (ThrSystemEntity thrSystemEntity1 : basicThirdSysEntities) {
@@ -179,8 +160,7 @@ public class ThrSystemController {
         }
         List<ThrSystemDetailEntity> basicThirdSysEntities;
         basicThirdSysEntities = thrSystemDetailService.filterBasicThirdSysDetail(filterBasicThirdSysDetailRequest);
-        PageInfo<ThrSystemDetailEntity> pageInfo;
+        PageInfo<ThrSystemDetailEntity> pageInfo = new PageInfo<>(basicThirdSysEntities);
-        pageInfo = new PageInfo<>(basicThirdSysEntities);
         PageSimpleResponse<ThrSystemDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(basicThirdSysEntities);
@@ -237,8 +217,7 @@ public class ThrSystemController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<ThrSystemBusApiEntity> basicThirdSysEntities = thrSystemBusApiService.filterSysBusApi(filterBasicThirdSysDetailRequest);
-        PageInfo<ThrSystemBusApiEntity> pageInfo;
+        PageInfo<ThrSystemBusApiEntity> pageInfo = new PageInfo<>(basicThirdSysEntities);
-        pageInfo = new PageInfo<>(basicThirdSysEntities);
         PageSimpleResponse<ThrSystemBusApiEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(basicThirdSysEntities);