需求

src/main/java/com/zfire/mall/manager/bean/OrderExecBean.java

@@ -130,8 +130,8 @@ public class OrderExecBean {
 
     @ApiModelProperty(value = "经销商集团名称")
     private String customerGroupName;
-    @ApiModelProperty("金蝶部门")
-    private String k3OrgName;
+/*    @ApiModelProperty("金蝶部门")
+    private String k3OrgName;*/
 
     @ApiModelProperty("物料分组")
     private String materialGroupName;

src/main/java/com/zfire/mall/manager/bean/listV2/OrderEnginVO.java

@@ -149,9 +149,9 @@ public class OrderEnginVO {
     @ZfireField(isQuery = false)
     @ApiModelProperty(value = "所属集团")
     private String customerGroupName;
-    @ZfireField(isQuery = false)
+/*    @ZfireField(isQuery = false)
     @ApiModelProperty("金蝶部门")
-    private String k3OrgName;
+    private String k3OrgName;*/
 
     @ZfireField(tbName = "b")
     @ApiModelProperty("原供价")

src/main/java/com/zfire/mall/manager/bean/listV2/OrderExecPolicyVO.java

@@ -141,9 +141,9 @@ public class OrderExecPolicyVO {
     @ZfireField(isQuery = false)
     @ApiModelProperty(value = "所属集团")
     private String customerGroupName;
-    @ZfireField(isQuery = false)
+/*    @ZfireField(isQuery = false)
     @ApiModelProperty("金蝶部门")
-    private String k3OrgName;
+    private String k3OrgName;*/
 
     @ZfireField(tbName = "b")
     @ApiModelProperty("原供价")

src/main/java/com/zfire/mall/manager/bean/listV2/OrderExecRetailVO.java

@@ -137,9 +137,9 @@ public class OrderExecRetailVO {
     @ZfireField(isQuery = false)
     @ApiModelProperty(value = "经销商集团名称")
     private String customerGroupName;
-    @ZfireField(isQuery = false)
+/*    @ZfireField(isQuery = false)
     @ApiModelProperty("金蝶部门")
-    private String k3OrgName;
+    private String k3OrgName;*/
 
     @ZfireField(tbName = "b")
     @ApiModelProperty("原供价")

src/main/java/com/zfire/mall/manager/bean/listV2/OrderExecVO.java

@@ -132,8 +132,8 @@ public class OrderExecVO {
 
     @ApiModelProperty(value = "经销商集团名称")
     private String customerGroupName;
-    @ApiModelProperty("金蝶部门")
-    private String k3OrgName;
+/*    @ApiModelProperty("金蝶部门")
+    private String k3OrgName;*/
 
 
     @ApiModelProperty("原供价")

src/main/java/com/zfire/mall/manager/bean/sale/StorageFeeBeanVO.java

@@ -121,8 +121,8 @@ public class StorageFeeBeanVO {
     @ApiModelProperty("业务员")
     private String serviceName;
 
-    @ApiModelProperty("金蝶部门")
-    private String k3OrgNumber;
+ /*   @ApiModelProperty("金蝶部门")
+    private String k3OrgNumber;*/
 
     @ApiModelProperty("使用单位")
     private String refUseUnit;

src/main/java/com/zfire/mall/manager/logic/customer/CustomerProductTypeLogic.java

@@ -275,7 +275,7 @@ public class CustomerProductTypeLogic {
         List<AdminUser> adminUsers = adminUserLogic.allList();
         Map<String, AdminUser> map = adminUsers.stream().collect(Collectors.toMap(AdminUser::getAdminUserId, v -> v));
 
-        String[] titles = new String[]{"经销商编码","钱包名称","业务员帐号","经销商名称","业务员名称","金蝶部门编号"};
+        String[] titles = new String[]{"经销商编码","钱包名称","业务员帐号","经销商名称","业务员名称"};
         List<List<Object>> rows = new ArrayList<>();
         for (CustomerProductTypeRelaBean bean : list) {
             List<Object> row = new ArrayList<>();
@@ -289,7 +289,7 @@ public class CustomerProductTypeLogic {
             }
             row.add(bean.getCustomerName());
             row.add(bean.getServiceName());
-            row.add(bean.getK3OrgNumber());
+
             rows.add(row);
         }
         ExcelData excelData = new ExcelData();

src/main/java/com/zfire/mall/manager/logic/retail/RetailOrderLogic.java

@@ -2131,7 +2131,7 @@ public class RetailOrderLogic {
                 "经销商名称", "销售类型", "物料编码", "厂产品代码","产品名称", "规格型号", "直调状态","钱包","返利钱包","订单未发货数量",
                 "单价","总数量","退订数量", "退货数量", "订单金额", "订单返利金额","折扣金额", "发货金额","出库数量",
                 "发货数量","直调数量","直调状态","退订金额","退货金额","表头业务员","表体业务员","归属业务员","表头备注","销售政策名称","销售执行编码"
-                ,"工程编号","工程登录编号","文件编号","机型类别","项目名称","所属集团","存货类别","金蝶部门","物料分组","原供价","价格类型","审核状态","审核人","审核时间","是否置换过","使用单位","项目说明"};
+                ,"工程编号","工程登录编号","文件编号","机型类别","项目名称","所属集团","存货类别","物料分组","原供价","价格类型","审核状态","审核人","审核时间","是否置换过","使用单位","项目说明"};
         List<List<Object>> rows = new ArrayList<>();
         for (OrderExecBean o : orderExecBeans) {
             List<Object> row = new ArrayList<>();
@@ -2184,7 +2184,7 @@ public class RetailOrderLogic {
             row.add(o.getRefProjectName());
             row.add(o.getCustomerGroupName());
             row.add(o.getK3CategoryName());
-            row.add(o.getK3OrgName());
+          //  row.add(o.getK3OrgName());
             row.add(o.getMaterialGroupName());
             row.add(o.getOrgPrice());
             row.add(o.getPriceType());