Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js

@@ -10,6 +10,15 @@ export default {
       headers: { 'Content-Type': 'application/json' }
     })
   },
+  // 单车返利核对（待核对）查询不分页数据
+  checkApplyGetVehRebateAll: function(data) {
+    return request({
+      url: '/scm/v1/scmvehrebate/checkApplyGetVehRebateAll',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
   // 一次导出
   excelListOne: function(data) {
     return request({

anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatemanagement.js

@@ -10,6 +10,15 @@ export default {
       headers: { 'Content-Type': 'application/json' }
     })
   },
+  // 查询不分页
+  listAll: function(data) {
+    return request({
+      url: '/scm/v1/scmvehrebate/listAll',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
   // 选择车辆信息--查询分页列表
   pageList: function(data) {
     return request({

anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 export default {
-  // 单车返利核对（待核对）查询分页列表
+  // 专项返利核对（待核对）查询分页列表
   listPage: function(data) {
     return request({
       url: '/scm/v1/scmspecialrebate/checkApplyGetSpecialRebate',
@@ -10,6 +10,15 @@ export default {
       headers: { 'Content-Type': 'application/json' }
     })
   },
+  // 专项返利核对（待核对）查询不分页
+  checkApplyGetSpecialRebateAll: function(data) {
+    return request({
+      url: '/scm/v1/scmspecialrebate/checkApplyGetSpecialRebateAll',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
   // 一次导出
   excelListOne: function(data) {
     return request({

anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatemanagement.js

@@ -10,6 +10,15 @@ export default {
       headers: { 'Content-Type': 'application/json' }
     })
   },
+  // 查询不分页
+  listAll: function(data) {
+    return request({
+      url: '/scm/v1/scmspecialrebate/listAll',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
   // 删除
   delete: function(params) {
     return request({

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue

@@ -57,8 +57,8 @@
           </div>
         </div>
         <div class="">
-          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange" show-summary :summary-method="getSummaries">
-            <el-table-column fixed type="selection" align="center" width="50"/>
+            <el-table-column fixed type="selection" align="center" width="60"/>
             <el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80"/>
             <el-table-column label="操作" align="center" width="180">
               <template slot-scope="scope">
@@ -84,8 +84,8 @@
             <el-table-column prop="manufactorSettlementPrice" label="车辆入库价" align="center" width="140" />
             <el-table-column prop="freight" label="其中运费" align="center" width="120" />
             <el-table-column prop="createTime" label="创建日期" align="center" width="120" />
-            <el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
             <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
+            <el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
             <el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
             <el-table-column prop="withholdCost" label="其中预提费用" align="center" width="140" />
             <el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
@@ -410,6 +410,7 @@ export default {
       // 查询条件 -----------
       tableKey: 0,
       list: [],
+      listAll: [],
       sids: [],
       FormLoading: false,
       state_list: [
@@ -549,6 +550,13 @@ export default {
           this.listQuery.total = 0
         }
       })
+      req.checkApplyGetVehRebateAll(this.listQuery.params).then((res) => {
+        if (res.success) {
+          this.listAll = res.data
+        } else {
+          this.listAll = []
+        }
+      })
     },
     // 查询按钮
     handleFilter() {
@@ -783,6 +791,33 @@ export default {
         this.uploadData.orgPath = ''
         this.getList()
       }
+    },
+    // 合计
+    getSummaries(param) {
+      param.data = this.listAll
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+          return
+        }
+        const values = data.map(item => Number(item[column.property]))
+        if (column.property === 'manufactorSettlementPrice' || column.property === 'freight' || column.property === 'estimateRebate' || column.property === 'expectCost' || column.property === 'uploadMoney' || column.property === 'secondaryUploadMoney' || column.property === 'stayDetermineMoney' || column.property === 'money' || column.property === 'diffAmount' || column.property === 'adjustmentMoney') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
+            } else {
+              return Math.round((parseFloat(prev)) * 100) / 100
+            }
+          }, 0)
+          sums[index] += ''
+        } else {
+          sums[index] = ''
+        }
+      })
+      return sums
     }
   }
 }

anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue

@@ -222,6 +222,7 @@ export default {
       // 查询条件 -----------
       tableKey: 0,
       list: [],
+      listAll: [],
       sids: [],
       FormLoading: false,
       listLoading: false,
@@ -361,6 +362,13 @@ export default {
           this.listQuery.total = 0
         }
       })
+      req.listAll(this.listQuery.params).then((res) => {
+        if (res.success) {
+          this.listAll = res.data
+        } else {
+          this.listAll = []
+        }
+      })
     },
     // 查询按钮
     handleFilter() {
@@ -515,6 +523,7 @@ export default {
     },
     // 合计
     getSummaries(param) {
+      param.data = this.listAll
       const { columns, data } = param
       const sums = []
       columns.forEach((column, index) => {

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue

@@ -56,8 +56,8 @@
           </div>
         </div>
         <div class="">
-          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange" show-summary :summary-method="getSummaries">
-            <el-table-column fixed type="selection" align="center" width="50"/>
+            <el-table-column fixed type="selection" align="center" width="60"/>
             <el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80"/>
             <el-table-column label="操作" align="center" width="180">
               <template slot-scope="scope">
@@ -79,8 +79,8 @@
             <el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
             <el-table-column prop="brandName" label="品牌" align="center" width="120" />
             <el-table-column prop="createTime" label="创建日期" align="center" width="120" />
-            <el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
             <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
+            <el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
             <el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
             <el-table-column prop="withholdCost" label="其中预提费用" align="center" width="140" />
             <el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
@@ -395,6 +395,7 @@ export default {
       // 查询条件 -----------
       tableKey: 0,
       list: [],
+      listAll: [],
       sids: [],
       FormLoading: false,
       rebateType_list: [],
@@ -546,6 +547,13 @@ export default {
           this.listQuery.total = 0
         }
       })
+      req.checkApplyGetSpecialRebateAll(this.listQuery.params).then((res) => {
+        if (res.success) {
+          this.listAll = res.data
+        } else {
+          this.listAll = []
+        }
+      })
     },
     // 查询按钮
     handleFilter() {
@@ -779,6 +787,33 @@ export default {
         this.uploadData.orgPath = ''
         this.getList()
       }
+    },
+    // 合计
+    getSummaries(param) {
+      param.data = this.listAll
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+          return
+        }
+        const values = data.map(item => Number(item[column.property]))
+        if (column.property === 'estimateRebate' || column.property === 'expectCost' || column.property === 'uploadMoney' || column.property === 'secondaryUploadMoney' || column.property === 'stayDetermineMoney' || column.property === 'money' || column.property === 'diffAmount' || column.property === 'adjustmentMoney') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
+            } else {
+              return Math.round((parseFloat(prev)) * 100) / 100
+            }
+          }, 0)
+          sums[index] += ''
+        } else {
+          sums[index] = ''
+        }
+      })
+      return sums
     }
   }
 }

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue

@@ -157,6 +157,7 @@ export default {
       // 查询条件 -----------
       tableKey: 0,
       list: [],
+      listAll: [],
       sids: [],
       FormLoading: false,
       listLoading: false,
@@ -293,6 +294,13 @@ export default {
           this.listQuery.total = 0
         }
       })
+      req.listAll(this.listQuery.params).then((res) => {
+        if (res.success) {
+          this.listAll = res.data
+        } else {
+          this.listAll = []
+        }
+      })
     },
     // 查询按钮
     handleFilter() {
@@ -389,6 +397,7 @@ export default {
     },
     // 合计
     getSummaries(param) {
+      param.data = this.listAll
       const { columns, data } = param
       const sums = []
       columns.forEach((column, index) => {

yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSpuRest.java

@@ -30,12 +30,18 @@ public class BaseGoodsSpuRest {
     @ApiOperation("商品管理分页列表")
     @PostMapping("/goodsListPage")
     public ResultBean<PagerVo<BaseGoodsSpuListVo>> goodsListPage(@RequestBody PagerQuery<BaseGoodsSpuListQuery> pq) {
+        BaseGoodsSpuListQuery query = pq.getParams();
+        query.setType("0");
         return baseGoodsSpuService.goodsListPage(pq);
     }
 
     @ApiOperation("保存修改商品信息")
     @PostMapping("/saveOrUpdateGoods")
     public ResultBean<String> saveOrUpdateGoods(@RequestBody BaseGoodsDetailsDto dto) {
+        dto.setGoodsClassKey("004");
+        dto.setGoodsClassValue("售后类");
+        dto.setGoodsLevelKey("001");
+        dto.setGoodsLevelValue("一级");
         return baseGoodsSpuService.saveOrUpdateGoods(dto);
     }
 
@@ -95,5 +101,22 @@ public class BaseGoodsSpuRest {
     @GetMapping("/selByCodeAndDept")
     ResultBean<Integer> selByCodeAndDept(@RequestParam("code") String code,@RequestParam("deptSid") String deptSid){
         return baseGoodsSpuService.selByCodeAndDept(code,deptSid);
-    };
+    }
+
+    //-------------------------------  行政类商品管理  --------------------------------
+
+    @ApiOperation("保存修改行政商品信息")
+    @PostMapping("/saveOrUpdateOaGoods")
+    public ResultBean<String> saveOrUpdateOaGoods(@RequestBody BaseGoodsDetailsDto dto) {
+        return baseGoodsSpuService.saveOrUpdateGoods(dto);
+    }
+
+    @ApiOperation("行政商品管理分页列表")
+    @PostMapping("/oaGoodsListPage")
+    public ResultBean<PagerVo<BaseGoodsSpuListVo>> oaGoodsListPage(@RequestBody PagerQuery<BaseGoodsSpuListQuery> pq) {
+        BaseGoodsSpuListQuery query = pq.getParams();
+        query.setType("1");
+        return baseGoodsSpuService.goodsListPage(pq);
+    }
+
 }

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsDto.java

@@ -1,6 +1,5 @@
 package com.yxt.base.biz.base.basegoodsspu;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.yxt.common.core.dto.Dto;
 import lombok.Data;
 
@@ -48,4 +47,9 @@ public class BaseGoodsDetailsDto implements Dto {
     private String agencyPrice;//首保价格
     private List<UrlQuery> picPath = new ArrayList<>();//商品图片
 
+    private String goodsClassKey;//商品类型key
+    private String goodsClassValue;//商品类型
+    private String goodsLevelKey;//商品等级key
+    private String goodsLevelValue;//商品等级
+
 }

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsVo.java

@@ -46,4 +46,8 @@ public class BaseGoodsDetailsVo implements Vo {
     private String agencyPrice;//首保价格
     private List<UrlQuery> picPath = new ArrayList<>();//商品图片
 
+    private String goodsClassKey;//商品类型key
+    private String goodsClassValue;//商品类型
+    private String goodsLevelKey;//商品等级key
+    private String goodsLevelValue;//商品等级
 }

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpu.java

@@ -30,4 +30,8 @@ public class BaseGoodsSpu extends BaseEntity {
     private String isListed;//是否上架
     private String useOrgSid;//使用组织sid
     private String createOrgSid;//创建组织sid
+    private String goodsClassKey;//商品类型key
+    private String goodsClassValue;//商品类型
+    private String goodsLevelKey;//商品等级key
+    private String goodsLevelValue;//商品等级
 }

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuListQuery.java

@@ -25,5 +25,9 @@ public class BaseGoodsSpuListQuery implements Query {
     private String goodsTypeName;//商品类别
     private String brandName;//品牌
     private String manufacturerName;//厂家
-
+    private String goodsClassKey;//商品类型key
+    private String goodsClassValue;//商品类型
+    private String goodsLevelKey;//商品等级key
+    private String goodsLevelValue;//商品等级
+    private String type;// 0售后商品 1行政商品
 }

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuListVo.java

@@ -34,6 +34,9 @@ public class BaseGoodsSpuListVo implements Vo {
     private String agencyPrice;//首保价格
     private String picUrl;
     private List<UrlQuery> picPath = new ArrayList<>();//商品图片
-
+    private String goodsClassKey;//商品类型key
+    private String goodsClassValue;//商品类型
+    private String goodsLevelKey;//商品等级key
+    private String goodsLevelValue;//商品等级
 
 }

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml

@@ -41,6 +41,10 @@ WHERE
     <select id="goodsListPage" resultType="com.yxt.base.biz.base.basegoodsspu.BaseGoodsSpuListVo">
         SELECT
         p.sid,
+        p.goodsClassKey,
+        p.goodsClassValue,
+        p.goodsLevelKey,
+        p.goodsLevelValue,
         p.goodsName,
         p.goodsCode,
         p.goodsPY,

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java

@@ -4,18 +4,25 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.base.biz.base.basebrandinfo.BaseBrandInfo;
+import com.yxt.base.biz.base.basebrandinfo.BaseBrandInfoService;
 import com.yxt.base.biz.base.basegoodssku.BaseGoodsSku;
+import com.yxt.base.biz.base.basegoodssku.BaseGoodsSkuService;
 import com.yxt.base.biz.base.basegoodssku.BaseGoodsSkuVo;
 import com.yxt.base.biz.base.basegoodsskuextend.BaseGoodsSkuExtend;
 import com.yxt.base.biz.base.basegoodsskuextend.BaseGoodsSkuExtendService;
 import com.yxt.base.biz.base.basegoodsskuextend.BaseGoodsSkuExtendVo;
 import com.yxt.base.biz.base.basegoodsskuextend.UrlsVo;
+import com.yxt.base.biz.base.basegoodsspudetail.BaseGoodsSpuDetailService;
 import com.yxt.base.biz.base.basegoodsspudetail.BaseGoodsSpuDetailVo;
+import com.yxt.base.biz.base.basegoodstype.BaseGoodsType;
+import com.yxt.base.biz.base.basegoodstype.BaseGoodsTypeService;
 import com.yxt.base.biz.base.basegoodsunit.BaseGoodsUnit;
 import com.yxt.base.biz.base.basegoodsunit.BaseGoodsUnitService;
+import com.yxt.base.biz.base.basemanufacturer.BaseManufacturer;
+import com.yxt.base.biz.base.basemanufacturer.BaseManufacturerService;
 import com.yxt.base.feign.portal.privilege.PrivilegeQuery;
 import com.yxt.base.feign.portal.sysorganization.SysOrganizationFeign;
-import com.yxt.base.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.base.feign.portal.sysstafforg.SysStaffOrgFeign;
 import com.yxt.base.feign.portal.sysuser.SysUserFeign;
 import com.yxt.base.utils.PinYinUtils;
@@ -26,20 +33,14 @@ import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.base.biz.base.basebrandinfo.BaseBrandInfo;
-import com.yxt.base.biz.base.basebrandinfo.BaseBrandInfoService;
-import com.yxt.base.biz.base.basegoodssku.BaseGoodsSkuService;
-import com.yxt.base.biz.base.basegoodsspudetail.BaseGoodsSpuDetailService;
-import com.yxt.base.biz.base.basegoodstype.BaseGoodsType;
-import com.yxt.base.biz.base.basegoodstype.BaseGoodsTypeService;
-import com.yxt.base.biz.base.basemanufacturer.BaseManufacturer;
-import com.yxt.base.biz.base.basemanufacturer.BaseManufacturerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.text.SimpleDateFormat;
+import java.util.ArrayList;
-import java.util.*;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
 
 /**
  * @author wangpengfei
@@ -254,6 +255,23 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
         if (StringUtils.isNotBlank(query.getManufacturerName())) {
             qw.like("m.manufacturerName", query.getManufacturerName());
         }
+        if (StringUtils.isNotBlank(query.getGoodsClassKey())) {
+            qw.like("p.goodsClassKey", query.getGoodsClassKey());
+        }
+        if (StringUtils.isNotBlank(query.getGoodsClassValue())) {
+            qw.like("p.goodsClassValue", query.getGoodsClassValue());
+        }
+        if (StringUtils.isNotBlank(query.getGoodsLevelKey())) {
+            qw.like("p.goodsLevelKey", query.getGoodsLevelKey());
+        }
+        if (StringUtils.isNotBlank(query.getGoodsLevelValue())) {
+            qw.like("p.goodsLevelValue", query.getGoodsLevelValue());
+        }
+        if (query.getType().equals("0")) {
+            qw.eq("p.goodsClassKey","004");
+        } else {
+            qw.ne("p.goodsClassKey","004");
+        }
         IPage<BaseGoodsSpu> page = PagerUtil.queryToPage(pq);
         IPage<BaseGoodsSpuListVo> pagging = baseMapper.goodsListPage(page, qw);
         PagerVo<BaseGoodsSpuListVo> p = PagerUtil.pageToVo(pagging, null);
@@ -310,7 +328,7 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
                 baseGoodsSkuService.updateById(skuUpdate);
                 BaseGoodsSkuExtend skuExtendUpdate = baseGoodsSkuExtendService.getOneBySKuSid(skuUpdate.getSid());
                 if (null != skuExtendUpdate) {
-                    BeanUtil.copyProperties(dto, skuExtendUpdate, "id", "sid");
+                    BeanUtil.copyProperties(dto, skuExtendUpdate, "id", "sid","isOriginalFactory","isOriginalFactoryValue");
                     if (StringUtils.isNotBlank(dto.getSkuRemarks())) {
                         skuExtendUpdate.setRemarks(dto.getSkuRemarks());
                     }