Browse Source

优化

master
dimengzhe 2 years ago
parent
commit
36d0ba6291
  1. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  2. 15
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
  3. 12
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
  4. 5
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java

5
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@ -6967,9 +6967,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}*/ }*/
if("1".equals(busSalesOrder.getPayTypeKey())){ if("1".equals(busSalesOrder.getPayTypeKey())){
busSalesOrderIsDTKPJVo.setIsEdit(true); busSalesOrderIsDTKPJVo.setIsEdit(true);
if(busSalesOrder.getOneBillMoney() != null){ /* if(busSalesOrder.getOneBillMoney() != null){
busSalesOrderIsDTKPJVo.setOneBillMoney(busSalesOrder.getOneBillMoney().toString()); busSalesOrderIsDTKPJVo.setOneBillMoney(busSalesOrder.getOneBillMoney().toString());
} }*/
}else{ }else{
busSalesOrderIsDTKPJVo.setIsEdit(false); busSalesOrderIsDTKPJVo.setIsEdit(false);

15
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

@ -354,7 +354,10 @@ public class AppBusAdvanceGinvoiceapplyService {
vo.setIsCanEdit(true); vo.setIsCanEdit(true);
}*/ }*/
vo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit()); vo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit());
vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); if(!busSalesOrderIsDTKPJVo.getIsEdit()){
vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
}
return rb.success().setData(vo); return rb.success().setData(vo);
} }
@ -483,7 +486,10 @@ public class AppBusAdvanceGinvoiceapplyService {
vo.setIsCanEdit(true); vo.setIsCanEdit(true);
}*/ }*/
vo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit()); vo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit());
vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); if(!busSalesOrderIsDTKPJVo.getIsEdit()){
vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
}
return rb.success().setData(vo); return rb.success().setData(vo);
} }
@ -1158,7 +1164,10 @@ public class AppBusAdvanceGinvoiceapplyService {
vo.setIsCanEdit(true); vo.setIsCanEdit(true);
}*/ }*/
vo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit()); vo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit());
vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); if(!busSalesOrderIsDTKPJVo.getIsEdit()){
vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
}
return rb.success().setData(vo); return rb.success().setData(vo);
} }

12
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

@ -318,7 +318,10 @@ public class InvoicedService {
vo.setIsCanEdit(true); vo.setIsCanEdit(true);
}*/ }*/
vo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit()); vo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit());
vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); if(!busSalesOrderIsDTKPJVo.getIsEdit()){
vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
}
return rb.success().setData(vo); return rb.success().setData(vo);
} }
@ -439,8 +442,11 @@ public class InvoicedService {
billApplicationIInfoVo.setIsCanEdit(true); billApplicationIInfoVo.setIsCanEdit(true);
}*/ }*/
billApplicationIInfoVo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit()); billApplicationIInfoVo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit());
billApplicationIInfoVo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); if(!busSalesOrderIsDTKPJVo.getIsEdit()){
billApplicationIInfoVo.setInvoiceTotal(busSalesOrderIsDTKPJVo.getOneBillMoney()); billApplicationIInfoVo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
billApplicationIInfoVo.setInvoiceTotal(busSalesOrderIsDTKPJVo.getOneBillMoney());
}
} else { } else {
billApplicationIInfoVo.setModelSid(busDeliveredApply.getModelSid()); billApplicationIInfoVo.setModelSid(busDeliveredApply.getModelSid());
billApplicationIInfoVo.setModelName(busDeliveredApply.getModelName()); billApplicationIInfoVo.setModelName(busDeliveredApply.getModelName());

5
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java

@ -403,7 +403,10 @@ public class AppBusDeliveredApplyService {
billApplicationIInfoVo.setIsCanEdit(true); billApplicationIInfoVo.setIsCanEdit(true);
}*/ }*/
billApplicationIInfoVo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit()); billApplicationIInfoVo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit());
billApplicationIInfoVo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); if(!busSalesOrderIsDTKPJVo.getIsEdit()){
billApplicationIInfoVo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
}
} }
return null; return null;
} }

Loading…
Cancel
Save