feature:补录报账单号自动推送SAP

release
gaorl 2 years ago
parent d76edb5318
commit 2a8f951cbd
  1. 7
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java
  2. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java
  3. 15
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java

@ -165,12 +165,15 @@ public class OrderInfoController {
@PostMapping("/updateBillNumber") @PostMapping("/updateBillNumber")
@ApiOperation(value = "发票列表", notes = "发票列表修改报账单号") @ApiOperation(value = "发票列表", notes = "发票列表修改报账单号")
@SysLog(operation = "发票列表", operationDesc = "发票列表修改报账单号", key = "订单发票管理") @SysLog(operation = "发票列表", operationDesc = "发票列表修改报账单号", key = "订单发票管理")
public R updateBillNumber(@RequestParam("bzdh") String bzdh, @RequestParam("orderInfoId") String orderInfoId) { public R updateBillNumber(@RequestParam("bzdh") String bzdh,
@RequestParam("orderInfoId") String orderInfoId,
@RequestParam("fpqqlsh")String fpqqlsh,
@RequestParam("xhfNsrsbh")String xhfNsrsbh) {
if(StringUtils.isBlank(bzdh)||StringUtils.isBlank(orderInfoId)){ if(StringUtils.isBlank(bzdh)||StringUtils.isBlank(orderInfoId)){
return R.error("请求参数有误"); return R.error("请求参数有误");
} }
try { try {
int i = orderInfoService.updateBillNumber(bzdh, orderInfoId); int i = orderInfoService.updateBillNumber(bzdh, orderInfoId,fpqqlsh,xhfNsrsbh);
if(i > 0){ if(i > 0){
return R.ok(); return R.ok();
} }

@ -222,7 +222,7 @@ public interface OrderInfoService {
R ratioConversion(List<String> orderInfoIds,String ratio,String xhfNsrsbh,String originUnit,String newUnit); R ratioConversion(List<String> orderInfoIds,String ratio,String xhfNsrsbh,String originUnit,String newUnit);
int updateBillNumber(String bzdh,String orderInfoId); int updateBillNumber(String bzdh,String orderInfoId,String fpqqlsh,String xhfNsrsbh);
@Transactional @Transactional
R logicalDeleteByOrderInfoId(List<PageRequestVO> pageRequestList); R logicalDeleteByOrderInfoId(List<PageRequestVO> pageRequestList);

@ -31,6 +31,7 @@ import com.dxhy.order.consumer.dao.OrderProcessInfoMapper;
import com.dxhy.order.consumer.model.OderDetailInfo; import com.dxhy.order.consumer.model.OderDetailInfo;
import com.dxhy.order.consumer.model.PageOrderExt; import com.dxhy.order.consumer.model.PageOrderExt;
import com.dxhy.order.consumer.model.page.PageRequestVO; import com.dxhy.order.consumer.model.page.PageRequestVO;
import com.dxhy.order.consumer.modules.manager.service.InvoiceDataService;
import com.dxhy.order.consumer.modules.order.model.PageInvoiceItem; import com.dxhy.order.consumer.modules.order.model.PageInvoiceItem;
import com.dxhy.order.consumer.modules.order.model.PageKySlReq; import com.dxhy.order.consumer.modules.order.model.PageKySlReq;
import com.dxhy.order.consumer.modules.order.model.PageKySlRsp; import com.dxhy.order.consumer.modules.order.model.PageKySlRsp;
@ -188,6 +189,9 @@ public class OrderInfoServiceImpl implements OrderInfoService {
@Resource @Resource
private OrderMergeService orderMergeService; private OrderMergeService orderMergeService;
@Resource
private InvoiceDataService invoiceDataService;
DecimalFormat format = new DecimalFormat("#.###"); DecimalFormat format = new DecimalFormat("#.###");
@Override @Override
@ -1743,11 +1747,18 @@ public class OrderInfoServiceImpl implements OrderInfoService {
} }
@Override @Override
public int updateBillNumber(String bzdh,String orderInfoId){ public int updateBillNumber(String bzdh,String orderInfoId,String fpqqlsh,String xhfNsrsbh){
OrderProcessInfo orderProcessInfo = new OrderProcessInfo(); OrderProcessInfo orderProcessInfo = new OrderProcessInfo();
orderProcessInfo.setBzdh(bzdh); orderProcessInfo.setBzdh(bzdh);
orderProcessInfo.setOrderInfoId(orderInfoId); orderProcessInfo.setOrderInfoId(orderInfoId);
return orderProcessInfoMapper.updateOrderProcessInfoByFpqqlsh(orderProcessInfo,null); int i = orderProcessInfoMapper.updateOrderProcessInfoByFpqqlsh(orderProcessInfo, null);
if(i > 0) {
Map map = new HashMap();
map.put("ddqqlsh","");
map.put("xhfNsrsbh","");
invoiceDataService.manualPushInvoice(Arrays.asList(map));
}
return i;
} }
@Override @Override

Loading…
Cancel
Save