Merge remote-tracking branch 'origin/test' into test

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;
@@ -167,6 +168,16 @@ public class CommodityController {
         if(StringUtils.isBlank(commodityCodeEntity.getZxbm())||"000000000000000000".equals(commodityCodeEntity.getZxbm())){
             commodityCodeEntity.setZxbm(commodityCodeEntity.getId());
         }
+        if(StringUtils.isBlank(commodityCodeEntity.getGgxh())){
+            commodityCodeEntity.setGgxh("");
+        }
+        if(StringUtils.isBlank(commodityCodeEntity.getXmdw())){
+            commodityCodeEntity.setXmdw("");
+        }
+        if(StringUtils.isBlank(commodityCodeEntity.getXmdj())){
+            commodityCodeEntity.setXmdj("");
+        }
+
         /**
          * 添加校验
          */
@@ -517,7 +528,7 @@ public class CommodityController {
                 }
                 commodityCodeEntity.setSl(sl);
 
-                String ggxh = BaseServiceBeanTransitionUtils.ggxhTransition(commodityExcel.getGgxh());
+                String ggxh = BaseServiceBeanTransitionUtils.ggxhTransition(StringUtils.isBlank(commodityExcel.getGgxh())?"":commodityExcel.getGgxh());
                 commodityCodeEntity.setGgxh(ggxh);
                 commodityCodeEntity.setXmdw(StringUtils.isEmpty(commodityExcel.getDw()) ? "" : commodityExcel.getDw());
                 commodityCodeEntity.setXmdj(StringUtils.isEmpty(commodityExcel.getDj()) ? "" : commodityExcel.getDj());
@@ -718,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());
             }
 

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_0("0", "集团共享"),//放弃使用
-    DATA_SOURCE_11("1", "手工创建"),
+    DATA_SOURCE_1("1", "手工创建"),
-    DATA_SOURCE_12("2", "模板导入"),
+    DATA_SOURCE_2("2", "模板导入"),
-    DATA_SOURCE_13("3", "采集下级"),
+    DATA_SOURCE_3("3", "采集下级"),
-    DATA_SOURCE_14("4", "MDM推送"),
+    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", "电商接口同步"),
 
     ;
 

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);
@@ -614,20 +615,19 @@ public class CommodityServiceImpl implements CommodityService {
 
                 CommodityCodeCheckQuery commodityCodeCheckQuery = new CommodityCodeCheckQuery();
                 commodityCodeCheckQuery.setXmmc(xmmc);
-                commodityCodeCheckQuery.setZxbm(receiveSpxxReq.getZxbm());
+                String zxbm = StringUtils.isNotBlank(receiveSpxxReq.getZxbm()) ? receiveSpxxReq.getZxbm() : baseService.getGenerateShotKey();
+                commodityCodeCheckQuery.setZxbm(zxbm);
                 commodityCodeCheckQuery.setGgxh(receiveSpxxReq.getGgxh());
                 commodityCodeCheckQuery.setXmdw(receiveSpxxReq.getXmdw());
                 commodityCodeCheckQuery.setXmdj(receiveSpxxReq.getXmdj());
                 commodityCodeCheckQuery.setSl(receiveSpxxReq.getSl());
                 commodityCodeCheckQuery.setDeptId(receiveSpxxReq.getEntId());
                 Map<String,String> map = new HashMap<>();
-//                map.put("productName", xmmc);
+                map.put("zxbm",zxbm);
-                map.put("zxbm", receiveSpxxReq.getZxbm());
                 map.put("entId",receiveSpxxReq.getEntId());
 
                 log.debug("{}校验名称是否存在 参数:{}", LOGGER_MSG, map);
                 List<CommodityCodeEntity> 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 +640,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 +726,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 +741,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());
 

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());
         //数据状态

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());
         //更新时间

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;
     }
 

order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml

@@ -273,13 +273,13 @@
             <if test="commodityCode.sl != null and commodityCode.sl != ''">
                 tax_rate = #{commodityCode.sl,jdbcType=VARCHAR},
             </if>
-            <if test="commodityCode.ggxh != null and commodityCode.ggxh != ''">
+            <if test="commodityCode.ggxh != null">
                 specification_model = #{commodityCode.ggxh,jdbcType=VARCHAR},
             </if>
-            <if test="commodityCode.xmdw != null and commodityCode.xmdw != ''">
+            <if test="commodityCode.xmdw != null">
                 metering_unit = #{commodityCode.xmdw,jdbcType=VARCHAR},
             </if>
-            <if test="commodityCode.xmdj != null and commodityCode.xmdj != ''">
+            <if test="commodityCode.xmdj != null">
                 unit_price = #{commodityCode.xmdj,jdbcType=VARCHAR},
             </if>
             <if test="commodityCode.hsbz != null and commodityCode.hsbz != ''">
@@ -306,7 +306,7 @@
             <if test="commodityCode.userId != null and commodityCode.userId != ''">
                 user_id = #{commodityCode.userId,jdbcType=VARCHAR},
             </if>
-            <if test="commodityCode.createTime != null and commodityCode.createTime != ''">
+            <if test="commodityCode.createTime != null">
                 create_time = #{commodityCode.createTime,jdbcType=TIMESTAMP},
             </if>
             <if test="dataType == 0">
@@ -363,7 +363,7 @@
             <if test="commodityCode.tswl != null and commodityCode.tswl != ''">
                 tswl = #{commodityCode.tswl,jdbcType=VARCHAR},
             </if>
-            <if test="commodityCode.invoiceName != null and commodityCode.invoiceName != ''">
+            <if test="commodityCode.invoiceName != null">
                 invoice_name = #{commodityCode.invoiceName,jdbcType=VARCHAR},
             </if>
 
@@ -459,10 +459,10 @@
             <if test="commodityCode.xmdw != null and commodityCode.xmdw != ''">
                 metering_unit = #{commodityCode.xmdw,jdbcType=VARCHAR},
             </if>
-            <if test="commodityCode.createTime != null and commodityCode.createTime != ''">
+            <if test="commodityCode.createTime != null">
                 create_time = #{commodityCode.createTime,jdbcType=TIMESTAMP},
             </if>
-            <if test="commodityCode.modifyTime != null and commodityCode.modifyTime != ''">
+            <if test="commodityCode.modifyTime != null">
                 modify_time = #{commodityCode.modifyTime,jdbcType=TIMESTAMP},
             </if>
             <if test="commodityCode.modifyUserId != null and commodityCode.modifyUserId != ''">

order-management-common/src/main/java/com/dxhy/order/constant/ConfigureConstant.java

@@ -29,6 +29,7 @@ public class ConfigureConstant {
     public static final String STRING_1_ = "-1";
 
     public static final String STRING_0 = "0";
+    public static final String STRING_X = "X";
 
     public static final String STRING_000 = "0.00";
 

order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java

@@ -403,6 +403,7 @@ public enum OrderInfoEnum {
      * 系统来源(SAP:SAP)
      */
     SYS_SOURCE_SAP("SAP","SAP"),
+    SYS_SOURCE_DSXT("DSXT","DSXT"),
 
     /**
      * 订单类型（0:原始订单,1:拆分后订单,2:合并后订单,3:系统冲红订单,4:自动开票订单,5:作废重开订单;6:历史数据订单;7:发票修复数据）

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", "克隆公司库"),
     /**
      * 匹配状态
      */

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());
 

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;
 }

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/CompanyCommodityCodeServiceImpl.java

@@ -1,18 +1,21 @@
 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;
 import com.dxhy.order.consumer.modules.commodity.domain.dto.CloneCompanyCommodityDTO;
 import com.dxhy.order.consumer.modules.commodity.domain.dto.CloneCompanyCommodityDetailDTO;
 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;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
+import javax.annotation.Resource;
+
 /**
  * @Description
  * @Author 巩权林
@@ -23,6 +26,8 @@ public class CompanyCommodityCodeServiceImpl implements ICompanyCommodityCodeSer
 
     @Autowired
     private GroupCommodityCodeMapper groupCommodityMapper;
+    @Resource
+    private UserInfoService userInfoService;
 
     /**
      * 克隆物料
@@ -38,6 +43,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(CommodityCodeEnum.DATA_SOURCE_10.getKey());
+
         // 删除to公司下的所有物料
         groupCommodityMapper.deleteCommodityCodeByXhfNsrsbh(to);
 

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;
@@ -143,7 +144,7 @@ public class GroupCommodityCodeServiceImpl implements IGroupCommodityCodeService
             }
             if(queryCommodityEntity != null){
                 //如果优先级更高则不进行更新
-                if(Arrays.asList("1,2,6,7,8,10").contains(queryCommodityEntity.getDataSource())){
+                if(Arrays.asList("1,2,6,7,8,10".split(",")).contains(queryCommodityEntity.getDataSource())){
                     return R.error("第" + (i + 1) + "条数据，已存在");
                 }
                 newCommodityCodeEntity.setId(queryCommodityEntity.getId());
@@ -158,7 +159,8 @@ public class GroupCommodityCodeServiceImpl implements IGroupCommodityCodeService
             }else{
                 newCommodityCodeEntity.setId(baseService.getGenerateShotKey());
                 newCommodityCodeEntity.setXhfNsrsbh(quoteGroupCommodityDTO.getXhfNsrsbh());
-                newCommodityCodeEntity.setDataState(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);
                 newCommodityCodeEntity.setYhzcbs(ConfigureConstant.STRING_0);

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java

@@ -1344,6 +1344,8 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
                 fpkjtsReqSap.setZGSDM(orderProcessInfo.getGsdm());
                 fpkjtsReqSap.setZYWDJ(orderProcessInfo.getBzdh());
                 fpkjtsReqSap.setIMGID(orderInvoiceInfo.getDocuId());
+                fpkjtsReqSap.setPDFZJL(ddfpxx.getPDFZJL());
+                fpkjtsReqSap.setZJLLX(ddfpxx.getZJLLX());
                 //明细信息
                 ddmxxx.stream().forEach(f -> {
                     FpkjtsMxSap detail = new FpkjtsMxSap();

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java

@@ -10,6 +10,7 @@ import com.dxhy.order.constant.*;
 import com.dxhy.order.consumer.modules.order.model.dto.RewriteBzdhDTO;
 import com.dxhy.order.consumer.modules.order.model.vo.OrderInfoTotalAmountVO;
 import com.dxhy.order.consumer.modules.order.model.vo.OrderInfoVo;
+import com.dxhy.order.consumer.modules.order.model.vo.OrderInfoTotalAmountVO;
 import com.dxhy.order.consumer.modules.order.service.OrderBzdhService;
 import com.dxhy.order.exception.OrderReceiveException;
 import com.dxhy.order.model.*;

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java

@@ -16,6 +16,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;
@@ -1987,7 +1988,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);

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoice/sap/FpkjReqSap.java

@@ -1,6 +1,5 @@
 package com.dxhy.order.consumer.openapi.protocol.po.generateinvoice.sap;
 
-import com.dxhy.order.consumer.openapi.protocol.po.PoCommonRequestParam;
 import lombok.Data;
 
 import java.util.List;
@@ -88,6 +87,20 @@ public class FpkjReqSap {
      * 行项目结构
      */
     private List<FpkjMxSap> ITITEM;
-
+    //是否为电商系统数据
-
+    private String ZDSXT;
+    //是否独立开票抬头
+    private String ZDLKPTT;
+    //金税开票抬头名称
+    private String ZKPTTMC;
+    //金税开票纳税人识别号
+    private String ZKPSBH;
+    //金税开票地址
+    private String ZKPDZ;
+    //金税开票电话
+    private String ZKPDH;
+    //金税开票开户行
+    private String ZKPKHH;
+    //金税开票银行账号
+    private String ZKPZH;
 }

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoicepush/sap/FpkjtsReqSap.java

@@ -1,7 +1,6 @@
 package com.dxhy.order.consumer.openapi.protocol.po.generateinvoicepush.sap;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -273,4 +272,14 @@ public class FpkjtsReqSap {
      */
     @JSONField(name = "IT_ITEM")
     private List<FpkjtsMxSap> ITITEM;
+
+    /**
+     * pdf流
+     */
+    private String PDFZJL;
+
+    /**
+     * 字节流类型针对pdfzjl进行处理,OFD和PDF
+     */
+    private String ZJLLX;
 }

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;
@@ -5485,7 +5486,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());
         //数据状态

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;
@@ -51,12 +52,14 @@ import com.dxhy.order.model.sk.hp.*;
 import com.dxhy.order.model.sk.kp.*;
 import com.dxhy.order.model.sk.query.ResponseCommonInvoice;
 import com.dxhy.order.model.sk.sld.SearchSld;
-import com.dxhy.order.utils.*;
+import com.dxhy.order.utils.CommonUtils;
+import com.dxhy.order.utils.DecimalCalculateUtil;
+import com.dxhy.order.utils.JsonUtils;
+import com.dxhy.order.utils.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 
-import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.util.*;
@@ -3320,7 +3323,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;
     }
 
@@ -3508,6 +3511,20 @@ public class BeanTransitionUtils {
             ddtxxBO.setDDH(req.getZJSDH());
             ddtxxBO.setBZDH(req.getZBZDH());
             ddtxxBO.setXTLY(isinput.getSYSID());
+            //如果为X,表示数据来自电商系统，开票完成后需要推送给电商系统开票数据及板式文件。
+//            if(StringUtils.isNotBlank(req.getZDSXT()) && ConfigureConstant.STRING_X.equals(req.getZDSXT())){
+//                ddtxxBO.setXTLY(OrderInfoEnum.SYS_SOURCE_DSXT.getKey());
+//            }
+            //如果此字段为X，表示开票抬头数据不取购方ZGFBH关联的信息，而是取21-26列数据。
+            if(StringUtils.isNotBlank(req.getZDLKPTT()) && ConfigureConstant.STRING_X.equals(req.getZDLKPTT())){
+                ddtxxBO.setGMFMC(req.getZKPTTMC());
+                ddtxxBO.setGMFSBH(req.getZKPSBH());
+                ddtxxBO.setGMFDH(req.getZKPDH());
+                ddtxxBO.setGMFDZ(req.getZKPDZ());
+                ddtxxBO.setGMFYH(req.getZKPKHH());
+                ddtxxBO.setGMFZH(req.getZKPZH());
+                ddtxxBO.setGMFBM("");
+            }
             ddtxxBO.setGSDM(req.getBUKRS());
             ddtxxBO.setENTID(deptEntity.getDeptId());
             ddtxxBO.setBHZT(ConfigureConstant.STRING_0);

order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml

@@ -569,13 +569,13 @@
            tax_classification_name,
            preferential_policies_type,
            zzstsgl,
-           'clone',
+           #{from.userId,jdbcType=VARCHAR},
            now(),
            null,
            '',
            group_id,
            #{to.xhfMc,jdbcType=VARCHAR},
-           '10',
+           #{from.dataSource,jdbcType=VARCHAR},
            matching_state,
            data_state,
            tax_class_abbreviation,