更改

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(家访准备) <br/>
- * File: LoanHomevisitPrepFeign.java <br/>
- * Class: com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepFeign <br/>
- * Description: 家访准备. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-08-09 15:47:52 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "家访准备")
 @FeignClient(
         contextId = "anrui-riskcenter-LoanHomevisitPrep",

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<String> 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) {
+            if (state != 0) {
-                return rb.setMsg("所选数据中包含已预提专项返利信息，无法删除");
+                return rb.setMsg("请选择状态为未预提的记录删除");
             }
         }
         scmSpecialRebateService.delBySids(sids);

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) {
+            if (state != 0) {
-                return rb.setMsg("所选数据中包含已预提单车返利信息，无法删除");
+                return rb.setMsg("请选择状态为未预提的记录删除");
             }
         }
         scmVehRebateService.delBySids(sids);

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<AdPircarpulApplyDetailsVo> details(@PathVariable("sid") String sid
+	ResultBean<AdFrockallotApplyDetailsVo> 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);
 	}
 

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")

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 = "临时私车公用申请")

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 = "工装订制配发列表")

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<AdFrockallotDetail> {
 

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<AdFrockallotDetailMapper, AdFrockallotDetail> {
 

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(私车临时公用) <br/>
- * File: AdPircarpulApplyMapper.java <br/>
- * Class: com.yxt.anrui.oa.biz.adpircarpulapply.AdPircarpulApplyMapper <br/>
- * Description: 临时私车公用申请. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-02-20 09:42:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface AdPircarpulApplyMapper extends BaseMapper<AdPircarpulApply> {
 

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 = "临时私车公用列表")

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(私车临时公用) <br/>
- * File: AdPircarpulDetailMapper.java <br/>
- * Class: com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetailMapper <br/>
- * Description: 临时私车公用列表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-02-20 09:42:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface AdPircarpulDetailMapper extends BaseMapper<AdPircarpulDetail> {
 

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(私车临时公用) <br/>
- * File: AdPircarpulDetailService.java <br/>
- * Class: com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetailService <br/>
- * Description: 临时私车公用列表 业务逻辑. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-02-20 09:42:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Service
 public class AdPircarpulDetailService extends MybatisBaseService<AdPircarpulDetailMapper, AdPircarpulDetail> {
 

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 = "补卡申请")

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"),
+    WMSOLDINVENTORYPROFITIN("旧件盘盈入库申请", "process_g4zmi6xc:1:17592504"),
-    WMSOLDINVENTORYPROFITOUT("旧件盘亏出库申请", "process_gmjrjghm:2:15792512"),
+    WMSOLDINVENTORYPROFITOUT("旧件盘亏出库申请", "process_w4rvfxuv:1:17592512"),
-    WMSDISINVENTORYPROFITIN("拆件盘盈入库申请", "process_kwd3cagu:3:15792508"),
+    WMSDISINVENTORYPROFITIN("拆件盘盈入库申请", "process_x0piy712:1:17592508"),
-    WMSDISINVENTORYPROFITOUT("拆件盘亏出库申请", "process_gmjrjghm:3:15792516"),
+    WMSDISINVENTORYPROFITOUT("拆件盘亏出库申请", "process_bqtvd42s:1:17592516"),
     WMSOTHEROUTAPPLY("其他出库（报损出库）", "process_iks2hour:1:14197560"),
     WMSINVENTORYALLOCATEBILLONE("调拨申请(自有、合作二级站间调拨)", "process_hw0a2ybh:3:14242504"),
     WMSINVENTORYALLOCATEBILLTWO("调拨申请(集团内不同分公司两一级站间调拨)", "process_9pm5umo8:2:14242508"),