Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -385,7 +385,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         for (int i = 0; i < sids.size(); i++) {
             FinPaymentrecord finPaymentrecord = fetchBySid(sids.get(i));
             //到回款返利申请
-            if (finPaymentrecord.getCostTypeValue().equals("厂家车款") && !finPaymentrecord.getPayWayValue().equals("返利抵车款")) {
+            if (finPaymentrecord.getCostTypeValue().equals("厂家车款") && !dto.getPayWayValue().equals("返利抵车款")) {
                 ScmCollectionRebateDto scmCollectionRebateDto = new ScmCollectionRebateDto();
                 List<ScmCollectionRebateVehDto> scmCollectionRebateVehDtos = new ArrayList<>();
                 FinPaymentapply finPaymentapply = finPaymentapplyService.fetchBySid(finPaymentrecord.getApplySid());
@@ -393,12 +393,12 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 List<FinPaymentapplyVehicleVo> vehicleList = finPaymentapplyVehicleService.getVehicleList(finPaymentapply.getSid());
                 scmCollectionRebateDto.setBrandSid(finPaymentapply.getCarBrandSid());
                 scmCollectionRebateDto.setBrandName(finPaymentapply.getCarBrandName());
-                scmCollectionRebateDto.setCollectionTypeKey(finPaymentrecord.getPayWayKey());
-                scmCollectionRebateDto.setCollectionTypeValue(finPaymentrecord.getPayWayValue());
+                scmCollectionRebateDto.setCollectionTypeKey(dto.getPayWayKey());
+                scmCollectionRebateDto.setCollectionTypeValue(dto.getPayWayValue());
                 scmCollectionRebateDto.setManufaSaleChannel("");
                 scmCollectionRebateDto.setManufaSaleChannelValue(finPaymentapplyDetails.getActualPay());
-                scmCollectionRebateDto.setCollectionMoney(finPaymentrecord.getCost());
-                scmCollectionRebateDto.setCollectionDate(DateUtil.formatDate(finPaymentrecord.getPayDate()));
+                scmCollectionRebateDto.setCollectionMoney(new BigDecimal(dto.getCost()));
+                scmCollectionRebateDto.setCollectionDate(DateUtil.formatDate(dto.getPayDate()));
                 SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getCreateOrgSid()).getData();
                 scmCollectionRebateDto.setCreateOrgSid(finPaymentrecord.getCreateOrgSid());
                 scmCollectionRebateDto.setCreateOrgName(sysOrganizationVo.getName());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java

@@ -176,6 +176,7 @@ public class ScmCollectionRebateService extends MybatisBaseService<ScmCollection
     public ResultBean saveOrUpdateDto(ScmCollectionRebateDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
+        dto.setUploadDate(DateUtil.formatDate(DateUtil.parseDate(dto.getUploadDate())));
         List<ScmCollectionRebateVehDto> scmCollectionRebateVehs = dto.getScmCollectionRebateVehs();
         if (StringUtils.isBlank(dtoSid)) {
             String s = this.insertByDto(dto);
@@ -371,7 +372,7 @@ public class ScmCollectionRebateService extends MybatisBaseService<ScmCollection
         for (String sid : sids) {
             ScmCollectionRebate scmCollectionRebate = fetchBySid(sid);
             scmCollectionRebate.setUploadMoney(scmCollectionRebate.getEstimateRebate());
-            scmCollectionRebate.setUploadDate(stayCheckUpAgre.getUpDate());
+            scmCollectionRebate.setUploadDate(DateUtil.formatDate(DateUtil.parseDate(stayCheckUpAgre.getUpDate())));
             scmCollectionRebate.setAdjustmentMoney(new BigDecimal("0"));
             saveOrUpdate(scmCollectionRebate);
         }

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagement.vue

@@ -22,15 +22,36 @@
                   <el-option v-for="item in collectionType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
+              <el-form-item label="厂家回款通路">
+                <el-input v-model="listQuery.params.manufaSaleChannelValue" placeholder="" clearable/>
+              </el-form-item>
               <el-form-item label="回款日期">
                 <el-date-picker v-model="listQuery.params.collectionStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
                 <span style="padding: 0 8px">至</span>
                 <el-date-picker v-model="listQuery.params.collectionEndDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
               </el-form-item>
-              <el-form-item label="创建日期">
-                <el-date-picker v-model="listQuery.params.createStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+              <el-form-item label="返利类型">
+                <el-select v-model="listQuery.params.rebateTypeKey" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in rebateType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="返利名称">
+                <el-input v-model="listQuery.params.rebateName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="状态">
+                <el-select v-model="listQuery.params.state" placeholder="请选择" clearable>
+                  <el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="预提日期">
+                <el-date-picker v-model="listQuery.params.withholdingStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
                 <span style="padding: 0 8px">至</span>
-                <el-date-picker v-model="listQuery.params.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                <el-date-picker v-model="listQuery.params.withholdingEndDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+              </el-form-item>
+              <el-form-item label="上传日期">
+                <el-date-picker v-model="listQuery.params.uploadStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.uploadEndDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -189,6 +210,25 @@ export default {
       tableKey: 0,
       list: [],
       sids: [],
+      rebateType_list: [],
+      state_list: [
+        {
+          dictKey: '0',
+          dictValue: '未计提'
+        },
+        {
+          dictKey: '1',
+          dictValue: '计提中'
+        },
+        {
+          dictKey: '2',
+          dictValue: '待核对'
+        },
+        {
+          dictKey: '3',
+          dictValue: '已核对'
+        }
+      ],
       FormLoading: false,
       listLoading: false,
       collectionType_list: [],
@@ -197,12 +237,17 @@ export default {
           createOrgName: '',
           purchaseSystemName: '',
           brandName: '',
-          collectionTypeKey: '',
           createOrgSid: '',
-          createStartTime: '',
-          createEndTime: '',
+          collectionTypeKey: '',
+          manufaSaleChannelValue: '',
           collectionStartDate: '',
           collectionEndDate: '',
+          rebateTypeKey: '',
+          rebateName: '',
+          withholdingStartDate: '',
+          withholdingEndDate: '',
+          uploadStartDate: '',
+          uploadEndDate: '',
           state: '',
           orgPath: '',
           userSid: '',
@@ -242,6 +287,11 @@ export default {
   },
   methods: {
     init() {
+      typeValues({ type: 'rebateType' }).then((res) => {
+        if (res.success) {
+          this.rebateType_list = res.data
+        }
+      })
       typeValues({ type: 'paymentType' }).then((res) => {
         if (res.success) {
           this.collectionType_list = res.data
@@ -322,12 +372,17 @@ export default {
           createOrgName: '',
           purchaseSystemName: '',
           brandName: '',
-          collectionTypeKey: '',
           createOrgSid: '',
-          createStartTime: '',
-          createEndTime: '',
+          collectionTypeKey: '',
+          manufaSaleChannelValue: '',
           collectionStartDate: '',
           collectionEndDate: '',
+          rebateTypeKey: '',
+          rebateName: '',
+          withholdingStartDate: '',
+          withholdingEndDate: '',
+          uploadStartDate: '',
+          uploadEndDate: '',
           state: '',
           orgPath: '',
           userSid: '',

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue

@@ -40,9 +40,14 @@
                 <el-input v-model="listQuery.params.rebateName" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="预提日期">
-                <el-date-picker v-model="listQuery.params.createStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                <el-date-picker v-model="listQuery.params.withholdingStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
                 <span style="padding: 0 8px">至</span>
-                <el-date-picker v-model="listQuery.params.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                <el-date-picker v-model="listQuery.params.withholdingEndDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+              </el-form-item>
+              <el-form-item label="上传日期">
+                <el-date-picker v-model="listQuery.params.uploadStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.uploadEndDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -181,8 +186,10 @@ export default {
           rebateName: '',
           collectionEndDate: '',
           collectionStartDate: '',
-          createStartTime: '',
-          createEndTime: '',
+          uploadStartDate: '',
+          uploadEndDate: '',
+          withholdingStartDate: '',
+          withholdingEndDate: '',
           collectionTypeKey: '',
           createOrgSid: '',
           state: '',
@@ -211,6 +218,11 @@ export default {
   },
   methods: {
     init() {
+      typeValues({ type: 'rebateType' }).then((res) => {
+        if (res.success) {
+          this.rebateType_list = res.data
+        }
+      })
       typeValues({ type: 'paymentType' }).then((res) => {
         if (res.success) {
           this.collectionType_list = res.data
@@ -296,8 +308,10 @@ export default {
           rebateName: '',
           collectionEndDate: '',
           collectionStartDate: '',
-          createStartTime: '',
-          createEndTime: '',
+          uploadStartDate: '',
+          uploadEndDate: '',
+          withholdingStartDate: '',
+          withholdingEndDate: '',
           collectionTypeKey: '',
           createOrgSid: '',
           state: '',

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDto.java

@@ -56,7 +56,7 @@ public class PmsPurchaseBillDetailDto implements Dto {
 	@ApiModelProperty("单据sid")
     private String billSid; // 单据sid
 	@ApiModelProperty("商品基础信息Sid")
-    private String goodSpuSid; // 商品基础信息Sid
+    private String goodsSpuSid; // 商品基础信息Sid
 	@ApiModelProperty("商品名称")
     private String goodsSpuName; // 商品名称
 	@ApiModelProperty("商品Skusid")