md

emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java

@@ -282,6 +282,9 @@ public class EmisSettleBillController extends BaseController
         try {
 
             emisSettleBillService.addSubBillToSettleBill(emisSettleBill);
+
+           
+
             return AjaxResult.success("操作成功");
         }catch (Exception ex){
             ex.printStackTrace();

emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java

@@ -455,15 +455,20 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
                 // 部分收款
                 emisSettleBill.setPaymentStatus("2");
             }
-
-            // 如果已开票,则调整为部分开票
-            if("1".equals(emisSettleBill.getOpenBillStatus())){
-                emisSettleBill.setOpenBillStatus("2");
-            }
         }
 
+//        // 如果已开票,则调整为部分开票
+//        if("1".equals(emisSettleBill.getOpenBillStatus())){
+//            emisSettleBill.setOpenBillStatus("2");
+//        }
+
         // 账单总金额
-        return emisSettleBillMapper.updateEmisSettleBill(emisSettleBill);
+        emisSettleBillMapper.updateEmisSettleBill(emisSettleBill);
+
+        // 重新计算开票状态
+        reCalcSettleBillInvoiceStatus(old.getSettleBillNo());
+
+        return 1;
     }