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-06-19 22:57:27 +08:00
parent 6e67a0b187
commit fc73852c04
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -465,7 +465,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// 把历史发货日期带过来用于重新计算预估到到时间
emisWaybillSave.setSendDate(emisWaybillOld.getSendDate());
reUpdateWayBill(emisWaybillSave);
reUpdateWayBill(emisWaybillOld,emisWaybillSave);
}
return 1;
@ -891,11 +891,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// 占用进仓单号
if(!StringUtils.isEmpty(emisWaybillSave.getWarehouseInNo())) {
String warehouseInNo = WaybillHelper.formatQueryValue(emisWaybillSave.getWarehouseInNo());
useWarehouseInNo("",warehouseInNo);
// useWarehouseInNo(emisWaybillSave.getBillCode(),null,warehouseInNo);
useWarehouseInNo(emisWaybillSave.getBillCode(),null,warehouseInNo);
}
// 插入揽收记录
ScanInfo scanInfo = new ScanInfo();
List<Map<String,Object>> scanDataList = new ArrayList<>();
@ -937,7 +936,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
* @param emisWaybillSave
* @throws EmisBizError
*/
private void reUpdateWayBill(EmisWaybill emisWaybillSave) throws EmisBizError {
private void reUpdateWayBill(EmisWaybill oldEmisWaybill,EmisWaybill emisWaybillSave) throws EmisBizError {
// 公共计算部分
calcWayBillCommonInfo(emisWaybillSave,false);
@ -993,6 +992,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
emisWaybillAttachmentMapper.insertEmisWaybillAttachment(attachmentItem);
}
}
// 占用进仓单号
useWarehouseInNo(emisWaybillSave.getBillCode(),oldEmisWaybill.getWarehouseInNo(),emisWaybillSave.getWarehouseInNo());
}
/**