Merge branch 'master' of http://175.27.215.92:3000/yinq/aucma-mes-back

aucma-api/src/main/java/com/aucma/api/controller/PdaBindingController.java

@@ -5,6 +5,7 @@ import com.aucma.common.core.domain.AjaxResult;
 import com.aucma.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Optional;
@@ -16,7 +17,8 @@ import static com.aucma.common.core.domain.AjaxResult.success;
  * @author wanghao
  * @date 2023/11/14  9:28
  */
-@RestController("/api")
+@RestController
+@RequestMapping(("/api"))
 public class PdaBindingController {
 
     @Autowired
@@ -28,9 +30,9 @@ public class PdaBindingController {
        String boxName = service.selectBoxNameByCode(boxCode);
        if (StringUtils.isNotNull(boxName)){
            service.insertBindingInfo(boxCode,boxName,innerCode);
-         return success( ) ;
+         return success() ;
        }
-        return error("箱壳条码扫描");
+        return error("箱壳条码扫描错误");
     }
     //条码绑定
 }