新页面整箱领取

wms-webapi/src/main/java/top/wms/admin/controller/common/CommonController.java

@@ -45,7 +45,6 @@ import java.util.List;
 @RequestMapping("/common")
 public class CommonController {
 
-    private static final Logger log = LoggerFactory.getLogger(CommonController.class);
     private final FileService fileService;
     private final DeptService deptService;
     private final MenuService menuService;

wms-webapi/src/main/java/top/wms/admin/controller/fullWorkOrder/FullWorkOrderController.java

@@ -0,0 +1,31 @@
+package top.wms.admin.controller.fullWorkOrder;
+
+import top.continew.starter.extension.crud.enums.Api;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+import org.springframework.web.bind.annotation.*;
+
+import lombok.RequiredArgsConstructor;
+import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
+import top.wms.admin.common.controller.BaseController;
+import top.wms.admin.fullWorkOrder.model.query.FullWorkOrderQuery;
+import top.wms.admin.fullWorkOrder.model.req.FullWorkOrderReq;
+import top.wms.admin.fullWorkOrder.model.resp.FullWorkOrderResp;
+import top.wms.admin.fullWorkOrder.service.FullWorkOrderService;
+
+/**
+ * 整箱领取记录管理 API
+ *
+ * @author zc
+ * @since 2026/03/24 09:36
+ */
+@Tag(name = "整箱领取记录管理 API")
+@RestController
+@RequiredArgsConstructor
+@CrudRequestMapping(value = "/fullWorkOrder/fullWorkOrder", api = {Api.PAGE, Api.ADD, Api.DELETE, Api.EXPORT})
+public class FullWorkOrderController extends BaseController<FullWorkOrderService, FullWorkOrderResp, FullWorkOrderResp, FullWorkOrderQuery, FullWorkOrderReq> {
+
+
+
+}

wms-webapi/src/main/java/top/wms/admin/controller/ys/ysNetController.java

@@ -51,14 +51,27 @@ public class ysNetController {
     @GetMapping("/leave-weigh-page")
     public R leaveWeighPage() {
         try {
-            // 登出设备
-            NetCommon.logoutDevice();
+            // 检查设备是否已登录
+            if (NetCommon.isDeviceLoggedIn()) {
+                // 登出设备
+                NetCommon.logoutDevice();
+                log.info("设备已登出");
+            } else {
+                log.info("设备未登录，无需登出");
+            }
 
-            // 释放SDK
-            NetCommon.cleanupSDK();
+            // 检查SDK是否已初始化
+            if (NetCommon.isSDKInitialized()) {
+                // 释放SDK
+                NetCommon.cleanupSDK();
+                log.info("SDK已释放");
+            } else {
+                log.info("SDK未初始化，无需释放");
+            }
 
             return R.ok("离开称重页面成功，已释放资源");
         } catch (Exception e) {
+            log.error("离开称重页面失败", e);
             return R.fail("500", "离开称重页面失败：" + e.getMessage());
         }
     }
@@ -71,7 +84,7 @@ public class ysNetController {
         try {
             // 检查设备是否已登录
             if (!NetCommon.isDeviceLoggedIn()) {
-                return R.fail("500", "设备未登录，请先进入称重页面");
+                return R.fail("500", "摄像头连接异常！");
             }
 
             // 执行抓图