修改入库推送车辆台账缺少字段，增加app代办数量接口

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeign.java

@@ -151,7 +151,7 @@ public interface BusMainDepositFeign {
 
     /*************************************************APP虚拟订单预定车辆审批流程***************************************************/
 
-    @ApiOperation("提交App虚拟订单（预定车辆）审批流程")
+    @ApiOperation("提交App虚拟订单（预 定车辆）审批流程")
     @PostMapping("/submitAppMainDespoitVehicleApprove")
     public ResultBean submitAppMainDespoitVehicleApprove(@RequestBody @Valid AppBusDepositVehicleDto dto);
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeign.java

@@ -103,4 +103,9 @@ public interface ScmVehicleEnterlibraryFeign {
     @ResponseBody
     public ResultBean<AppScmVehicleEnterlibraryDetailsVo> getCarWarehousing(@PathVariable("warehousingSid") String warehousingSid);
 
+    @ApiOperation("手机端-查询本分公司下代办数量")
+    @GetMapping("/getToDoNum/{userSid}")
+    @ResponseBody
+    public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid);
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryFeignFallback.java

@@ -96,4 +96,9 @@ public class ScmVehicleEnterlibraryFeignFallback implements ScmVehicleEnterlibra
 	public ResultBean<AppScmVehicleEnterlibraryDetailsVo> getCarWarehousing(String warehousingSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<String> getToDoNum(String userSid) {
+		return null;
+	}
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineInfoVo.java

@@ -17,6 +17,9 @@ public class AppScmVehicleExamineInfoVo implements Vo {
     @ApiModelProperty("采购类型")
     private String purchaseKey;
 
+    @ApiModelProperty("是否填写车架号")
+    private boolean editVin;
+
     @ApiModelProperty("配置")
     private String config;
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeign.java

@@ -108,4 +108,9 @@ public interface ScmVehicleExamineFeign {
     @PostMapping("/submitCarInspectedInfo")
     @ResponseBody
     public ResultBean submitCarInspectedInfo(@RequestBody AppScmVehicleExamineSubmitDto dto);
+
+    @ApiOperation("手机端-查询本分公司下代办数量")
+    @GetMapping("/getToDoNum/{userSid}")
+    @ResponseBody
+    public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid);
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeignFallback.java

@@ -102,4 +102,9 @@ public class ScmVehicleExamineFeignFallback implements ScmVehicleExamineFeign {
 	public ResultBean submitCarInspectedInfo(AppScmVehicleExamineSubmitDto dto) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<String> getToDoNum(String userSid) {
+		return null;
+	}
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java

@@ -131,6 +131,11 @@ public interface ScmVehicleGressionFeign {
     @ResponseBody
     public ResultBean<TemporaryExitPermitInfo> temporaryExitPermitInfo(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid);
 
+    @ApiOperation("手机端-查询本分公司下代办数量")
+    @GetMapping("/getToDoNum/{userSid}")
+    @ResponseBody
+    public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid);
+
     /*************************************************PC移位审批流程***************************************************/
 
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java

@@ -122,6 +122,11 @@ public class ScmVehicleGressionFeignFallback implements ScmVehicleGressionFeign
         return null;
     }
 
+    @Override
+    public ResultBean<String> getToDoNum(String userSid) {
+        return null;
+    }
+
     @Override
     public ResultBean submitCarTransfer(SubmitCarTransferDto dto) {
         return null;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestayinventory/ScmVehicleStayInventoryFeign.java

@@ -87,4 +87,9 @@ public interface ScmVehicleStayInventoryFeign {
     @ResponseBody
     public ResultBean<PagerVo<AppScmVehicleStayInventoryListPageVo>> getInventoryList(@RequestBody PagerQuery<AppScmVehicleStayInventoryListPageQuery> pagerQuery);
 
+    @ApiOperation("手机端-查询本分公司下代办数量")
+    @GetMapping("/getToDoNum/{userSid}")
+    @ResponseBody
+    public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid);
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestayinventory/ScmVehicleStayInventoryFeignFallback.java

@@ -78,5 +78,10 @@ public class ScmVehicleStayInventoryFeignFallback implements ScmVehicleStayInven
 		return null;
 	}
 
+	@Override
+	public ResultBean<String> getToDoNum(String userSid) {
+		return null;
+	}
+
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionFeign.java

@@ -84,4 +84,9 @@ public interface ScmVehicleStayPatrolinspectionFeign {
     @PostMapping("/getInspectionList")
     @ResponseBody
     public ResultBean<PagerVo<AppScmVehicleStayPatrolinspectionPageVo>> getInspectionList(@RequestBody PagerQuery<AppScmVehicleStayPatrolinspectionPageQuery> pagerQuery);
+
+    @ApiOperation("手机端-查询本分公司下代办数量")
+    @GetMapping("/getToDoNum/{userSid}")
+    @ResponseBody
+    public ResultBean<String> getToDoNum(@PathVariable("userSid") String userSid);
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionFeignFallback.java

@@ -80,5 +80,10 @@ public class ScmVehicleStayPatrolinspectionFeignFallback implements ScmVehicleSt
 		return null;
 	}
 
+	@Override
+	public ResultBean<String> getToDoNum(String userSid) {
+		return null;
+	}
+
 
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryMapper.java

@@ -99,4 +99,8 @@ public interface ScmVehicleEnterlibraryMapper extends BaseMapper<ScmVehicleEnter
      * @return
      */
     IPage<ScmVehicleEnterlibraryPageVo> selectCarWarehousingList(IPage<ScmVehicleEnterlibraryPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehicleEnterlibraryPageVo> qw);
+
+    @Select("SELECT count(*) FROM scm_vehicle_enterlibrary WHERE useOrgSid = #{useOrgSid} and inboundState = '1' ")
+    int getToDoNum(@Param("useOrgSid") String useOrgSid);
+
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryRest.java

@@ -149,4 +149,9 @@ public class ScmVehicleEnterlibraryRest implements ScmVehicleEnterlibraryFeign {
         AppScmVehicleEnterlibraryDetailsVo vo = scmVehicleEnterlibraryService.getCarWarehousing(warehousingSid);
         return rb.success().setData(vo);
     }
+
+    @Override
+    public ResultBean<String> getToDoNum(String userSid) {
+        return scmVehicleEnterlibraryService.getToDoNum(userSid);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -326,6 +326,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     baseVehicleDto.setContractPrice(Integer.valueOf(applicationDetailsVo.getManufactorSettlementPrice())); // 厂家合同价
                     baseVehicleDto.setCostPrice(Integer.valueOf(applicationDetailsVo.getPurchasePrice()));// 厂家结算价
                     baseVehicleDto.setOrderingNo(applicationDetailsVo.getApplicationCode()); // 采购编号 厂家订单编号
+                    baseVehicleDto.setInsideCode(applicationDetailsVo.getInsideCode());
                     baseVehicleDto.setCreateOrgSid(scmVehicleEnterlibrary.getUseOrgSid());
                     baseVehicleDto.setCreateOrgName(scmVehicleEnterlibrary.getUseOrgName());
                     baseVehicleDto.setUseOrgSid(scmVehicleEnterlibrary.getUseOrgSid());
@@ -394,4 +395,11 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
         save(entity);
         return rb.success().setMsg("保存成功");
     }
+
+    public ResultBean<String> getToDoNum(String userSid) {
+        ResultBean rb = ResultBean.fireFail();
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        int count = baseMapper.getToDoNum(useOrgSid);
+        return rb.success().setData(String.valueOf(count));
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java

@@ -103,4 +103,6 @@ public interface ScmVehicleExamineMapper extends BaseMapper<ScmVehicleExamine> {
     AppScmVehicleExamineDetailsVo getCarInspected(@Param("inspectedSid") String inspectedSid);
 
 
+    @Select("SELECT count(*) FROM scm_vehicle_examine  WHERE useOrgSid = #{useOrgSid} and inspectionResult = '1' ")
+    int getToDoNum(@Param("useOrgSid") String useOrgSid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineRest.java

@@ -160,4 +160,9 @@ public class ScmVehicleExamineRest implements ScmVehicleExamineFeign {
         ResultBean rb = ResultBean.fireFail();
         return scmVehicleExamineService.submitCarInspectedInfo(dto);
     }
+
+    @Override
+    public ResultBean<String> getToDoNum(String userSid) {
+        return scmVehicleExamineService.getToDoNum(userSid);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

@@ -29,10 +29,15 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo;
+import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.base.common.enums.OperVehicleState;
 import com.yxt.anrui.base.common.enums.VehicleState;
+import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto;
+import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
@@ -103,6 +108,12 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
     @Autowired
     ScmVehinspectItemService scmVehinspectItemService;
 
+    @Autowired
+    FinPaymentrecordFeign finPaymentrecordFeign;
+
+    @Autowired
+    BaseOutsourcingApplicationFeign baseOutsourcingApplicationFeign;
+
 
     private QueryWrapper<ScmVehicleExamine> createQueryWrapper(ScmVehicleExamineQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -252,7 +263,11 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         List<String> carInspectedImages = new ArrayList<>();
         String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         AppScmVehicleExamineInfoVo vo = baseMapper.getCarInspectedInfo(inspectedSid, useOrgSid);
-
+        if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(vo.getPurchaseKey())) {
+            vo.setEditVin(true);
+        } else {
+            vo.setEditVin(false);
+        }
         List<ScmVehinspectItemVo> scmVehinspectItemVos = scmVehinspectItemService.selInfoByVehInspectSid(inspectedSid);
         List<AppScmInspectionItemVo> inspectionItemVos = new ArrayList<>();
         for (ScmVehinspectItemVo scmVehinspectItemVo : scmVehinspectItemVos) {
@@ -499,7 +514,16 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                     carWarehousingDto.setUseOrgSid(data1.getSid());
                     carWarehousingDto.setUseOrgName(data1.getName());
                     scmVehicleEnterlibraryService.saveCarWarehousing(carWarehousingDto);
-
+                    //如果订单为外采订单向待付款列表推送数据
+                    if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(scmVehicleExamine.getPurchaseTypeKey())) {
+                        BaseOutsourcingApplicationDetailsVo outsourcingApplicationDetailsVo = baseOutsourcingApplicationFeign.fetchBySid(scmVehicleExamine.getBusinessSid()).getData();
+                        FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
+                        finPaymentrecordDto.setApplySid(scmVehicleExamine.getBusinessSid());
+                        finPaymentrecordDto.setCreateOrgSid(scmVehicleExamine.getUseOrgSid());
+                        finPaymentrecordDto.setUseOrgSid(scmVehicleExamine.getUseOrgSid());
+                        finPaymentrecordDto.setCost(Integer.valueOf(outsourcingApplicationDetailsVo.getPurchasePrice()));
+                        finPaymentrecordFeign.save(finPaymentrecordDto);
+                    }
                     //车辆台账推送数据
                     BaseVehicleDto baseVehicleDto = new BaseVehicleDto();
                     baseVehicleDto.setVinNo(dto.getVin());
@@ -546,4 +570,11 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         }
         return rb.fail().setMsg("操作失败！");
     }
+
+    public ResultBean<String> getToDoNum(String userSid) {
+        ResultBean rb = ResultBean.fireFail();
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        int count = baseMapper.getToDoNum(useOrgSid);
+        return rb.success().setData(String.valueOf(count));
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java

@@ -115,4 +115,7 @@ public interface ScmVehicleGressionMapper extends BaseMapper<ScmVehicleGression>
     String selectNum(String bill);
 
     List<ScmVehicleGressionVo> getlastTimeEqual(@Param("vinNo") String vinNo, @Param("targetLocationSid") String targetLocationSid);
+
+    @Select("SELECT count(*) FROM scm_vehicle_gression  WHERE useOrgSid = #{useOrgSid} and handleState = '1' ")
+    int getToDoNum(@Param("useOrgSid") String useOrgSid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java

@@ -205,6 +205,11 @@ public class ScmVehicleGressionRest implements ScmVehicleGressionFeign {
         return scmVehicleGressionService.temporaryExitPermitInfo(sid,userSid);
     }
 
+    @Override
+    public ResultBean<String> getToDoNum(String userSid) {
+        return scmVehicleGressionService.getToDoNum(userSid);
+    }
+
     @Override
     public ResultBean submitCarTransfer(SubmitCarTransferDto dto) {
         return scmVehicleGressionService.submitCarTransfer(dto);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -36,6 +36,7 @@ import com.yxt.anrui.base.api.basevehicle.ExiCarConfigDetailVo;
 import com.yxt.anrui.base.api.basevehicle.VehicleGression;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
+import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
@@ -962,4 +963,11 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
 
 
     }
+
+    public ResultBean<String> getToDoNum(String userSid) {
+        ResultBean rb = ResultBean.fireFail();
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        int count = baseMapper.getToDoNum(useOrgSid);
+        return rb.success().setData(String.valueOf(count));
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryMapper.java

@@ -85,4 +85,7 @@ public interface ScmVehicleStayInventoryMapper extends BaseMapper<ScmVehicleStay
     void delBySid(@Param("sid") String sid, @Param("inventoryName") String inventoryName);
 
     String getVin(@Param("vin") String vin);
+
+    @Select("SELECT count(*) FROM scm_vehicle_stay_inventory  WHERE createOrgSid = #{useOrgSid} and isDelete = 0 ")
+    int getToDoNum(@Param("useOrgSid") String useOrgSid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryRest.java

@@ -111,4 +111,9 @@ public class ScmVehicleStayInventoryRest implements ScmVehicleStayInventoryFeign
         PagerVo<AppScmVehicleStayInventoryListPageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
         return new ResultBean<PagerVo<AppScmVehicleStayInventoryListPageVo>>().success().setData(pagerVo);
     }
+
+    @Override
+    public ResultBean<String> getToDoNum(String userSid) {
+        return scmVehicleStayInventoryService.getToDoNum(userSid);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryService.java

@@ -224,4 +224,11 @@ public class ScmVehicleStayInventoryService extends MybatisBaseService<ScmVehicl
     public String getVin(String vin) {
         return baseMapper.getVin(vin);
     }
+
+    public ResultBean<String> getToDoNum(String userSid) {
+        ResultBean rb = ResultBean.fireFail();
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        int count = baseMapper.getToDoNum(useOrgSid);
+        return rb.success().setData(String.valueOf(count));
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionMapper.java

@@ -82,4 +82,7 @@ public interface ScmVehicleStayPatrolinspectionMapper extends BaseMapper<ScmVehi
     void updateByStaySid(@Param("patrolInspectionSid") String patrolInspectionSid, @Param("newTime") String newTime, @Param("userName") String userName);
 
     List<ScmVehicleStayPatrolinspectionVo> selPatrolinspection(@Param("vin") String vin, @Param("id") String id);
+
+    @Select("SELECT count(*) FROM scm_vehicle_stay_patrolinspection  WHERE createOrgSid = #{useOrgSid} and isDelete = 0 ")
+    int getToDoNum(@Param("useOrgSid") String useOrgSid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionRest.java

@@ -114,5 +114,10 @@ public class ScmVehicleStayPatrolinspectionRest implements ScmVehicleStayPatroli
         return new ResultBean<PagerVo<AppScmVehicleStayPatrolinspectionPageVo>>().success().setData(pagerVo);
     }
 
+    @Override
+    public ResultBean<String> getToDoNum(String userSid) {
+        return scmVehicleStayPatrolinspectionService.getToDoNum(userSid);
+    }
+
 
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionService.java

@@ -211,4 +211,11 @@ public class ScmVehicleStayPatrolinspectionService extends MybatisBaseService<Sc
     public void updateByStaySid(String patrolInspectionSid, String newTime, String userName) {
         baseMapper.updateByStaySid(patrolInspectionSid, newTime, userName);
     }
+
+    public ResultBean<String> getToDoNum(String userSid) {
+        ResultBean rb = ResultBean.fireFail();
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        int count = baseMapper.getToDoNum(useOrgSid);
+        return rb.success().setData(String.valueOf(count));
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExamineInfoVo.java

@@ -17,6 +17,9 @@ public class AppExamineInfoVo implements Vo {
     @ApiModelProperty("采购类型")
     private String purchaseKey;
 
+    @ApiModelProperty("是否填写车架号")
+    private boolean editVin;
+
     @ApiModelProperty("配置")
     private String config;