diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java index 82f3b477..afbd66d4 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java @@ -11,6 +11,7 @@ import com.dxhy.order.baseservice.annotation.SysLog; import com.dxhy.order.baseservice.module.base.service.BaseService; import com.dxhy.order.baseservice.module.commodity.constant.CommodityEnum; import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity; +import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEnum; import com.dxhy.order.baseservice.module.commodity.model.CommodityExcel; import com.dxhy.order.baseservice.module.commodity.model.dto.QueryModifyLogDTO; import com.dxhy.order.baseservice.module.commodity.service.CommodityCodeModifyLogService; @@ -176,9 +177,6 @@ public class CommodityController { if(StringUtils.isBlank(commodityCodeEntity.getXmdj())){ commodityCodeEntity.setXmdj(""); } - if(StringUtils.isBlank(commodityCodeEntity.getInvoiceName())){ - commodityCodeEntity.setInvoiceName(""); - } /** * 添加校验 @@ -731,7 +729,7 @@ public class CommodityController { //0-集团共享；1-手工创建；2-模板导入；3-采集下级；4；MDM推送 commodityExcel.setDataSource(""); if(StringUtils.isNotBlank(commodityCodeEntity.getDataSource())){ - TaxClassCodeEnum codeValue = TaxClassCodeEnum.getCodeValue(commodityCodeEntity.getDataSource()); + CommodityCodeEnum codeValue = CommodityCodeEnum.getCodeValue(commodityCodeEntity.getDataSource()); commodityExcel.setDataSource(codeValue.getValue()); } diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityCodeEnum.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityCodeEnum.java index 69f90de3..c54f13ed 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityCodeEnum.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityCodeEnum.java @@ -3,14 +3,20 @@ package com.dxhy.order.baseservice.module.commodity.model; /** * 不在使用，使用TaxClassCodeEnum里的枚举 */ -@SuppressWarnings("") public enum CommodityCodeEnum { //0-集团共享；1-手工创建；2-模板导入；3-采集下级；4；MDM推送 - DATA_SOURCE_10("0", "集团共享"), - DATA_SOURCE_11("1", "手工创建"), - DATA_SOURCE_12("2", "模板导入"), - DATA_SOURCE_13("3", "采集下级"), - DATA_SOURCE_14("4", "MDM推送"), + DATA_SOURCE_0("0", "集团共享"),//放弃使用 + DATA_SOURCE_1("1", "手工创建"), + DATA_SOURCE_2("2", "模板导入"), + DATA_SOURCE_3("3", "采集下级"), + DATA_SOURCE_4("4", "自动归集"),//物料监听器机动车自动归集，入库OrderSaveSpxxHandler已被注释掉 + DATA_SOURCE_5("5", "接口同步"), + DATA_SOURCE_6("6", "手工填开"), + DATA_SOURCE_7("7", "历史数据"), + DATA_SOURCE_8("8", "订单同步公司库"), + DATA_SOURCE_9("9", "引用集团库"), + DATA_SOURCE_10("10", "克隆公司库"), + DATA_SOURCE_11("11", "电商接口同步"), ; diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java index d89bbec8..ee318f71 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java @@ -1,6 +1,7 @@ package com.dxhy.order.baseservice.module.commodity.service.impl; import cn.hutool.core.util.ObjectUtil; +import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEnum; import com.dxhy.order.baseservice.module.commodity.service.CommodityCodeModifyLogService; import com.dxhy.order.baseservice.module.thirdservice.user.service.UserInfoService; import com.dxhy.order.constant.*; @@ -139,7 +140,7 @@ public class CommodityServiceImpl implements CommodityService { } } else { - codeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_1.getKey()); + codeEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_1.getKey()); codeEntity.setCreateTime(new Date()); codeEntity.setUserId(userId.toString()); codeEntity.setMatchingState(TaxClassCodeEnum.MATCHING_STATE_1.getKey()); @@ -352,7 +353,7 @@ public class CommodityServiceImpl implements CommodityService { String tempMerchandiseName = StringUtil.replaceStr(commodityCodeEntity.getXmmc()); commodityCodeEntity.setXmmc(tempMerchandiseName); - commodityCodeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_2.getKey()); + commodityCodeEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_2.getKey()); commodityCodeEntity.setMatchingState(TaxClassCodeEnum.MATCHING_STATE_1.getKey()); commodityCodeEntity.setDataState(TaxClassCodeEnum.DATA_STATE_1.getKey()); if (StringUtils.isNotEmpty(commodityCodeEntity.getSsflMc()) @@ -415,7 +416,7 @@ public class CommodityServiceImpl implements CommodityService { entity.setSpbm(taxClassCodeParam.getSsbm()); entity.setXhfNsrsbh(nsrsbh); entity.setSpjc(taxClassCodeParam.getSsjc()); - entity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_0.getKey());//接口已放弃不在使用 + entity.setDataSource(CommodityCodeEnum.DATA_SOURCE_0.getKey());//接口已放弃不在使用 entity.setMatchingState(TaxClassCodeEnum.MATCHING_STATE_0.getKey()); entity.setDataState(TaxClassCodeEnum.DATA_STATE_0.getKey()); entity.setUserId(userId); @@ -621,13 +622,11 @@ public class CommodityServiceImpl implements CommodityService { commodityCodeCheckQuery.setSl(receiveSpxxReq.getSl()); commodityCodeCheckQuery.setDeptId(receiveSpxxReq.getEntId()); Map map = new HashMap<>(); -// map.put("productName", xmmc); map.put("zxbm", receiveSpxxReq.getZxbm()); map.put("entId",receiveSpxxReq.getEntId()); log.debug("{}校验名称是否存在 参数:{}", LOGGER_MSG, map); List commodityCodeEntityList = commodityMapper.queryProductList(map, null); - //R r = commodityService.checkRepeat(commodityCodeCheckQuery, NsrsbhUtils.transShListByNsrsbh(receiveSpxxReq.getXhfNsrsbh()), false); TaxClassCodeEntity taxClassCodeEntity = taxClassCodeService.queryTaxClassCodeFromCache(receiveSpxxReq.getSpbm()); CommodityCodeEntity commodityCodeEntity = null; if (ObjectUtil.isNotEmpty(taxClassCodeEntity)) { @@ -640,12 +639,17 @@ public class CommodityServiceImpl implements CommodityService { * */ if (commodityCodeEntity != null){ + commodityCodeEntity.setUserId(userInfoService.getUser() != null && userInfoService.getUser().getUserId() != null ? userInfoService.getUser().getUserId().toString():""); + commodityCodeEntity.setCreateTime(new Date()); commodityMapper.insertCommodity(commodityCodeEntity); log.debug("添加成功"); } }else{ // 简称、商品编码、规格型号、单位、优惠政策标识、零税率标识 + //todo 优先级 + commodityCodeEntity.setModifyTime(new Date()); + commodityCodeEntity.setModifyUserId(userInfoService.getUser() != null && userInfoService.getUser().getUserId() != null ? userInfoService.getUser().getUserId().toString():""); if (commodityCodeEntity != null){ commodityMapper.updateCommodityByZxbm(commodityCodeEntity, map); } @@ -721,10 +725,6 @@ public class CommodityServiceImpl implements CommodityService { commodityCodeEntity.setSsflMc(taxClassCodeEntity.getSpmc()); commodityCodeEntity.setLslbs(receiveSpxxReq.getLslbs()); commodityCodeEntity.setZzstsgl(receiveSpxxReq.getZzstsgl()); - commodityCodeEntity.setUserId(""); - commodityCodeEntity.setCreateTime(new Date()); - commodityCodeEntity.setModifyTime(new Date()); - commodityCodeEntity.setModifyUserId(""); commodityCodeEntity.setGroupId(""); commodityCodeEntity.setGroupName(""); commodityCodeEntity.setGroupCode(""); @@ -740,7 +740,7 @@ public class CommodityServiceImpl implements CommodityService { // commodityCodeEntity.setStatus("1"); commodityCodeEntity.setInvoiceName(CommonUtils.subSpmc(receiveSpxxReq.getXmmc())); - commodityCodeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_6.getKey()); + commodityCodeEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_11.getKey()); commodityCodeEntity.setMatchingState(TaxClassCodeEnum.MATCHING_STATE_0.getKey()); commodityCodeEntity.setDataState(TaxClassCodeEnum.DATA_STATE_0.getKey()); diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/impl/GroupTaxClassCodeServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/impl/GroupTaxClassCodeServiceImpl.java index 2cfd1d69..4aba31aa 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/impl/GroupTaxClassCodeServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/service/impl/GroupTaxClassCodeServiceImpl.java @@ -1,6 +1,7 @@ package com.dxhy.order.baseservice.module.taxclass.service.impl; import cn.hutool.core.util.ObjectUtil; +import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEnum; import com.dxhy.order.constant.ConfigureConstant; import com.dxhy.order.constant.OrderManagementConstant; import com.dxhy.order.constant.ResponseStatusCodes; @@ -196,7 +197,7 @@ public class GroupTaxClassCodeServiceImpl implements GroupTaxClassCodeService { } } //数据来源为手工创建 - groupTaxClassCodeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_1.getKey()); + groupTaxClassCodeEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_1.getKey()); //共享状态为待核实 groupTaxClassCodeEntity.setShareState(TaxClassCodeEnum.SHARE_STATE_1.getKey()); //数据状态为停用 @@ -511,7 +512,7 @@ public class GroupTaxClassCodeServiceImpl implements GroupTaxClassCodeService { String tempMerchandiseName = StringUtil.replaceStr(groupTaxClassCodeEntity.getMerchandiseName()); groupTaxClassCodeEntity.setMerchandiseName(tempMerchandiseName); groupTaxClassCodeEntity.setShareState(TaxClassCodeEnum.SHARE_STATE_1.getKey()); - groupTaxClassCodeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_2.getKey()); + groupTaxClassCodeEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_2.getKey()); //默认停用 groupTaxClassCodeEntity.setDataState(TaxClassCodeEnum.DATA_STATE_1.getKey()); if (StringUtils.isNotEmpty(groupTaxClassCodeEntity.getTaxClassificationName()) && StringUtils.isNotEmpty(groupTaxClassCodeEntity.getTaxClassCode())) { @@ -573,7 +574,7 @@ public class GroupTaxClassCodeServiceImpl implements GroupTaxClassCodeService { //单价 entity.setUnitPrice(commodityCodeEntity.getXmdj()); //数据来源 - entity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_3.getKey()); + entity.setDataSource(CommodityCodeEnum.DATA_SOURCE_3.getKey()); //匹配状态 entity.setMatchingState(TaxClassCodeEnum.MATCHING_STATE_0.getKey()); //数据状态 diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/vehicles/service/impl/VehiclesServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/vehicles/service/impl/VehiclesServiceImpl.java index 4d44632d..44f1bf8a 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/vehicles/service/impl/VehiclesServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/vehicles/service/impl/VehiclesServiceImpl.java @@ -1,5 +1,6 @@ package com.dxhy.order.baseservice.module.vehicles.service.impl; +import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEnum; import com.dxhy.order.constant.*; import com.dxhy.order.model.PageUtils; import com.dxhy.order.model.R; @@ -90,7 +91,7 @@ public class VehiclesServiceImpl implements VehiclesService { } if (StringUtils.isBlank(vehiclesCodeEntity.getDataSource())) { //设置数据来源 - vehiclesCodeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_1.getKey()); + vehiclesCodeEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_1.getKey()); } VehiclesCodeEntity duplicateVehiclesCodeEntity = isDuplicate(vehiclesCodeEntity); if (Objects.isNull(duplicateVehiclesCodeEntity)) { @@ -219,7 +220,7 @@ public class VehiclesServiceImpl implements VehiclesService { vehiclesCodeEntity.setPreferentialPoliciesType(""); } //数据来源(0-集团共享；1-手工创建；2-模板导入；3-采集下级；) - vehiclesCodeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_2.getKey()); + vehiclesCodeEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_2.getKey()); //数据创建时间 vehiclesCodeEntity.setCreateTime(new Date()); //更新时间 diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/utils/BaseServiceBeanTransitionUtils.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/utils/BaseServiceBeanTransitionUtils.java index e1efc2d0..2b71e4c9 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/utils/BaseServiceBeanTransitionUtils.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/utils/BaseServiceBeanTransitionUtils.java @@ -1,6 +1,7 @@ package com.dxhy.order.baseservice.utils; import cn.hutool.core.date.DateUtil; +import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEnum; import com.dxhy.order.constant.ConfigureConstant; import com.dxhy.order.constant.OrderInfoEnum; import com.dxhy.order.constant.TaxClassCodeEnum; @@ -99,7 +100,7 @@ public class BaseServiceBeanTransitionUtils { commodityCodeEntity.setCzlx(spxxtbReq.getCZLX()); commodityCodeEntity.setYcbz(ConfigureConstant.STRING_0); - commodityCodeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_5.getKey()); + commodityCodeEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_5.getKey()); return commodityCodeEntity; } diff --git a/order-management-common/src/main/java/com/dxhy/order/constant/TaxClassCodeEnum.java b/order-management-common/src/main/java/com/dxhy/order/constant/TaxClassCodeEnum.java index e297673b..337d1ff7 100644 --- a/order-management-common/src/main/java/com/dxhy/order/constant/TaxClassCodeEnum.java +++ b/order-management-common/src/main/java/com/dxhy/order/constant/TaxClassCodeEnum.java @@ -25,11 +25,6 @@ public enum TaxClassCodeEnum { DATA_SOURCE_3("3", "采集下级"), DATA_SOURCE_4("4", "自动归集"),//物料更新没使用 DATA_SOURCE_5("5", "接口同步"), - DATA_SOURCE_6("6", "手工填开"), - DATA_SOURCE_7("7", "历史数据"), - DATA_SOURCE_8("8", "订单同步公司库"), - DATA_SOURCE_9("9", "引用集团库"), - DATA_SOURCE_10("10", "克隆公司库"), /** * 匹配状态 */ diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/OrderSaveSpxxHandler.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/OrderSaveSpxxHandler.java index a84e0c66..dd26ee19 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/OrderSaveSpxxHandler.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/OrderSaveSpxxHandler.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; import com.dxhy.base.rabbitmq.rabbitplugin.listener.BaseListener; +import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEnum; import com.dxhy.order.baseservice.module.commodity.service.CommodityService; import com.dxhy.order.baseservice.module.taxclass.model.TaxClassCodeEntity; import com.dxhy.order.baseservice.module.taxclass.service.TaxClassCodeService; @@ -195,7 +196,7 @@ public class OrderSaveSpxxHandler implements BaseListener { vehiclesCodeEntity.setProducingEnterpriseName(scqymc); vehiclesCodeEntity.setEnjoyPreferentialPolicies(orderItemInfo.getYhzcbs()); vehiclesCodeEntity.setPreferentialPoliciesType(orderItemInfo.getLslbs()); - vehiclesCodeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_4.getKey()); + vehiclesCodeEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_4.getKey()); vehiclesCodeEntity.setCreateTime(new Date()); vehiclesCodeEntity.setModifyTime(new Date()); 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 ecdbd29c..c20040f7 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,6 @@ package com.dxhy.order.consumer.modules.commodity.service.impl; -import com.dxhy.order.baseservice.module.commodity.dao.GroupCommodityMapper; +import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEnum; import com.dxhy.order.baseservice.module.thirdservice.user.service.UserInfoService; import com.dxhy.order.constant.TaxClassCodeEnum; import com.dxhy.order.consumer.dao.GroupCommodityCodeMapper; @@ -9,7 +9,6 @@ import com.dxhy.order.consumer.modules.commodity.domain.dto.CloneCompanyCommodit import com.dxhy.order.consumer.modules.commodity.service.ICompanyCommodityCodeService; import com.dxhy.order.consumer.utils.ValidateUtils; import com.dxhy.order.model.R; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -45,7 +44,7 @@ public class CompanyCommodityCodeServiceImpl implements ICompanyCommodityCodeSer ValidateUtils.validate(from); from.setUserId(userInfoService.getUser() != null&&userInfoService.getUser().getUserId()!= null?userInfoService.getUser().getUserId().toString():"clone"); - from.setDataSource(TaxClassCodeEnum.DATA_SOURCE_10.getKey()); + from.setDataSource(CommodityCodeEnum.DATA_SOURCE_10.getKey()); // 删除to公司下的所有物料 groupCommodityMapper.deleteCommodityCodeByXhfNsrsbh(to); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java index 951c7ee1..a0c35e6d 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java @@ -2,6 +2,7 @@ package com.dxhy.order.consumer.modules.commodity.service.impl; import com.dxhy.order.baseservice.module.base.service.BaseService; import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity; +import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEnum; import com.dxhy.order.baseservice.module.taxclass.dao.TaxClassCodeMapper; import com.dxhy.order.baseservice.module.taxclass.model.TaxClassCodeEntity; import com.dxhy.order.baseservice.module.thirdservice.user.service.UserInfoService; @@ -158,7 +159,7 @@ public class GroupCommodityCodeServiceImpl implements IGroupCommodityCodeService }else{ newCommodityCodeEntity.setId(baseService.getGenerateShotKey()); newCommodityCodeEntity.setXhfNsrsbh(quoteGroupCommodityDTO.getXhfNsrsbh()); - newCommodityCodeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_9.getKey()); + newCommodityCodeEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_9.getKey()); newCommodityCodeEntity.setDataState(ConfigureConstant.STRING_0); newCommodityCodeEntity.setXhfMc(quoteGroupCommodityDTO.getXhfMc()); newCommodityCodeEntity.setHsbz(ConfigureConstant.STRING_1); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index d0e675be..ad0437b7 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java @@ -15,6 +15,7 @@ import com.dxhy.order.baseservice.module.buyer.model.BuyerEntity; import com.dxhy.order.baseservice.module.buyer.service.BuyerService; import com.dxhy.order.baseservice.module.commodity.dao.CommodityMapper; import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity; +import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEnum; import com.dxhy.order.baseservice.module.groupmanagement.dao.GroupManagementMapper; import com.dxhy.order.baseservice.module.taxclass.dao.TaxClassCodeMapper; import com.dxhy.order.baseservice.module.taxclass.model.TaxClassCodeEntity; @@ -1975,7 +1976,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { comm.setZzstsgl(itemInfo.getZzstsgl()); //如果税编和简称对不上返回报错 comm.setXhfMc(orderInfoVo.getXhfMc()); - comm.setDataSource(TaxClassCodeEnum.DATA_SOURCE_8.getKey()); + comm.setDataSource(CommodityCodeEnum.DATA_SOURCE_8.getKey()); comm.setMatchingState(TaxClassCodeEnum.MATCHING_STATE_0.getKey()); comm.setDataState(TaxClassCodeEnum.DATA_STATE_0.getKey()); comm.setSpjc(spjc); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV3.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV3.java index 946242b3..b500b368 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV3.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV3.java @@ -21,6 +21,7 @@ import com.dxhy.order.baseservice.module.buyer.protocol.*; import com.dxhy.order.baseservice.module.buyer.service.BuyerService; import com.dxhy.order.baseservice.module.buyer.service.VerifyBuyerManageInfoService; import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity; +import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEnum; import com.dxhy.order.baseservice.module.commodity.model.protocol.SpxxcxReqBO; import com.dxhy.order.baseservice.module.commodity.service.CommodityService; import com.dxhy.order.baseservice.module.commodity.service.VerifyCommodityCodeService; @@ -5484,7 +5485,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 { //单价 myEntity.setUnitPrice(null); //数据来源 - myEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_5.getKey()); + myEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_5.getKey()); //匹配状态 myEntity.setMatchingState(TaxClassCodeEnum.MATCHING_STATE_0.getKey()); //数据状态 diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index 095b9724..1e460713 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -9,6 +9,7 @@ import com.dxhy.order.baseservice.module.buyer.model.BuyerEntity; import com.dxhy.order.baseservice.module.buyer.protocol.GmfxxCommonBO; import com.dxhy.order.baseservice.module.buyer.protocol.GmfxxtbReqBO; import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity; +import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEnum; import com.dxhy.order.baseservice.module.thirdservice.user.model.DeptEntity; import com.dxhy.order.baseservice.openapi.model.SksbxxtbReqBO; import com.dxhy.order.baseservice.openapi.protocol.qd.PageXfxx; @@ -3318,7 +3319,7 @@ public class BeanTransitionUtils { commodityCodeEntity.setCzlx(spxxtbReq.getCZLX()); commodityCodeEntity.setYcbz(ConfigureConstant.STRING_0); - commodityCodeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_5.getKey()); + commodityCodeEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_5.getKey()); return commodityCodeEntity; } 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 85a2eeed..8bab52fe 100644 --- a/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml +++ b/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml @@ -571,8 +571,8 @@ zzstsgl, #{from.userId,jdbcType=VARCHAR}, now(), - modify_time, - modify_user_id, + null, + '', group_id, #{to.xhfMc,jdbcType=VARCHAR}, #{from.dataSource,jdbcType=VARCHAR},