diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/domain/dto/CloneCompanyCommodityDetailDTO.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/domain/dto/CloneCompanyCommodityDetailDTO.java index 30192ef1..74a7d0c9 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/domain/dto/CloneCompanyCommodityDetailDTO.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/domain/dto/CloneCompanyCommodityDetailDTO.java @@ -17,4 +17,7 @@ public class CloneCompanyCommodityDetailDTO { private String entId; // 数据权限id @NotBlank(message = "销方名称") private String xhfMc; + + private String userId; + private String dataSource; } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/CompanyCommodityCodeServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/CompanyCommodityCodeServiceImpl.java index 1a1affd0..ecdbd29c 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/CompanyCommodityCodeServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/CompanyCommodityCodeServiceImpl.java @@ -1,6 +1,8 @@ package com.dxhy.order.consumer.modules.commodity.service.impl; import com.dxhy.order.baseservice.module.commodity.dao.GroupCommodityMapper; +import com.dxhy.order.baseservice.module.thirdservice.user.service.UserInfoService; +import com.dxhy.order.constant.TaxClassCodeEnum; import com.dxhy.order.consumer.dao.GroupCommodityCodeMapper; import com.dxhy.order.consumer.modules.commodity.domain.dto.CloneCompanyCommodityDTO; import com.dxhy.order.consumer.modules.commodity.domain.dto.CloneCompanyCommodityDetailDTO; @@ -13,6 +15,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; +import javax.annotation.Resource; + /** * @Description * @Author 巩权林 @@ -23,6 +27,8 @@ public class CompanyCommodityCodeServiceImpl implements ICompanyCommodityCodeSer @Autowired private GroupCommodityCodeMapper groupCommodityMapper; + @Resource + private UserInfoService userInfoService; /** * 克隆物料 @@ -38,6 +44,9 @@ public class CompanyCommodityCodeServiceImpl implements ICompanyCommodityCodeSer ValidateUtils.validate(to); ValidateUtils.validate(from); + from.setUserId(userInfoService.getUser() != null&&userInfoService.getUser().getUserId()!= null?userInfoService.getUser().getUserId().toString():"clone"); + from.setDataSource(TaxClassCodeEnum.DATA_SOURCE_10.getKey()); + // 删除to公司下的所有物料 groupCommodityMapper.deleteCommodityCodeByXhfNsrsbh(to); diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml index eff72748..85a2eeed 100644 --- a/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml +++ b/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml @@ -569,13 +569,13 @@ tax_classification_name, preferential_policies_type, zzstsgl, - user_id, - create_time, + #{from.userId,jdbcType=VARCHAR}, + now(), modify_time, modify_user_id, group_id, #{to.xhfMc,jdbcType=VARCHAR}, - data_source, + #{from.dataSource,jdbcType=VARCHAR}, matching_state, data_state, tax_class_abbreviation,