diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepFeign.java
index 5131ef579c..4c582d2bc0 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepFeign.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepFeign.java
@@ -33,21 +33,6 @@ import com.yxt.common.core.vo.PagerVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
-import java.util.List;
-
-/**
- * Project: anrui-riskcenter(家访准备)
- * File: LoanHomevisitPrepFeign.java
- * Class: com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepFeign
- * Description: 家访准备.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-08-09 15:47:52
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Api(tags = "家访准备")
@FeignClient(
contextId = "anrui-riskcenter-LoanHomevisitPrep",
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java
index 48a6b5ee59..76b2194658 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java
@@ -115,17 +115,10 @@ public class ScmSpecialRebateRest implements ScmSpecialRebateFeign {
public ResultBean delBySids(@RequestBody String[] sids) {
ResultBean rb = ResultBean.fireFail();
for (String sid : sids) {
- List stringList = scmSpecialRebateWithService.fetchBySpecialReBateSid(sid);
- for (String s : stringList) {
- ScmSpecialRebateWithApply scmSpecialRebateWithApply = scmSpecialRebateWithApplyService.fetchBySid(s);
- if (!scmSpecialRebateWithApply.getNodeState().equals("待提交")) {
- return rb.setMsg("所选数据中包含已提交专项返利信息，无法删除");
- }
- }
ScmSpecialRebate scmSpecialRebate = scmSpecialRebateService.fetchBySid(sid);
Integer state = scmSpecialRebate.getState();
- if (state == 1) {
- return rb.setMsg("所选数据中包含已预提专项返利信息，无法删除");
+ if (state != 0) {
+ return rb.setMsg("请选择状态为未预提的记录删除");
}
}
scmSpecialRebateService.delBySids(sids);
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java
index 6ebeda8fa2..a61f072aaa 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java
@@ -197,8 +197,8 @@ public class ScmVehRebateRest implements ScmVehRebateFeign {
for (String sid : sids) {
ScmVehRebate scmVehRebate = scmVehRebateService.fetchBySid(sid);
Integer state = scmVehRebate.getState();
- if (state == 1) {
- return rb.setMsg("所选数据中包含已预提单车返利信息，无法删除");
+ if (state != 0) {
+ return rb.setMsg("请选择状态为未预提的记录删除");
}
}
scmVehRebateService.delBySids(sids);
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFrockallotApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFrockallotApplyRest.java
index cf3a0d025a..ecc67f3b5d 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFrockallotApplyRest.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFrockallotApplyRest.java
@@ -26,29 +26,16 @@
package com.yxt.anrui.oa.api;
import com.yxt.anrui.oa.biz.adfrockallotapply.*;
-import com.yxt.anrui.oa.biz.adpircarpulapply.AdPircarpulApplyDetailsVo;
import com.yxt.anrui.oa.biz.adpircarpulapply.AdPircarpulApplyDto;
-import com.yxt.anrui.oa.biz.adpircarpulapply.AdPircarpulApplyVo;
import com.yxt.anrui.oa.biz.oaform.flowable.CompleteDto;
import com.yxt.anrui.oa.biz.oaform.flowable.NodeQuery;
import com.yxt.anrui.oa.biz.oaform.flowable.TaskDto;
-import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import com.yxt.anrui.oa.api.adfrockallotapply.AdFrockallotApply;
-import com.yxt.anrui.oa.api.adfrockallotapply.AdFrockallotApplyQuery;
-import com.yxt.anrui.oa.api.adfrockallotapply.AdFrockallotApplyVo;
-import com.yxt.anrui.oa.api.adfrockallotapply.AdFrockallotApplyDetailsVo;
-import com.yxt.anrui.oa.api.adfrockallotapply.AdFrockallotApplyDto;
-import com.yxt.anrui.oa.api.adfrockallotapply.AdFrockallotApplyFeign;
-
import javax.validation.Valid;
@Api(tags = "工装订制配发申请")
@@ -80,20 +67,20 @@ public class AdFrockallotApplyRest {
@ApiOperation("新增或修改")
@PostMapping("/save")
- public ResultBean save(@RequestBody AdPircarpulApplyDto dto) {
+ public ResultBean save(@RequestBody AdFrockallotApplyDto dto) {
return adFrockallotApplyService.saveOrUpdateDto(dto);
}
@ApiOperation("详情")
@GetMapping("/details/{sid}")
- ResultBean details(@PathVariable("sid") String sid
+ ResultBean details(@PathVariable("sid") String sid
, @RequestParam(value = "application", required = false) String application) {
return adFrockallotApplyService.details(sid,application);
}
@ApiOperation("提交审批流程")
@PostMapping("/submit")
- public ResultBean submit(@RequestBody AdPircarpulApplyDto dto) {
+ public ResultBean submit(@RequestBody AdFrockallotApplyDto dto) {
return adFrockallotApplyService.submit(dto);
}
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFrockallotDetailRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFrockallotDetailRest.java
index c6fff4a48e..16dcf0b126 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFrockallotDetailRest.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFrockallotDetailRest.java
@@ -25,24 +25,9 @@
*********************************************************/
package com.yxt.anrui.oa.api;
-import com.yxt.anrui.oa.biz.adfrockallotdetail.*;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.List;
-import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetail;
-import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailQuery;
-import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailVo;
-import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailDetailsVo;
-import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailDto;
-import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailFeign;
-
-
@Api(tags = "工装订制配发列表")
@RestController
@RequestMapping("v1/adfrockallotdetail")
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPircarpulApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPircarpulApplyRest.java
index d895ef0830..0e49cab1e7 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPircarpulApplyRest.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPircarpulApplyRest.java
@@ -25,23 +25,16 @@
*********************************************************/
package com.yxt.anrui.oa.api;
-import com.yxt.anrui.oa.biz.adleasehostapply.AdLeasehostApplyDetailsVo;
-import com.yxt.anrui.oa.biz.adleasehostapply.AdLeasehostApplyDto;
-import com.yxt.anrui.oa.biz.adleasehostapply.adPircarpulApplyService;
-import com.yxt.anrui.oa.biz.adleasehostapply.AdLeasehostApplyVo;
import com.yxt.anrui.oa.biz.adpircarpulapply.*;
import com.yxt.anrui.oa.biz.oaform.flowable.CompleteDto;
import com.yxt.anrui.oa.biz.oaform.flowable.NodeQuery;
import com.yxt.anrui.oa.biz.oaform.flowable.TaskDto;
-import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
-
import javax.validation.Valid;
@Api(tags = "临时私车公用申请")
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetail.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetail.java
index 80f0f6fe85..da53734b1f 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetail.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetail.java
@@ -30,7 +30,7 @@ import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
+import java.math.BigDecimal;
@Data
@ApiModel(value = "工装订制配发列表", description = "工装订制配发列表")
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailMapper.java
index ca5cb73c69..87a0c03244 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailMapper.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailMapper.java
@@ -25,21 +25,11 @@
*********************************************************/
package com.yxt.anrui.oa.biz.adfrockallotdetail;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetail;
-import com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetailVo;
import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
-import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetail;
-import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailVo;
-
import java.util.List;
-
@Mapper
public interface AdFrockallotDetailMapper extends BaseMapper {
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailService.java
index 6ac1817752..8454db38bb 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailService.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailService.java
@@ -26,30 +26,11 @@
package com.yxt.anrui.oa.biz.adfrockallotdetail;
import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetail;
-import com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetailDto;
-import com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetailVo;
-import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.base.utils.PagerUtil;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
-import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetail;
-import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailQuery;
-import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailVo;
-import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailDetailsVo;
-import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailDto;
-import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailFeign;
-
import org.springframework.stereotype.Service;
-
import java.util.Collections;
import java.util.List;
-
@Service
public class AdFrockallotDetailService extends MybatisBaseService {
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyMapper.java
index c0eb75ee34..1dc74326b9 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyMapper.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyMapper.java
@@ -25,32 +25,9 @@
*********************************************************/
package com.yxt.anrui.oa.biz.adpircarpulapply;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.anrui.oa.biz.adleasehostapply.AdLeasehostApplyDetailsVo;
import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import com.yxt.anrui.oa.api.adpircarpulapply.AdPircarpulApply;
-import com.yxt.anrui.oa.api.adpircarpulapply.AdPircarpulApplyVo;
-import java.util.List;
-
-/**
- * Project: yxt-oa(私车临时公用)
- * File: AdPircarpulApplyMapper.java
- * Class: com.yxt.anrui.oa.biz.adpircarpulapply.AdPircarpulApplyMapper
- * Description: 临时私车公用申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-02-20 09:42:01
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Mapper
public interface AdPircarpulApplyMapper extends BaseMapper {
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetail.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetail.java
index 062f12d806..7bfe84f057 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetail.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetail.java
@@ -30,7 +30,7 @@ import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
+import java.math.BigDecimal;
@Data
@ApiModel(value = "临时私车公用列表", description = "临时私车公用列表")
@@ -38,35 +38,35 @@ import lombok.Data;
public class AdPircarpulDetail extends BaseEntity {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("申请sid")
+ @ApiModelProperty("申请sid")
private String mainSid; // 申请sid
- @ApiModelProperty("人员sid")
+ @ApiModelProperty("人员sid")
private String userSid; // 人员sid
- @ApiModelProperty("人员姓名")
+ @ApiModelProperty("人员姓名")
private String userName; // 人员姓名
- @ApiModelProperty("部门sid")
+ @ApiModelProperty("部门sid")
private String deptSid; // 部门sid
- @ApiModelProperty("部门名称")
+ @ApiModelProperty("部门名称")
private String deptName; // 部门名称
- @ApiModelProperty("岗位sid")
+ @ApiModelProperty("岗位sid")
private String postSid; // 岗位sid
- @ApiModelProperty("岗位名称")
+ @ApiModelProperty("岗位名称")
private String postName; // 岗位名称
- @ApiModelProperty("用车事由")
+ @ApiModelProperty("用车事由")
private String reasonsForUsingVehicles; // 用车事由
- @ApiModelProperty("计划出发地址")
+ @ApiModelProperty("计划出发地址")
private String departureAddress; // 计划出发地址
- @ApiModelProperty("目的地地址")
+ @ApiModelProperty("目的地地址")
private String destinationAddress; // 目的地地址
- @ApiModelProperty("计划出发时间")
+ @ApiModelProperty("计划出发时间")
private String departureTime; // 计划出发时间
- @ApiModelProperty("计划返回时间")
+ @ApiModelProperty("计划返回时间")
private String returnTime; // 计划返回时间
- @ApiModelProperty("车牌号")
+ @ApiModelProperty("车牌号")
private String plateNumber; // 车牌号
- @ApiModelProperty("预计费用")
+ @ApiModelProperty("预计费用")
private BigDecimal expectCost; // 预计费用
- @ApiModelProperty("费用明细")
+ @ApiModelProperty("费用明细")
private String costRemarks; // 费用明细
}
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailMapper.java
index ef614b36d3..089f127964 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailMapper.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailMapper.java
@@ -25,33 +25,11 @@
*********************************************************/
package com.yxt.anrui.oa.biz.adpircarpuldetail;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostDetail;
-import com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostDetailVo;
import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
-import com.yxt.anrui.oa.api.adpircarpuldetail.AdPircarpulDetail;
-import com.yxt.anrui.oa.api.adpircarpuldetail.AdPircarpulDetailVo;
-
import java.util.List;
-/**
- * Project: yxt-oa(私车临时公用)
- * File: AdPircarpulDetailMapper.java
- * Class: com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetailMapper
- * Description: 临时私车公用列表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-02-20 09:42:01
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Mapper
public interface AdPircarpulDetailMapper extends BaseMapper {
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailService.java
index ca8ed81fd9..6a1c4df5a6 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailService.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailService.java
@@ -26,42 +26,11 @@
package com.yxt.anrui.oa.biz.adpircarpuldetail;
import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostDetail;
-import com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostDetailDto;
-import com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostDetailVo;
-import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.base.utils.PagerUtil;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
-import com.yxt.anrui.oa.api.adpircarpuldetail.AdPircarpulDetail;
-import com.yxt.anrui.oa.api.adpircarpuldetail.AdPircarpulDetailQuery;
-import com.yxt.anrui.oa.api.adpircarpuldetail.AdPircarpulDetailVo;
-import com.yxt.anrui.oa.api.adpircarpuldetail.AdPircarpulDetailDetailsVo;
-import com.yxt.anrui.oa.api.adpircarpuldetail.AdPircarpulDetailDto;
-import com.yxt.anrui.oa.api.adpircarpuldetail.AdPircarpulDetailFeign;
-
import org.springframework.stereotype.Service;
-
import java.util.Collections;
import java.util.List;
-/**
- * Project: yxt-oa(私车临时公用)
- * File: AdPircarpulDetailService.java
- * Class: com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetailService
- * Description: 临时私车公用列表 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-02-20 09:42:01
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Service
public class AdPircarpulDetailService extends MybatisBaseService {
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java
index 6bd07c59b6..bf6d93d15c 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java
@@ -25,19 +25,11 @@
*********************************************************/
package com.yxt.anrui.oa.biz.oamendapply;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.yxt.anrui.oa.biz.oaform.OaForm;
import com.yxt.common.core.domain.BaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.util.Date;
-
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.springframework.data.annotation.Transient;
-
@Data
@ApiModel(value = "补卡申请", description = "补卡申请")
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/flowable/flow/ProcDefEnum.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/flowable/flow/ProcDefEnum.java
index ba000270da..2b409e7093 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/flowable/flow/ProcDefEnum.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/flowable/flow/ProcDefEnum.java
@@ -8,13 +8,13 @@ public enum ProcDefEnum {
/***************************正式流程id***********************************/
WMSINVENCHECKREPORT("盘点报告审批", "process_wtab67fj:1:14197600"),
- WMSOLDINVENCHECKREPORT("旧件盘点报告审批", "process_wtab67fj:1:14197600"),
+ WMSOLDINVENCHECKREPORT("旧件盘点报告审批", "process_chyb7xug:1:17592520"),
WMSINVENTORYPROFITIN("盘盈入库申请", "process_kwd3cagu:1:14197564"),
WMSINVENTORYPROFITOUT("盘亏出库申请", "process_gmjrjghm:1:14197568"),
- WMSOLDINVENTORYPROFITIN("旧件盘盈入库申请", "process_kwd3cagu:2:15792504"),
- WMSOLDINVENTORYPROFITOUT("旧件盘亏出库申请", "process_gmjrjghm:2:15792512"),
- WMSDISINVENTORYPROFITIN("拆件盘盈入库申请", "process_kwd3cagu:3:15792508"),
- WMSDISINVENTORYPROFITOUT("拆件盘亏出库申请", "process_gmjrjghm:3:15792516"),
+ WMSOLDINVENTORYPROFITIN("旧件盘盈入库申请", "process_g4zmi6xc:1:17592504"),
+ WMSOLDINVENTORYPROFITOUT("旧件盘亏出库申请", "process_w4rvfxuv:1:17592512"),
+ WMSDISINVENTORYPROFITIN("拆件盘盈入库申请", "process_x0piy712:1:17592508"),
+ WMSDISINVENTORYPROFITOUT("拆件盘亏出库申请", "process_bqtvd42s:1:17592516"),
WMSOTHEROUTAPPLY("其他出库（报损出库）", "process_iks2hour:1:14197560"),
WMSINVENTORYALLOCATEBILLONE("调拨申请(自有、合作二级站间调拨)", "process_hw0a2ybh:3:14242504"),
WMSINVENTORYALLOCATEBILLTWO("调拨申请(集团内不同分公司两一级站间调拨)", "process_9pm5umo8:2:14242508"),