hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(deleted订单部门字段错误问题 

- 新ata): 修复销售增 queryCorrectDeptId 和 updateCdeptid 方法
- 添加 QueryCorrectDeptIdVo 和 UpdateSoSaleCdeptId 类
- 在 DeleteU8cDataUtil 中实现 repairSoSaleDepartment 方法
- 优化 DeleteU8cDataUtilEntity 类，增加 cdeptid 字段
- 更新 DeleteU8cDataUtilEntity.xml，添加 cdeptid 映射
This commit is contained in:
liuy 2025-05-29 11:30:31 +08:00
parent 781994dff1
commit 8767b8fe08
7 changed files with 154 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java
View File

@ -81,9 +81,9 @@ public class DeleteU8cDataUtil {
// cancelSignatureSoSaleReadExcelV2();
cancelSignatureSoSaleReadExcel20250528V2();
abandonmentReviewSoSaleinvoice2505282107();
cancelSignatureSoSaleReadExcel2505282140V2();
// cancelSignatureSoSaleReadExcel20250528V2();
// abandonmentReviewSoSaleinvoice2505282107();
// cancelSignatureSoSaleReadExcel2505282140V2();
}
}
}
@ -1334,4 +1334,40 @@ public class DeleteU8cDataUtil {
e.printStackTrace();
}
}
/**
* 修复销售订单部门字段错误问题
*/
public void repairSoSaleDepartment() {
try {
//确定销售订单范围、19648
List<DeleteU8cDataUtilEntity> deleteU8cDataUtilEntities = deleteU8cDataUtilDao.cancelSignatureSoSaleReadExcel20250528V2();
if (deleteU8cDataUtilEntities != null && deleteU8cDataUtilEntities.size() > 0) {
for (DeleteU8cDataUtilEntity deleteU8cDataUtilEntity : deleteU8cDataUtilEntities) {
//找到正确的部门主键
if (deleteU8cDataUtilEntity.getCdeptid() == null) {
throw new Exception("deleteU8cDataUtilEntity.getCdeptid() == null");
}
if (deleteU8cDataUtilEntity.getPk_corp() == null) {
throw new Exception("deleteU8cDataUtilEntity.getPk_corp() == null");
}
QueryCorrectDeptIdVo queryCorrectDeptIdVo = new QueryCorrectDeptIdVo();
queryCorrectDeptIdVo.setPk_deptdoc(deleteU8cDataUtilEntity.getCdeptid());
queryCorrectDeptIdVo.setPk_corp(deleteU8cDataUtilEntity.getPk_corp());
List<QueryCorrectDeptIdVo> queryCorrectDeptIdVos = deleteU8cDataUtilDao.queryCorrectDeptId(queryCorrectDeptIdVo);
if (queryCorrectDeptIdVos == null || queryCorrectDeptIdVos.size() != 1) {
throw new Exception("queryCorrectDeptIdVos.size() != 1");
}
QueryCorrectDeptIdVo queryCorrectDeptIdVo1 = queryCorrectDeptIdVos.get(0);
//发起销售订单表头部门修改
UpdateSoSaleCdeptId updateSoSaleCdeptId = new UpdateSoSaleCdeptId();
updateSoSaleCdeptId.setCdeptid(queryCorrectDeptIdVo1.getNewdeptpk());//部门id
updateSoSaleCdeptId.setCsaleid(deleteU8cDataUtilEntity.getCsaleid());//销售订单id
deleteU8cDataUtilDao.updateCdeptid(updateSoSaleCdeptId);
}
}
} catch (Exception e) {
e.printStackTrace();
}
}
}

18
service/src/main/java/com/hzya/frame/deletedata/dao/DeleteU8cDataUtilDao.java
View File

@ -2,9 +2,11 @@ package com.hzya.frame.deletedata.dao;
import com.hzya.frame.basedao.dao.IBaseDao;
import com.hzya.frame.deletedata.entity.DeleteU8cDataUtilEntity;
import com.hzya.frame.deletedata.vo.DeleteArapDjzbVo;
//import com.hzya.frame.deletedata.vo.DeleteArapDjzbVo;
import com.hzya.frame.deletedata.vo.DeleteIcGeneralHVo;
import com.hzya.frame.deletedata.vo.DeleteSoSaleVo;
import com.hzya.frame.deletedata.vo.QueryCorrectDeptIdVo;
import com.hzya.frame.deletedata.vo.UpdateSoSaleCdeptId;
import java.util.List;
@ -101,4 +103,18 @@ public interface DeleteU8cDataUtilDao extends IBaseDao<DeleteU8cDataUtilEntity,
* @author liuyang
*/
List<DeleteU8cDataUtilEntity> querySoSaleinvoiceByCancelApprovalV2(DeleteU8cDataUtilEntity deleteU8cDataUtilEntity) throws Exception;
/**
* 查找正确的部门主键
*
* @author liuyang
*/
List<QueryCorrectDeptIdVo> queryCorrectDeptId(QueryCorrectDeptIdVo deleteU8cDataUtilEntity) throws Exception;
/**
* 修改销售订单表头部门主键
*
* @author liuyang
*/
void updateCdeptid(UpdateSoSaleCdeptId updateSoSaleCdeptId) throws Exception;
}

16
service/src/main/java/com/hzya/frame/deletedata/dao/impl/DeleteU8cDataUtilDaoImpl.java
View File

@ -4,9 +4,7 @@ import com.baomidou.dynamic.datasource.annotation.DS;
import com.hzya.frame.basedao.dao.MybatisGenericDao;
import com.hzya.frame.deletedata.dao.DeleteU8cDataUtilDao;
import com.hzya.frame.deletedata.entity.DeleteU8cDataUtilEntity;
import com.hzya.frame.deletedata.vo.DeleteArapDjzbVo;
import com.hzya.frame.deletedata.vo.DeleteIcGeneralHVo;
import com.hzya.frame.deletedata.vo.DeleteSoSaleVo;
import com.hzya.frame.deletedata.vo.*;
import org.springframework.stereotype.Repository;
import java.util.List;
@ -92,5 +90,17 @@ public class DeleteU8cDataUtilDaoImpl extends MybatisGenericDao<DeleteU8cDataUti
public List<DeleteU8cDataUtilEntity> querySoSaleinvoiceByCancelApprovalV2(DeleteU8cDataUtilEntity deleteU8cDataUtilEntity) throws Exception {
return query("com.hzya.frame.deletedata.dao.impl.DeleteU8cDataUtilDaoImpl.querySoSaleinvoiceByCancelApprovalV2", deleteU8cDataUtilEntity);
}
@DS("lets_u8c")
@Override
public List<QueryCorrectDeptIdVo> queryCorrectDeptId(QueryCorrectDeptIdVo deleteU8cDataUtilEntity) throws Exception {
return (List<QueryCorrectDeptIdVo>) selectList("com.hzya.frame.deletedata.dao.impl.DeleteU8cDataUtilDaoImpl.queryCorrectDeptId", deleteU8cDataUtilEntity);
}
@DS("lets_u8c")
@Override
public void updateCdeptid(UpdateSoSaleCdeptId updateSoSaleCdeptId) throws Exception {
update("com.hzya.frame.deletedata.dao.impl.DeleteU8cDataUtilDaoImpl.updateCdeptid", updateSoSaleCdeptId);
}
}

10
service/src/main/java/com/hzya/frame/deletedata/entity/DeleteU8cDataUtilEntity.java
View File

@ -24,6 +24,16 @@ public class DeleteU8cDataUtilEntity extends BaseEntity {
private String fstatus;
private String cdeptid;
public String getCdeptid() {
return cdeptid;
}
public void setCdeptid(String cdeptid) {
this.cdeptid = cdeptid;
}
public String getFstatus() {
return fstatus;
}

33
service/src/main/java/com/hzya/frame/deletedata/entity/DeleteU8cDataUtilEntity.xml
View File

@ -12,6 +12,7 @@
<result property="dwbm" column="dwbm" jdbcType="VARCHAR"/>
<result property="csaleid" column="csaleid" jdbcType="VARCHAR"/>
<result property="cdeptid" column="cdeptid" jdbcType="VARCHAR"/>
</resultMap>
<!--查询需要删除的销售发票-->
@ -310,6 +311,7 @@
AND a.cdeptid NOT IN ( SELECT pk_deptdoc FROM bd_deptdoc WHERE deptname = '业务部门' AND dr = 0 )
AND a.cdeptid IS NOT NULL
and a.pk_corp != c.pk_corp
and a.csaleid = '1015A11000000000OUKB'
</select>
<!--查询审批状态下的销售发票-->
@ -336,5 +338,36 @@
)
AND a.dr = 0
</select>
<!--查找正确的部门id-->
<select id="queryCorrectDeptId" parameterType="com.hzya.frame.deletedata.vo.QueryCorrectDeptIdVo" resultMap="get-queryCorrectDeptId-result">
-- 找到正确的部门主键
SELECT
a.PK_DEPTDOC "olddeptpk",
a.DEPTCODE "olddeptcode",
a.PK_CORP "olddeptcorp",
b.pk_deptdoc "newdeptpk",
b.deptcode "newdeptcode",
b.pk_corp "newdeptcorp"
FROM
( SELECT a.pk_deptdoc, a.deptcode, a.pk_corp FROM bd_deptdoc a WHERE a.pk_deptdoc = #{pk_deptdoc} AND dr = 0 ) a
LEFT JOIN bd_deptdoc b ON a.DEPTCODE = b.DEPTCODE
AND b.PK_CORP = #{pk_corp}
AND b.dr = 0
</select>
<resultMap id="get-queryCorrectDeptId-result" type="com.hzya.frame.deletedata.vo.QueryCorrectDeptIdVo" >
<result property="olddeptpk" column="olddeptpk" jdbcType="VARCHAR"/>
<result property="olddeptcode" column="olddeptcode" jdbcType="VARCHAR"/>
<result property="olddeptcorp" column="olddeptcorp" jdbcType="VARCHAR"/>
<result property="newdeptpk" column="newdeptpk" jdbcType="VARCHAR"/>
<result property="newdeptcode" column="newdeptcode" jdbcType="VARCHAR"/>
<result property="newdeptcorp" column="newdeptcorp" jdbcType="VARCHAR"/>
</resultMap>
<!--修改销售主表对应的部门id-->
<update id="updateCdeptid" parameterType="com.hzya.frame.deletedata.vo.UpdateSoSaleCdeptId">
update so_sale set cdeptid=#{cdeptid} where csaleid = #{csaleid} and dr = 0
</update>
</mapper>

25
service/src/main/java/com/hzya/frame/deletedata/vo/QueryCorrectDeptIdVo.java Normal file
View File

@ -0,0 +1,25 @@
package com.hzya.frame.deletedata.vo;
import lombok.Data;
/**
* @Author：liuyang
* @Package：com.hzya.frame.deletedata.vo
* @Project：kangarooDataCenterV3
* @name：QueryCorrectDeptIdVo
* @Date：2025/5/29 09:27
* @Filename：QueryCorrectDeptIdVo
*/
@Data
public class QueryCorrectDeptIdVo {
//入参
private String pk_deptdoc;
private String pk_corp;
//出参
private String olddeptpk;
private String olddeptcode;
private String olddeptcorp;
private String newdeptpk;
private String newdeptcode;
private String newdeptcorp;
}

17
service/src/main/java/com/hzya/frame/deletedata/vo/UpdateSoSaleCdeptId.java Normal file
View File

@ -0,0 +1,17 @@
package com.hzya.frame.deletedata.vo;
import lombok.Data;
/**
* @Author：liuyang
* @Package：com.hzya.frame.deletedata.vo
* @Project：kangarooDataCenterV3
* @name：UpdateSoSaleCdeptId
* @Date：2025/5/29 10:48
* @Filename：UpdateSoSaleCdeptId
*/
@Data
public class UpdateSoSaleCdeptId {
private String cdeptid;
private String csaleid;
}