出入库调试

YYC

2023-06-15 a8da7c463224b9a5bc4628197afe4d9f7d05361c

 igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5208.java

@@ -43,7 +43,7 @@

    @Override
    public String getInterfaceId() {
        return Phone35Constant.API_PHONE_5205;
        return Phone35Constant.API_PHONE_5208;
    }

    @SuppressWarnings("unchecked")
@@ -57,14 +57,14 @@
            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误，请重试！！");
        }
        //参数验证
        if (StringUtils.isEmpty(param.getDeptId())) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误，请重试！！");
        }
//        if (StringUtils.isEmpty(param.getDeptId())) {
//            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误，请重试！！");
//        }

        //查询流水数据信息
        InoutRecord inoutData = hPhoneService.getInoutRecord(phone35AuthUser.getCompanyId(), phone35AuthUser.getDeptId(), param.getId(), param.getIntelCard());
        if(inoutData == null){
            if(StringUtils.isEmpty(param.getId())){
        if (inoutData == null) {
            if (StringUtils.isEmpty(param.getId())) {
                return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "未查询到此卡数据信息，请重试！！");
            }
            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "未获取到所选数据信息，请重试！！");
@@ -72,28 +72,28 @@
        //封装响应数据
        Phone35InoutDto inoutHandle = new Phone35InoutDto();
        BeanUtils.copyProperties(inoutData, inoutHandle);
        inoutHandle.setDepotName(phone35Util.getDepotName(inoutData.getCompanyId(),inoutData.getDepotId()));
        inoutHandle.setDepotName(phone35Util.getDepotName(inoutData.getCompanyId(), inoutData.getDepotId()));
        inoutHandle.setProgressName(phone35Util.getProgressName(phone35AuthUser.getCompanyId(), inoutData.getProgress()));
        inoutHandle.setFoodVarietyName(FoodVariety.getMsg(inoutData.getFoodVariety()));
        inoutHandle.setFoodLevelName(FoodLevel.getMsg(inoutData.getFoodLevel()));
//        inoutHandle.setHandleStart(inoutData.getHandleStart()); TODO 
//        inoutHandle.setHandelEnd(inoutData.getHandleEnd()); TODO 
//        inoutHandle.setHandleStart(inoutData.getHandleStart());
//        inoutHandle.setHandelEnd(inoutData.getHandleEnd());
        inoutHandle.setProgress(inoutData.getProgress());

        //根据流水id、组织编码查询图片信息
        List<FileData> files = fileService.listFile(phone35AuthUser.getCompanyId(), inoutData.getId());
        if(files != null){
        if (files != null) {
            String bathPath;
            int i = 1;
            for (FileData file : files) {
                //只设置值仓的图片
                if(file.getBizTag().equals(InoutConstant.PROGRESS_HANDLE)){
                    if(i==1){
                if (file.getBizTag().equals(InoutConstant.PROGRESS_HANDLE)) {
                    if (i == 1) {
                        i++;
                        bathPath = fileService.getInoutFilePath(file.getCreateTime());
                        inoutHandle.setFileName1(file.getFileName());
                        inoutHandle.setBase64Img1(FfmpegUtil.getImgStr(bathPath + file.getFileName()));
                    }else {
                    } else {
                        bathPath = fileService.getInoutFilePath(file.getCreateTime());
                        inoutHandle.setFileName2(file.getFileName());
                        inoutHandle.setBase64Img2(FfmpegUtil.getImgStr(bathPath + file.getFileName()));