索赔相关调整修改对接

采购推送调整

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillPageListVo.java

@@ -11,9 +11,14 @@ import lombok.Data;
 @Data
 public class AsBusrepairBillPageListVo {
 
+    private String sid;
+
     @ApiModelProperty("索赔单数量")
     private String num;
 
+    @ApiModelProperty("索赔单编号")
+    private String spdBillNo;
+
     @ApiModelProperty("单据编号")
     private String billNo;
 

yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyRest.java

@@ -92,9 +92,7 @@ public class AsArrearsoutApplyRest {
 	@ApiOperation("初始化")
 	@GetMapping("/init/{gdSid}")
 	public ResultBean<AsArrearsoutApplyDetailsVo> init(@PathVariable("gdSid") String gdSid){
-		ResultBean rb = ResultBean.fireFail();
+		return asArrearsoutApplyService.init(gdSid);
-		AsArrearsoutApplyDetailsVo vo = asArrearsoutApplyService.init(gdSid);
-		return rb.success().setData(vo);
 	}
 
 	@ApiOperation("根据SID获取一条记录")

yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java

@@ -43,6 +43,8 @@ import com.yxt.anrui.as.feign.flowable.flow2.FlowFeign;
 import com.yxt.anrui.as.feign.flowable.flowtask.FlowTaskFeign;
 import com.yxt.anrui.as.feign.flowable.flowtask.FlowTaskVo;
 import com.yxt.anrui.as.feign.flowable.flowtask.LatestTaskVo;
+import com.yxt.anrui.as.feign.fms.FmsReceivesettle;
+import com.yxt.anrui.as.feign.fms.FmsReceivesettleFeign;
 import com.yxt.anrui.as.feign.message.MessageFeign;
 import com.yxt.anrui.as.feign.message.MessageFlowVo;
 import com.yxt.anrui.as.feign.message.MessageFlowableQuery;
@@ -62,6 +64,7 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -101,6 +104,8 @@ public class AsArrearsoutApplyService extends MybatisBaseService<AsArrearsoutApp
     private AsBusrepairBillService asBusrepairBillService;
     @Autowired
     private AsBusrepairBillVechService asBusrepairBillVechService;
+    @Autowired
+    private FmsReceivesettleFeign fmsReceivesettleFeign;
 
     public PagerVo<AsArrearsoutApplyVo> listPageVo(PagerQuery<AsArrearsoutApplyQuery> pq) {
         AsArrearsoutApplyQuery query = pq.getParams();
@@ -224,7 +229,8 @@ public class AsArrearsoutApplyService extends MybatisBaseService<AsArrearsoutApp
         return vo;
     }
 
-    public AsArrearsoutApplyDetailsVo init(String gdSid) {
+    public ResultBean<AsArrearsoutApplyDetailsVo> init(String gdSid) {
+        ResultBean rb = ResultBean.fireFail();
         AsBusrepairBill asBusrepairBill = asBusrepairBillService.fetchBySid(gdSid);
         AsArrearsoutApplyDetailsVo asArrearsoutApplyDetailsVo = new AsArrearsoutApplyDetailsVo();
         asArrearsoutApplyDetailsVo.setPairBillSid(gdSid);
@@ -239,7 +245,21 @@ public class AsArrearsoutApplyService extends MybatisBaseService<AsArrearsoutApp
         asArrearsoutApplyDetailsVo.setUseOrgName(asBusrepairBill.getUseOrgName());
         asArrearsoutApplyDetailsVo.setBillTypeKey(asBusrepairBill.getBillTypeKey());
         asArrearsoutApplyDetailsVo.setBillTypeValue(asBusrepairBill.getBillType());
-        return asArrearsoutApplyDetailsVo;
+        FmsReceivesettle fmsReceivesettle = fmsReceivesettleFeign.fetchBySourceSid(gdSid).getData();
+        if (fmsReceivesettle == null){
+            return rb.setMsg("请先进行结算");
+        }
+        BigDecimal pairReceivedMoney;
+        if (StringUtils.isNotBlank(fmsReceivesettle.getOtherSettleAmount())){
+            pairReceivedMoney = fmsReceivesettle.getSettleAmount().add(new BigDecimal(fmsReceivesettle.getOtherSettleAmount()));
+        }else {
+            pairReceivedMoney = fmsReceivesettle.getSettleAmount();
+        }
+        asArrearsoutApplyDetailsVo.setPairReceivedMoney(pairReceivedMoney);
+        asArrearsoutApplyDetailsVo.setPairReceivableMoney(asBusrepairBill.getReceivableAmount());
+        asArrearsoutApplyDetailsVo.setPairArrearsMoney(asBusrepairBill.getReceivableAmount().subtract(pairReceivedMoney));
+        asArrearsoutApplyDetailsVo.setBalanceDate(fmsReceivesettle.getSettleTime());
+        return rb.success().setData(asArrearsoutApplyDetailsVo);
     }
 
     public ResultBean submit(SubmitAsArrearsoutApplyDto dto) {

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.java

@@ -8,6 +8,7 @@ import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBill;
 import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -23,4 +24,12 @@ public interface AsBusclaimBillMapper extends BaseMapper<AsBusclaimBill> {
     int saveList(List<AsBusclaimBill> resultList);
 
     AsBusclaimBill selectByBillNo(String billNo);
+
+    @Select("select count(*) from as_busclaim_bill where billNo = #{billNo}")
+    int checkBillNo(String billNo);
+
+    void updateByBillNo(AsBusclaimBill asBusclaimBill);
+
+    @Select("select billNo from as_busclaim_bill where repairBillSid = #{repairBillSid}")
+    List<String> selectByRepairBillSid(String repairBillSid);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.xml

@@ -13,8 +13,11 @@
                a.claimOtherAmount,
                a.state,
                a.invoiceState,
-               a.adjustState
+               a.adjustState,
+               abbv.vinNo,
+               abbv.vehMark
         from as_busclaim_bill a
+        LEFT JOIN as_busrepair_bill_vech abbv ON a.repairBillSid = abbv.billSid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -41,4 +44,8 @@
         order by id desc
         limit 1
     </select>
+
+    <update id="updateByBillNo">
+        UPDATE as_busclaim_bill SET hourAmount = #{item.hourAmount,jdbcType=DECIMAL},goodsAmount = #{item.goodsAmount,jdbcType=DECIMAL},claimOutAmount = #{item.claimOutAmount,jdbcType=DECIMAL},claimSubsidyAmount = #{item.claimSubsidyAmount,jdbcType=DECIMAL},claimOtherAmount = #{item.claimOtherAmount,jdbcType=DECIMAL}) WHERE billNo = #{item.billNo,jdbcType=VARCHAR}
+    </update>
 </mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillRest.java

@@ -97,7 +97,15 @@ public class AsBusclaimBillRest {
         resultList = getSheetVal(sheet, resultCell);
         System.out.println("结果是--->" + resultList);
         try {
-            asBusclaimBillService.saveList(resultList);
+            for (AsBusclaimBill asBusclaimBill : resultList) {
+                int i = asBusclaimBillService.checkBillNo(asBusclaimBill.getBillNo());
+                if (i == 0){
+                    return ResultBean.fireFail().setMsg(asBusclaimBill.getBillNo() + "不存在");
+                }
+            }
+            for (AsBusclaimBill asBusclaimBill : resultList) {
+                asBusclaimBillService.updateByBillNo(asBusclaimBill);
+            }
             return ResultBean.fireSuccess().setMsg("数据导入成功");
         } catch (Exception e) {
             e.printStackTrace();

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillService.java

@@ -30,6 +30,10 @@ import java.util.List;
 public class AsBusclaimBillService extends MybatisBaseService<AsBusclaimBillMapper, AsBusclaimBill> {
     public ResultBean saveBill(AsBusclaimBillDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        int i = baseMapper.checkBillNo(dto.getBillNo());
+        if (i > 0){
+            return rb.setMsg("索赔单号已存在");
+        }
         AsBusclaimBill asBusclaimBill = new AsBusclaimBill();
         BeanUtil.copyProperties(dto, asBusclaimBill, "sid");
         asBusclaimBill.setReportDate(DateUtil.today());
@@ -74,4 +78,16 @@ public class AsBusclaimBillService extends MybatisBaseService<AsBusclaimBillMapp
     public AsBusclaimBill selectByBillNo(String billNo) {
         return baseMapper.selectByBillNo(billNo);
     }
+
+    public int checkBillNo(String billNo) {
+        return baseMapper.checkBillNo(billNo);
+    }
+
+    public void updateByBillNo(AsBusclaimBill asBusclaimBill) {
+        baseMapper.updateByBillNo(asBusclaimBill);
+    }
+
+    public List<String> selectByRepairBillSid(String repairBillSid) {
+        return baseMapper.selectByRepairBillSid(repairBillSid);
+    }
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml

@@ -113,7 +113,7 @@
     <select id="billPageList" resultType="com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillPageListVo">
         select a.sid,
                a.useOrgName,
-               a.deptName,
+               a.dept as deptName,
                a.createByName,
                a.subject,
                DATE_FORMAT(a.entryTime, '%Y-%m-%d')           as entryTime,
@@ -128,7 +128,9 @@
                DATE_FORMAT(a.createTime, '%Y-%m-%d')          as createTime,
                a.waitorName,
                a.groupName,
-               a.mainRepairers
+               a.mainRepairers,
+               a.nodeName,
+               b.vehModel
         from as_busrepair_bill a
                  LEFT JOIN as_busrepair_bill_vech AS b on a.sid = b.billSid
         <where>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@@ -20,6 +20,7 @@ import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.SitemsVo;
 import com.yxt.anrui.as.api.enums.AsBillTypeEnum;
 import com.yxt.anrui.as.api.utils.AsRule;
 import com.yxt.anrui.as.api.utils.domain.AsBillNo;
+import com.yxt.anrui.as.biz.asbusclaimbill.AsBusclaimBillService;
 import com.yxt.anrui.as.biz.asbusrepairbillaitem.AsBusrepairBillAitemService;
 import com.yxt.anrui.as.biz.asbusrepairbillinsurance.AsBusrepairBillInsuranceService;
 import com.yxt.anrui.as.biz.asbusrepairbillinvoice.AsBusrepairBillInvoiceService;
@@ -92,8 +93,10 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
     private AsBusrepairBillAitemService asBusrepairBillAitemService;
     @Autowired
     private AsBusrepairInventorybillDetailService asBusrepairInventorybillDetailService;
-    @Autowired
+    @Resource
     private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
+    @Autowired
+    private AsBusclaimBillService asBusclaimBillService;
     /**
      * 维修领料获取派工单
      *
@@ -781,7 +784,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         }
         //制单部门
         if (StringUtils.isNotBlank(query.getDeptName())) {
-            qw.like("a.deptName", query.getDeptName());
+            qw.like("a.dept", query.getDeptName());
         }
         //制单人
         if (StringUtils.isNotBlank(query.getCreateByName())) {
@@ -804,6 +807,10 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
             qw.like("a.subject", query.getSubject());
         }
         //进厂时间开始时间-进厂时间结束时间
+        qw.apply(StringUtils.isNotBlank(query.getEntryTimeStart()), "date_format (a.entryTime,'%Y-%m-%d') >= date_format('" + query.getEntryTimeStart() + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(query.getEntryTimeEnd()), "date_format (a.entryTime,'%Y-%m-%d') <= date_format('" + query.getEntryTimeEnd() + "','%Y-%m-%d')"
+                );
+        //预计完工开始时间-预计完工结束时间
         qw.apply(StringUtils.isNotBlank(query.getEstimatedFinishTimeStart()), "date_format (a.estimatedFinishTime,'%Y-%m-%d') >= date_format('" + query.getEstimatedFinishTimeStart() + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(query.getEstimatedFinishTimeEnd()), "date_format (a.estimatedFinishTime,'%Y-%m-%d') <= date_format('" + query.getEstimatedFinishTimeEnd() + "','%Y-%m-%d')"
                 );
@@ -840,9 +847,14 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
             qw.like("a.mainRepairers", query.getMainRepairers());
         }
         qw.like("a.subject", "保内");
-        qw.gt("a.nodeCode", 3);
+        qw.gt("a.nodeCode", 4);
         IPage<AsBusrepairBill> page = PagerUtil.queryToPage(pagerQuery);
         IPage<AsBusrepairBillPageListVo> pagging = baseMapper.billPageList(page, qw);
+        for (AsBusrepairBillPageListVo record : pagging.getRecords()) {
+            List<String> billNos = asBusclaimBillService.selectByRepairBillSid(record.getSid());
+            record.setNum(String.valueOf(billNos.size()));
+            record.setSpdBillNo(String.join(",",billNos));
+        }
         PagerVo<AsBusrepairBillPageListVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }

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

@@ -44,6 +44,8 @@ import com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceService;
 import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayDetailsVo;
 import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayDto;
 import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayService;
+import com.yxt.pms.biz.pms.pmssupplierinfo.PmsSupplierInfoDetailsVo;
+import com.yxt.pms.biz.pms.pmssupplierinfo.PmsSupplierInfoService;
 import com.yxt.pms.feign.base.Rule;
 import com.yxt.pms.feign.flowable.flow.*;
 import com.yxt.pms.feign.flowable.flow2.FlowDelegateQuery;
@@ -100,6 +102,8 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
     @Autowired
     private PmsPurchasePayService pmsPurchasePayService;
     @Autowired
+    private PmsSupplierInfoService pmsSupplierInfoService;
+    @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
@@ -451,8 +455,9 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
                 wmsAnsBillDto.setBillState(0);
                 wmsAnsBillDto.setReviewStatus("");
                 wmsAnsBillDto.setRefuseReason("");
-                wmsAnsBillDto.setContact("");
+                PmsSupplierInfoDetailsVo pmsSupplierInfoDetailsVo = pmsSupplierInfoService.fetchDetailsVoBySid(pmsPurchaseBill.getSupplierSid());
-                wmsAnsBillDto.setMobile("");
+                wmsAnsBillDto.setContact(pmsSupplierInfoDetailsVo.getContactName());
+                wmsAnsBillDto.setMobile(pmsPurchaseBill.getSupplierPhone());
                 wmsAnsBillDto.setSupplierSid(pmsPurchaseBill.getSupplierSid());
                 wmsAnsBillDto.setSupplierName(pmsPurchaseBill.getSupplierName());
                 wmsAnsBillDto.setGoodsOwnerSid("");