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 2025-07-03 11:07:19 +08:00
parent 88887af375
commit eaf74a5405
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java
View File

@ -441,9 +441,17 @@ public class EmisSettleSubBillController extends EmisBaseController
bug:1610
现金账单确认/月结账单确认：应收运费大于等于标准报价，业务确认完帐单后，现金账单确认/月结账单确认界面系统自动确认；
非特殊报价和一口价， 财务也自动确认
bug:1688
调整为现金保留自动确认,月结调整为不自动确认
*/
EmisWaybill waybill=emisBaseService.getWaybillByBillCode(old.getBillNo());
if( !"3".equals(waybill.getCalcFeeType()) && !"1".equals(waybill.getBlSpecialQuote()) ) {
if(
!"3".equals(waybill.getCalcFeeType())
&& !"1".equals(waybill.getBlSpecialQuote())
&& !"2".equals(waybill.getPaymentType())
&& !"4".equals(waybill.getPaymentType())
&& !"5".equals(waybill.getPaymentType())
) {
if (waybill.getFreight().compareTo(waybill.getRealFee()) >= 0) {
EmisSettleSubBill updSubBillByCenter = new EmisSettleSubBill();