--部门物品分发

futian.liu

2023-11-24 7261ee93908d61a2c714645f19501aee9a7aba7b

--部门物品分发

 consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java

@@ -207,6 +207,7 @@
    @GetMapping("/query/warehouse/goods")
    public ResponseValue queryWarehouseGoods(Long agencyId, Long categoryId) {

        // TODO 调拨查询仓库物品
        Map<String, Object> map = new HashMap<>();
        map.put("categoryId", categoryId);


 consum-base/src/main/java/com/consum/base/controller/BaseWarehouseManagerController.java

@@ -1,7 +1,7 @@
package com.consum.base.controller;

import com.consum.base.BaseController;
import com.consum.base.pojo.WarehouseManagerParam;
import com.consum.base.pojo.request.WarehouseManagerParam;
import com.consum.base.service.BaseWarehouseManagerServiceImpl;
import com.consum.model.po.BaseWarehouseManager;
import com.consum.model.po.FinSysTenantUser;

 consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java

@@ -6,6 +6,7 @@
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.excel.exception.ExcelDataConvertException;
import com.consum.base.BaseController;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.FinSysTenantUserSearchParam;
import com.consum.base.pojo.FinSysTenantUserUpdParam;
import com.consum.base.pojo.response.DepartmentVO;
@@ -46,6 +47,7 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
@@ -985,14 +987,18 @@
            departmentVO.setId(id);
            departmentVO.setName(department.getName());
            departmentVO.setType("department");
            FinSysTenantUser finSysTenantUser = new FinSysTenantUser();
            finSysTenantUser.setSysDeptId(id);
            List<FinSysTenantUser> tenantUserList = finSysTenantUserService.select(finSysTenantUser);

            String sql = "SELECT SYS_USER_ID,USER_NAME FROM "
                + "fin_sys_tenant_user "
                + "WHERE SYS_DEPT_ID =:deptId AND SYS_USER_ID NOT IN(SELECT MANAGER_ID FROM base_warehouse_manager)";
            Map<String, Object> param = new HashMap<>();
            param.put("deptId", id);
            List<Map<String, Object>> select = finSysTenantUserService.select(sql, param, new MapperUtil());
            List<UserVO> userVOList = Lists.newArrayList();
            tenantUserList.forEach(user -> {
            select.forEach(user -> {
                UserVO userVO = new UserVO();
                userVO.setId(user.getId());
                userVO.setName(user.getUserName());
                userVO.setId((Long) user.get("sysUserId"));
                userVO.setName(user.get("userName").toString());
                userVO.setType("user");
                userVOList.add(userVO);
            });

 consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java

@@ -4,10 +4,12 @@
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.MapUtils;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.GoodsUseRecordVO;
import com.consum.base.pojo.LWhFormTransferGoodsInfoParam;
import com.consum.base.pojo.ProcureModelInfoDto;
import com.consum.base.pojo.UseRecordDto;
import com.consum.base.pojo.UseRecordSkuDto;
import com.consum.base.pojo.request.ProcureModelInfoParam;
import com.consum.base.pojo.RecordUserInfoVO;
import com.consum.base.pojo.UseRecordSkuVO;
import com.consum.base.pojo.dto.UseRecordDTO;
import com.consum.base.pojo.query.TransferQry;
import com.consum.base.pojo.request.LWhFormTransferParam;
import com.consum.base.pojo.response.FormTransferVO;
@@ -21,11 +23,9 @@
import com.consum.base.service.LWhProcureModelService;
import com.consum.base.service.LWhProcureModelUserRecordServiceImpl;
import com.consum.base.service.LWhProcureModelUserServiceImpl;
import com.consum.model.po.BaseGoodsModels;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormTransfer;
import com.consum.model.po.LWhProcureModel;
import com.consum.model.po.LWhProcureModelUser;
import com.consum.model.po.LWhProcureModelUserRecord;
import com.consum.model.vo.LWhFormOutputVo;
@@ -43,6 +43,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
import org.apache.commons.compress.utils.Lists;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -94,7 +96,7 @@
        }
        int result = this.lWhFormTransferService.add(param, this.getSysInfo());
        if (result > 0) {
            return ResponseValue.success(1);
            return ResponseValue.success();
        }
        return ResponseValue.error("新增失败！");
    }
@@ -297,48 +299,54 @@
        @ApiImplicitParam(name = "procureModelInfoDto", value = "使用信息", required = true)
    })
    @PostMapping("/useInfo/update")
    public ResponseValue infoUpdate(@RequestBody List<ProcureModelInfoDto> procureModelInfoDto) {
    public ResponseValue infoUpdate(@RequestBody List<ProcureModelInfoParam> procureModelInfoParam) {

        S_user_core currentUser = this.getCurrentUser();
        if (currentUser == null) {
            return ResponseValue.error("登录用户信息不存在");
        }
        if (CollectionUtils.isEmpty(procureModelInfoDto)) {
        if (CollectionUtils.isEmpty(procureModelInfoParam)) {
            return ResponseValue.error("参数错误");
        }

        for (ProcureModelInfoDto procureModelInfo : procureModelInfoDto) {
        Map<Long, List<ProcureModelInfoParam>> collect = procureModelInfoParam.stream()
            .collect(Collectors.groupingBy(ProcureModelInfoParam::getBaseGoodModelId));
        for (Map.Entry<Long, List<ProcureModelInfoParam>> entry : collect.entrySet()) {
            Long baseGoodModelId = entry.getKey();

            String transferOrderId = procureModelInfo.getTransferOrderId();
            String baseGoodModelId = procureModelInfo.getBaseGoodModelId();
            List<ProcureModelInfoParam> procureModelInfoList = entry.getValue();
            Optional<ProcureModelInfoParam> first = procureModelInfoList.stream().findFirst();
            ProcureModelInfoParam procureModelInf = first.get();
            Long businessId = procureModelInf.getBusinessId();
            LWhProcureModelUserRecord lWhProcureModelUserRecord = new LWhProcureModelUserRecord();
            lWhProcureModelUserRecord.setId(IdUtil.generateId());
            lWhProcureModelUserRecord.setTransBusinessId(businessId);
            FinSysTenantUser sysInfo = getSysInfo();
            lWhProcureModelUserRecord.setOperatorId(sysInfo.getId());
            lWhProcureModelUserRecord.setOperatorName(sysInfo.getUserName());
            lWhProcureModelUserRecord.setDealTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
            lWhProcureModelUserRecordService.insert(lWhProcureModelUserRecord);

            LWhProcureModel lWhProcureModel = new LWhProcureModel();
            lWhProcureModel.setBusinessId(Long.valueOf(transferOrderId));
            lWhProcureModel.setBaseGoodsModelsId(Long.valueOf(baseGoodModelId));
            // 部门分发
            lWhProcureModel.setBusinessType(4);
            List<LWhProcureModel> lWhProcureModelList = lWhProcureModelService.select(lWhProcureModel);
            lWhProcureModelList.forEach(item -> {
                Long id = item.getId();
                LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser();
                lWhProcureModelUser.setWhProcureModelId(id);
                List<LWhProcureModelUser> procureModelUserList = lWhProcureModelUserService.select(lWhProcureModelUser);
                procureModelUserList.forEach(procureModelUser -> {
                    procureModelUser.setNowUserName(procureModelInfo.getUserName());
                    procureModelUser.setNowUserPhone(procureModelInfo.getPhone());
            List<LWhProcureModelUser> procureModelUserList = Lists.newArrayList();
            if (CollectionUtils.isEmpty(procureModelInfoList)) {
                for (ProcureModelInfoParam item : procureModelInfoList) {
                    LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser();
                    lWhProcureModelUser.setId(IdUtil.generateId());
                    lWhProcureModelUser.setTransBusinessId(businessId);
                    lWhProcureModelUser.setProcureModelUserRecordId(lWhProcureModelUserRecord.getId());
                    lWhProcureModelUser.setWhProcureModelId(procureModelInf.getProcureModelId());
                    lWhProcureModelUser.setBaseGoodsModelsId(baseGoodModelId);
                    lWhProcureModelUser.setNowUserPhone(item.getPhone());
                    lWhProcureModelUser.setNowUserName(item.getUserName());
                    lWhProcureModelUser.setGoodsNum(item.getCount());
                    procureModelUserList.add(lWhProcureModelUser);
                }

                    LWhProcureModelUserRecord lWhProcureModelUserRecord = new LWhProcureModelUserRecord();
                    lWhProcureModelUserRecord.setId(IdUtil.generateId());
                    lWhProcureModelUserRecord.setTransBusinessId(Long.valueOf(transferOrderId));
                    FinSysTenantUser sysInfo = getSysInfo();
                    lWhProcureModelUserRecord.setOperatorId(sysInfo.getId());
                    lWhProcureModelUserRecord.setOperatorName(sysInfo.getUserName());
                    lWhProcureModelUserRecord.setDealTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
                    lWhProcureModelUserRecordService.insert(lWhProcureModelUserRecord);
                });
                lWhProcureModelUserService.updateBatch(procureModelUserList);
            });
                lWhProcureModelUserService.insert(procureModelUserList);
            }

        }

        return ResponseValue.success();
    }

@@ -359,42 +367,47 @@
        if (currentUser == null) {
            return ResponseValue.error("登录用户信息不存在");
        }
        LWhProcureModelUserRecord lWhProcureModelUserRecord = new LWhProcureModelUserRecord();
        lWhProcureModelUserRecord.setTransBusinessId(transferOrderId);
        String sql =
            "select * from l_wh_procure_model_user_record pmur inner join l_wh_procure_model_user pmu on pmur.TRANS_BUSINESS_ID = pmu.  " + transferOrderId;
        List<LWhProcureModelUserRecord> modelUserRecords = lWhProcureModelUserRecordService.select(lWhProcureModelUserRecord);
        List<UseRecordDTO> useRecordDTOList = lWhProcureModelUserService.selectUseRecord(transferOrderId);
        if (CollectionUtils.isEmpty(useRecordDTOList)) {
            return ResponseValue.error("未查询到使用记录");
        }
        List<GoodsUseRecordVO> result = Lists.newArrayList();
        //分组
        Map<Long, Map<Long, List<UseRecordDTO>>> collect = useRecordDTOList.stream()
            .collect(Collectors.groupingBy(UseRecordDTO::getId, Collectors.groupingBy(UseRecordDTO::getBaseGoodsModelsId)));
        //开始循环collect
        for (Map.Entry<Long, Map<Long, List<UseRecordDTO>>> entry : collect.entrySet()) {
            Long id = entry.getKey();
            Map<Long, List<UseRecordDTO>> value = entry.getValue();
            //开始循环value
            List<UseRecordSkuVO> useRecordSkuList = Lists.newArrayList();
            for (Map.Entry<Long, List<UseRecordDTO>> item : value.entrySet()) {
                List<UseRecordDTO> list = item.getValue();
                List<RecordUserInfoVO> recordUserInfoList = Lists.newArrayList();
                for (UseRecordDTO useRecordDto : list) {

        List<UseRecordDto> result = Lists.newArrayList();
        for (LWhProcureModelUserRecord item : modelUserRecords) {
            Long id = item.getId();
            UseRecordDto useRecordDto = new UseRecordDto();
            useRecordDto.setId(id);
            useRecordDto.setUpdateUserName(item.getOperatorName());
            useRecordDto.setUpdateTime(item.getDealTime());
                    GoodsUseRecordVO goodsUseRecordVO = new GoodsUseRecordVO();
                    goodsUseRecordVO.setId(id);
                    goodsUseRecordVO.setUpdateUserName(useRecordDto.getUpdateUserName());
                    goodsUseRecordVO.setUpdateTime(useRecordDto.getUpdateTime());

            LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser();
            lWhProcureModelUser.setProcureModelUserRecordId(id);
            List<LWhProcureModelUser> procureModelUserList = lWhProcureModelUserService.select(lWhProcureModelUser);
                    UseRecordSkuVO useRecordSkuVO = new UseRecordSkuVO();
                    useRecordSkuVO.setBaseGoodModelId(useRecordDto.getBaseGoodsModelsId());
                    useRecordSkuVO.setBaseGoodModelName(useRecordDto.getBaseGoodsModelsName());
                    useRecordSkuVO.setUnit(useRecordDto.getUnit());
                    useRecordSkuVO.setProcureModelId(useRecordDto.getProcureModelId());

            List<UseRecordSkuDto> recordSkuDtoList = Lists.newArrayList();
            procureModelUserList.forEach(procureModelUser -> {
                UseRecordSkuDto useRecordSkuDto = new UseRecordSkuDto();

                BaseGoodsModels baseGoodsModels = new BaseGoodsModels();
                baseGoodsModels.setId(procureModelUser.getBaseGoodsModelsId());
                BaseGoodsModels baseGoodsModel = baseGoodsModelsService.getByModelNameAndGoodsTemplatesId(baseGoodsModels);
                String unit = baseGoodsModel.getUnit();
                useRecordSkuDto.setBaseUnit(unit);
                useRecordSkuDto.setBaseGoodModelName(baseGoodsModel.getModelName());
                useRecordSkuDto.setCount(procureModelUser.getGoodsNum());
                useRecordSkuDto.setPhone(procureModelUser.getNowUserPhone());
                useRecordSkuDto.setUserName(procureModelUser.getNowUserName());

                recordSkuDtoList.add(useRecordSkuDto);
            });
            useRecordDto.setRecordSkuDtoList(recordSkuDtoList);

                    RecordUserInfoVO recordUserInfoVO = new RecordUserInfoVO();
                    recordUserInfoVO.setUseName(useRecordDto.getUseName());
                    recordUserInfoVO.setPhone(useRecordDto.getPhone());
                    recordUserInfoVO.setNum(useRecordDto.getNum());
                    recordUserInfoList.add(recordUserInfoVO);
                    useRecordSkuVO.setRecordUserInfos(recordUserInfoList);
                    useRecordSkuList.add(useRecordSkuVO);
                    goodsUseRecordVO.setRecordSkuDtoList(useRecordSkuList);
                    result.add(goodsUseRecordVO);
                }
            }
        }
        return ResponseValue.success(result);
    }

 consum-base/src/main/java/com/consum/base/pojo/GoodsUseRecordVO.java

File was renamed from consum-base/src/main/java/com/consum/base/pojo/UseRecordDto.java
@@ -6,11 +6,11 @@
/**
 * @author asus
 * @version 1.0
 * @description: TODO
 * @description: 物品使用信息
 * @date 2023/11/8 15:20
 */
@Data
public class UseRecordDto {
public class GoodsUseRecordVO {

    // recordId
    private Long id;
@@ -19,7 +19,7 @@
    // 修改时间
    private Long updateTime;
    // 规格型号
    private List<UseRecordSkuDto> recordSkuDtoList;
    private List<UseRecordSkuVO> recordSkuDtoList;


}

 consum-base/src/main/java/com/consum/base/pojo/ProcureModelInfoDto.java

File was deleted

 consum-base/src/main/java/com/consum/base/pojo/RecordUserInfoVO.java

File was renamed from consum-base/src/main/java/com/consum/base/pojo/RecordUserInfoDto.java
@@ -9,16 +9,16 @@
 * @date 2023/11/8 15:20
 */
@Data
public class RecordUserInfoDto {
public class RecordUserInfoVO {


    // 使用人
    private String userName;
    private String useName;

    // 联系电话
    private Long phone;

    // 数量
    private int count;
    private int num;

}

 consum-base/src/main/java/com/consum/base/pojo/UseRecordSkuDto.java

File was deleted

 consum-base/src/main/java/com/consum/base/pojo/UseRecordSkuVO.java

New file
@@ -0,0 +1,29 @@
package com.consum.base.pojo;

import java.util.List;
import lombok.Data;

/**
 * @author asus
 * @version 1.0
 * @description: TODO
 * @date 2023/11/8 15:20
 */
@Data
public class UseRecordSkuVO {


    // 单号id
    private Long procureModelId;
    // 物品规格型号
    private Long baseGoodModelId;
    // 物品规格型号
    private String baseGoodModelName;
    // 计量单位
    private String unit;


    private List<RecordUserInfoVO> recordUserInfos;


}

 consum-base/src/main/java/com/consum/base/pojo/WarehouseManagerInfo.java

@@ -1,6 +1,7 @@
package com.consum.base.pojo;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
@@ -13,7 +14,9 @@
@ApiModel(value = "库管员信息")
public class WarehouseManagerInfo {

    @ApiModelProperty(value = "库管员id")
    private Long managerId;
    @ApiModelProperty(value = "库管员姓名")
    private String managerName;

}

 consum-base/src/main/java/com/consum/base/pojo/dto/UseRecordDTO.java

New file
@@ -0,0 +1,37 @@
package com.consum.base.pojo.dto;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import lombok.NoArgsConstructor;

/**
 * @author asus
 * @version 1.0
 * @description: 使用记录
 * @date 2023/11/24 9:32
 */
@NoArgsConstructor
@Data
public class UseRecordDTO {

    @JsonProperty("id")
    private Long id;
    @JsonProperty("unit")
    private String unit;
    @JsonProperty("phone")
    private Long phone;
    @JsonProperty("updateUserName")
    private String updateUserName;
    @JsonProperty("num")
    private Integer num;
    @JsonProperty("useName")
    private String useName;
    @JsonProperty("baseGoodsModelsName")
    private String baseGoodsModelsName;
    @JsonProperty("updateTime")
    private Long updateTime;
    @JsonProperty("baseGoodsModelsId")
    private Long baseGoodsModelsId;
    @JsonProperty("procureModelId")
    private Long procureModelId;
}

 consum-base/src/main/java/com/consum/base/pojo/dto/UserAndTenantInfoDTO.java

New file
@@ -0,0 +1,24 @@
package com.consum.base.pojo.dto;

import lombok.Data;
import lombok.NoArgsConstructor;

/**
 * @author asus
 * @version 1.0
 * @description: TODO
 * @date 2023/11/24 15:31
 */
@NoArgsConstructor
@Data
public class UserAndTenantInfoDTO {

    private Long tenantId;
    private String tenantName;

    private Long departId;
    private String departName;

    private Long sysUserId;
    private String userName;
}

 consum-base/src/main/java/com/consum/base/pojo/request/LWhFormTransferParam.java

@@ -48,10 +48,16 @@
    private Integer transferBusinessType;

    @ApiModelProperty(value = "部门id")
    private Integer departmentId;
    private Long departmentId;

    @ApiModelProperty(value = "部门名字")
    private String departmentName;

    @ApiModelProperty(value = "领取人名字")
    private String operatorName;

    @ApiModelProperty(value = "联系电话")
    private Long tel;
    /**
     * 调拨单型号
     */

 consum-base/src/main/java/com/consum/base/pojo/request/ProcureModelInfoParam.java

New file
@@ -0,0 +1,34 @@
package com.consum.base.pojo.request;

import lombok.Data;

/**
 * @author asus
 * @version 1.0
 * @description: 物品使用人修改
 * @date 2023/11/8 11:48
 */
@Data
public class ProcureModelInfoParam {

    // 单号id
    private Long businessId;

    private Long procureModelId;
    // 物品规格型号
    private Long baseGoodModelId;

    // 计量单位
    private String baseUnit;

    // 使用人
    private String userName;

    // 联系电话
    private Long phone;

    // 数量
    private int count;


}

 consum-base/src/main/java/com/consum/base/pojo/request/WarehouseManagerParam.java

File was renamed from consum-base/src/main/java/com/consum/base/pojo/WarehouseManagerParam.java
@@ -1,6 +1,8 @@
package com.consum.base.pojo;
package com.consum.base.pojo.request;

import com.consum.base.pojo.WarehouseManagerInfo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
import lombok.Data;

@@ -14,8 +16,10 @@
@ApiModel(value = "库管员信息")
public class WarehouseManagerParam {

    @ApiModelProperty(value = "仓库id")
    private Long warehouseId;

    @ApiModelProperty(value = "库管员信息")
    List<WarehouseManagerInfo> warehouseManagerInfoList;

}

 consum-base/src/main/java/com/consum/base/service/BaseWarehouseManagerServiceImpl.java

@@ -2,7 +2,7 @@

import com.consum.base.core.utils.IdUtil;
import com.consum.base.pojo.WarehouseManagerInfo;
import com.consum.base.pojo.WarehouseManagerParam;
import com.consum.base.pojo.request.WarehouseManagerParam;
import com.consum.model.po.BaseWarehouseManager;
import com.consum.model.po.FinSysTenantUser;
import com.iplatform.model.po.S_role;
@@ -91,7 +91,6 @@
                userRoleParam.put("managerId", sysUserId);
                userRoleParam.put("roleId", roleId);
                this.execute(saveUserRole, userRoleParam);
//                this.finSysTenantUserService.execInsertRoleUserList(roleList, sysUserId);

            }
        }

 consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java

@@ -16,6 +16,7 @@
import com.consum.base.pojo.response.LWHFromTransferExtendVO;
import com.consum.model.po.BaseGoodsModels;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.BaseWarehouseManager;
import com.consum.model.po.FinSysTenant;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormOutput;
@@ -35,6 +36,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import org.apache.commons.compress.utils.Lists;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -72,6 +74,8 @@
    private LWhProcureModelUserServiceImpl lWhProcureModelUserService;
    @Autowired
    private LWhProcureModelUserRecordServiceImpl lWhProcureModelUserRecordService;
    @Autowired
    private BaseWarehouseManagerServiceImpl baseWarehouseManagerService;

    private static String QUERY_FORM_TRANSFER_LIST = "SELECT ft.* FROM l_wh_form_transfer ft "
        + "left join L_WH_PROCURE_MODEL pm on pm.BUSINESS_ID = ft.id "
@@ -117,11 +121,40 @@
        //当业务类型为部门分发时 添加部门分发记录和使用人
        if (businessType == 1) {
            //部门分发类型 出库仓库类型0机构1部门
            // TODO 出库业务类型 联系电话
            lWhFormTransfer.setOutWarehouseType(1);
            //lWhFormTransfer.setOutOperatorId();
            lWhFormTransfer.setOutOperatorName(param.getOperatorName());
            lWhFormTransfer.setOutputTime(param.getCreateTime());
            //从当前登录库管人从库中出库，入到所选部门的下

            //查询库管员信息和相关仓库
            Long id = sysInfo.getSysUserId();
            BaseWarehouseManager manager = new BaseWarehouseManager();
            manager.setManagerId(id);
            List<BaseWarehouseManager> managerList = baseWarehouseManagerService.select(manager);
            if (CollectionUtils.isEmpty(managerList)) {
                log.error("库管员不存在");
                throw new Exception("库管员不存在");
            }
            Optional<BaseWarehouseManager> first = managerList.stream().findFirst();
            if (first.isPresent()) {
                BaseWarehouseManager baseWarehouseManager = first.get();
                Long baseWarehouseId = baseWarehouseManager.getBaseWarehouseId();
                BaseWarehouse baseWarehouse = new BaseWarehouse();
                baseWarehouse.setId(baseWarehouseId);
                BaseWarehouse warehouse = baseWarehouseService.get(baseWarehouse);

                lWhFormTransfer.setInWarehouseType(1);
                lWhFormTransfer.setInWarehouseId(param.getDepartmentId());
                lWhFormTransfer.setInWarehouseName(param.getDepartmentName());
                lWhFormTransfer.setInOperatorName(param.getOperatorName());
                lWhFormTransfer.setInTime(param.getCreateTime());

                lWhFormTransfer.setOutWarehouseType(0);
                lWhFormTransfer.setOutWarehouseId(warehouse.getId());
                lWhFormTransfer.setOutWarehouseName(warehouse.getWarehouseName());

                lWhFormTransfer.setOutOperatorId(sysInfo.getId());
                lWhFormTransfer.setOutOperatorName(sysInfo.getUserName());
                lWhFormTransfer.setOutputTime(param.getCreateTime());
                lWhFormTransfer.setTel(param.getTel());
            }
        }

        //根据机构id查询调拨机构
@@ -306,6 +339,9 @@
        Map<String, Object> paramMap = new HashMap<>();
        paramMap.put("id", result.getId());
        List<Map<String, Object>> procureModelList = lWhFormOutputService.select(sql, paramMap, new MapperUtil());

        String queryRecord = "SELECT * FROM l_wh_procure_model_user_record where TRANS_BUSINESS_ID = :id order by DEAL_TIME desc limit 1";
        LWhProcureModelUserRecord lWhProcureModelUserRecord = lWhProcureModelUserRecordService.get(queryRecord, paramMap, new LWhProcureModelUserRecord());
        List<FormTransferGoodsVO> formTransferGoods = Lists.newArrayList();
        for (Map<String, Object> map : procureModelList) {
            FormTransferGoodsVO procureTemplateInfoVO = MapUtils.convertMapToObj(map, FormTransferGoodsVO.class);
@@ -325,6 +361,7 @@
                    Long procureModelId = goodsModelVO.getId();
                    LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser();
                    lWhProcureModelUser.setWhProcureModelId(procureModelId);
                    lWhProcureModelUser.setProcureModelUserRecordId(lWhProcureModelUserRecord.getId());
                    List<LWhProcureModelUser> procureModelUserList = this.lWhProcureModelUserService.select(lWhProcureModelUser);
                    if (!CollectionUtils.isEmpty(procureModelUserList)) {
                        List<DepartGoodsUseInfo> departGoodsUseInfoList = Lists.newArrayList();

 consum-base/src/main/java/com/consum/base/service/LWhProcureModelUserServiceImpl.java

@@ -1,6 +1,13 @@
package com.consum.base.service;

import com.consum.base.core.utils.MapUtils;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.dto.UseRecordDTO;
import com.google.common.collect.Lists;
import com.walker.jdbc.service.BaseServiceImpl;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.springframework.stereotype.Service;

/**
@@ -12,4 +19,32 @@
@Service
public class LWhProcureModelUserServiceImpl extends BaseServiceImpl {

    public List<UseRecordDTO> selectUseRecord(Long businessId) {
        String sql = "SELECT\n"
            + "\tpmur.ID,\n"
            + "\tpm.ID procureModelId,\n"
            + "\tpmur.DEAL_TIME updateTime,\n"
            + "\tpmur.OPERATOR_NAME updateUserName,\n"
            + "\tpm.BASE_GOODS_MODELS_ID,\n"
            + "\tpm.BASE_GOODS_MODELS_NAME,\n"
            + "\tbgm.UNIT,\n"
            + "\tpmu.GOODS_NUM num,\n"
            + "\tpmu.NOW_USER_NAME useName,\n"
            + "\tpmu.NOW_USER_PHONE phone\n"
            + "FROM\n"
            + "\tl_wh_procure_model_user pmu\n"
            + "\tINNER JOIN l_wh_procure_model_user_record pmur ON pmu.PROCURE_MODEL_USER_RECORD_ID = pmur.id\n"
            + "\tINNER JOIN l_wh_procure_model pm ON pm.id = pmu.WH_PROCURE_MODEL_ID\n"
            + "\tINNER JOIN base_goods_models bgm ON pm.BASE_GOODS_MODELS_ID = bgm.id\n"
            + "\tWHERE pm.BUSINESS_ID =:id order by pmur.DEAL_TIME desc ";
        Map<String, Object> procureModelId = new HashMap<>();
        procureModelId.put("id", businessId);
        List<Map<String, Object>> select = this.select(sql, procureModelId, new MapperUtil());
        List<UseRecordDTO> useRecordDTOList = Lists.newArrayList();
        select.forEach(item -> {
            UseRecordDTO useRecordDto = MapUtils.convertMapToObj(item, UseRecordDTO.class);
            useRecordDTOList.add(useRecordDto);
        });
        return useRecordDTOList;
    }
}

 consum-model-pojo/src/main/java/com/consum/model/po/LWhFormTransfer.java

@@ -7,10 +7,12 @@

/**
 * 表名:L_WH_FORM_TRANSFER *
 *
 * @author genrator
 */
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
public class LWhFormTransfer extends BasePo<LWhFormTransfer> {

    // 序列化版本号
    private static final long serialVersionUID = 1L;

@@ -139,6 +141,10 @@
    private String procureDoc = null;
    @JsonIgnore
    protected boolean isset_procureDoc = false;

    private Long tel = null;
    @JsonIgnore
    protected boolean isset_tel = false;

    /**
     * 默认构造函数
@@ -595,44 +601,58 @@
        return this.procureDoc == null || this.procureDoc.length() == 0;
    }

    public Long getTel() {
        return tel;
    }

    public void setTel(Long tel) {
        this.tel = tel;
        this.isset_tel = true;
    }

    @JsonIgnore
    public boolean isEmptyTel() {
        return this.tel == null;
    }

    /**
     * 重写 toString() 方法
     */
    @Override
    public String toString() {
        return new StringBuilder()
                .append("id=").append(this.id)
                .append("inWarehouseFormId=").append(this.inWarehouseFormId)
                .append("inWarehouseFlowId=").append(this.inWarehouseFlowId)
                .append("outWarehouseFlowId=").append(this.outWarehouseFlowId)
                .append("outWarehouseFormId=").append(this.outWarehouseFormId)
                .append("businessType=").append(this.businessType)
                .append("businessFormCode=").append(this.businessFormCode)
                .append("inWarehouseType=").append(this.inWarehouseType)
                .append("inWarehouseId=").append(this.inWarehouseId)
                .append("inWarehouseName=").append(this.inWarehouseName)
                .append("outWarehouseType=").append(this.outWarehouseType)
                .append("outWarehouseId=").append(this.outWarehouseId)
                .append("outWarehouseName=").append(this.outWarehouseName)
                .append("inAgencyId=").append(this.inAgencyId)
                .append("inAgencyName=").append(this.inAgencyName)
                .append("outAgencyId=").append(this.outAgencyId)
                .append("outAgencyName=").append(this.outAgencyName)
                .append("operatorId=").append(this.operatorId)
                .append("operatorName=").append(this.operatorName)
                .append("createTime=").append(this.createTime)
                .append("states=").append(this.states)
                .append("inOperatorId=").append(this.inOperatorId)
                .append("inOperatorName=").append(this.inOperatorName)
                .append("inTime=").append(this.inTime)
                .append("outOperatorId=").append(this.outOperatorId)
                .append("outOperatorName=").append(this.outOperatorName)
                .append("outputTime=").append(this.outputTime)
                .append("beiz1=").append(this.beiz1)
                .append("beiz2=").append(this.beiz2)
                .append("beiz3=").append(this.beiz3)
                .append("procureDoc=").append(this.procureDoc)
                .toString();
            .append("id=").append(this.id)
            .append("inWarehouseFormId=").append(this.inWarehouseFormId)
            .append("inWarehouseFlowId=").append(this.inWarehouseFlowId)
            .append("outWarehouseFlowId=").append(this.outWarehouseFlowId)
            .append("outWarehouseFormId=").append(this.outWarehouseFormId)
            .append("businessType=").append(this.businessType)
            .append("businessFormCode=").append(this.businessFormCode)
            .append("inWarehouseType=").append(this.inWarehouseType)
            .append("inWarehouseId=").append(this.inWarehouseId)
            .append("inWarehouseName=").append(this.inWarehouseName)
            .append("outWarehouseType=").append(this.outWarehouseType)
            .append("outWarehouseId=").append(this.outWarehouseId)
            .append("outWarehouseName=").append(this.outWarehouseName)
            .append("inAgencyId=").append(this.inAgencyId)
            .append("inAgencyName=").append(this.inAgencyName)
            .append("outAgencyId=").append(this.outAgencyId)
            .append("outAgencyName=").append(this.outAgencyName)
            .append("operatorId=").append(this.operatorId)
            .append("operatorName=").append(this.operatorName)
            .append("createTime=").append(this.createTime)
            .append("states=").append(this.states)
            .append("inOperatorId=").append(this.inOperatorId)
            .append("inOperatorName=").append(this.inOperatorName)
            .append("inTime=").append(this.inTime)
            .append("outOperatorId=").append(this.outOperatorId)
            .append("outOperatorName=").append(this.outOperatorName)
            .append("outputTime=").append(this.outputTime)
            .append("beiz1=").append(this.beiz1)
            .append("beiz2=").append(this.beiz2)
            .append("beiz3=").append(this.beiz3)
            .append("procureDoc=").append(this.procureDoc)
            .toString();
    }

    /**
@@ -739,6 +759,9 @@
        if (this.isset_procureDoc) {
            l_wh_form_transfer.setProcureDoc(this.getProcureDoc());
        }
        if (this.isset_tel) {
            l_wh_form_transfer.setTel(this.getTel());
        }
        return l_wh_form_transfer;
    }
}

 consum-model-pojo/src/main/java/com/consum/model/po/LWhFormTransfer_mapper.java

@@ -7,17 +7,18 @@
import com.walker.jdbc.sqlgen.InsertBuilder;
import com.walker.jdbc.sqlgen.SelectBuilder;
import com.walker.jdbc.sqlgen.UpdateBuilder;
import org.springframework.jdbc.core.RowMapper;

import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Map;
import org.springframework.jdbc.core.RowMapper;

/**
 * 表名:L_WH_FORM_TRANSFER *
 *
 * @author genrator
 */
public class LWhFormTransfer_mapper extends LWhFormTransfer implements BaseMapper<LWhFormTransfer> {

    // 序列化版本号
    private static final long serialVersionUID = 1L;

@@ -56,6 +57,8 @@
    public static final String Beiz2 = "beiz2";
    public static final String Beiz3 = "beiz3";
    public static final String ProcureDoc = "procure_doc";
    public static final String Tel = "tel";


    /**
     * 默认构造函数
@@ -159,6 +162,9 @@
        if (lWhFormTransfer.isset_procureDoc) {
            this.setProcureDoc(lWhFormTransfer.getProcureDoc());
        }
        if (lWhFormTransfer.isset_tel) {
            this.setTel(lWhFormTransfer.getTel());
        }
        // 去掉，2022-09-07
        // this.setDatabaseName_(l_wh_form_transfer.getDatabaseName_());
    }
@@ -170,12 +176,12 @@
    public String getTableName_() {
        String tableName = "l_wh_form_transfer";
        /**
        if (StringUtils.isNotEmpty(this.getDatabaseName_())) {
            return this.getDatabaseName_() + "." + tableName;
        } else {
            return tableName;
        }
        */
         if (StringUtils.isNotEmpty(this.getDatabaseName_())) {
         return this.getDatabaseName_() + "." + tableName;
         } else {
         return tableName;
         }
         */
        return tableName;
    }

@@ -232,6 +238,7 @@
        ib.set(Beiz2, this.getBeiz2(), this.isset_beiz2);
        ib.set(Beiz3, this.getBeiz3(), this.isset_beiz3);
        ib.set(ProcureDoc, this.getProcureDoc(), this.isset_procureDoc);
        ib.set(Tel, this.getTel(), this.isset_tel);
        return ib.genMapSql();
    }

@@ -271,6 +278,7 @@
        ub.set(Beiz2, this.getBeiz2(), this.isset_beiz2);
        ub.set(Beiz3, this.getBeiz3(), this.isset_beiz3);
        ub.set(ProcureDoc, this.getProcureDoc(), this.isset_procureDoc);
        ub.set(Tel, this.getTel(), this.isset_tel);
        ub.where(this.getPkName_(), this.getPkValue_());
        return ub.genMapSql();
    }
@@ -311,6 +319,7 @@
        ub.set(Beiz2, this.getBeiz2(), this.isset_beiz2);
        ub.set(Beiz3, this.getBeiz3(), this.isset_beiz3);
        ub.set(ProcureDoc, this.getProcureDoc(), this.isset_procureDoc);
        ub.set(Tel, this.getTel(), this.isset_tel);
        return ub.genMapSql(where, parameters);
    }

@@ -350,6 +359,7 @@
        ub.set(Beiz2, this.getBeiz2(), this.isset_beiz2);
        ub.set(Beiz3, this.getBeiz3(), this.isset_beiz3);
        ub.set(ProcureDoc, this.getProcureDoc(), this.isset_procureDoc);
        ub.set(Tel, this.getTel(), this.isset_tel);
        return ub.genArraySql(where, parameters);
    }

@@ -397,7 +407,9 @@
     */
    @Override
    public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
        return new SqlAndParameters<>("select id, in_warehouse_form_id, in_warehouse_flow_id, out_warehouse_flow_id, out_warehouse_form_id, business_type, business_form_code, in_warehouse_type, in_warehouse_id, in_warehouse_name, out_warehouse_type, out_warehouse_id, out_warehouse_name, in_agency_id, in_agency_name, out_agency_id, out_agency_name, operator_id, operator_name, create_time, states, in_operator_id, in_operator_name, in_time, out_operator_id, out_operator_name, output_time, beiz1, beiz2, beiz3, procure_doc from " + this.getTableName_() + " " + where, parameters);
        return new SqlAndParameters<>(
            "select id, in_warehouse_form_id, in_warehouse_flow_id, out_warehouse_flow_id, out_warehouse_form_id, business_type, business_form_code, in_warehouse_type, in_warehouse_id, in_warehouse_name, out_warehouse_type, out_warehouse_id, out_warehouse_name, in_agency_id, in_agency_name, out_agency_id, out_agency_name, operator_id, operator_name, create_time, states, in_operator_id, in_operator_name, in_time, out_operator_id, out_operator_name, output_time, beiz1, beiz2, beiz3, procure_doc from "
                + this.getTableName_() + " " + where, parameters);
    }

    /**
@@ -405,7 +417,9 @@
     */
    @Override
    public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
        return new SqlAndParameters<>("select id, in_warehouse_form_id, in_warehouse_flow_id, out_warehouse_flow_id, out_warehouse_form_id, business_type, business_form_code, in_warehouse_type, in_warehouse_id, in_warehouse_name, out_warehouse_type, out_warehouse_id, out_warehouse_name, in_agency_id, in_agency_name, out_agency_id, out_agency_name, operator_id, operator_name, create_time, states, in_operator_id, in_operator_name, in_time, out_operator_id, out_operator_name, output_time, beiz1, beiz2, beiz3, procure_doc from " + this.getTableName_() + " " + where, parameters);
        return new SqlAndParameters<>(
            "select id, in_warehouse_form_id, in_warehouse_flow_id, out_warehouse_flow_id, out_warehouse_form_id, business_type, business_form_code, in_warehouse_type, in_warehouse_id, in_warehouse_name, out_warehouse_type, out_warehouse_id, out_warehouse_name, in_agency_id, in_agency_name, out_agency_id, out_agency_name, operator_id, operator_name, create_time, states, in_operator_id, in_operator_name, in_time, out_operator_id, out_operator_name, output_time, beiz1, beiz2, beiz3, procure_doc from "
                + this.getTableName_() + " " + where, parameters);
    }

    /**
@@ -634,6 +648,14 @@
        if (columnIndex > 0) {
            l_wh_form_transfer.setProcureDoc(rs.getString(columnIndex));
        }
        columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.Tel);
        if (columnIndex > 0) {
            if (rs.getBigDecimal(columnIndex) == null) {
                l_wh_form_transfer.setTel(null);
            } else {
                l_wh_form_transfer.setTel(rs.getLong(columnIndex));
            }
        }
        return l_wh_form_transfer;
    }
}