diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java index ca80fd4b0..62296013b 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java @@ -248,7 +248,7 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements // 3) 调用scanSiteBatchByWaybills重新扫描 if (!waybills.isEmpty()) { - this.scanSiteBatchByWaybills(waybills); +// this.scanSiteBatchByWaybills(waybills); } } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java index 59f276a8b..6d7495c03 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java @@ -1,10 +1,10 @@ -/** +/** * @Project: emis * @Title: EmisTmsSiteBatchServiceImpl.java * @author linfso * @date 2024-03-01 08:54:56 * @Copyright: ShangHai Duta 2022 All rights reserved. -* @version v1.0 +* @version v1.0 * @Description:

一级网点TMS组批次 实体类

*/ @@ -40,7 +40,7 @@ import org.springframework.util.CollectionUtils; /** * 一级网点TMS组批次Service业务层处理 - * + * * @author linfso * @date 2024-03-01 08:54:56 */ @@ -73,7 +73,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi /** * 获取稽核数据 - * + * * @param id * @return */ @@ -85,7 +85,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi /** * 查询一级网点TMS组批次 - * + * * @param id 一级网点TMS组批次主键 * @return 一级网点TMS组批次 */ @@ -112,7 +112,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi /** * 查询一级网点TMS组批次列表 - * + * * @param emisTmsSiteBatch 一级网点TMS组批次 * @return 一级网点TMS组批次 */ @@ -123,7 +123,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi /** * 批次明细 - * + * * @param emisTmsSiteBatch * @return */ @@ -134,7 +134,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi /** * 新增一级网点TMS组批次 - * + * * @param emisTmsSiteBatch 一级网点TMS组批次 * @return 结果 */ @@ -452,7 +452,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi /** * 修改一级网点TMS组批次 - * + * * @param emisTmsSiteBatch 一级网点TMS组批次 * @return 结果 */ @@ -468,7 +468,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi /** * 批量删除一级网点TMS组批次 - * + * * @param ids 需要删除的一级网点TMS组批次主键 * @return 结果 */ @@ -489,7 +489,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi /** * 删除一级网点TMS组批次信息 - * + * * @param id 一级网点TMS组批次主键 * @return 结果 */ @@ -509,7 +509,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi if (CollectionUtil.isEmpty(waybills)) { return; } - scanSiteBatchByWaybills(waybills); +// scanSiteBatchByWaybills(waybills); } @Override diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index 08144427c..8827a3f1d 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -157,32 +157,32 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb * @param emisWaybillSave */ private void saveOrUpdateWaybillOther(EmisWaybill emisWaybillSave) { -// if (emisWaybillSave == null || emisWaybillSave.getId() == null) { -// return; -// } -// -// String salesSupport = emisWaybillSave.getSalesSupport(); -// String billCode = emisWaybillSave.getBillCode(); -// Long waybillId = emisWaybillSave.getId(); -// -// // 查询是否已存在 -// EmisWaybillOther existing = emisWaybillOtherMapper.selectEmisWaybillOtherByWaybillId(waybillId); -// -// if (existing != null) { -// // 更新 -// existing.setSalesSupport(salesSupport); -// existing.setBillCode(billCode); -// existing.preUpdate(); -// emisWaybillOtherMapper.updateEmisWaybillOther(existing); -// } else { -// // 新增 -// EmisWaybillOther waybillOtherEntity = new EmisWaybillOther(); -// waybillOtherEntity.setWaybillId(waybillId); -// waybillOtherEntity.setBillCode(billCode); -// waybillOtherEntity.setSalesSupport(salesSupport); -// waybillOtherEntity.preInsert(); -// emisWaybillOtherMapper.insertEmisWaybillOther(waybillOtherEntity); -// } + if (emisWaybillSave == null || emisWaybillSave.getId() == null) { + return; + } + + String salesSupport = emisWaybillSave.getSalesSupport(); + String billCode = emisWaybillSave.getBillCode(); + Long waybillId = emisWaybillSave.getId(); + + // 查询是否已存在 + EmisWaybillOther existing = emisWaybillOtherMapper.selectEmisWaybillOtherByWaybillId(waybillId); + + if (existing != null) { + // 更新 + existing.setSalesSupport(salesSupport); + existing.setBillCode(billCode); + existing.preUpdate(); + emisWaybillOtherMapper.updateEmisWaybillOther(existing); + } else { + // 新增 + EmisWaybillOther waybillOtherEntity = new EmisWaybillOther(); + waybillOtherEntity.setWaybillId(waybillId); + waybillOtherEntity.setBillCode(billCode); + waybillOtherEntity.setSalesSupport(salesSupport); + waybillOtherEntity.preInsert(); + emisWaybillOtherMapper.insertEmisWaybillOther(waybillOtherEntity); + } } /**