修改结算4

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyService.java

@@ -1060,6 +1060,9 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
             asBusrepairBill.setNodeCode(6);
             asBusrepairBill.setNodeName("已结算");
             asBusrepairBill.setNodeTime(new DateTime());
+            if (null != settelApply.getSettleAmount()) {
+                asBusrepairBill.setSettleAmount(settelApply.getSettleAmount());
+            }
             asBusrepairBill.setSettleTime(DateUtil.formatDate(new Date()));
             if (asBusrepairBill.getMaterialConfirm().intValue() == 0) {
                 asBusrepairBill.setMaterialConfirm(1);
@@ -1081,6 +1084,9 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
             asBusrepairBill.setNodeName("已结算");
             asBusrepairBill.setNodeTime(new DateTime());
             asBusrepairBill.setOutDoorState("2");
+            if (null != settelApply.getSettleAmount()) {
+                asBusrepairBill.setSettleAmount(settelApply.getSettleAmount());
+            }
             asBusrepairBillService.updateById(asBusrepairBill);
             //新增工单环节信息
             AsBusrepairBillNode billNode = new AsBusrepairBillNode();
@@ -1423,6 +1429,9 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
                         asBusrepairBill.setMaterialConfirm(1);
                         asBusrepairBill.setOutDoorState("2");
                     }
+                    if (null != settelApply.getSettleAmount()) {
+                        asBusrepairBill.setSettleAmount(settelApply.getSettleAmount());
+                    }
                     asBusrepairBillService.updateById(asBusrepairBill);
                     //新增工单环节信息
                     AsBusrepairBillNode billNode = new AsBusrepairBillNode();
@@ -1439,6 +1448,9 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
                     asBusrepairBill.setNodeName("已结算");
                     asBusrepairBill.setNodeTime(new DateTime());
                     asBusrepairBill.setOutDoorState("2");
+                    if (null != settelApply.getSettleAmount()) {
+                        asBusrepairBill.setSettleAmount(settelApply.getSettleAmount());
+                    }
                     asBusrepairBillService.updateById(asBusrepairBill);
                     //新增工单环节信息
                     AsBusrepairBillNode billNode = new AsBusrepairBillNode();