进项税转出修改设置整体成功和失败

release
路明慧 2 years ago
parent c57856d3ec
commit f3d5fddaba
  1. 2
      dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java
  2. 2
      dxhy-erp/src/main/java/com/dxhy/erp/service/BaseIReceiptInvoiceService.java
  3. 4
      dxhy-erp/src/main/java/com/dxhy/erp/service/IReceiptOutService.java
  4. 5
      dxhy-erp/src/main/java/com/dxhy/erp/service/impl/BaseIReceiptInvoiceServiceImpl.java
  5. 4
      dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java

@ -1436,7 +1436,7 @@ public class InterfaceController extends AbstractController {
return JsonUtils.getInstance().toJsonString(outPut); return JsonUtils.getInstance().toJsonString(outPut);
} }
StringBuilder uuids = new StringBuilder(); StringBuilder uuids = new StringBuilder();
zdatans.forEach(e -> uuids.append(e.getZFPDM() == null ? "" : e.getZFPDM()).append(e.getZFPHM())); zdatans.forEach(e -> uuids.append(e.getZFPDM() == null ? "" : e.getZFPDM()).append(e.getZFPHM()).append(","));
//根据uuid查询发票 //根据uuid查询发票
String[] ids = uuids.toString().split(","); String[] ids = uuids.toString().split(",");

@ -31,6 +31,6 @@ public interface BaseIReceiptInvoiceService {
* 请求参数 * 请求参数
* @return 返回结果 * @return 返回结果
*/ */
String cancelOut(BaseReceiptOutCancelEditReqVO reqVO) throws Exception; String cancelOut(BaseReceiptOutCancelEditReqVO reqVO);
} }

@ -16,7 +16,7 @@ import java.util.concurrent.ExecutionException;
*/ */
public interface IReceiptOutService { public interface IReceiptOutService {
String transfer(BaseInvoiceEditVO baseInvoiceEditVO, UserInfo userInfo) throws Exception; String transfer(BaseInvoiceEditVO baseInvoiceEditVO, UserInfo userInfo);
String transferOrcancelOut(List<ZDATAN> zdatans,UserInfo userInfo) throws Exception; String transferOrcancelOut(List<ZDATAN> zdatans,UserInfo userInfo);
} }

@ -63,7 +63,7 @@ public class BaseIReceiptInvoiceServiceImpl extends MpBaseServiceImpl<BaseTDxRec
* @return 返回结果 * @return 返回结果
*/ */
@Override @Override
public String cancelOut(BaseReceiptOutCancelEditReqVO reqVO) throws Exception{ public String cancelOut(BaseReceiptOutCancelEditReqVO reqVO){
DynamicContextHolder.push("business"+ DbConstant.BUSINESS_WRITE); DynamicContextHolder.push("business"+ DbConstant.BUSINESS_WRITE);
String[] uuids = reqVO.getPrimaryKey().split(","); String[] uuids = reqVO.getPrimaryKey().split(",");
@ -123,6 +123,8 @@ public class BaseIReceiptInvoiceServiceImpl extends MpBaseServiceImpl<BaseTDxRec
condRecord.setOutInvoiceAmout(null); condRecord.setOutInvoiceAmout(null);
// 转出税额 // 转出税额
condRecord.setOutTaxAmount(null); condRecord.setOutTaxAmount(null);
//转出所属期
condRecord.setOutBelongDate(null);
UpdateWrapper<BaseTDxRecordInvoice> updateWrapper = new UpdateWrapper<>(); UpdateWrapper<BaseTDxRecordInvoice> updateWrapper = new UpdateWrapper<>();
updateWrapper.set("out_status",condRecord.getOutStatus()); updateWrapper.set("out_status",condRecord.getOutStatus());
updateWrapper.set("out_reason",condRecord.getOutReason()); updateWrapper.set("out_reason",condRecord.getOutReason());
@ -130,6 +132,7 @@ public class BaseIReceiptInvoiceServiceImpl extends MpBaseServiceImpl<BaseTDxRec
updateWrapper.set("out_by",condRecord.getOutBy()); updateWrapper.set("out_by",condRecord.getOutBy());
updateWrapper.set("out_invoice_amout",condRecord.getOutInvoiceAmout()); updateWrapper.set("out_invoice_amout",condRecord.getOutInvoiceAmout());
updateWrapper.set("out_tax_amount",condRecord.getOutTaxAmount()); updateWrapper.set("out_tax_amount",condRecord.getOutTaxAmount());
updateWrapper.set("out_belong_date",condRecord.getOutTaxAmount());
updateWrapper.eq("uuid",condRecord.getUuid()); updateWrapper.eq("uuid",condRecord.getUuid());
super.baseMapper.update(null,updateWrapper); super.baseMapper.update(null,updateWrapper);

@ -41,7 +41,7 @@ public class ReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutDao,
@Resource @Resource
BaseIReceiptInvoiceService baseIReceiptInvoiceService; BaseIReceiptInvoiceService baseIReceiptInvoiceService;
@Override @Override
public String transfer( BaseInvoiceEditVO condVO, UserInfo userInfo) throws Exception{ public String transfer( BaseInvoiceEditVO condVO, UserInfo userInfo){
DynamicContextHolder.push("business"+DbConstant.BUSINESS_READ); DynamicContextHolder.push("business"+DbConstant.BUSINESS_READ);
String idStr = condVO.getPrimaryKey(); String idStr = condVO.getPrimaryKey();
@ -79,7 +79,7 @@ public class ReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutDao,
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public String transferOrcancelOut(List<ZDATAN> zdatans,UserInfo userInfo) throws Exception{ public String transferOrcancelOut(List<ZDATAN> zdatans,UserInfo userInfo){
String result = ""; String result = "";
for (ZDATAN zdata : zdatans) { for (ZDATAN zdata : zdatans) {
//转出税额大于1则是转出 //转出税额大于1则是转出

Loading…
Cancel
Save