Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java

@@ -274,7 +274,7 @@ public class BackReceiveController extends BaseController {
         }
     }
 
-    @Log(title = "退料接收记录-web", businessType = BusinessType.INSERT)
+    @Log(title = "退料接收记录（数量接收/成套接收）-web", businessType = BusinessType.INSERT)
     @PostMapping("backReceiveRecordWeb")
     public AjaxResult backReceiveRecordWeb(@RequestBody BackApplyInfo record) {
         try {
@@ -286,7 +286,6 @@ public class BackReceiveController extends BaseController {
             throw new RuntimeException(e);
         }
     }
-
     @Log(title = "退料接收记录（编码接收）-web", businessType = BusinessType.INSERT)
     @PostMapping("backReceiveRecordWebPt")
     public AjaxResult backReceiveRecordWebPt(@RequestBody BackApplyInfo record) {

sgzb-ui/src/api/claimAndRefund/return.js

@@ -174,7 +174,13 @@ export function backReceiveRecordWeb(data) {
     data: data
   })
 }
-
+export function backReceiveRecordWebPt(data) {
+  return request({
+    url: 'base/backReceive/backReceiveRecordWebPt ',
+    method: 'post',
+    data: data
+  })
+}
 
 // 退料接收 数量接收
 export function setNumBack(data) {