From 29f20ff7ae0881a8ed71d747458515c8af05df0d Mon Sep 17 00:00:00 2001 From: linfso Date: Wed, 5 Jun 2024 16:45:59 +0800 Subject: [PATCH] md --- .../web/emis/EmisTmsScanRecordController.java | 13 ++++++++++++ .../erp/emis/mapper/EmisWaybillMapper.java | 4 ++++ .../erp/emis/service/EmisBaseService.java | 16 +++++++++++++++ .../service/IEmisTmsScanRecordService.java | 5 +++++ .../impl/EmisTmsScanRecordServiceImpl.java | 20 ++++++++++++++++++- .../mapper/EmisProblemTypeMapper.xml | 2 +- .../resources/mapper/EmisWaybillMapper.xml | 15 ++++++++++++++ 7 files changed, 73 insertions(+), 2 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java index baea54d8b..a7430cc76 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java @@ -327,4 +327,17 @@ public class EmisTmsScanRecordController extends EmisBaseController { return toAjax(emisTmsScanRecordService.deleteEmisTmsScanRecordByIds(ids)); } + + + /** + * 删除TMS扫描记录 + */ + @PreAuthorize("@ss.hasPermi('emis:emisTmsScanRecord:remove')") + @Log(title = "TMS扫描记录", businessType = BusinessType.DELETE) + @DeleteMapping("/deleteSignedAndRemark") + public AjaxResult deleteSignedAndRemark(Long[] ids,String remark) + { + // 删除备注 + return toAjax(emisTmsScanRecordService.deleteEmisTmsScanRecordByIds(ids)); + } } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java index 5bcdadd2c..40f5edf39 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java @@ -97,8 +97,12 @@ public interface EmisWaybillMapper extends BaseMapper public int updatePrintStatus(EmisWaybill emisWaybill); + // 更新为签收 public int updateSignStatus(EmisWaybill emisWaybill); + // 删除签收状态 + public int updateUnSignStatus(EmisWaybill emisWaybill); + // 更新问题件状态 public int updateProblemStatus(EmisWaybill emisWaybill); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 2f68abbf8..8ad3889e5 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -395,6 +395,22 @@ public class EmisBaseService { } + /** + * 更新为未签收状态 + * @param billCode + */ + public void updateUnSignStatus(String billCode) { + String mainBillCode = billCode; + if(billCode.startsWith("T7080") && billCode.length()>14 ) { + mainBillCode = billCode.substring(0, 14); + } + + EmisWaybill waybill = new EmisWaybill(); + waybill.setBillCode(mainBillCode); + emisWaybillMapper.updateUnSignStatus(waybill); + + } + /** * 更新问题件状态 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanRecordService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanRecordService.java index e2cee2e73..6ff691c8d 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanRecordService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanRecordService.java @@ -104,4 +104,9 @@ public interface IEmisTmsScanRecordService public List queryScanStatRecordList(EmisTmsScanRecord emisTmsScanRecord); + + // 删除签收记录 + public int deleteSignedAndRemark(Long[] ids,String remark); + + } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java index 37a8ae25a..1643200f8 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java @@ -31,8 +31,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.xdadan.erp.emis.mapper.EmisTmsScanRecordMapper; import com.xdadan.erp.emis.service.IEmisTmsScanRecordService; +import org.springframework.transaction.annotation.Transactional; -/** + /** * TMS扫描记录Service业务层处理 * * @author linfso @@ -708,6 +709,23 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm } + @Transactional + @Override + public int deleteSignedAndRemark(Long[] ids,String remark) + { + // 更新运单记录到上一个状态 + for (Long id:ids) { + EmisTmsScanRecord record= selectEmisTmsScanRecordById(id); + // 删除运单签收记录 + updateUnSignStatus(record.getBillCode()); + + record.setRemark(remark); + emisTmsScanRecordMapper.updateEmisTmsScanRecord(record); + } + + return emisTmsScanRecordMapper.deleteEmisTmsScanRecordByIds(ids); + } + diff --git a/emis-biz/src/main/resources/mapper/EmisProblemTypeMapper.xml b/emis-biz/src/main/resources/mapper/EmisProblemTypeMapper.xml index 377b1de99..b60042040 100644 --- a/emis-biz/src/main/resources/mapper/EmisProblemTypeMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisProblemTypeMapper.xml @@ -45,7 +45,7 @@ and update_site like concat('%', #{updateSite}, '%') - order by orderNum desc + order by create_time desc