Merge branch 'release' of http://10.1.1.216/xm/sdenergy/sims/sims-order-sdenergy into release

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/constant/CommodityExportEnum.java

@@ -39,6 +39,8 @@ public enum CommodityExportEnum {
     COMMODITY_ITEM_TAX_INCLUSIVE_TAG("11", "hsbz","含税价标志*"),
 
     COMMODITY_ITEM_TAX_RATE("12", "sl","税率"),
+    COMMODITY_ITEM_TAX_DATA_SOURCE("13", "dataSource","数据来源"),
+    COMMODITY_ITEM_TAX_TSWL("14", "tswl","是否特殊物料"),
     ;
     /**
      * key

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java

@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.dxhy.base.file.common.ExcelReadContext;
 import com.dxhy.base.file.exception.ExcelReadException;
 import com.dxhy.base.file.handle.ExcelReadHandle;
@@ -12,9 +11,9 @@ 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.model.dto.QueryModifyLogResultDTO;
 import com.dxhy.order.baseservice.module.commodity.service.CommodityCodeModifyLogService;
 import com.dxhy.order.baseservice.module.commodity.service.CommodityService;
 import com.dxhy.order.baseservice.module.commodity.service.VerifyCommodityCodeService;
@@ -676,7 +675,7 @@ public class CommodityController {
             commodityExcel.setSpbm(commodityCodeEntity.getSpbm());
             commodityExcel.setSpjc(nullToEmptyString(commodityCodeEntity.getSpjc()));
 
-            if (OrderInfoEnum.YHZCBS_1.getKey().equals(commodityCodeEntity.getYhzcbs(   ))) {
+            if (OrderInfoEnum.YHZCBS_1.getKey().equals(commodityCodeEntity.getYhzcbs())) {
                 commodityExcel.setYhzcbs(ConfigureConstant.STRING_YHZCBS_S);
             } else if (OrderInfoEnum.YHZCBS_0.getKey().equals(commodityCodeEntity.getYhzcbs())) {
                 commodityExcel.setYhzcbs(ConfigureConstant.STRING_YHZCBS_F);
@@ -689,6 +688,16 @@ public class CommodityController {
             } else if (OrderInfoEnum.HSBZ_0.getKey().equals(commodityCodeEntity.getHsbz())) {
                 commodityExcel.setHsbz(ConfigureConstant.STRING_YHZCBS_F);
             }
+            commodityExcel.setTswl("否");
+            if(ConfigureConstant.STRING_1.equals(commodityCodeEntity.getTswl())){
+                commodityExcel.setTswl("是");
+            }
+           //0-集团共享；1-手工创建；2-模板导入；3-采集下级；4；MDM推送
+            commodityExcel.setDataSource("");
+            if(StringUtils.isNotBlank(commodityCodeEntity.getDataSource())){
+                CommodityCodeEnum codeValue = CommodityCodeEnum.getCodeValue(commodityCodeEntity.getDataSource());
+                commodityExcel.setDataSource(codeValue.getValue());
+            }
 
             commodityExcel.setSl(commodityCodeEntity.getSl());
             commodityExcelList.add(commodityExcel);

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityCodeEnum.java

@@ -0,0 +1,45 @@
+package com.dxhy.order.baseservice.module.commodity.model;
+
+public enum CommodityCodeEnum {
+    //0-集团共享；1-手工创建；2-模板导入；3-采集下级；4；MDM推送
+    DATA_SOURCE_0("0", "集团共享"),
+    DATA_SOURCE_1("1", "手工创建"),
+    DATA_SOURCE_2("2", "模板导入"),
+    DATA_SOURCE_3("3", "采集下级"),
+    DATA_SOURCE_4("4", "MDM推送"),
+
+    ;
+
+    /**
+     * key
+     */
+    private final String key;
+
+    /**
+     * 值
+     */
+    private final String value;
+
+    public String getKey() {
+        return key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    CommodityCodeEnum(String key, String value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    public static CommodityCodeEnum getCodeValue(String key) {
+
+        for (CommodityCodeEnum item : values()) {
+            if (item.getKey().equals(key)) {
+                return item;
+            }
+        }
+        return null;
+    }
+}

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityExcel.java

@@ -100,4 +100,8 @@ public class CommodityExcel {
      */
     private String sl;
 
+    private String tswl;
+
+    private String dataSource;
+
 }