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

md

Browse Source
This commit is contained in:
linfso 2024-08-06 14:05:40 +08:00
parent fe4eaeb141
commit 2a867c4a0d
5 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
View File

@ -148,6 +148,9 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
// 更新问题件状态
public int updateProblemStatus(EmisWaybill emisWaybill);
// 取消问题件登记
public int cancelProblemRegister(EmisWaybill emisWaybill);
// 更新上一站，下一站
public int updatePreOrNextSiteByBillCode(EmisWaybill emisWaybill);

6
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemInfoServiceImpl.java
View File

@ -14,6 +14,7 @@ import java.util.*;
import com.xdadan.erp.common.core.domain.AjaxResult;
import com.xdadan.erp.common.utils.DateUtils;
import com.xdadan.erp.emis.domain.EmisWaybill;
import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
import com.xdadan.erp.emis.domain.enumtype.ScanType;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
@ -125,6 +126,11 @@ public class EmisWaybillProblemInfoServiceImpl extends EmisBaseService implement
// 删除问题件
emisWaybillProblemInfoMapper.deleteEmisWaybillProblemInfoById(id);
// 删除运单的问题件记录
EmisWaybill emisWaybill = new EmisWaybill();
emisWaybill.setBillCode(emisWaybillProblemInfo.getMainBillCode());
emisWaybillMapper.cancelProblemRegister(emisWaybill);
}
return 1;

4
emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
View File

@ -387,11 +387,11 @@
</update>
<delete id="deleteEmisSettleBillById" parameterType="Long">
update emis_settle_bill set del_flag='0' where id = #{id}
update emis_settle_bill set del_flag='1' where id = #{id}
</delete>
<delete id="deleteEmisSettleBillByIds" parameterType="String">
update emis_settle_bill set del_flag='0' where id in
update emis_settle_bill set del_flag='1' where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>

4
emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
View File

@ -614,8 +614,10 @@
where id = #{id}
</update>
<!-- and rel_id = #{promId} -->
<delete id="deletePromScanRecord" parameterType="String">
update emis_tms_scan_record set del_flag='1' where scan_type='-1' and rel_id = #{promId} and main_bill_code=#{billCode}
update emis_tms_scan_record set del_flag='1' where scan_type='-1' and main_bill_code=#{billCode}
</delete>
<delete id="deleteEmisTmsScanRecordById" parameterType="Long">

14
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -2386,6 +2386,20 @@
where bill_code=#{billCode}
</update>
<!-- 取消问题件登记 -->
<update id="cancelProblemRegister" parameterType="EmisWaybill">
update emis_waybill
<trim prefix="SET" suffixOverrides=",">
bl_is_question = '0',
problem_type = null,
problem_cause = null,
problem_delay_days = null
<if test="updateBy != null and updateBy != ''">,update_by = #{updateBy}</if>
<if test="updateSite != null and updateSite != ''">,update_site = #{updateSite}</if>
</trim>
where bill_code=#{billCode}
</update>
<update id="updateTransferInfo" parameterType="EmisWaybill">
update emis_waybill
<trim prefix="SET" suffixOverrides=",">