fix：费用申请审批时分配异常；微调查询

src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCustomerPriceServiceImpl.java

@@ -176,7 +176,11 @@ public class GoodsCustomerPriceServiceImpl extends ServiceImpl<GoodsCustomerPric
         for (String cusCode : cusPriceMap.keySet()) {
             List<InventoryCusPrice> cusPriceList = cusPriceMap.get(cusCode);
             List<String> skuCodes = cusPriceList.stream().map(InventoryCusPrice::getInvCode).collect(Collectors.toList());
-            flushSupplierSkuPrices(cusCode, skuCodes);
+            try {
+                flushSupplierSkuPrices(cusCode, skuCodes);
+            } catch (Exception e) {
+                log.error("客户价格同步失败：{},skus:{}",cusCode,JsonUtil.objectToJson(skuCodes));
+            }
         }
 
         for (InventoryCusPrice cusPrice : allCusPriceList) {

src/main/java/com/qs/serve/modules/tbs/entity/so/TbsBudgetSo.java

@@ -76,5 +76,7 @@ public class TbsBudgetSo implements Serializable {
     /** 考核期名称 */
     private String scheduleName;
 
+    private String centerType;
+
 }
 

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java

@@ -687,7 +687,7 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService
                     // 只对第一次赋值
                     activityCenter.setOrgCenterAmount(activityCenter.getCenterAmount());
                 }
-                if(ii+1 == activityCenterList.size()){
+                if(ii+1 == currentActivityCenterList.size()){
                     // 最后一项
                     activityCenter.setCenterAmount(subjectAmountSpuir);
                 }else {

src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java

@@ -179,6 +179,8 @@ public class VtbVerificationController {
     @PreAuthorize("hasRole('vtb:verification:query')")
     public R<PageVo<VtbVerification>> pageMy4Post(@RequestBody VtbVerificationSo param){
         param.setLoadMy(1);
+        PageUtil.setPageNum(param.getPageNum());
+        PageUtil.setPageSize(param.getPageSize());
         return getPage(param);
     }
 

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java

@@ -176,6 +176,9 @@ public class VtbVerificationBatchOperationServiceImpl implements VtbVerification
                         continue;
                     }
                     for (TbsAffairCommitBo.AffairSubjectCenterItemLine centerItemLine : itemLine.getCenterItemLines()) {
+                        if(centerItemLine.getAmount().compareTo(BigDecimal.ZERO)<0){
+                            Assert.throwEx("ActivityCenterId["+centerItemLine.getActivityCenterId()+"]金额错误，不支持超过"+centerItemLine.getAmount());
+                        }
                         totalSubjectAmt = totalSubjectAmt.add(centerItemLine.getAmount());
                     }
                 }

src/main/java/com/qs/serve/task/GoodsTask.java

@@ -2,6 +2,7 @@ package com.qs.serve.task;
 
 import com.qs.serve.common.util.AuthContextUtils;
 import com.qs.serve.modules.goods.service.GoodsApplicationService;
+import com.qs.serve.modules.goods.service.GoodsCustomerPriceService;
 import com.qs.serve.modules.goods.service.GoodsSpuService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -21,6 +22,7 @@ public class GoodsTask {
 
     private GoodsSpuService goodsSpuService;
     private GoodsApplicationService goodsApplicationService;
+    private GoodsCustomerPriceService goodsCustomerPriceService;
 
     @Scheduled(cron="0 0 1 * * ?")
     public void buildTempTable(){
@@ -28,6 +30,15 @@ public class GoodsTask {
         goodsSpuService.initSkuNum();
     }
 
+    /**
+     * 每两个小时同步一次
+     */
+    @Scheduled(cron="0 0/2 0 * * ?")
+    public void syncCusPriceGoods(){
+        AuthContextUtils.setTenant("001");
+        goodsCustomerPriceService.syncCustomerPrice();
+    }
+
     /**
      * 每两个小时同步一次
      */

src/main/resources/mapper/tbs/TbsBudgetMapper.xml

@@ -81,6 +81,7 @@
             </if>
             <if test="query.budgetNumber !=null and query.budgetNumber !='' "> and `tbs_budget`.`budget_number` like concat('%',#{query.budgetNumber},'%')</if>
             <if test="query.budgetState !=null "> and `tbs_budget`.`budget_state` = #{query.budgetState}</if>
+            <if test="query.centerType !=null and query.centerType !=''"> and `tbs_budget`.`center_type` = #{query.centerType}</if>
             <if test="query.crossYearFlag !=null "> and `tbs_budget`.`cross_year_flag` = #{query.crossYearFlag}</if>
             <if test="query.inactiveFlag !=null "> and `tbs_budget`.`inactive_flag` = #{query.inactiveFlag}</if>
             <if test="query.budgetCheckState !=null "> and `tbs_budget`.`budget_check_state` = #{query.budgetCheckState}</if>