入库部分和接口

ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java

@@ -2,6 +2,7 @@ package com.ruoyi.api.controller;
 
 import com.ruoyi.api.service.IToErpService;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.log.service.IRequestLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -16,13 +17,21 @@ public class ToErpApiController {
 
     @Autowired
     private IToErpService toErpService;
+    @Autowired
+    private IRequestLogService requestLogService;
 
     /**
      * 接收入出库通知单
      */
     @PostMapping("/receiveDeliveryNotice")
+    @ResponseBody
     public AjaxResult receiveDeliveryNotice(@RequestBody DeliveryNoticeVo deliveryNoticeVo) {
-        return toErpService.receiveDeliveryNotice(deliveryNoticeVo);
+
+        AjaxResult ajaxResult = toErpService.receiveDeliveryNotice(deliveryNoticeVo);
+        requestLogService.insertRequestLog(requestLogService.getRequestLog(deliveryNoticeVo.toString(), "接收入出库通知单", ajaxResult));
+        return ajaxResult;
+
+
     }
 
 
@@ -30,7 +39,9 @@ public class ToErpApiController {
      * 回传其他出入库单
      */
 //    @Scheduled(fixedDelay = 1500)
-    public void callbackTransferBill() {
-        toErpService.callbackTransferBill();
+    @RequestMapping("/callbackDeliveryNotice")
+    @ResponseBody
+    public AjaxResult callbackDeliveryNotice(String billNo) {
+       return toErpService.callbackDeliveryNotice(billNo);
     }
 }