1

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java

@@ -109,6 +109,8 @@ public class ScmSpecialRebateDetailsVo implements Vo {
     private String stayDetermineMoneyNew;
     @ApiModelProperty("其中预计费用")
     private BigDecimal expectCost;
+    @ApiModelProperty("其中预提费用")
+    private BigDecimal withholdCost;
     @ApiModelProperty("差异金额")
     private BigDecimal diffAmount;
     @ApiModelProperty("预计支出费用")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java

@@ -95,6 +95,8 @@ public class ScmSpecialRebateVo implements Vo {
     private String stayDetermineMoney;
     @ApiModelProperty("其中预计费用")
     private BigDecimal expectCost;
+    @ApiModelProperty("其中预提费用")
+    private BigDecimal withholdCost;
     @ApiModelProperty("所属年月")
     private String palceGenDate;
     @ApiModelProperty("其中费用")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApply.java

@@ -78,4 +78,6 @@ public class ScmSpecialRebateWithApply extends BaseEntity {
     private String taskId; // taskId
     @ApiModelProperty("组织全路径")
     private String orgPath;
+    @ApiModelProperty("办结日期")
+    private String finishTime;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyQuery.java

@@ -57,6 +57,9 @@ public class ScmSpecialRebateWithApplyQuery implements Query {
     private String createStartTime; // 创建开始日期
     @ApiModelProperty("创建结束日期")
     private String createEndTime; // 创建结束日期
+    @ApiModelProperty("办结日期")
+    private String finishTimeStart;
+    private String finishTimeEnd;
     @ApiModelProperty("流程状态")
     private String nodeState;
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyVo.java

@@ -57,6 +57,9 @@ public class ScmSpecialRebateWithApplyVo implements Vo {
     @ApiModelProperty("创建日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createTime; // 创建日期
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("办结日期")
+    private Date finishTime;
     @ApiModelProperty("申请部门名称")
     private String deptName;
     @ApiModelProperty("预提申请")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java

@@ -125,6 +125,8 @@ public class ScmVehRebateDetailsVo implements Vo {
     private Integer onceCheckState;
     @ApiModelProperty("其中预计费用")
     private BigDecimal expectCost;
+    @ApiModelProperty("其中预提费用")
+    private BigDecimal withholdCost;
     @ApiModelProperty("差异金额")
     private BigDecimal diffAmount;
     @ApiModelProperty("预计待支付费用")

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml

@@ -6,6 +6,7 @@
     <select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateVo">
         SELECT *,
         expectItureCost + expectTreatCost + expectSuppCost AS expectCost,
+        expectItureCost + expectTreatCost + expectSuppCost AS withholdCost,
         onceItureCost + onceTreatCost + onceSuppCost + secondItureCost + secondTreatCost + secondSuppCost AS money
         FROM scm_special_rebate
         <where>
@@ -17,6 +18,7 @@
         SELECT *,
         sid AS specialRebateSid,
         expectItureCost + expectTreatCost + expectSuppCost AS expectCost,
+        expectItureCost + expectTreatCost + expectSuppCost AS withholdCost,
         onceItureCost + onceTreatCost + onceSuppCost + secondItureCost + secondTreatCost + secondSuppCost AS money
         FROM scm_special_rebate
         <where>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java

@@ -190,6 +190,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         ScmSpecialRebate entity = fetchBySid(sid);
         ScmSpecialRebateDetailsVo vo = new ScmSpecialRebateDetailsVo();
         BeanUtil.copyProperties(entity, vo);
+        vo.setWithholdCost(vo.getExpectItureCost().add(vo.getExpectTreatCost()).add(vo.getExpectSuppCost()));
         return vo;
     }
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java

@@ -134,7 +134,7 @@ public class ScmSpecialrebateCheckapplydetailService extends MybatisBaseService<
 		for (String s : sids) {
 			ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo = baseMapper.fetchBySpecialRebateSid(s);
 			if (scmSpecialRebateDetailsVo != null){
-				scmSpecialRebateDetailsVo.setExpectCost(scmSpecialRebateDetailsVo.getExpectItureCost().add(scmSpecialRebateDetailsVo.getExpectTreatCost()).add(scmSpecialRebateDetailsVo.getExpectSuppCost()));
+				scmSpecialRebateDetailsVo.setWithholdCost(scmSpecialRebateDetailsVo.getExpectItureCost().add(scmSpecialRebateDetailsVo.getExpectTreatCost()).add(scmSpecialRebateDetailsVo.getExpectSuppCost()));
 				scmSpecialRebateDetailsVo.setMoney(scmSpecialRebateDetailsVo.getOnceItureCost().add(scmSpecialRebateDetailsVo.getOnceTreatCost()).add(scmSpecialRebateDetailsVo.getOnceSuppCost()).add(scmSpecialRebateDetailsVo.getSecondItureCost()).add(scmSpecialRebateDetailsVo.getSecondTreatCost()).add(scmSpecialRebateDetailsVo.getSecondSuppCost()).toString());
 				scmSpecialRebateDetailsVos.add(scmSpecialRebateDetailsVo);
 			}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyMapper.xml

@@ -29,6 +29,9 @@
     <update id="updateFlowFiled">
         UPDATE scm_special_rebate_with_apply
         SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}
+        <if test="nodeState == '已办结' or nodeState == '终止'">
+            , finishTime = NOW()
+        </if>
         <if test="procDefId != null and procDefId != ''">
             , procDefId=#{procDefId}
         </if>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java

@@ -162,6 +162,11 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
         qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (ssrwa.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(createEndTime), "date_format (ssrwa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
                 );
+        String finishTimeStart = query.getFinishTimeStart();
+        String finishTimeEnd = query.getFinishTimeEnd();
+        qw.apply(StringUtils.isNotEmpty(finishTimeStart), "date_format (ssrwa.finishTime,'%Y-%m-%d') >= date_format('" + finishTimeStart + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(finishTimeEnd), "date_format (ssrwa.finishTime,'%Y-%m-%d') <= date_format('" + finishTimeEnd + "','%Y-%m-%d')"
+                );
         qw.groupBy("ssrwa.sid");
         qw.orderByDesc("ssrwa.createTime");
         IPage<ScmSpecialRebateWithApply> page = PagerUtil.queryToPage(pq);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@@ -476,6 +476,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         ScmVehRebate entity = fetchBySid(sid);
         ScmVehRebateDetailsVo vo = new ScmVehRebateDetailsVo();
         BeanUtil.copyProperties(entity, vo);
+        vo.setWithholdCost(vo.getExpectTreatCost().add(vo.getExpectSuppCost()));
         return vo;
     }
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailService.java

@@ -93,6 +93,7 @@ public class ScmVehrebateCheckapplydetailService extends MybatisBaseService<ScmV
 		for (String s : sids) {
 			ScmVehRebateDetailsVo scmVehRebateDetailsVo = baseMapper.selByVehRebteSid(s);
 			if (scmVehRebateDetailsVo != null){
+				scmVehRebateDetailsVo.setWithholdCost(scmVehRebateDetailsVo.getExpectTreatCost().add(scmVehRebateDetailsVo.getExpectSuppCost()));
 				scmVehRebateDetailsVo.setMoney(scmVehRebateDetailsVo.getOnceTreatCost().add(scmVehRebateDetailsVo.getOnceSuppCost()).add(scmVehRebateDetailsVo.getSecondTreatCost()).add(scmVehRebateDetailsVo.getSecondSuppCost()).toString());
 				scmVehRebateDetailsVos.add(scmVehRebateDetailsVo);
 			}

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillQuery.java

@@ -79,6 +79,8 @@ public class PmsPurchaseBillQuery implements Query {
     private String supplierName;
     @ApiModelProperty("是否需要开发票（是1，否0）")
     private String isInvoicing;
+    @ApiModelProperty("厂家订单号")
+    private String manufacturersOrderNumber;
 
     @ApiModelProperty("组织全路径")
     private String orgPath;

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java

@@ -191,6 +191,9 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
         if (StringUtils.isNotBlank(query.getSupplierName())) {
             qw.like("ppb.supplierName", query.getSupplierName());
         }
+        if (StringUtils.isNotBlank(query.getManufacturersOrderNumber())) {
+            qw.like("ppb.manufacturersOrderNumber", query.getManufacturersOrderNumber());
+        }
         if (StringUtils.isNotBlank(query.getIsInvoicing())) {
             qw.eq("ppbi.isInvoicing", query.getIsInvoicing());
         }