aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'demand: tms-运输管理-货物组批次-删除批次成本时更新批次成本录入状态' (#239) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/239
This commit is contained in:
heyu 2025-11-24 16:56:19 +08:00
commit d1586e7bc4
3 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchMapper.java
View File

@ -109,6 +109,14 @@ public interface EmisTmsSiteBatchMapper extends BaseMapper<EmisTmsSiteBatch>
*/ */
public int updateEnteringStatus(String batchNo); public int updateEnteringStatus(String batchNo);
/**
* 重置录入状态为未录入
*
* @param batchNo 批次号
* @return 结果
*/
public int resetEnteringStatus(String batchNo);
/** /**
* 根据运单号列表查询组批次信息 * 根据运单号列表查询组批次信息
* *

25
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java
View File

@ -1,10 +1,10 @@
/** /**
* @Project: emis * @Project: emis
* @Title: EmisTmsCostFeeServiceImpl.java * @Title: EmisTmsCostFeeServiceImpl.java
* @author linfso * @author linfso
* @date 2024-10-10 01:53:20 * @date 2024-10-10 01:53:20
* @Copyright: ShangHai Duta 2022 All rights reserved. * @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0 * @version v1.0
* @Description: <p> TMS运输成本账单 实体类 </p> * @Description: <p> TMS运输成本账单 实体类 </p>
*/ */
@ -45,7 +45,7 @@ import static org.apache.commons.lang3.time.DateUtils.parseDate;
/** /**
* TMS运输成本账单Service业务层处理 * TMS运输成本账单Service业务层处理
* *
* @author linfso * @author linfso
* @date 2024-10-10 01:53:20 * @date 2024-10-10 01:53:20
*/ */
@ -93,7 +93,7 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT
/** /**
* 查询TMS运输成本账单列表 * 查询TMS运输成本账单列表
* *
* @param emisTmsCostFee TMS运输成本账单 * @param emisTmsCostFee TMS运输成本账单
* @return TMS运输成本账单 * @return TMS运输成本账单
*/ */
@ -105,8 +105,8 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT
/** /**
* 检查是否重复 * 检查是否重复
* *
* @param emisTmsCostFee * @param emisTmsCostFee
* @return 数量 * @return 数量
*/ */
@Override @Override
@ -125,7 +125,7 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT
/** /**
* 新增TMS运输成本账单 * 新增TMS运输成本账单
* *
* @param emisTmsCostFee TMS运输成本账单 * @param emisTmsCostFee TMS运输成本账单
* @return 结果 * @return 结果
*/ */
@ -1268,7 +1268,7 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT
/** /**
* 修改TMS运输成本账单 * 修改TMS运输成本账单
* *
* @param emisTmsCostFee TMS运输成本账单 * @param emisTmsCostFee TMS运输成本账单
* @return 结果 * @return 结果
*/ */
@ -1346,7 +1346,7 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT
/** /**
* 批量删除TMS运输成本账单 * 批量删除TMS运输成本账单
* *
* @param ids 需要删除的TMS运输成本账单主键 * @param ids 需要删除的TMS运输成本账单主键
* @return 结果 * @return 结果
*/ */
@ -1363,7 +1363,7 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT
/** /**
* 删除TMS运输成本账单信息 * 删除TMS运输成本账单信息
* *
* @param id TMS运输成本账单主键 * @param id TMS运输成本账单主键
* @return 结果 * @return 结果
*/ */
@ -1388,6 +1388,11 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT
} }
} }
// 重置批次录入状态
if(StringUtils.isNotBlank(emisTmsCostFee.getBatchNo())){
emisTmsSiteBatchMapper.resetEnteringStatus(emisTmsCostFee.getBatchNo());
}
return 1; return 1;
} }

7
emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
View File

@ -383,6 +383,13 @@
where batch_no=#{batchNo} where batch_no=#{batchNo}
</update> </update>
<!-- 重置录入状态 -->
<update id="resetEnteringStatus" parameterType="String">
update emis_tms_site_batch set
bl_entering = '0'
where batch_no=#{batchNo}
</update>
<insert id="insertEmisTmsSiteBatch" parameterType="EmisTmsSiteBatch" useGeneratedKeys="true" keyProperty="id"> <insert id="insertEmisTmsSiteBatch" parameterType="EmisTmsSiteBatch" useGeneratedKeys="true" keyProperty="id">
insert into emis_tms_site_batch insert into emis_tms_site_batch
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">