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-27 14:48:18 +08:00
parent 0b5024f5f3
commit a224116156
4 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonToolsController.java
View File

@ -70,15 +70,20 @@ public class EmisCommonToolsController extends EmisBaseController
// List<Map> empStatList=emisBaseService.selectWaybillStatByEmpCode(getLoginUser().getUser().getEmpCode()); // List<Map> empStatList=emisBaseService.selectWaybillStatByEmpCode(getLoginUser().getUser().getEmpCode());
EmisWaybill emisWaybill = new EmisWaybill(); EmisWaybill emisWaybill = new EmisWaybill();
setPrivParams(emisWaybill);
Map orderMap=emisBaseService.getWaybillStatMap(emisWaybill); Map orderMap=emisBaseService.getWaybillStatMap(emisWaybill);
Map orderStatMap = new HashMap(); Map orderStatMap = new HashMap();
int waitTakeNum=(int)(Math.random()*100+20); int waitTakeNum=(int)orderMap.getOrDefault("waitDoNum",0);
int takeNum=(int)orderMap.getOrDefault("hasDoNum",0);
int dispNum=(int)orderMap.getOrDefault("dispNum",0);
int signedNum=(int)orderMap.getOrDefault("signedNum",0);
orderStatMap.put("waitTakeNum",waitTakeNum); orderStatMap.put("waitTakeNum",waitTakeNum);
orderStatMap.put("takeNum",waitTakeNum+8); orderStatMap.put("takeNum",takeNum);
orderStatMap.put("dispNum",waitTakeNum-10); orderStatMap.put("dispNum",dispNum);
orderStatMap.put("signedNum",waitTakeNum-15); orderStatMap.put("signedNum",signedNum);
statMap.put("orderStat",orderStatMap); statMap.put("orderStat",orderStatMap);
// 获取员工佣金信息 // 获取员工佣金信息

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

@ -434,6 +434,8 @@ public class EmisBaseService {
return destinationList.get(0); return destinationList.get(0);
} }
} }
return null;
} }

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

@ -1224,13 +1224,23 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
double fee = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); double fee = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString());
fee=WaybillHelper.calcSettledFee(fee,quoteItem.getPriceType()); fee=WaybillHelper.calcSettledFee(fee,quoteItem.getPriceType());
// 如果低于最低报价，则使用最低报价来计算
if( fee < quoteItem.getLeastPrice().doubleValue() ){
fee = quoteItem.getLeastPrice().doubleValue();
feeItem.setRemark("must > "+quoteItem.getLeastPrice().doubleValue());
}else{
feeItem.setRemark(feeItem.getCalcExp());
}
feeItem.setFee(BigDecimal.valueOf(fee)); feeItem.setFee(BigDecimal.valueOf(fee));
feeItem.setRealFee(BigDecimal.valueOf(fee)); feeItem.setRealFee(BigDecimal.valueOf(fee));
log.info("计算后费用:"+feeItem.getFee()); log.info("计算后费用:"+feeItem.getFee());
totalFee=totalFee+fee; totalFee=totalFee+fee;
feeItem.setRemark(feeItem.getCalcExp());
feeItem.setBlAutoGen("1"); feeItem.setBlAutoGen("1");
feeList.add(feeItem); feeList.add(feeItem);

6
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -778,9 +778,6 @@
UNION UNION
SELECT #{params.privSiteCode} FROM dual SELECT #{params.privSiteCode} FROM dual
) )
or a.salesmen=#{params.privEmpName}
or a.payee=#{params.privEmpName}
or a.operate_employee_code=#{params.privEmpCode} or a.operate_employee_code=#{params.privEmpCode}
or a.take_piece_employee_code=#{params.privEmpCode} or a.take_piece_employee_code=#{params.privEmpCode}
) )
@ -790,6 +787,9 @@
group by a.waybill_status group by a.waybill_status
</select> </select>
<!-- or a.salesmen=#{params.privEmpName}-->
<!-- or a.payee=#{params.privEmpName}-->
<!-- 通用权限判断 参数 isPrivQuery --> <!-- 通用权限判断 参数 isPrivQuery -->
<select id="selectEmisWaybillById" parameterType="Long" resultMap="EmisWaybillResult"> <select id="selectEmisWaybillById" parameterType="Long" resultMap="EmisWaybillResult">