diff --git a/mhd-auth/src/main/resources/bootstrap.yml b/mhd-auth/src/main/resources/bootstrap.yml index fa142335b..a4dc57b58 100644 --- a/mhd-auth/src/main/resources/bootstrap.yml +++ b/mhd-auth/src/main/resources/bootstrap.yml @@ -12,9 +12,9 @@ spring: cloud: nacos: discovery: -# server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.102.192.5:6848 +# server-addr: 10.102.192.5:6848 username: nacos password: manhuoda@2023 #线上正式环境 @@ -22,9 +22,9 @@ spring: # username: nacos # password: manhuoda@2023 config: -# server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.102.192.5:6848 +# server-addr: 10.102.192.5:6848 username: nacos password: manhuoda@2023 #线上正式环境 diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserPo.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserPo.java index 740d08242..8e2d71869 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserPo.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserPo.java @@ -220,4 +220,34 @@ public class UserPo { @ApiModelProperty(name = "制单员nc编码") private String documentPreparerNcCode; + + @ApiModelProperty("法人代表") + private String legalRepresentative; + + @ApiModelProperty("统一编码") + private String unifiedCode; + + @ApiModelProperty("注册电话") + private String registeredPhone; + + @ApiModelProperty("注册地址") + private String registeredAddress; + + @ApiModelProperty("传真") + private String fax; + + @ApiModelProperty("付款银行") + private String paymentBank; + + @ApiModelProperty("付款账户") + private String paymentAccount; + + @ApiModelProperty("发票抬头") + private String invoiceTitle; + + @ApiModelProperty("税号") + private String taxNumber; + + @ApiModelProperty("备注") + private String remark; } diff --git a/mhd-gateway/src/main/resources/bootstrap.yml b/mhd-gateway/src/main/resources/bootstrap.yml index a692761a1..69dddcf6e 100644 --- a/mhd-gateway/src/main/resources/bootstrap.yml +++ b/mhd-gateway/src/main/resources/bootstrap.yml @@ -18,7 +18,8 @@ spring: # server-addr: 10.102.192.5:6848 # server-addr: 10.33.0.129:6010 #线上正式环境 - server-addr: 10.102.192.5:6848 + server-addr: 127.0.0.1:8848 +# server-addr: 10.102.192.5:6848 username: nacos password: manhuoda@2023 config: @@ -26,7 +27,8 @@ spring: # 线上测试环境配置 容器名+端口号 # server-addr: 10.33.0.129:6010 #线上正式环境 - server-addr: 10.102.192.5:6848 + server-addr: 127.0.0.1:8848 +# server-addr: 10.102.192.5:6848 username: nacos password: manhuoda@2023 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 diff --git a/mhd-modules/mhd-file/src/main/resources/bootstrap.yml b/mhd-modules/mhd-file/src/main/resources/bootstrap.yml index c75ea7186..32651ed6b 100644 --- a/mhd-modules/mhd-file/src/main/resources/bootstrap.yml +++ b/mhd-modules/mhd-file/src/main/resources/bootstrap.yml @@ -14,10 +14,14 @@ spring: nacos: discovery: server-addr: 127.0.0.1:8848 + username: nacos + password: manhuoda@2023 # 线上测试环境配置 容器名+端口号 #server-addr: mhd-nacos:8848 config: server-addr: 127.0.0.1:8848 + username: nacos + password: manhuoda@2023 # 线上测试环境配置 容器名+端口号 #server-addr: mhd-nacos:8848 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java new file mode 100644 index 000000000..40719bd6f --- /dev/null +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java @@ -0,0 +1,167 @@ +package com.mhd.basic.application.service.Lease; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.mhd.basic.domain.container.repository.po.ContainerPO; +import com.mhd.basic.domain.container.repository.todo.ContainerDO; +import com.mhd.basic.domain.container.service.ContainerDomainService; +import com.mhd.basic.domain.lease.entity.Lease; +import com.mhd.basic.domain.lease.repository.facade.ILeaseService; +import com.mhd.basic.domain.lease.repository.po.LeasePO; +import com.mhd.basic.domain.lease.repository.todo.LeaseDO; +import com.mhd.basic.domain.lease.service.LeaseDomainService; +import com.mhd.common.core.enums.DictCode; +import com.mhd.common.core.exception.ServiceException; +import com.mhd.common.security.utils.SecurityUtils; +import com.mhd.system.api.domain.SysDictData; +import com.mhd.system.api.model.LoginUser; +import com.mhd.system.service.ISysDictTypeService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +/** + * 租赁管理ApplicationService + * + * @author gen + * @date 2024-05-07 + */ +@Service +@Slf4j +public class LeaseApplicationService { + + @Autowired + private LeaseDomainService leaseDomainService; + + @Autowired + private ILeaseService leaseService; + + @Autowired + private ISysDictTypeService dictTypeService; + + + /** + * 分页查询租赁管理列表 + */ + + public List queryList(LeaseDO leaseDO) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (loginUser != null && loginUser.getUserPo() != null){ + Long loginUserOrganizationId = loginUser.getUserPo().getOrganizationId(); + Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); + + // 数据权限：根据organizationId来设置查询权限 + // organizationId等于2827时查询全部，其他仅查询各自组织的信息 + if (loginUserOrganizationId != null && loginUserOrganizationId.equals(2827L)) { + // 南光组织（organizationId=2827）：可以查询所有组织的数据 + // 如果前端传递了 organizationId，使用前端传递的值进行过滤 + // 如果前端没有传递 organizationId，清空组织过滤条件，查询所有组织的数据 + if (leaseDO.getOrganizationId() == null) { + leaseDO.setOrganizationId(null); + leaseDO.setTopOrganizationId(null); + } + } else { + // 其他组织：设置organizationId，只查询当前组织的数据 + if (topOrganizationId != null && topOrganizationId != 1){ + leaseDO.setTopOrganizationId(topOrganizationId); + } + // 如果前端传递了organizationId，验证是否与当前登录用户的组织ID一致 + if (leaseDO.getOrganizationId() != null && !leaseDO.getOrganizationId().equals(loginUserOrganizationId)) { + // 前端传递了其他组织的organizationId，强制使用当前登录用户的组织ID，防止越权查询 + leaseDO.setOrganizationId(loginUserOrganizationId); + } + } + } + return leaseDomainService.queryList(leaseDO); + } + + + /** + * 新增租赁管理 + */ + public Boolean insert(LeaseDO leaseDO) { + // 设置当前登录用户的组织信息 + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (loginUser != null && loginUser.getUserPo() != null) { + leaseDO.setOrganizationId(loginUser.getUserPo().getOrganizationId()); + leaseDO.setOrganizationName(loginUser.getUserPo().getOrganizationName()); + leaseDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); + } + List timeOverlapSimple = isTimeOverlapSimple(leaseDO.getCargoOwnerName(), leaseDO.getStartDate(), leaseDO.getEndDate(), null); + if (ObjectUtil.isNotEmpty(timeOverlapSimple)) { + throw new ServiceException("同一货主租赁信息时间不能重叠"); + } + return leaseDomainService.insert(leaseDO); + } + + private List isTimeOverlapSimple(String cargoOwnerName, Date startDate, Date endDate, Long excludeId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(Lease::getCargoOwnerName, cargoOwnerName) + .eq(Lease::getDelFlag, 1) // 只查询正常状态 + .le(Lease::getStartDate, endDate) + .ge(Lease::getEndDate, startDate); + if (excludeId != null) { + wrapper.ne(Lease::getId, excludeId); + } + return leaseService.list(wrapper); + } + + /** + * 修改租赁管理 + */ + public Boolean update(LeaseDO leaseDO) { + List timeOverlapSimple = isTimeOverlapSimple(leaseDO.getCargoOwnerName(), leaseDO.getStartDate(), leaseDO.getEndDate(), leaseDO.getId()); + if (ObjectUtil.isNotEmpty(timeOverlapSimple)) { + throw new ServiceException("同一货主租赁信息时间不能重叠"); + } + return leaseDomainService.update(leaseDO); + } + + /** + * 批量删除租赁管理 + */ + public boolean delete(Long[] leaseIds) { + return leaseDomainService.delete(leaseIds); + } + + /** + * 获取租赁管理详细信息 + */ + public LeasePO getInfo(Long leaseId) + { + return leaseDomainService.getInfo(leaseId); + } + + /** + * @description 批量作废租赁 + * @author ZhouGY + * @date 2024/5/13 9:46 + * @param leaseIds + * @return Boolean + */ + public Boolean nullifyByIds(List leaseIds){ + return leaseDomainService.nullifyByIds(leaseIds); + } + +// /** +// * @description 设置数据字典键值 +// * @author ZhouGY +// * @date 2024/4/7 14:33 +// * @param containerDO +// */ +// private void setDataDict(LeaseDO leaseDO){ +// //翻译租赁类型 +// List storageTypeDictDataList = dictTypeService.selectDictDataByType(DictCode.CONTAINER_TYPE.getCode()); +// if (null == storageTypeDictDataList) { +// throw new ServiceException("租赁类型数据字典不存在 请联系管理员"); +// } +// SysDictData storageTypeDictData = storageTypeDictDataList.stream().filter(info -> ObjectUtil.equal(info.getDictValue(), containerDO.getContainerType())).findAny().orElse(null); +// if (null == storageTypeDictData) { +// throw new ServiceException("租赁类型【" + leaseDO.getContainerType() + "】数据字典不存在 请联系管理员"); +// } +// leaseDO.setContainerTypeName(storageTypeDictData.getDictLabel()); +// } +} diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/batch/BatchApplicationService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/batch/BatchApplicationService.java index 23b5559b0..433041bed 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/batch/BatchApplicationService.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/batch/BatchApplicationService.java @@ -1,15 +1,22 @@ package com.mhd.basic.application.service.batch; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.mhd.basic.domain.batch.repository.po.BatchPO; import com.mhd.basic.domain.batch.repository.todo.BatchDO; import com.mhd.basic.domain.batch.service.BatchDomainService; +import com.mhd.basic.domain.batchDetail.entity.BatchDetail; +import com.mhd.basic.domain.batchDetail.repository.facade.IBatchDetailService; +import com.mhd.basic.domain.batchDetail.repository.po.BatchDetailPO; import com.mhd.basic.domain.pack.repository.todo.PackDO; import com.mhd.common.core.domain.po.UserPo; import com.mhd.common.security.utils.SecurityUtils; import com.mhd.system.api.model.LoginUser; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.util.ArrayList; import java.util.List; /** * 批次管理ApplicationService @@ -22,6 +29,8 @@ import java.util.List; public class BatchApplicationService { @Autowired private BatchDomainService batchDomainService; + @Autowired + private IBatchDetailService batchDetailService; /** @@ -36,7 +45,21 @@ public class BatchApplicationService { batchDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); } } - return batchDomainService.queryList(batchDO); + List batchPOS = batchDomainService.queryList(batchDO); + for (BatchPO batchPO : batchPOS) { + List batchDetailList = batchDetailService.list(new LambdaQueryWrapper() + .eq(BatchDetail::getBatchId, batchPO.getBatchId()) + .eq(BatchDetail::getDelFlag, "1")); + List batchDetailPOS = new ArrayList<>(); + // 逐个对象拷贝 + for (BatchDetail detail : batchDetailList) { + BatchDetailPO detailPO = new BatchDetailPO(); + BeanUtils.copyProperties(detail, detailPO); + batchDetailPOS.add(detailPO); + } + batchPO.setBatchDetailList(batchDetailPOS); + } + return batchPOS; } diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/container/ContainerApplicationService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/container/ContainerApplicationService.java index ca2a60370..f5c8a2160 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/container/ContainerApplicationService.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/container/ContainerApplicationService.java @@ -79,8 +79,6 @@ public class ContainerApplicationService { containerDO.setOrganizationName(loginUser.getUserPo().getOrganizationName()); containerDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); } - //翻译库区类型 - setDataDict(containerDO); return containerDomainService.insert(containerDO); } @@ -117,22 +115,4 @@ public class ContainerApplicationService { return containerDomainService.nullifyByIds(containerIds); } - /** - * @description 设置数据字典键值 - * @author ZhouGY - * @date 2024/4/7 14:33 - * @param containerDO - */ - private void setDataDict(ContainerDO containerDO){ - //翻译容器类型 - List storageTypeDictDataList = dictTypeService.selectDictDataByType(DictCode.CONTAINER_TYPE.getCode()); - if (null == storageTypeDictDataList) { - throw new ServiceException("容器类型数据字典不存在 请联系管理员"); - } - SysDictData storageTypeDictData = storageTypeDictDataList.stream().filter(info -> ObjectUtil.equal(info.getDictValue(), containerDO.getContainerType())).findAny().orElse(null); - if (null == storageTypeDictData) { - throw new ServiceException("容器类型【" + containerDO.getContainerType() + "】数据字典不存在 请联系管理员"); - } - containerDO.setContainerTypeName(storageTypeDictData.getDictLabel()); - } } diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/batchDetail/repository/persistence/BatchDetailImpl.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/batchDetail/repository/persistence/BatchDetailImpl.java index ec531a1a8..9308fc1dd 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/batchDetail/repository/persistence/BatchDetailImpl.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/batchDetail/repository/persistence/BatchDetailImpl.java @@ -70,6 +70,7 @@ public class BatchDetailImpl extends ServiceImpl List batchDetailDbList = batchDetailMapper.selectList(new QueryWrapper().lambda() .eq(BatchDetail::getBatchId, batchDO.getBatchId())); List batchDetailListSave = new ArrayList<>(); + List batchDetailListSave2 = new ArrayList<>(); List batchDetailListUpdates = new ArrayList<>(); if (CollectionUtil.isNotEmpty(batchDetailDbList)){ Map batchDetailMap = batchDetailDbList.stream().collect(Collectors.toMap(BatchDetail::getBatchLabels, Function.identity())); @@ -96,6 +97,20 @@ public class BatchDetailImpl extends ServiceImpl batchDetailListSave.add(batchDetail); } } + }else { + //是空没有详情 新增 + for (BatchDetailDO batchDetailDO : batchDetailDOList) { + BatchDetail batchDetail = new BatchDetail(); + BeanUtils.copyProperties(batchDetailDO, batchDetail); + batchDetail.setBatchId(batchDO.getBatchId()); + batchDetail.setOrganizationId(batchDO.getOrganizationId()); + batchDetail.setOrganizationName(batchDO.getOrganizationName()); + batchDetail.setTopOrganizationId(batchDO.getTopOrganizationId()); + batchDetail.setCreateBy(userPo.getUserId()); + batchDetail.setCreateByName(userPo.getUserName()); + batchDetail.setCreateTime(new Date()); + batchDetailListSave2.add(batchDetail); + } } //删除 之前存在 现在没有的 List batchDetailIds = batchDetailDbList.stream().map(BatchDetail::getBatchDetailId).collect(Collectors.toList()); @@ -113,6 +128,8 @@ public class BatchDetailImpl extends ServiceImpl //新增 if (CollectionUtil.isNotEmpty(batchDetailListSave)){ saveBatch(batchDetailListSave); + }else if (CollectionUtil.isNotEmpty(batchDetailListSave2)){ + saveBatch(batchDetailListSave2); } //修改 if (CollectionUtil.isNotEmpty(batchDetailListUpdates)){ diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/entity/Lease.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/entity/Lease.java new file mode 100644 index 000000000..ccb4c61c9 --- /dev/null +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/entity/Lease.java @@ -0,0 +1,55 @@ +package com.mhd.basic.domain.lease.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.mhd.common.core.annotation.Excel; +import com.mhd.common.core.web.domain.BaseVOEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 租赁管理对象 container + * + */ + +@Data +public class Lease extends BaseVOEntity{ + private static final long serialVersionUID = 1L; + + @ApiModelProperty("id") + @TableId(type = IdType.AUTO) + private Long id; + + @ApiModelProperty("组织表ID") + @Excel(name = "组织表ID") + private Long organizationId; + + @ApiModelProperty("组织名称") + @Excel(name = "组织名称") + private String organizationName; + + @ApiModelProperty("一级组织表ID") + @Excel(name = "一级组织表ID") + private Long topOrganizationId; + + @ApiModelProperty("货主名称") + private String cargoOwnerName; + + @ApiModelProperty(value = "租赁方式(整租/散租)") + private String leaseType; + + @ApiModelProperty("租赁面积(m²)") + private BigDecimal leaseArea; + + @ApiModelProperty("开始日期") + private Date startDate; + + @ApiModelProperty("结束日期") + private Date endDate; + + @ApiModelProperty("备注") + private String remark; +} diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/facade/ILeaseService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/facade/ILeaseService.java new file mode 100644 index 000000000..a7de83151 --- /dev/null +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/facade/ILeaseService.java @@ -0,0 +1,43 @@ +package com.mhd.basic.domain.lease.repository.facade; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.mhd.basic.domain.lease.entity.Lease; +import com.mhd.basic.domain.lease.repository.po.LeasePO; +import com.mhd.basic.domain.lease.repository.todo.LeaseDO; + +import java.util.List; + +/** + * 租赁管理Service接口 + * + * @author gen + * @date 2024-05-07 + */ +public interface ILeaseService extends IService +{ + /** + * 分页查询租赁管理列表 + */ + public List queryList(LeaseDO leaseDO); + + /** + * 新增租赁管理 + */ + public Boolean insert(LeaseDO leaseDO); + + /** + * 修改租赁管理 + */ + public Boolean update(LeaseDO leaseDO); + + /** + * 批量删除租赁管理 + */ + public Boolean delete(Long[] leaseIds); + + + /** + * 查询租赁管理 + */ + public LeasePO getInfo(Long leaseId); +} diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/mapper/LeaseMapper.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/mapper/LeaseMapper.java new file mode 100644 index 000000000..2d38584a2 --- /dev/null +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/mapper/LeaseMapper.java @@ -0,0 +1,21 @@ +package com.mhd.basic.domain.lease.repository.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.mhd.basic.domain.lease.entity.Lease; +import com.mhd.basic.domain.lease.repository.po.LeasePO; +import com.mhd.basic.domain.lease.repository.todo.LeaseDO; + +import java.util.List; + +/** + * 租赁管理Mapper接口 + * + */ +public interface LeaseMapper extends BaseMapper +{ + /** + * 查询租赁管理列表 + */ + public List queryList(LeaseDO leaseDO); + +} diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/persistence/LeaseImpl.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/persistence/LeaseImpl.java new file mode 100644 index 000000000..208ba54a7 --- /dev/null +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/persistence/LeaseImpl.java @@ -0,0 +1,114 @@ +package com.mhd.basic.domain.lease.repository.persistence; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.mhd.basic.domain.lease.entity.Lease; +import com.mhd.basic.domain.lease.repository.facade.ILeaseService; +import com.mhd.basic.domain.lease.repository.mapper.LeaseMapper; +import com.mhd.basic.domain.lease.repository.po.LeasePO; +import com.mhd.basic.domain.lease.repository.todo.LeaseDO; +import com.mhd.common.security.utils.SecurityUtils; +import com.mhd.system.api.model.LoginUser; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * 容器管理Service业务层处理 + * + * @author gen + * @date 2024-05-07 + */ +@Service +public class LeaseImpl extends ServiceImpl implements ILeaseService { + @Autowired + private LeaseMapper leaseMapper; + + /** + * 查询容器管理列表 + */ + @Override + public List queryList(LeaseDO leaseDO) + { + return leaseMapper.queryList(leaseDO); + } + + /** + * 新增容器管理 + */ + @Override + public Boolean insert(LeaseDO leaseDO) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + Lease lease = new Lease(); + BeanUtils.copyProperties(leaseDO,lease); + return this.save(lease); + } + + /** + * 修改容器管理 + */ + @Override + public Boolean update(LeaseDO leaseDO) { + Lease lease = new Lease(); + BeanUtils.copyProperties(leaseDO,lease); + return this.updateById(lease); + } + + /** + * 批量删除容器管理 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean delete(Long[] leaseIds ) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + List list = new ArrayList<>(); + for (Long id : leaseIds) { + Lease lease = new Lease(); + lease.setId(id); + lease.setDelFlag(2); + lease.setUpdateBy(loginUser.getUserid()); + lease.setUpdateByName(loginUser.getUsername()); + lease.setUpdateTime(new Date()); + list.add(lease); + } + return this.updateBatchById(list); + } + + /** + * 修改容器管理 + */ + @Override + public LeasePO getInfo(Long leaseId) { + Lease lease = this.getById(leaseId); + LeasePO leasePO = new LeasePO(); + BeanUtils.copyProperties(lease,leasePO); + return leasePO; + } + +// /** +// * @description 校验唯一 +// * @author ZhouGY +// * @date 2024/5/9 21:10 +// * @param containerDO +// */ +// private void verifyUniqueness(ContainerDO containerDO){ +// LoginUser loginUser = SecurityUtils.getLoginUser(); +// Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); +// if (topOrganizationId == null || topOrganizationId == 0 ){ +// throw new ServiceException("获取当前登陆人组织失败！"); +// } +// int count = leaseMapper.selectCount(new QueryWrapper().lambda() +// .eq(Container::getTopOrganizationId, topOrganizationId) +// .eq(Container::getContainerCode,containerDO.getContainerCode()) +// .eq(Container::getOrganizationId, containerDO.getOrganizationId()) +// .ne(containerDO.getContainerId() != null, Container::getContainerId, containerDO.getContainerId() ) +// .eq(Container::getDelFlag,1)); +// if (count > 0){ +// throw new ServiceException("容器编码【" + containerDO.getContainerCode() + "】已存在"); +// } +// } +} diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/po/LeasePO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/po/LeasePO.java new file mode 100644 index 000000000..63b928e12 --- /dev/null +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/po/LeasePO.java @@ -0,0 +1,58 @@ +package com.mhd.basic.domain.lease.repository.po; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.mhd.common.core.annotation.Excel; +import com.mhd.common.core.web.domain.BaseVOEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 租赁管理对象 container + * + */ + +@Data +public class LeasePO extends BaseVOEntity{ + private static final long serialVersionUID = 1L; + + @ApiModelProperty("id") + private Long id; + + @ApiModelProperty("组织表ID") + @Excel(name = "组织表ID") + private Long organizationId; + + @ApiModelProperty("组织名称") + @Excel(name = "组织名称") + private String organizationName; + + @ApiModelProperty("一级组织表ID") + @Excel(name = "一级组织表ID") + private Long topOrganizationId; + + @ApiModelProperty("货主名称") + private String cargoOwnerName; + + @ApiModelProperty(value = "租赁方式(整租/散租)") + private String leaseType; + + @ApiModelProperty("租赁面积(m²)") + private BigDecimal leaseArea; + + @ApiModelProperty("开始日期") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date startDate; + + @ApiModelProperty("结束日期") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date endDate; + + @ApiModelProperty("备注") + private String remark; +} diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java new file mode 100644 index 000000000..22755ecd4 --- /dev/null +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java @@ -0,0 +1,57 @@ +package com.mhd.basic.domain.lease.repository.todo; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.mhd.common.core.annotation.Excel; +import com.mhd.common.core.web.domain.BaseVOEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 租赁管理对象 container + * + */ + +@Data +public class LeaseDO extends BaseVOEntity{ + private static final long serialVersionUID = 1L; + + @ApiModelProperty("id") + private Long id; + + @ApiModelProperty("组织表ID") + @Excel(name = "组织表ID") + private Long organizationId; + + @ApiModelProperty("组织名称") + @Excel(name = "组织名称") + private String organizationName; + + @ApiModelProperty("一级组织表ID") + @Excel(name = "一级组织表ID") + private Long topOrganizationId; + + @ApiModelProperty("货主名称") + private String cargoOwnerName; + + @ApiModelProperty(value = "租赁方式(整租/散租)") + private String leaseType; + + @ApiModelProperty("租赁面积(m²)") + private BigDecimal leaseArea; + + @ApiModelProperty("开始日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date startDate; + + @ApiModelProperty("结束日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date endDate; + + @ApiModelProperty("备注") + private String remark; +} diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/service/LeaseDomainService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/service/LeaseDomainService.java new file mode 100644 index 000000000..20c5cff06 --- /dev/null +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/service/LeaseDomainService.java @@ -0,0 +1,87 @@ +package com.mhd.basic.domain.lease.service; + +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.mhd.basic.domain.container.entity.Container; +import com.mhd.basic.domain.container.repository.facade.IContainerService; +import com.mhd.basic.domain.container.repository.po.ContainerPO; +import com.mhd.basic.domain.container.repository.todo.ContainerDO; +import com.mhd.basic.domain.lease.entity.Lease; +import com.mhd.basic.domain.lease.repository.facade.ILeaseService; +import com.mhd.basic.domain.lease.repository.po.LeasePO; +import com.mhd.basic.domain.lease.repository.todo.LeaseDO; +import com.mhd.common.security.utils.SecurityUtils; +import com.mhd.system.api.model.LoginUser; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +/** + * 租赁管理 + * + */ +@Service +@Slf4j +public class LeaseDomainService { + + @Autowired + private ILeaseService leaseService; + + + /** + * 分页查询租赁管理列表 + */ + public List queryList(LeaseDO leaseDO) { + return leaseService.queryList(leaseDO); + } + + + /** + * 新增租赁管理 + */ + public Boolean insert(LeaseDO leaseDO) { + + return leaseService.insert(leaseDO); + } + + /** + * 修改租赁管理 + */ + public Boolean update(LeaseDO leaseDO) { + return leaseService.update(leaseDO); + } + + /** + * 批量删除租赁管理 + */ + public Boolean delete(Long[] leaseIds) { + return leaseService.delete(leaseIds); + } + + /** + * 获取租赁管理详细信息 + */ + public LeasePO getInfo(Long leaseId) + { + return leaseService.getInfo(leaseId); + } + + + /** + * @description 批量作废租赁 + * @author ZhouGY + * @date 2024/5/13 9:46 + * @param leaseIds + * @return Boolean + */ + public Boolean nullifyByIds(List leaseIds) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + return leaseService.update(new UpdateWrapper().lambda() + .set(Lease::getUpdateBy, loginUser.getUserid()) + .set(Lease::getUpdateTime, new Date()) + .in(Lease::getId, leaseIds) + .eq(Lease::getDelFlag, 1)); + } +} diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/assember/lease/LeaseAssembler.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/assember/lease/LeaseAssembler.java new file mode 100644 index 000000000..c67c39942 --- /dev/null +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/assember/lease/LeaseAssembler.java @@ -0,0 +1,61 @@ +package com.mhd.basic.interfaces.assember.lease; + +import cn.hutool.core.util.ObjectUtil; +import com.mhd.basic.domain.container.repository.todo.ContainerDO; +import com.mhd.basic.domain.lease.repository.todo.LeaseDO; +import com.mhd.basic.interfaces.dto.container.ContainerDTO; +import com.mhd.basic.interfaces.dto.lease.LeaseDTO; +import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException; +import com.mhd.common.core.exception.digitalLogisticsException.UserError; +import com.mhd.common.core.utils.IgnoreNullUtil; +import com.mhd.common.core.utils.bean.BeanUtils; +import com.mhd.common.security.utils.SecurityUtils; +import com.mhd.system.api.model.LoginUser; +import org.springframework.stereotype.Component; + +import java.util.Date; + +/** + * 容器管理Assembler + * + */ +@Component +public class LeaseAssembler { + + /** + * 转换实体 + */ + public LeaseDO toDO(LeaseDTO leaseDTO) { + LeaseDO leaseDO = new LeaseDO(); + // 拷贝 + BeanUtils.copyProperties(leaseDTO, leaseDO, IgnoreNullUtil.getNullPropertyNames(leaseDTO)); + return leaseDO; + } + + /** + * 转换实体 + */ + public LeaseDO toDOByEdit(LeaseDTO leaseDTO) { + LeaseDO leaseDO = new LeaseDO(); + // 拷贝 + BeanUtils.copyProperties(leaseDTO, leaseDO, IgnoreNullUtil.getNullPropertyNames(leaseDTO)); + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (ObjectUtil.isNull(loginUser)) { + throw new DigitalLogisticsException(UserError.TIMEOUT); + } + if(leaseDTO.getId() != null){ + leaseDO.setUpdateBy(loginUser.getUserid()); + leaseDO.setUpdateByName(loginUser.getUsername()); + leaseDO.setUpdateTime(new Date()); + }else { + leaseDO.setOrganizationId(loginUser.getUserPo().getOrganizationId()); + leaseDO.setOrganizationName(loginUser.getUserPo().getOrganizationName()); + leaseDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); + leaseDO.setCreateBy(loginUser.getUserid()); + leaseDO.setCreateByName(loginUser.getUsername()); + leaseDO.setCreateTime(new Date()); + } + return leaseDO; + } + +} \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/lease/LeaseDTO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/lease/LeaseDTO.java new file mode 100644 index 000000000..b41954c13 --- /dev/null +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/lease/LeaseDTO.java @@ -0,0 +1,53 @@ +package com.mhd.basic.interfaces.dto.lease; + +import com.mhd.common.core.annotation.Excel; +import com.mhd.common.core.web.domain.BaseVOEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * 租赁管理对象 container + * + */ + +@Data +public class LeaseDTO extends BaseVOEntity{ + private static final long serialVersionUID = 1L; + + @ApiModelProperty("id") + private Long id; + + @ApiModelProperty("组织表ID") + @Excel(name = "组织表ID") + private Long organizationId; + + @ApiModelProperty("组织名称") + @Excel(name = "组织名称") + private String organizationName; + + @ApiModelProperty("一级组织表ID") + @Excel(name = "一级组织表ID") + private Long topOrganizationId; + + @ApiModelProperty("货主名称") + private String cargoOwnerName; + + @ApiModelProperty(value = "租赁方式(整租/散租)") + private String leaseType; + + @ApiModelProperty("租赁面积(m²)") + private BigDecimal leaseArea; + + @ApiModelProperty("开始日期") + private Date startDate; + + @ApiModelProperty("结束日期") + private Date endDate; + + @ApiModelProperty("备注") + private String remark; +} diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/lease/LeaseApi.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/lease/LeaseApi.java new file mode 100644 index 000000000..d8447f749 --- /dev/null +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/lease/LeaseApi.java @@ -0,0 +1,111 @@ +package com.mhd.basic.interfaces.facadeApi.lease; + +import com.mhd.basic.application.service.Lease.LeaseApplicationService; +import com.mhd.basic.application.service.container.ContainerApplicationService; +import com.mhd.basic.domain.container.repository.po.ContainerPO; +import com.mhd.basic.domain.container.repository.todo.ContainerDO; +import com.mhd.basic.domain.lease.repository.po.LeasePO; +import com.mhd.basic.domain.lease.repository.todo.LeaseDO; +import com.mhd.basic.interfaces.assember.container.ContainerAssembler; +import com.mhd.basic.interfaces.assember.lease.LeaseAssembler; +import com.mhd.basic.interfaces.dto.container.ContainerDTO; +import com.mhd.basic.interfaces.dto.lease.LeaseDTO; +import com.mhd.common.core.web.controller.BaseController; +import com.mhd.common.core.web.domain.AjaxResult; +import com.mhd.common.core.web.page.TableDataInfo; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 租赁管理Api + */ +@RestController +@RequestMapping("/LeaseApi") +public class LeaseApi extends BaseController{ + + @Autowired + private LeaseApplicationService leaseApplicationService; + + @Resource + private LeaseAssembler leaseAssembler; + + /** + * 分页查询租赁管理列表 + */ + @ApiOperation("查询租赁管理列表") + @GetMapping("/list") + public TableDataInfo list(LeaseDTO leaseDTO) + { + //转换实体 + LeaseDO leaseDO = leaseAssembler.toDO(leaseDTO); + startPage(); + List list = leaseApplicationService.queryList(leaseDO); + return getDataTable(list); + } + + /** + * 分页查询租赁管理列表 + */ + @ApiOperation("查询租赁管理列表") + @GetMapping("/listByApp") + public AjaxResult listByApp(LeaseDTO leaseDTO) + { + //转换实体 + LeaseDO leaseDO = leaseAssembler.toDO(leaseDTO); + List list = leaseApplicationService.queryList(leaseDO); + return AjaxResult.success(list); + } + + /** + * 编辑租赁管理 + */ + @ApiOperation("编辑租赁管理") + @PostMapping("/edit") + public AjaxResult edit(@RequestBody LeaseDTO leaseDTO) + { + //转换实体 + LeaseDO leaseDO = leaseAssembler.toDOByEdit(leaseDTO); + if(leaseDTO.getId() != null){ + return toAjax(leaseApplicationService.update(leaseDO)); + }else { + return toAjax(leaseApplicationService.insert(leaseDO)); + } + } + + /** + * 批量删除租赁管理 + */ + @ApiOperation("批量删除租赁管理") + @DeleteMapping("/deleteByIds/{leaseIds}") + public AjaxResult delete(@PathVariable Long[] leaseIds) + { + return toAjax(leaseApplicationService.delete(leaseIds)); + } + + /** + * 获取租赁管理详细信息 + */ + @ApiOperation("获取租赁管理") + @GetMapping(value = "/getInfo/{leaseId}") + public AjaxResult getInfo(@PathVariable("leaseId") Long leaseId) + { + return AjaxResult.success(leaseApplicationService.getInfo(leaseId)); + } + + + /** + * 批量作废租赁 + */ + @ApiOperation("批量作废租赁") + @GetMapping("/nullifyByIds/{leaseIds}") + public AjaxResult nullifyByIds(@PathVariable("leaseIds") List leaseIds) + { + return toAjax(leaseApplicationService.nullifyByIds(leaseIds)); + } + + +} diff --git a/mhd-modules/mhd-system/src/main/resources/bootstrap.yml b/mhd-modules/mhd-system/src/main/resources/bootstrap.yml index ac7087779..fa495b9aa 100644 --- a/mhd-modules/mhd-system/src/main/resources/bootstrap.yml +++ b/mhd-modules/mhd-system/src/main/resources/bootstrap.yml @@ -13,10 +13,10 @@ spring: cloud: nacos: discovery: -# server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8848 # server-addr: 10.33.0.129:6010 # 线上测试环境配置 容器名+端口号 - server-addr: 10.102.192.5:6848 +# server-addr: 10.102.192.5:6848 username: nacos password: manhuoda@2023 #线上正式环境 @@ -25,7 +25,7 @@ spring: # server-addr: 127.0.0.1:8848 # server-addr: 10.33.0.129:6010 # 线上测试环境配置 容器名+端口号 - server-addr: 10.102.192.5:6848 +# server-addr: 10.102.192.5:6848 username: nacos password: manhuoda@2023 #线上正式环境 diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml new file mode 100644 index 000000000..99ce74d42 --- /dev/null +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select + id, + organization_id, + organization_name, + top_organization_id, + cargo_owner_name, + lease_type, + lease_area, + start_date, + end_date, + remark, + create_time, + create_by, + create_by_name, + update_time, + update_by, + update_by_name, + del_flag + from lease + + + + + + + and organization_id = #{organizationId} + + + and top_organization_id = #{topOrganizationId} + + + and organization_name like concat('%', #{organizationName}, '%') + + + and cargo_owner_name like concat('%', #{cargoOwnerName}, '%') + + + and lease_type = #{leaseType} + + + and lease_area = #{leaseArea} + + + and remark like concat('%', #{remark}, '%') + + + + + and create_by_name like concat('%', #{createByName}, '%') + + + and update_by_name like concat('%', #{updateByName}, '%') + + + + and start_date >= #{startDate} and start_date <= #{endDate} + + + + + and del_flag = #{delFlag} + and del_flag = 1 + + + + + + \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialBaseInfo/MaterialBaseInfoMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialBaseInfo/MaterialBaseInfoMapper.xml index 67845fb2f..afc981936 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialBaseInfo/MaterialBaseInfoMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialBaseInfo/MaterialBaseInfoMapper.xml @@ -170,7 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and material_base_info_id in (SELECT DISTINCT material_base_info_id - FROM test_szwl_wms.material_inventory + FROM ngwl_test_wms.material_inventory WHERE allocation_quantity > 0 AND del_flag = 1) @@ -178,6 +178,118 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + and organization_id = #{organizationId} + + + and organization_name like concat('%', #{organizationName}, '%') + + + and top_organization_id = #{topOrganizationId} + + + and shipper_id = #{shipperId} + + + and shipper_name like concat('%', #{shipperName}, '%') + + + and material_code = #{materialCode} + + + and material_name like concat('%', #{materialName}, '%') + + + and bar_code = #{barCode} + + + and material_classify_code = #{materialClassifyCode} + + + and material_classify_name like concat('%', #{materialClassifyName}, '%') + + + and material_type = #{materialType} + + + and material_type_name like concat('%', #{materialTypeName}, '%') + + + and unit_code = #{unitCode} + + + and unit_name like concat('%', #{unitName}, '%') + + + and pack_id = #{packId} + + + and pack_code = #{packCode} + + + and pack_name like concat('%', #{packName}, '%') + + + and brand_id = #{brandId} + + + and brand_code = #{brandCode} + + + and brand_name like concat('%', #{brandName}, '%') + + + and shelf_life = #{shelfLife} + + + and weight_limit = #{weightLimit} + + + and volume_limit = #{volumeLimit} + + + and material_shape = #{materialShape} + + + and material_shape_name like concat('%', #{materialShapeName}, '%') + + + and material_size = #{materialSize} + + + and material_length = #{materialLength} + + + and material_width = #{materialWidth} + + + and material_height = #{materialHeight} + + + and nullify = #{nullify} + + + and create_by_name like concat('%', #{createByName}, '%') + + + and update_by_name like concat('%', #{updateByName}, '%') + + + + and common = #{common} + and ( + 1 = 1 + or common = 1 ) + + + and del_flag = #{delFlag} + and del_flag = 1 + + + diff --git a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java index cd0701fa4..f8865d5a6 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java +++ b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java @@ -1195,7 +1195,7 @@ public class UserApplicationService { (userDO.getUserAccountType() == null || userDO.getUserAccountType() < 4)) { //给用户分配默认普通角色权限 RoleDo roleDo = new RoleDo(); - roleDo.setRoleCode(RoleEnum.MUST.getCode()); + roleDo.setRoleCode(RoleEnum.OWNER_CARGO.getCode()); roleDo.setOrganizationId(userEntity.getOrganizationId()); RoleEntity roleEntity = roleDomainService.selectByOrganizationIdAndRoleCode(roleDo); if (roleEntity != null) { @@ -1205,8 +1205,8 @@ public class UserApplicationService { userDO.setRoleId(roleEntity.getRoleId()); userRoleDomainService.addUserRole(userRoleDo); } - userDO.setRoleCode(RoleEnum.MUST.getCode()); - userDO.setRoleName(RoleEnum.MUST.getName()); + userDO.setRoleCode(RoleEnum.OWNER_CARGO.getCode()); + userDO.setRoleName(RoleEnum.OWNER_CARGO.getName()); userDO.setUserId(userEntity.getUserId()); userDomainService.updateUser(userDO); }else{ @@ -4908,7 +4908,7 @@ public class UserApplicationService { Map sysDepartInterfaceInfoPoMap = sysDepartInterfaceInfoPos.stream().collect(Collectors.toMap(SysDepartInterfaceInfoPo::getInterfaceTypeKey, Function.identity())); SysDepartInterfaceInfoPo sysDepartInterfaceInfoPo = sysDepartInterfaceInfoPoMap.get("isWT"); //是否开启 - if ("1".equals(sysDepartInterfaceInfoPo.getInterfaceTypeValue())) { + if (sysDepartInterfaceInfoPo != null && "1".equals(sysDepartInterfaceInfoPo.getInterfaceTypeValue())) { return true; } return false; diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserEntity.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserEntity.java index dbd88aec9..3715bca94 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserEntity.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserEntity.java @@ -165,4 +165,31 @@ public class UserEntity extends BaseVOEntity { @ApiModelProperty(name = "制单员nc编码") private String documentPreparerNcCode; + + @ApiModelProperty("法人代表") + private String legalRepresentative; + + @ApiModelProperty("统一编码") + private String unifiedCode; + + @ApiModelProperty("注册电话") + private String registeredPhone; + + @ApiModelProperty("注册地址") + private String registeredAddress; + + @ApiModelProperty("传真") + private String fax; + + @ApiModelProperty("付款银行") + private String paymentBank; + + @ApiModelProperty("付款账户") + private String paymentAccount; + + @ApiModelProperty("发票抬头") + private String invoiceTitle; + + @ApiModelProperty("税号") + private String taxNumber; } diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/CustomerDO.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/CustomerDO.java index 03d92bc7e..2d689fe2f 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/CustomerDO.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/CustomerDO.java @@ -45,4 +45,37 @@ public class CustomerDO extends BaseVOEntity { @ApiModelProperty(name = "用户ID集合") private List userIds; + + @ApiModelProperty("法人代表") + private String legalRepresentative; + + @ApiModelProperty("统一编码") + private String unifiedCode; + + @ApiModelProperty("注册电话") + private String registeredPhone; + + @ApiModelProperty("注册地址") + private String registeredAddress; + + @ApiModelProperty("传真") + private String fax; + + @ApiModelProperty("付款银行") + private String paymentBank; + + @ApiModelProperty("付款账户") + private String paymentAccount; + + @ApiModelProperty("发票抬头") + private String invoiceTitle; + + @ApiModelProperty("税号") + private String taxNumber; + + @ApiModelProperty(name = "邮箱") + private String userEmail; + + @ApiModelProperty(name = "备注") + private String userRemark; } diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDO.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDO.java index 6015ff20d..61281c395 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDO.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDO.java @@ -254,4 +254,31 @@ public class UserDO extends BaseVOEntity { @ApiModelProperty(name = "制单员nc编码") private String documentPreparerNcCode; + + @ApiModelProperty("法人代表") + private String legalRepresentative; + + @ApiModelProperty("统一编码") + private String unifiedCode; + + @ApiModelProperty("注册电话") + private String registeredPhone; + + @ApiModelProperty("注册地址") + private String registeredAddress; + + @ApiModelProperty("传真") + private String fax; + + @ApiModelProperty("付款银行") + private String paymentBank; + + @ApiModelProperty("付款账户") + private String paymentAccount; + + @ApiModelProperty("发票抬头") + private String invoiceTitle; + + @ApiModelProperty("税号") + private String taxNumber; } diff --git a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/CustomerDTO.java b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/CustomerDTO.java index 07efe9518..2f3e1f20e 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/CustomerDTO.java +++ b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/CustomerDTO.java @@ -47,4 +47,36 @@ public class CustomerDTO extends BaseVOEntity { @ApiModelProperty("详细地址") private String userAreaAddress; + @ApiModelProperty("法人代表") + private String legalRepresentative; + + @ApiModelProperty("统一编码") + private String unifiedCode; + + @ApiModelProperty("注册电话") + private String registeredPhone; + + @ApiModelProperty("注册地址") + private String registeredAddress; + + @ApiModelProperty("传真") + private String fax; + + @ApiModelProperty("付款银行") + private String paymentBank; + + @ApiModelProperty("付款账户") + private String paymentAccount; + + @ApiModelProperty("发票抬头") + private String invoiceTitle; + + @ApiModelProperty("税号") + private String taxNumber; + + @ApiModelProperty(name = "邮箱") + private String userEmail; + + @ApiModelProperty(name = "备注") + private String userRemark; } diff --git a/mhd-user-center/src/main/resources/bootstrap.yml b/mhd-user-center/src/main/resources/bootstrap.yml index 42a2695ae..319142ad3 100644 --- a/mhd-user-center/src/main/resources/bootstrap.yml +++ b/mhd-user-center/src/main/resources/bootstrap.yml @@ -18,17 +18,17 @@ spring: cloud: nacos: discovery: -# server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 # server-addr: 10.33.0.129:6010 - server-addr: 10.102.192.5:6848 +# server-addr: 10.102.192.5:6848 username: nacos password: manhuoda@2023 config: -# server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 # server-addr: 10.33.0.129:6010 - server-addr: 10.102.192.5:6848 +# server-addr: 10.102.192.5:6848 username: nacos password: manhuoda@2023 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 diff --git a/mhd-user-center/src/main/resources/mapper/UserMapper.xml b/mhd-user-center/src/main/resources/mapper/UserMapper.xml index f56b08f72..1ffb85392 100644 --- a/mhd-user-center/src/main/resources/mapper/UserMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserMapper.xml @@ -70,7 +70,16 @@ a.department_id, a.ding_user_id, a.ding_dept_id, - a.validity_period_management,a.salesperson_nc_code,a.document_preparer_nc_code + a.validity_period_management,a.salesperson_nc_code,a.document_preparer_nc_code, + a.legal_representative, + a.unified_code, + a.registered_phone, + a.registered_address, + a.fax, + a.payment_bank, + a.payment_account, + a.invoice_title, + a.tax_number FROM "USER" a where a.del_flag = 1 diff --git a/mhd_finance/src/main/resources/bootstrap.yml b/mhd_finance/src/main/resources/bootstrap.yml index 05a425d45..8d4f10f81 100644 --- a/mhd_finance/src/main/resources/bootstrap.yml +++ b/mhd_finance/src/main/resources/bootstrap.yml @@ -25,7 +25,8 @@ spring: # username: nacos # password: manhuoda@2023 #线上正式环境 - server-addr: 10.102.192.5:6848 + server-addr: 127.0.0.1:8848 +# server-addr: 10.102.192.5:6848 username: nacos password: manhuoda@2023 #线上正式环境 @@ -39,7 +40,8 @@ spring: # username: nacos # password: manhuoda@2023 #线上正式环境 - server-addr: 10.102.192.5:6848 + server-addr: 127.0.0.1:8848 +# server-addr: 10.102.192.5:6848 username: nacos password: manhuoda@2023 #线上正式环境 diff --git a/mhd_oms/pom.xml b/mhd_oms/pom.xml index 10fd57f01..abc31e8c1 100644 --- a/mhd_oms/pom.xml +++ b/mhd_oms/pom.xml @@ -90,7 +90,7 @@ org.projectlombok lombok - 1.18.4 + 1.18.30 provided diff --git a/mhd_oms/src/main/resources/bootstrap.yml b/mhd_oms/src/main/resources/bootstrap.yml index 8aa1783a7..d791822d4 100644 --- a/mhd_oms/src/main/resources/bootstrap.yml +++ b/mhd_oms/src/main/resources/bootstrap.yml @@ -17,6 +17,8 @@ spring: nacos: discovery: server-addr: 127.0.0.1:8848 + username: nacos + password: manhuoda@2023 # 演示环境 # server-addr: 47.92.229.169:8848 # 测试开发环境 @@ -31,6 +33,8 @@ spring: config: # 配置中心地址 server-addr: 127.0.0.1:8848 + username: nacos + password: manhuoda@2023 # 演示环境 # server-addr: 47.92.229.169:8848 # 测试开发环境 diff --git a/mhd_product/src/main/resources/bootstrap.yml b/mhd_product/src/main/resources/bootstrap.yml index 9bc1d51e5..6b9b2cada 100644 --- a/mhd_product/src/main/resources/bootstrap.yml +++ b/mhd_product/src/main/resources/bootstrap.yml @@ -18,9 +18,9 @@ spring: cloud: nacos: discovery: -# server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.102.192.5:6848 +# server-addr: 10.102.192.5:6848 username: nacos password: manhuoda@2023 #线上正式环境 @@ -30,9 +30,9 @@ spring: #线上正式环境 # server-addr: 10.102.192.105:6848 config: -# server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.102.192.5:6848 +# server-addr: 10.102.192.5:6848 username: nacos password: manhuoda@2023 #线上正式环境 diff --git a/mhd_thrid_party/src/main/resources/bootstrap.yml b/mhd_thrid_party/src/main/resources/bootstrap.yml index c5a07c32a..3a34654e5 100644 --- a/mhd_thrid_party/src/main/resources/bootstrap.yml +++ b/mhd_thrid_party/src/main/resources/bootstrap.yml @@ -18,9 +18,9 @@ spring: cloud: nacos: discovery: -# server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.102.192.5:6848 +# server-addr: 10.102.192.5:6848 username: nacos password: manhuoda@2023 #线上正式环境 @@ -30,9 +30,9 @@ spring: #线上正式环境 # server-addr: 10.102.192.105:6848 config: -# server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.102.192.5:6848 +# server-addr: 10.102.192.5:6848 username: nacos password: manhuoda@2023 #线上正式环境 diff --git a/mhd_transport/src/main/resources/bootstrap.yml b/mhd_transport/src/main/resources/bootstrap.yml index f0ff542dd..a06e7156e 100644 --- a/mhd_transport/src/main/resources/bootstrap.yml +++ b/mhd_transport/src/main/resources/bootstrap.yml @@ -18,10 +18,10 @@ spring: cloud: nacos: discovery: -# server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8848 # 线上测试环境配置使用ip+端口号 # server-addr: 10.33.0.129:6010 - server-addr: 10.102.192.5:6848 +# server-addr: 10.102.192.5:6848 username: nacos password: manhuoda@2023 #线上正式环境 @@ -31,9 +31,9 @@ spring: #线上正式环境 # server-addr: 10.102.192.105:6848 config: -# server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8848 # 线上测试环境配置使用ip+端口号 - server-addr: 10.102.192.5:6848 +# server-addr: 10.102.192.5:6848 username: nacos password: manhuoda@2023 #线上正式环境 diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java index 37aac16d1..af2a0622b 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java @@ -1,5 +1,6 @@ package com.mhd.wms.application.service.materialBaseInfo; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.mhd.common.security.utils.SecurityUtils; import com.mhd.system.api.model.LoginUser; import com.mhd.wms.domain.materialBarCode.service.MaterialBarCodeDomainService; @@ -8,12 +9,16 @@ import com.mhd.wms.domain.materialBaseInfo.repository.todo.MaterialBaseInfoDO; import com.mhd.wms.domain.materialBaseInfo.service.MaterialBaseInfoDomainService; import com.mhd.wms.domain.materialCommon.repository.todo.MaterialCommonDO; import com.mhd.wms.domain.materialCommon.service.MaterialCommonDomainService; +import com.mhd.wms.domain.materialGoodsRule.entity.MaterialGoodsRule; +import com.mhd.wms.domain.materialGoodsRule.repository.mapper.MaterialGoodsRuleMapper; +import com.mhd.wms.domain.materialGoodsRule.repository.po.MaterialGoodsRulePO; import com.mhd.wms.domain.materialGoodsRule.repository.todo.MaterialGoodsRuleDO; import com.mhd.wms.domain.materialGoodsRule.service.MaterialGoodsRuleDomainService; import com.mhd.wms.domain.materialInventoryWarning.service.MaterialInventoryWarningDomainService; import com.mhd.wms.domain.materialWarehouseControl.repository.todo.MaterialWarehouseControlDO; import com.mhd.wms.domain.materialWarehouseControl.service.MaterialWarehouseControlDomainService; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,6 +47,8 @@ public class MaterialBaseInfoApplicationService { @Autowired private MaterialBarCodeDomainService materialBarCodeDomainService; + @Autowired + private MaterialGoodsRuleMapper materialGoodsRuleMapper; /** * 分页查询物料基础信息列表 @@ -55,7 +62,18 @@ public class MaterialBaseInfoApplicationService { materialBaseInfoDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); } } - return materialBaseInfoDomainService.queryList(materialBaseInfoDO); + List materialBaseInfoPOS = materialBaseInfoDomainService.queryList(materialBaseInfoDO); + for (MaterialBaseInfoPO materialBaseInfoPO : materialBaseInfoPOS) { + MaterialGoodsRule materialGoodsRules = materialGoodsRuleMapper.selectOne(new LambdaQueryWrapper() + .eq(MaterialGoodsRule::getMaterialBaseInfoId, materialBaseInfoPO.getMaterialBaseInfoId()) + .eq(MaterialGoodsRule::getDelFlag, 1)); + if (materialGoodsRules != null){ + MaterialGoodsRulePO materialGoodsRulePO = new MaterialGoodsRulePO(); + BeanUtils.copyProperties(materialGoodsRules,materialGoodsRulePO); + materialBaseInfoPO.setMaterialGoodsRule(materialGoodsRulePO); + } + } + return materialBaseInfoPOS; } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/entity/MaterialBaseInfo.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/entity/MaterialBaseInfo.java index d953bb484..de3f47c7f 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/entity/MaterialBaseInfo.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/entity/MaterialBaseInfo.java @@ -169,4 +169,31 @@ public class MaterialBaseInfo extends BaseVOEntity { @ApiModelProperty("是否公用: 1-是 2-否") @Excel(name = "是否公用: 1-是 2-否") private Integer common; + + @ApiModelProperty("SKU码") + private String skuCode; + + @ApiModelProperty("单价") + private BigDecimal unitPrice; + + @ApiModelProperty("币制") + private String currency; + + @ApiModelProperty("原产国") + private String originCountry; + + @ApiModelProperty("HS码") + private String hsCode; + + @ApiModelProperty("申报单位") + private String declarationUnit; + + @ApiModelProperty("法定单位") + private String statutoryUnit; + + @ApiModelProperty("法定第二单位") + private String statutorySecondUnit; + + @ApiModelProperty("规格型号") + private String specificationModel; } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java index baf2d61d2..9668285d5 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java @@ -189,4 +189,32 @@ public class MaterialBaseInfoPO extends BaseVOEntity { @Excel(name = "是否公用: 1-是 2-否") private Integer common; + + @ApiModelProperty("SKU码") + private String skuCode; + + @ApiModelProperty("单价") + private BigDecimal unitPrice; + + @ApiModelProperty("币制") + private String currency; + + @ApiModelProperty("原产国") + private String originCountry; + + @ApiModelProperty("HS码") + private String hsCode; + + @ApiModelProperty("申报单位") + private String declarationUnit; + + @ApiModelProperty("法定单位") + private String statutoryUnit; + + @ApiModelProperty("法定第二单位") + private String statutorySecondUnit; + + @ApiModelProperty("规格型号") + private String specificationModel; + } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java index 9d9d2b6c8..ccb2fe5b9 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java @@ -187,4 +187,31 @@ public class MaterialBaseInfoDO extends BaseVOEntity { @ApiModelProperty("是否公用: 1-是 2-否") @Excel(name = "是否公用: 1-是 2-否") private Integer common; + + @ApiModelProperty("SKU码") + private String skuCode; + + @ApiModelProperty("单价") + private BigDecimal unitPrice; + + @ApiModelProperty("币制") + private String currency; + + @ApiModelProperty("原产国") + private String originCountry; + + @ApiModelProperty("HS码") + private String hsCode; + + @ApiModelProperty("申报单位") + private String declarationUnit; + + @ApiModelProperty("法定单位") + private String statutoryUnit; + + @ApiModelProperty("法定第二单位") + private String statutorySecondUnit; + + @ApiModelProperty("规格型号") + private String specificationModel; } diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java index 0f40a6c79..ede7dbf6c 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java @@ -190,4 +190,31 @@ public class MaterialBaseInfoDTO extends BaseVOEntity { @ApiModelProperty("是否公用: 1-是 2-否") @Excel(name = "是否公用: 1-是 2-否") private Integer common; + + @ApiModelProperty("SKU码") + private String skuCode; + + @ApiModelProperty("单价") + private BigDecimal unitPrice; + + @ApiModelProperty("币制") + private String currency; + + @ApiModelProperty("原产国") + private String originCountry; + + @ApiModelProperty("HS码") + private String hsCode; + + @ApiModelProperty("申报单位") + private String declarationUnit; + + @ApiModelProperty("法定单位") + private String statutoryUnit; + + @ApiModelProperty("法定第二单位") + private String statutorySecondUnit; + + @ApiModelProperty("规格型号") + private String specificationModel; } diff --git a/mhd_wms/src/main/resources/bootstrap.yml b/mhd_wms/src/main/resources/bootstrap.yml index 9a099ecf8..daa9ac6db 100644 --- a/mhd_wms/src/main/resources/bootstrap.yml +++ b/mhd_wms/src/main/resources/bootstrap.yml @@ -14,7 +14,9 @@ spring: nacos: discovery: # 服务注册地址 - #server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8848 + username: nacos + password: manhuoda@2023 # 演示环境 # server-addr: 47.92.229.169:8848 # 测试开发环境 @@ -24,10 +26,12 @@ spring: # 大运通泰生产环境 # server-addr: 39.107.137.158:8848 # 线上测试环境 - server-addr: 116.204.23.92:8848 +# server-addr: 116.204.23.92:8848 config: # 配置中心地址 - #server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8848 + username: nacos + password: manhuoda@2023 # 演示环境 # server-addr: 47.92.229.169:8848 # 测试开发环境 @@ -37,7 +41,7 @@ spring: # 大运通泰生产环境 # server-addr: 39.107.137.158:8848 # 线上测试环境 - server-addr: 116.204.23.92:8848 +# server-addr: 116.204.23.92:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml b/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml index 18c9ba30e..25280c311 100644 --- a/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml +++ b/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml @@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select material_base_info_id, organization_id, organization_name, top_organization_id, shipper_id, shipper_code, shipper_name, material_code, material_name, bar_code, material_classify_code, material_classify_name, material_type, material_type_name, pack_id, pack_code, pack_name, unit_code, unit_name, brand_id, brand_code, brand_name, shelf_life, weight_limit, volume_limit, material_shape, material_shape_name, material_size, material_length, material_width, material_height, remark, nullify, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag,common from material_base_info + select material_base_info_id, organization_id, organization_name, top_organization_id, shipper_id, shipper_code, shipper_name, material_code, material_name, bar_code, material_classify_code, material_classify_name, material_type, material_type_name, pack_id, pack_code, pack_name, unit_code, unit_name, brand_id, brand_code, brand_name, shelf_life, weight_limit, volume_limit, material_shape, material_shape_name, material_size, material_length, material_width, material_height, remark, nullify, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag,common,sku_code, unit_price, currency, origin_country, hs_code, declaration_unit, statutory_unit, statutory_second_unit,specification_Model from material_base_info