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-12-26 15:10:48 +08:00
parent b50c3c3332
commit d767b7119c
2 changed files with 7 additions and 6 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/service/impl/EmisSettleBillServiceImpl.java
View File

@ -488,6 +488,7 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
return 0; return 0;
} }
// 已开票金额
BigDecimal totalMoney = BigDecimal.ZERO; BigDecimal totalMoney = BigDecimal.ZERO;
// 所有开票金额 = 已开票金额+不开票金额 // 所有开票金额 = 已开票金额+不开票金额
BigDecimal totalAllMoney = BigDecimal.ZERO; BigDecimal totalAllMoney = BigDecimal.ZERO;
@ -501,6 +502,8 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
String billNo= MapUtils.getString(mapItem,"billNo",null); String billNo= MapUtils.getString(mapItem,"billNo",null);
BigDecimal sumMoney = BigDecimal.valueOf(Double.valueOf(mapItem.get("sumMoney").toString())); BigDecimal sumMoney = BigDecimal.valueOf(Double.valueOf(mapItem.get("sumMoney").toString()));
hasOpenBillMap.put(billNo,sumMoney); hasOpenBillMap.put(billNo,sumMoney);
totalMoney=totalMoney.add(sumMoney);
} }
// 获取账单运单列表,重新计算每一单的开票状态 // 获取账单运单列表,重新计算每一单的开票状态

10
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java
View File

@ -95,20 +95,18 @@ public class EmisWarehouseInBatchServiceImpl extends EmisBaseService implements
throw new EmisBizError(EmisBizErrorType.FAIL,"进仓货物列表不能为空"); throw new EmisBizError(EmisBizErrorType.FAIL,"进仓货物列表不能为空");
} }
// 进仓序列号,插入进仓批次
// 进仓序列号
String serialNo= WaybillHelper.genWsInSerialNo(); String serialNo= WaybillHelper.genWsInSerialNo();
emisWarehouseInBatch.setSerialNo(serialNo); emisWarehouseInBatch.setSerialNo(serialNo);
emisWarehouseInBatch.setEntryDate(new Date()); emisWarehouseInBatch.setEntryDate(new Date());
emisWarehouseInBatchMapper.insertEmisWarehouseInBatch(emisWarehouseInBatch);
// 插入进仓商品明细,关联商品序号
for(EmisWarehouseInDtl item:cargoList){ for(EmisWarehouseInDtl item:cargoList){
item.setId(null); item.setInSerialNo(serialNo);
emisWarehouseInDtlMapper.insertEmisWarehouseInDtl(item); emisWarehouseInDtlMapper.insertEmisWarehouseInDtl(item);
} }
emisWarehouseInBatchMapper.insertEmisWarehouseInBatch(emisWarehouseInBatch);
// 插入运单商品附件图片 // 插入运单商品附件图片
if(!StringUtils.isEmpty(emisWarehouseInBatch.getPicUrl()) ){ if(!StringUtils.isEmpty(emisWarehouseInBatch.getPicUrl()) ){