保外工单应收调差

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java

@@ -159,4 +159,8 @@ public interface FinUncollectedReceivablesDetailedFeign {
     @ApiOperation("根据维修工单sid查询应收金额之和")
     @PostMapping("/selYsByBillSid")
     ResultBean<BigDecimal> selYsByBillSid(@RequestParam("billSid") String billSid);
+
+    @ApiOperation("应收调差更新")
+    @PostMapping("/diffUncollected")
+    ResultBean diffUncollected(@RequestParam("diffMoney")String diffMoney,@RequestParam("busSid")String busSid,@RequestParam("type")String type);
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java

@@ -184,4 +184,9 @@ public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncoll
 		return null;
 	}
 
+	@Override
+	public ResultBean diffUncollected(String diffMoney, String busSid, String type) {
+		return null;
+	}
+
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java

@@ -145,4 +145,6 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper<FinU
     List<CustomerBillSummaryExportVo> selexportCustomerBillExcelDetails(@Param("contractNo") String contractNo);
 
     List<AsDetailsOfReceivablesAndUncollectedItemsVo> asListAll(@Param(Constants.WRAPPER) QueryWrapper<FinUncollectedReceivablesDetailed> qw);
+
+    FinUncollectedReceivablesDetailed selectByBusSid(@Param("busSid") String busSid,@Param("type") String type);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml

@@ -1088,4 +1088,9 @@ select * from
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="selectByBusSid"
+            resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed">
+        select * from fin_uncollected_receivables_detailed where contractSid = #{busSid} and receivablesName = #{type}
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java

@@ -224,6 +224,11 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece
         return finUncollectedReceivablesDetailedService.selYsByBillSid(billSid);
     }
 
+    @Override
+    public ResultBean diffUncollected(String diffMoney, String busSid, String type) {
+        return finUncollectedReceivablesDetailedService.diffUncollected(diffMoney,busSid,type);
+    }
+
 
     @Override
     public ResultBean<List<FinUncollectedReceivablesDetailed>> selectByContractNo(String contractNo) {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@@ -1432,4 +1432,18 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
     }
 
 
+    public ResultBean diffUncollected(String diffMoney, String busSid, String type) {
+        ResultBean rb = ResultBean.fireFail();
+        FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = baseMapper.selectByBusSid(busSid,type);
+        if(finUncollectedReceivablesDetailed != null){
+            BigDecimal curr = finUncollectedReceivablesDetailed.getCurrentReceivableMoney();
+            String receableMoney = finUncollectedReceivablesDetailed.getReveivableMoney();
+            curr = curr.add(new BigDecimal(diffMoney));
+            finUncollectedReceivablesDetailed.setCurrentReceivableMoney(curr);
+            receableMoney = new BigDecimal(receableMoney).add(new BigDecimal(diffMoney)).toString();
+            finUncollectedReceivablesDetailed.setReveivableMoney(receableMoney);
+            baseMapper.updateById(finUncollectedReceivablesDetailed);
+        }
+        return rb.success();
+    }
 }

yxt-as/src/main/java/com/yxt/anrui/as/AsApplication.java

@@ -13,7 +13,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
         "com.yxt.common.base.config",
         "com.yxt.anrui.as"
 })
-@EnableFeignClients(basePackages = {"com.yxt.*.*"})
+@EnableFeignClients(basePackages = {"com.yxt.anrui.as.feign"})
 public class AsApplication {
     public static void main(String[] args) {
         SpringApplication.run(AsApplication.class, args);

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml

@@ -78,12 +78,12 @@
                 d.manufacturerName,
                 d.goodsSkuOwnSpec,
                 d.unit,
-                d.warehouseSid,
+               <!-- d.warehouseSid,
                 d.warehouseName,
                 wa.sid AS warehouseAreaSid,
                 wa.areaName AS warehouseAreaName,
                 d.warehouseRackSid,
-                d.warehouseRackCode,
+                d.warehouseRackCode,-->
                 d.count
         FROM
                 as_busrepair_inventorybill_detail AS d

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapply/AsBwdiffapplyService.java

@@ -37,6 +37,7 @@ import com.yxt.anrui.as.api.asbusclaimcheckapply.AsBusclaimCheckApply;
 import com.yxt.anrui.as.api.asbusclaimcheckapply.flowable.*;
 import com.yxt.anrui.as.api.asbwdiffapply.*;
 import com.yxt.anrui.as.api.asbwdiffapply.flowable.*;
+import com.yxt.anrui.as.api.asbwdiffapplydetail.AsBwdiffapplyDetail;
 import com.yxt.anrui.as.api.asbwdiffapplydetail.AsBwdiffapplyDetailDetailsVo;
 import com.yxt.anrui.as.api.asbwdiffapplydetail.AsBwdiffapplyDetailDto;
 import com.yxt.anrui.as.api.asbwdiffapplydetail.AsBwdiffapplyDetailFile;
@@ -44,6 +45,7 @@ import com.yxt.anrui.as.biz.asappendix.AsAppendixService;
 import com.yxt.anrui.as.biz.asbwdiffapplydetail.AsBwdiffapplyDetailService;
 import com.yxt.anrui.as.feign.base.billno.Rule;
 import com.yxt.anrui.as.feign.file.AsFileEnum;
+import com.yxt.anrui.as.feign.fin.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
 import com.yxt.anrui.as.feign.flowable.flow.BusinessVariables;
 import com.yxt.anrui.as.feign.flowable.flow.FlowableFeign;
 import com.yxt.anrui.as.feign.flowable.flow.ProcDefEnum;
@@ -116,6 +118,8 @@ public class AsBwdiffapplyService extends MybatisBaseService<AsBwdiffapplyMapper
 	private AsBwdiffapplyDetailService asBwdiffapplyDetailService;
 	@Autowired
 	private SysUserRoleFeign sysUserRoleFeign;
+	@Autowired
+	private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
 
 	public PagerVo<AsBwdiffapplyVo> listPageVo(PagerQuery<AsBwdiffapplyQuery> pq) {
 		AsBwdiffapplyQuery query = pq.getParams();
@@ -186,7 +190,7 @@ public class AsBwdiffapplyService extends MybatisBaseService<AsBwdiffapplyMapper
 		PagerVo<AsBwdiffapplyVo> p = PagerUtil.pageToVo(pagging, null);
 		return p;
 	}
-	
+
 	public String saveOrUpdateDto(AsBwdiffapplyDto dto){
 		String dtoSid = dto.getSid();
 		List<AsBwdiffapplyFile> fileList = dto.getFileList();
@@ -259,7 +263,7 @@ public class AsBwdiffapplyService extends MybatisBaseService<AsBwdiffapplyMapper
 		}
 		return dtoSid;
 	}
-	
+
 	public String insertByDto(AsBwdiffapplyDto dto){
 		AsBwdiffapply entity = new AsBwdiffapply();
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
@@ -267,17 +271,17 @@ public class AsBwdiffapplyService extends MybatisBaseService<AsBwdiffapplyMapper
 		baseMapper.insert(entity);
 		return entity.getSid();
 	}
-	
+
 	public void updateByDto(AsBwdiffapplyDto dto){
           String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
-        } 
+        }
 		AsBwdiffapply entity = fetchBySid(dtoSid);
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
 		baseMapper.updateById(entity);
 	}
-	
+
 	public AsBwdiffapplyDetailsVo fetchDetailsVoBySid(String sid){
 		AsBwdiffapply entity = fetchBySid(sid);
 		AsBwdiffapplyDetailsVo vo = new AsBwdiffapplyDetailsVo();
@@ -456,6 +460,26 @@ public class AsBwdiffapplyService extends MybatisBaseService<AsBwdiffapplyMapper
 			UpdateFlowFieldVo ufVo = resultBean.getData();
 			updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
 			if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+				List<AsBwdiffapplyDetail> bwdiffapplyDetailsList = asBwdiffapplyDetailService.selectByMainSid(businessSid);
+				bwdiffapplyDetailsList.removeAll(Collections.singleton(null));
+				if(!bwdiffapplyDetailsList.isEmpty()){
+					for (int i = 0; i < bwdiffapplyDetailsList.size(); i++) {
+						AsBwdiffapplyDetail asBwdiffapplyDetail = bwdiffapplyDetailsList.get(i);
+						String sourceBillSid = asBwdiffapplyDetail.getSourceBillSid();
+						if(asBwdiffapplyDetail.getDiffHourAmount() != null){
+							ResultBean resultBean1 =finUncollectedReceivablesDetailedFeign.diffUncollected(asBwdiffapplyDetail.getDiffHourAmount().toString(),sourceBillSid,"工时费");
+						}
+						if(asBwdiffapplyDetail.getDiffGoodsAmount() != null){
+							ResultBean resultBean1 =finUncollectedReceivablesDetailedFeign.diffUncollected(asBwdiffapplyDetail.getDiffGoodsAmount().toString(),sourceBillSid,"材料费");
+						}
+						if(asBwdiffapplyDetail.getDiffOtherAmount() != null){
+							ResultBean resultBean1 =finUncollectedReceivablesDetailedFeign.diffUncollected(asBwdiffapplyDetail.getDiffOtherAmount().toString(),sourceBillSid,"其他费用");
+						}
+
+					}
+				}
+
+
 
 			} else {
 				//极光推送

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapplydetail/AsBwdiffapplyDetailMapper.java

@@ -59,4 +59,6 @@ public interface AsBwdiffapplyDetailMapper extends BaseMapper<AsBwdiffapplyDetai
 
     @Select("select * from as_bwdiffapply_detail where mainSid = #{mainSid}")
     List<AsBwdiffapplyDetailDetailsVo> fetchByMainSid(String mainSid);
+
+    List<AsBwdiffapplyDetail> selectByMainSid(@Param("mainSid") String businessSid);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapplydetail/AsBwdiffapplyDetailMapper.xml

@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.as.biz.asbwdiffapplydetail.AsBwdiffapplyDetailMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+
+    <select id="selectByMainSid" resultType="com.yxt.anrui.as.api.asbwdiffapplydetail.AsBwdiffapplyDetail">
+        select *
+        from as_bwdiffapply_detail
+        where mainSid = #{mainSid}
+    </select>
 </mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapplydetail/AsBwdiffapplyDetailService.java

@@ -97,4 +97,8 @@ public class AsBwdiffapplyDetailService extends MybatisBaseService<AsBwdiffapply
 	public List<AsBwdiffapplyDetailDetailsVo> fetchByMainSid(String mainSid) {
 		return baseMapper.fetchByMainSid(mainSid);
 	}
+
+	public List<AsBwdiffapplyDetail> selectByMainSid(String businessSid) {
+		return baseMapper.selectByMainSid(businessSid);
+	}
 }

yxt-as/src/main/java/com/yxt/anrui/as/feign/fin/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java

@@ -65,4 +65,8 @@ public interface FinUncollectedReceivablesDetailedFeign {
     @ApiOperation("根据维修工单sid查询应收金额之和")
     @PostMapping("/selYsByBillSid")
     ResultBean<BigDecimal> selYsByBillSid(@RequestParam("billSid") String billSid);
+
+    @ApiOperation("应收调差更新")
+    @PostMapping("/diffUncollected")
+    ResultBean diffUncollected(@RequestParam("diffMoney")String diffMoney,@RequestParam("busSid")String busSid,@RequestParam("type")String type);
 }

yxt-as/src/main/java/com/yxt/anrui/as/feign/fin/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java

@@ -29,6 +29,7 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -46,7 +47,6 @@ import java.util.List;
  * @version 1.0
  * @since 1.0
  */
-@Component
 public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncollectedReceivablesDetailedFeign {
 
 
@@ -60,4 +60,9 @@ public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncoll
 	public ResultBean<BigDecimal> selYsByBillSid(String billSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean diffUncollected(String diffMoney, String busSid, String type) {
+		return null;
+	}
 }