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

Merge pull request 'aike' (#243) from aike into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/243
This commit is contained in:
heyu 2025-11-25 18:57:53 +08:00
commit 33e99b89e8
4 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
View File

@ -924,7 +924,7 @@ public class EmisCommonController extends EmisBaseController
redissonService.setStr(statusKey, "RUNNING", 1800); redissonService.setStr(statusKey, "RUNNING", 1800);
// 异步执行任务 // 异步执行任务
emisTmsSiteBatchMissService.autoScanSiteBatch(lineCode); // emisTmsSiteBatchMissService.autoScanSiteBatch(lineCode);
log.info("autoScanSiteBatch async task started"); log.info("autoScanSiteBatch async task started");
return AjaxResult.success("异步任务已启动，请稍后查看执行结果"); return AjaxResult.success("异步任务已启动，请稍后查看执行结果");

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java
View File

@ -248,7 +248,7 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements
// 3) 调用scanSiteBatchByWaybills重新扫描 // 3) 调用scanSiteBatchByWaybills重新扫描
if (!waybills.isEmpty()) { if (!waybills.isEmpty()) {
this.scanSiteBatchByWaybills(waybills); // this.scanSiteBatchByWaybills(waybills);
} }
} }

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java
View File

@ -509,7 +509,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi
if (CollectionUtil.isEmpty(waybills)) { if (CollectionUtil.isEmpty(waybills)) {
return; return;
} }
scanSiteBatchByWaybills(waybills); // scanSiteBatchByWaybills(waybills);
} }
@Override @Override

52
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -157,32 +157,32 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
* @param emisWaybillSave * @param emisWaybillSave
*/ */
private void saveOrUpdateWaybillOther(EmisWaybill emisWaybillSave) { private void saveOrUpdateWaybillOther(EmisWaybill emisWaybillSave) {
// if (emisWaybillSave == null || emisWaybillSave.getId() == null) { if (emisWaybillSave == null || emisWaybillSave.getId() == null) {
// return; return;
// } }
//
// String salesSupport = emisWaybillSave.getSalesSupport(); String salesSupport = emisWaybillSave.getSalesSupport();
// String billCode = emisWaybillSave.getBillCode(); String billCode = emisWaybillSave.getBillCode();
// Long waybillId = emisWaybillSave.getId(); Long waybillId = emisWaybillSave.getId();
//
// // 查询是否已存在 // 查询是否已存在
// EmisWaybillOther existing = emisWaybillOtherMapper.selectEmisWaybillOtherByWaybillId(waybillId); EmisWaybillOther existing = emisWaybillOtherMapper.selectEmisWaybillOtherByWaybillId(waybillId);
//
// if (existing != null) { if (existing != null) {
// // 更新 // 更新
// existing.setSalesSupport(salesSupport); existing.setSalesSupport(salesSupport);
// existing.setBillCode(billCode); existing.setBillCode(billCode);
// existing.preUpdate(); existing.preUpdate();
// emisWaybillOtherMapper.updateEmisWaybillOther(existing); emisWaybillOtherMapper.updateEmisWaybillOther(existing);
// } else { } else {
// // 新增 // 新增
// EmisWaybillOther waybillOtherEntity = new EmisWaybillOther(); EmisWaybillOther waybillOtherEntity = new EmisWaybillOther();
// waybillOtherEntity.setWaybillId(waybillId); waybillOtherEntity.setWaybillId(waybillId);
// waybillOtherEntity.setBillCode(billCode); waybillOtherEntity.setBillCode(billCode);
// waybillOtherEntity.setSalesSupport(salesSupport); waybillOtherEntity.setSalesSupport(salesSupport);
// waybillOtherEntity.preInsert(); waybillOtherEntity.preInsert();
// emisWaybillOtherMapper.insertEmisWaybillOther(waybillOtherEntity); emisWaybillOtherMapper.insertEmisWaybillOther(waybillOtherEntity);
// } }
} }
/** /**