优化

wms-common/src/main/java/top/wms/admin/common/enums/ConsumeOrderTypeEnum.java

@@ -1,24 +0,0 @@
-package top.wms.admin.common.enums;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import top.continew.starter.core.enums.BaseEnum;
-
-/**
- * 交易状态枚举
- *
- * @author Charles7c
- * @since 2022/12/29 22:38
- */
-@Getter
-@RequiredArgsConstructor
-public enum ConsumeOrderTypeEnum implements BaseEnum<Integer> {
-
-    /**
-     * 在线消费
-     */
-    CONSUME(0, "消费");
-
-    private final Integer value;
-    private final String description;
-}

wms-common/src/main/java/top/wms/admin/common/enums/ConsumePayModeEnum.java

@@ -1,49 +0,0 @@
-package top.wms.admin.common.enums;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import top.continew.starter.core.enums.BaseEnum;
-
-/**
- * 支付方式枚举
- *
- * @author Charles7c
- * @since 2022/12/29 22:38
- */
-@Getter
-@RequiredArgsConstructor
-public enum ConsumePayModeEnum implements BaseEnum<Integer> {
-
-    /**
-     * 人脸
-     */
-    FACE(0, "人脸"),
-
-    /**
-     * 云卡
-     */
-    CLOUD_CARD(1, "云卡"),
-
-    /**
-     * 刷卡
-     */
-    SWIPE_CARD(2, "刷卡"),
-
-    /**
-     * 支付宝
-     */
-    ALIPAY(3, "支付宝"),
-
-    /**
-     * 微信
-     */
-    WECHAT(4, "微信"),
-
-    /**
-     * 取餐码
-     */
-    MEAL_CODE(5, "取餐码");
-
-    private final Integer value;
-    private final String description;
-}

wms-common/src/main/java/top/wms/admin/common/enums/ConsumeRechargeModeEnum.java

@@ -1,39 +0,0 @@
-package top.wms.admin.common.enums;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import top.continew.starter.core.enums.BaseEnum;
-
-/**
- * 消费-充值方式
- *
- * @author Charles7c
- * @since 2022/12/29 22:38
- */
-@Getter
-@RequiredArgsConstructor
-public enum ConsumeRechargeModeEnum implements BaseEnum<Integer> {
-
-    /**
-     * 现金
-     */
-    CASH(0, "现金"),
-
-    /**
-     * 支付宝
-     */
-    ALIPAY(1, "支付宝"),
-
-    /**
-     * 微信
-     */
-    WECHAT(2, "微信"),
-
-    /**
-     * 网银
-     */
-    ONLINE_BANKING(3, "网银");
-
-    private final Integer value;
-    private final String description;
-}

wms-common/src/main/java/top/wms/admin/common/enums/ConsumeRechargeTypeEnum.java

@@ -1,49 +0,0 @@
-package top.wms.admin.common.enums;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import top.continew.starter.core.enums.BaseEnum;
-
-/**
- * 消费-操作类型
- *
- * @author Charles7c
- * @since 2022/12/29 22:38
- */
-@Getter
-@RequiredArgsConstructor
-public enum ConsumeRechargeTypeEnum implements BaseEnum<Integer> {
-
-    /**
-     * 补贴
-     */
-    SUBSIDY(0, "补贴"),
-
-    /**
-     * 充值
-     */
-    RECHARGE(1, "充值"),
-
-    /**
-     * 退款
-     */
-    REFUND(2, "退款"),
-
-    /**
-     * 清零(全部)
-     */
-    CLEAR(3, "清零(全部)"),
-
-    /**
-     * 清零(充值)
-     */
-    CLEAR_CZ(4, "清零(充值)"),
-
-    /**
-     * 清零(补贴)
-     */
-    CLEAR_BT(5, "清零(补贴)");
-
-    private final Integer value;
-    private final String description;
-}

wms-common/src/main/java/top/wms/admin/common/enums/ConsumeRechargeWayEnum.java

@@ -1,29 +0,0 @@
-package top.wms.admin.common.enums;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import top.continew.starter.core.enums.BaseEnum;
-
-/**
- * 消费-充值来源
- *
- * @author Charles7c
- * @since 2022/12/29 22:38
- */
-@Getter
-@RequiredArgsConstructor
-public enum ConsumeRechargeWayEnum implements BaseEnum<Integer> {
-
-    /**
-     * 在线消费
-     */
-    WEB(0, "平台"),
-
-    /**
-     * 离线消费
-     */
-    PHONE(1, "手机");
-
-    private final Integer value;
-    private final String description;
-}

wms-common/src/main/java/top/wms/admin/common/enums/ConsumeResultEnum.java

@@ -1,44 +0,0 @@
-package top.wms.admin.common.enums;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import top.continew.starter.core.enums.BaseEnum;
-
-/**
- * 交易状态枚举
- *
- * @author Charles7c
- * @since 2022/12/29 22:38
- */
-@Getter
-@RequiredArgsConstructor
-public enum ConsumeResultEnum implements BaseEnum<Integer> {
-
-    /**
-     * 在线消费
-     */
-    ONLINE_CONSUME(0, "在线消费"),
-
-    /**
-     * 离线消费
-     */
-    OFFLINE_CONSUME(1, "离线消费"),
-
-    /**
-     * 超时
-     */
-    TIMEOUT(2, "超时"),
-
-    /**
-     * 消费异常
-     */
-    CONSUMPTION_EXCEPTION(3, "消费异常"),
-
-    /**
-     * 异常消费
-     */
-    EXCEPTION_CONSUMPTION(4, "异常消费");
-
-    private final Integer value;
-    private final String description;
-}

wms-common/src/main/java/top/wms/admin/common/enums/ConsumeTmrtypeEnum.java

@@ -1,38 +0,0 @@
-package top.wms.admin.common.enums;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import top.continew.starter.core.enums.BaseEnum;
-
-/**
- * 消费-充值来源
- *
- * @author Charles7c
- * @since 2022/12/29 22:38
- */
-@Getter
-@RequiredArgsConstructor
-public enum ConsumeTmrtypeEnum implements BaseEnum<Integer> {
-    /**
-     * 早餐
-     */
-    BREAKFAST(0, "早餐"),
-
-    /**
-     * 中餐
-     */
-    LUNCH(1, "中餐"),
-
-    /**
-     * 午餐
-     */
-    DINNER(2, "午餐"),
-
-    /**
-     * 夜餐
-     */
-    NIGHT(3, "夜餐");
-
-    private final Integer value;
-    private final String description;
-}

wms-common/src/main/java/top/wms/admin/common/enums/ConsumeTypeConverter.java

@@ -1,49 +0,0 @@
-package top.wms.admin.common.enums;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import top.continew.starter.core.enums.BaseEnum;
-
-/**
- * 消费类型枚举
- *
- * @author Charles7c
- * @since 2022/12/29 22:38
- */
-@Getter
-@RequiredArgsConstructor
-public enum ConsumeTypeConverter implements BaseEnum<Integer> {
-
-    /**
-     * 单价
-     */
-    UNIT_PRICE(0, "单价"),
-
-    /**
-     * 定额
-     */
-    FIXED_PRICE(1, "定额"),
-
-    /**
-     * 时段模式
-     */
-    TIME_PERIOD(2, "时段模式"),
-
-    /**
-     * 计次
-     */
-    COUNTING(3, "计次"),
-
-    /**
-     * 点餐机模式
-     */
-    ORDERING_MACHINE(5, "点餐机模式"),
-
-    /**
-     * 身份模式
-     */
-    IDENTITY(9, "身份模式");
-
-    private final Integer value;
-    private final String description;
-}

wms-common/src/main/java/top/wms/admin/common/enums/ConsumeWalletModeEnum.java

@@ -1,34 +0,0 @@
-package top.wms.admin.common.enums;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import top.continew.starter.core.enums.BaseEnum;
-
-/**
- * 钱包消费模式枚举
- *
- * @author Charles7c
- * @since 2022/12/29 22:38
- */
-@Getter
-@RequiredArgsConstructor
-public enum ConsumeWalletModeEnum implements BaseEnum<Integer> {
-
-    /**
-     * 先消费补贴再个人
-     */
-    SUBSIDY_THEN_PERSONAL(0, "先消费补贴再个人"),
-
-    /**
-     * 仅现金
-     */
-    ONLY_CASH(1, "仅现金"),
-
-    /**
-     * 仅补贴
-     */
-    ONLY_SUBSIDY(2, "仅补贴");
-
-    private final Integer value;
-    private final String description;
-}

wms-common/src/main/java/top/wms/admin/common/enums/EnableEnum.java

@@ -1,29 +0,0 @@
-package top.wms.admin.common.enums;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import top.continew.starter.core.enums.BaseEnum;
-
-/**
- * 启用禁用
- *
- * @author Charles7c
- * @since 2022/12/29 22:38
- */
-@Getter
-@RequiredArgsConstructor
-public enum EnableEnum implements BaseEnum<Integer> {
-
-    /**
-     * 禁用
-     */
-    DISABLE(0, "禁用"),
-
-    /**
-     * 在线消费
-     */
-    ENABLE(1, "启用");
-
-    private final Integer value;
-    private final String description;
-}

wms-common/src/main/java/top/wms/admin/common/enums/LightLevelEnum.java

@@ -0,0 +1,49 @@
+package top.wms.admin.common.enums;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import top.continew.starter.core.enums.BaseEnum;
+
+/**
+ *
+ *
+ * @author Charles7c
+ * @since 2023/2/26 21:35
+ */
+@Getter
+@RequiredArgsConstructor
+public enum LightLevelEnum implements BaseEnum<Integer> {
+
+    /**
+     * 一级
+     */
+    LEVEL1(1, "一级"),
+
+    /**
+     * 二级
+     */
+    LEVEL2(2, "二级"),
+
+    /**
+     * 三级
+     */
+    LEVEL3(3, "三级");
+
+    private final Integer value;
+    private final String description;
+
+    /**
+     * 根据描述获取值
+     *
+     * @param description 描述
+     * @return 值，如果找不到则返回 null
+     */
+    public static Integer getValueByDescription(String description) {
+        for (LightLevelEnum enumValue : values()) {
+            if (enumValue.getDescription().equals(description)) {
+                return enumValue.getValue();
+            }
+        }
+        return null;
+    }
+}

wms-common/src/main/java/top/wms/admin/common/enums/LightLevelEnumConverter.java

@@ -0,0 +1,55 @@
+package top.wms.admin.common.enums;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.data.ReadCellData;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class LightLevelEnumConverter implements Converter<Integer> {
+
+    private static final Map<Integer, String> LIGHT_LEVEL_MAP = new HashMap<>();
+    static {
+        LIGHT_LEVEL_MAP.put(1, "一级");
+        LIGHT_LEVEL_MAP.put(2, "二级");
+        LIGHT_LEVEL_MAP.put(3, "三级");
+    }
+
+    @Override
+    public Class<?> supportJavaTypeKey() {
+        return Integer.class; // 支持的 Java 类型
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING; // 写入 Excel 时用字符串
+    }
+
+    @Override
+    public WriteCellData<String> convertToExcelData(Integer value,
+                                                    ExcelContentProperty contentProperty,
+                                                    GlobalConfiguration globalConfiguration) {
+        if (value == null) {
+            return new WriteCellData<>("");
+        }
+        String label = LIGHT_LEVEL_MAP.getOrDefault(value, "");
+        return new WriteCellData<>(label);
+    }
+
+    @Override
+    public Integer convertToJavaData(ReadCellData<?> cellData,
+                                     ExcelContentProperty contentProperty,
+                                     GlobalConfiguration globalConfiguration) {
+        String stringValue = cellData.getStringValue();
+        for (Map.Entry<Integer, String> entry : LIGHT_LEVEL_MAP.entrySet()) {
+            if (entry.getValue().equals(stringValue)) {
+                return entry.getKey();
+            }
+        }
+        return null;
+    }
+}

wms-common/src/main/java/top/wms/admin/common/enums/OperTypeEnum.java

@@ -1,33 +0,0 @@
-package top.wms.admin.common.enums;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import top.continew.starter.core.enums.BaseEnum;
-
-@Getter
-@RequiredArgsConstructor
-public enum OperTypeEnum implements BaseEnum<Integer> {
-
-    /**
-     * 新增
-     */
-    ADD(0, "新增"),
-
-    /**
-     * 修改
-     */
-    UPDATE(1, "修改"),
-
-    /**
-     * 下发
-     */
-    DOWN(2, "下发"),
-
-    /**
-     * 删除
-     */
-    DEL(3, "删除");
-
-    private final Integer value;
-    private final String description;
-}

wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/service/FullWorkOrderService.java

@@ -3,7 +3,6 @@ package top.wms.admin.fullWorkOrder.service;
 import top.continew.starter.extension.crud.service.BaseService;
 import top.wms.admin.fullWorkOrder.model.query.FullWorkOrderQuery;
 import top.wms.admin.fullWorkOrder.model.req.FullWorkOrderReq;
-import top.wms.admin.fullWorkOrder.model.resp.FullWorkOrderDetailResp;
 import top.wms.admin.fullWorkOrder.model.resp.FullWorkOrderResp;
 
 /**

wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/service/impl/FullWorkOrderServiceImpl.java

@@ -15,8 +15,6 @@ 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;
-import top.wms.admin.materialProcess.model.query.MaterialProcessQuery;
-import top.wms.admin.materialProcess.model.resp.MaterialProcessResp;
 
 import java.util.Date;
 import java.util.List;
@@ -41,8 +39,6 @@ public class FullWorkOrderServiceImpl extends BaseServiceImpl<FullWorkOrderMappe
         req.setTitle(title);
     }
 
-
-
     @Override
     public void export(FullWorkOrderQuery query, SortQuery sortQuery, HttpServletResponse response) {
         List<FullWorkOrderResp> list = super.list(query, sortQuery, this.getDetailClass());
@@ -50,5 +46,4 @@ public class FullWorkOrderServiceImpl extends BaseServiceImpl<FullWorkOrderMappe
         ExcelUtils.export(list, "整箱领取导出记录", FullWorkOrderResp.class, response);
     }
 
-
 }

wms-module-system/src/main/java/top/wms/admin/material/model/entity/MaterialInfoDO.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 
+import top.wms.admin.common.enums.LightLevelEnum;
 import top.wms.admin.common.model.entity.BaseDO;
 
 import java.io.Serial;
@@ -56,4 +57,9 @@ public class MaterialInfoDO extends BaseDO {
      * 流程ID
      */
     private Long materialProcessId;
+
+    /**
+     * 灯光等级
+     */
+    private Integer lightLevel;
 }

wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialImportRowReq.java

@@ -1,6 +1,5 @@
 package top.wms.admin.material.model.req;
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -40,6 +39,12 @@ public class MaterialImportRowReq implements Serializable {
     @NotNull(message = "物料单位重量不能为空")
     private BigDecimal unitWeight;
 
+    /**
+     * 灯光等级
+     */
+    @Schema(description = "灯光等级")
+    private String lightLevelName;
+
     /*
      * 物料规格
      * */

wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialInfoReq.java

@@ -73,4 +73,10 @@ public class MaterialInfoReq implements Serializable {
     @Schema(description = "流程ID")
     @NotNull(message = "流程ID不能为空")
     private Long materialProcessId;
+
+    /**
+     * 灯光等级
+     */
+    @Schema(description = "灯光等级")
+    private Integer lightLevel;
 }

wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java

@@ -2,10 +2,9 @@ package top.wms.admin.material.model.resp;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
-import lombok.Data;
-
 import io.swagger.v3.oas.annotations.media.Schema;
-
+import lombok.Data;
+import top.wms.admin.common.enums.LightLevelEnumConverter;
 import top.wms.admin.common.model.resp.BaseDetailResp;
 
 import java.io.Serial;
@@ -28,28 +27,28 @@ public class MaterialInfoResp extends BaseDetailResp {
      * 物料名称
      */
     @Schema(description = "物料名称")
-    @ExcelProperty(value = "物料名称")
+    @ExcelProperty(value = "物料名称", order = 1)
     private String materialName;
 
     /**
      * 物料编码
      */
     @Schema(description = "物料编码")
-    @ExcelProperty(value = "物料编码")
+    @ExcelProperty(value = "物料编码", order = 2)
     private String encoding;
 
     /**
      * 物料单位重量(g)
      */
     @Schema(description = "物料单位重量(g)")
-    @ExcelProperty(value = "物料单位重量(g)")
+    @ExcelProperty(value = "物料单位重量(g)", order = 3)
     private Double unitWeight;
 
     /**
      * 物料规格
      */
     @Schema(description = "物料规格")
-    @ExcelProperty(value = "物料规格")
+    @ExcelProperty(value = "物料规格", order = 5)
     private String materialSpec;
 
     /**
@@ -87,7 +86,6 @@ public class MaterialInfoResp extends BaseDetailResp {
     @ExcelIgnore
     private Long materialProcessId;
 
-
     /**
      * 品类下行浮动范围（%）
      */
@@ -102,4 +100,11 @@ public class MaterialInfoResp extends BaseDetailResp {
     @ExcelIgnore
     private BigDecimal upFloatRatio;
 
+    /**
+     * 颜色灯光值
+     */
+    @Schema(description = "灯光等级")
+    @ExcelProperty(value = "灯光等级", converter = LightLevelEnumConverter.class, order = 4)
+    private Integer lightLevel;
+
 }

wms-module-system/src/main/java/top/wms/admin/material/service/MaterialInfoService.java

@@ -3,7 +3,6 @@ package top.wms.admin.material.service;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.web.multipart.MultipartFile;
 import top.continew.starter.extension.crud.service.BaseService;
-import top.wms.admin.material.model.entity.MaterialInfoDO;
 import top.wms.admin.material.model.query.MaterialInfoQuery;
 import top.wms.admin.material.model.req.MaterialInfoImportReq;
 import top.wms.admin.material.model.req.MaterialInfoReq;

wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java

@@ -39,6 +39,8 @@ import top.continew.starter.file.excel.util.ExcelUtils;
 import top.continew.starter.web.util.FileUploadUtils;
 import top.wms.admin.common.constant.CacheConstants;
 import top.wms.admin.common.context.UserContextHolder;
+import top.wms.admin.common.enums.LightLevelEnum;
+import top.wms.admin.common.enums.LightLevelEnumConverter;
 import top.wms.admin.common.util.SecureUtils;
 import top.wms.admin.material.mapper.MaterialInfoMapper;
 import top.wms.admin.material.model.entity.MaterialInfoDO;
@@ -205,16 +207,33 @@ public class MaterialInfoServiceImpl extends BaseServiceImpl<MaterialInfoMapper,
         List<String> collect = importMaterialList.stream().map(MaterialImportRowReq::getTypeName).distinct().toList();
         Map<String, Long> materialTypeMap = new HashMap<>();
         if (CollUtil.isNotEmpty(collect)) {
-        List<MaterialTypeDO> materialTypeList = materialTypeMapper.selectList(new LambdaQueryWrapper<MaterialTypeDO>().in(MaterialTypeDO::getTypeName, collect));
+            List<MaterialTypeDO> materialTypeList = materialTypeMapper
-            materialTypeMap = materialTypeList.stream().collect(Collectors.toMap(MaterialTypeDO::getTypeName, MaterialTypeDO::getId, (k1, v1) -> v1));
+                .selectList(new LambdaQueryWrapper<MaterialTypeDO>().in(MaterialTypeDO::getTypeName, collect));
+            materialTypeMap = materialTypeList.stream()
+                .collect(Collectors.toMap(MaterialTypeDO::getTypeName, MaterialTypeDO::getId, (k1, v1) -> v1));
         }
         //查询物料流程
-        List<String> collect1 = importMaterialList.stream().map(MaterialImportRowReq::getProcessName).distinct().toList();
+        List<String> collect1 = importMaterialList.stream()
-        List<MaterialProcessDO> materialProcessList = materialProcessMapper.selectList(new LambdaQueryWrapper<MaterialProcessDO>().in(MaterialProcessDO::getProcessName, collect1));
+            .map(MaterialImportRowReq::getProcessName)
+            .distinct()
+            .toList();
+        List<MaterialProcessDO> materialProcessList = materialProcessMapper
+            .selectList(new LambdaQueryWrapper<MaterialProcessDO>().in(MaterialProcessDO::getProcessName, collect1));
         Map<String, Long> materialProcessMap = new HashMap<>();
         if (CollUtil.isNotEmpty(materialProcessList)) {
-            materialProcessMap = materialProcessList.stream().collect(Collectors.toMap(MaterialProcessDO::getProcessName, MaterialProcessDO::getId, (k1, v1) -> v1));
+            materialProcessMap = materialProcessList.stream()
+                .collect(Collectors.toMap(MaterialProcessDO::getProcessName, MaterialProcessDO::getId, (k1, v1) -> v1));
         }
+        //处理灯光等级
+        Map<String, Integer> lightLevelMap = new HashMap<>();
+        importMaterialList.forEach(row -> {
+            if (row.getLightLevelName() != null) {
+                Integer valueByDescription = LightLevelEnum.getValueByDescription(row.getLightLevelName());
+                if(null != valueByDescription){
+                    lightLevelMap.put(row.getLightLevelName(), valueByDescription);
+                }
+            }
+        });
 
         // 批量操作数据库集合
         List<MaterialInfoDO> insertList = new ArrayList<>();
@@ -230,6 +249,7 @@ public class MaterialInfoServiceImpl extends BaseServiceImpl<MaterialInfoMapper,
             materialDO.setMaterialSpec(StrUtil.isNotBlank(row.getMaterialSpec()) ? row.getMaterialSpec() : null);
             materialDO.setMaterialProcessId(materialProcessMap.get(row.getProcessName()));
             materialDO.setMaterialTypeId(materialTypeMap.get(row.getTypeName()));
+            materialDO.setLightLevel(lightLevelMap.get(row.getLightLevelName()));
             // 修改 or 新增
             if (UPDATE.validate(req.getDuplicateName(), row.getMaterialName(), existName)) {
                 materialDO.setMaterialName(row.getMaterialName());
@@ -283,9 +303,7 @@ public class MaterialInfoServiceImpl extends BaseServiceImpl<MaterialInfoMapper,
      */
     private List<MaterialImportRowReq> filterImportData(List<MaterialImportRowReq> importRowList) {
         // 校验过滤
-        return importRowList.stream()
+        return importRowList.stream().filter(row -> ValidationUtil.validate(row).isEmpty()).toList();
-            .filter(row -> ValidationUtil.validate(row).isEmpty())
-            .toList();
     }
 
     /**

wms-module-system/src/main/java/top/wms/admin/materialProcess/model/req/MaterialProcessImportReq.java

@@ -1,7 +1,6 @@
 package top.wms.admin.materialProcess.model.req;
 
 import lombok.Data;
-import lombok.experimental.Accessors;
 import top.wms.admin.system.enums.ImportPolicyEnum;
 
 import java.io.Serial;

wms-module-system/src/main/java/top/wms/admin/materialProcess/model/req/MaterialProcessImportRowReq.java

@@ -2,12 +2,10 @@ package top.wms.admin.materialProcess.model.req;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
-import lombok.experimental.Accessors;
 
 import java.io.Serial;
 import java.io.Serializable;
 
-
 /**
  * 物料流程导入行数据
  *

wms-module-system/src/main/java/top/wms/admin/materialProcess/model/resp/MaterialProcessImportResp.java

@@ -1,7 +1,6 @@
 package top.wms.admin.materialProcess.model.resp;
 
 import lombok.Data;
-import lombok.experimental.Accessors;
 
 import java.io.Serial;
 import java.io.Serializable;

wms-module-system/src/main/java/top/wms/admin/materialProcess/service/MaterialProcessService.java

@@ -23,18 +23,21 @@ public interface MaterialProcessService extends BaseService<MaterialProcessResp,
 
     /**
      * 获取流程下拉列表
+     * 
      * @return 流程下拉列表
      */
     List<LabelValueResp> getSelectList();
 
     /**
      * 下载导入模板
+     * 
      * @param response 响应对象
      */
     void downloadImportTemplate(HttpServletResponse response) throws Exception;
 
     /**
      * 解析导入文件
+     * 
      * @param file 导入文件
      * @return 解析响应
      */
@@ -42,6 +45,7 @@ public interface MaterialProcessService extends BaseService<MaterialProcessResp,
 
     /**
      * 导入物料流程
+     * 
      * @param req 导入请求
      * @return 导入响应
      */

wms-module-system/src/main/java/top/wms/admin/materialProcess/service/impl/MaterialProcessServiceImpl.java

@@ -25,7 +25,6 @@ import top.continew.starter.file.excel.util.ExcelUtils;
 import top.continew.starter.web.util.FileUploadUtils;
 import top.wms.admin.common.constant.CacheConstants;
 import top.wms.admin.common.context.UserContextHolder;
-import top.wms.admin.material.model.resp.MaterialInfoResp;
 import top.wms.admin.materialProcess.mapper.MaterialProcessMapper;
 import top.wms.admin.materialProcess.mapstruct.MaterialProcessConvert;
 import top.wms.admin.materialProcess.model.entity.MaterialProcessDO;
@@ -56,7 +55,6 @@ public class MaterialProcessServiceImpl extends BaseServiceImpl<MaterialProcessM
 
     private final MaterialProcessConvert materialProcessConvert;
 
-
     @Override
     public void beforeAdd(MaterialProcessReq req) {
         // 校验流程名称是否重复
@@ -73,15 +71,16 @@ public class MaterialProcessServiceImpl extends BaseServiceImpl<MaterialProcessM
     public void beforeUpdate(MaterialProcessReq req, Long id) {
         // 校验流程名称是否重复
         MaterialProcessDO processDO = baseMapper.selectOne(Wrappers.lambdaQuery(MaterialProcessDO.class)
-                .eq(MaterialProcessDO::getProcessName, req.getProcessName()).ne(MaterialProcessDO::getId, id));
+            .eq(MaterialProcessDO::getProcessName, req.getProcessName())
+            .ne(MaterialProcessDO::getId, id));
         CheckUtils.throwIf(ObjectUtil.isNotEmpty(processDO), "流程名称已存在");
         // 校验流程编码是否重复
         processDO = baseMapper.selectOne(Wrappers.lambdaQuery(MaterialProcessDO.class)
-                .eq(MaterialProcessDO::getProcessCode, req.getProcessCode()).ne(MaterialProcessDO::getId, id));
+            .eq(MaterialProcessDO::getProcessCode, req.getProcessCode())
+            .ne(MaterialProcessDO::getId, id));
         CheckUtils.throwIf(ObjectUtil.isNotEmpty(processDO), "流程编码已存在");
     }
 
-
     @Override
     public void export(MaterialProcessQuery query, SortQuery sortQuery, HttpServletResponse response) {
         List<MaterialProcessResp> list = super.list(query, sortQuery, this.getDetailClass());
@@ -223,8 +222,7 @@ public class MaterialProcessServiceImpl extends BaseServiceImpl<MaterialProcessM
         if (fieldValues.isEmpty()) {
             return 0;
         }
-        return (int)this.count(Wrappers.<MaterialProcessDO>lambdaQuery()
+        return (int)this.count(Wrappers.<MaterialProcessDO>lambdaQuery().in(dbField, fieldValues));
-            .in(dbField, fieldValues));
     }
 
     /**
@@ -234,9 +232,7 @@ public class MaterialProcessServiceImpl extends BaseServiceImpl<MaterialProcessM
      */
     private List<MaterialProcessImportRowReq> filterImportData(List<MaterialProcessImportRowReq> importRowList) {
         // 校验过滤
-        return importRowList.stream()
+        return importRowList.stream().filter(row -> ValidationUtil.validate(row).isEmpty()).toList();
-            .filter(row -> ValidationUtil.validate(row).isEmpty())
-            .toList();
     }
 
     /**
@@ -274,8 +270,8 @@ public class MaterialProcessServiceImpl extends BaseServiceImpl<MaterialProcessM
                                          List<String> existName,
                                          List<String> existCode) {
         return list.stream()
-            .anyMatch(row -> EXIT.validate(req.getDuplicateName(), row.getProcessName(), existName) || EXIT
+            .anyMatch(row -> EXIT.validate(req.getDuplicateName(), row.getProcessName(), existName) || EXIT.validate(req
-                .validate(req.getDuplicateCode(), row.getProcessCode(), existCode));
+                .getDuplicateCode(), row.getProcessCode(), existCode));
     }
 
     /**

wms-module-system/src/main/java/top/wms/admin/materialType/model/query/MaterialTypeQuery.java

@@ -10,7 +10,6 @@ import top.continew.starter.data.core.enums.QueryType;
 import java.io.Serial;
 import java.io.Serializable;
 import java.time.*;
-import java.math.BigDecimal;
 
 /**
  * 物料品类查询条件

wms-module-system/src/main/java/top/wms/admin/weighManage/service/impl/WorkOrderServiceImpl.java

@@ -139,7 +139,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         MaterialInfoDO materialInfoDO = materialInfoMapper.selectById(req.getMaterialId());
         CheckUtils.throwIf((materialInfoDO == null || null == materialInfoDO.getMaterialTypeId()), "该物料信息不全，请先维护！");
         MaterialTypeDO materialTypeDO = materialTypeMapper.selectById(materialInfoDO.getMaterialTypeId());
-        CheckUtils.throwIf((materialTypeDO == null || null == materialTypeDO.getDownFloatRatio() || null == materialTypeDO.getUpFloatRatio()), "该物料品类信息不全，请先维护！");
+        CheckUtils.throwIf((materialTypeDO == null || null == materialTypeDO
+            .getDownFloatRatio() || null == materialTypeDO.getUpFloatRatio()), "该物料品类信息不全，请先维护！");
 
         //下行浮动范围
         BigDecimal downFloatRatio = materialTypeDO.getDownFloatRatio();
@@ -152,7 +153,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
         // 计算比值：(实重 - 标重) / 标重
         BigDecimal weightDifference = electronicWeight.subtract(standardWeight);
-        BigDecimal ratio = weightDifference.divide(standardWeight, 4, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(100));
+        BigDecimal ratio = weightDifference.divide(standardWeight, 4, BigDecimal.ROUND_HALF_UP)
+            .multiply(BigDecimal.valueOf(100));
         log.info("ratio当前比值:{}%", ratio);
 
         // 检查比值是否超过上行浮动范围

wms-webapi/.flattened-pom.xml

@@ -96,6 +96,18 @@
       <scope>system</scope>
       <systemPath>${project.basedir}/Library/MvCameraControlWrapper.jar</systemPath>
     </dependency>
+    <dependency>
+      <groupId>com.sun.jna</groupId>
+      <artifactId>jna</artifactId>
+      <version>1.0</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/src/main/resources/lib/jna.jar</systemPath>
+    </dependency>
+    <dependency>
+      <groupId>com.fazecast</groupId>
+      <artifactId>jSerialComm</artifactId>
+      <version>2.10.5</version>
+    </dependency>
   </dependencies>
   <build>
     <finalName>${project.parent.name}</finalName>

wms-webapi/pom.xml

@@ -125,6 +125,13 @@
             <systemPath>${project.basedir}/src/main/resources/lib/jna.jar</systemPath>
         </dependency>
 
+        <!-- 串口通信依赖 -->
+        <dependency>
+            <groupId>com.fazecast</groupId>
+            <artifactId>jSerialComm</artifactId>
+            <version>2.10.5</version>
+        </dependency>
+
     </dependencies>
 
     <build>

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

@@ -11,8 +11,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.dromara.x.file.storage.core.FileInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

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

@@ -26,6 +26,4 @@ import top.wms.admin.fullWorkOrder.service.FullWorkOrderService;
 @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/meterial/MaterialInfoController.java

@@ -2,7 +2,6 @@ package top.wms.admin.controller.meterial;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
 import io.swagger.v3.oas.annotations.Operation;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotNull;
@@ -22,7 +21,6 @@ import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
 import top.continew.starter.log.annotation.Log;
 import top.continew.starter.web.model.R;
 import top.wms.admin.common.controller.BaseController;
-import top.wms.admin.material.model.entity.MaterialInfoDO;
 import top.wms.admin.material.model.query.MaterialInfoQuery;
 import top.wms.admin.material.model.req.MaterialInfoImportReq;
 import top.wms.admin.material.model.req.MaterialInfoReq;

wms-webapi/src/main/java/top/wms/admin/controller/vm/VmCommandController.java

@@ -1,6 +1,5 @@
 package top.wms.admin.controller.vm;
 
-import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSONObject;
 import io.netty.channel.Channel;
 import lombok.extern.slf4j.Slf4j;

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

@@ -51,8 +51,6 @@ public class NetCommon {
         return true;
     }
 
-
-
     /**
      * Launch the application.
      */
@@ -80,7 +78,6 @@ public class NetCommon {
         System.out.println("程序执行完成");
     }
 
-
     /**
      * 登录设备
      *
@@ -129,13 +126,17 @@ public class NetCommon {
     public static void queryChannels() {
         int nMaxChlCount = 256;
         IntByReference dwChlCount = new IntByReference(nMaxChlCount);
-        NetDEVSDKLib.NETDEV_VIDEO_CHL_DETAIL_INFO_EX_S[] stVideoChlList = (NetDEVSDKLib.NETDEV_VIDEO_CHL_DETAIL_INFO_EX_S[]) new NetDEVSDKLib.NETDEV_VIDEO_CHL_DETAIL_INFO_EX_S().toArray(nMaxChlCount);
+        NetDEVSDKLib.NETDEV_VIDEO_CHL_DETAIL_INFO_EX_S[] stVideoChlList = (NetDEVSDKLib.NETDEV_VIDEO_CHL_DETAIL_INFO_EX_S[])new NetDEVSDKLib.NETDEV_VIDEO_CHL_DETAIL_INFO_EX_S()
+            .toArray(nMaxChlCount);
         boolean bRet = netdevsdk.NETDEV_QueryVideoChlDetailListEx(lpUserID, dwChlCount, stVideoChlList);
 
         if (bRet) {
             log.info("通道查询成功，通道数量: {}", dwChlCount.getValue());
             for (int i = 0; i < dwChlCount.getValue(); i++) {
-                System.out.println("通道ID: " + stVideoChlList[i].dwChannelID + ", 状态: " + (stVideoChlList[i].enStatus == 1 ? "在线" : "离线") + ", 名称: " + new String(stVideoChlList[i].szChnName).trim());
+                System.out
+                    .println("通道ID: " + stVideoChlList[i].dwChannelID + ", 状态: " + (stVideoChlList[i].enStatus == 1
+                        ? "在线"
+                        : "离线") + ", 名称: " + new String(stVideoChlList[i].szChnName).trim());
             }
         } else {
             log.error("通道查询失败, 错误码:{}", netdevsdk.NETDEV_GetLastError());

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

@@ -22,4 +22,3 @@ public class CheckTableModle extends DefaultTableModel {
         }
     }
 }
-

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

@@ -3,7 +3,6 @@ package top.wms.admin.controller.ys.utils;
 import javax.swing.*;
 import javax.swing.table.TableCellEditor;
 
-
 public class ComboBoxTable extends JTable {
     /**
      * 序列化

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

@@ -24,10 +24,8 @@ public class Common {
 
     public static final int NETDEMO_PICTURE_SIZE = 1048576; /* 图片内存建议分配大小 */
 
-	public static boolean isIP(String addr)  
+    public static boolean isIP(String addr) {
-    {  
+        if (addr.length() < 7 || addr.length() > 15 || "".equals(addr)) {
-        if(addr.length() < 7 || addr.length() > 15 || "".equals(addr))  
-        {  
             return false;
         }
         /**
@@ -143,18 +141,14 @@ public class Common {
         return strStatus;
     }
 
-	public static boolean isValidDate(String seconds,String format)
+    public static boolean isValidDate(String seconds, String format) {
-    {
         SimpleDateFormat dateFormat = null;
         dateFormat = new SimpleDateFormat(format);
         dateFormat.setLenient(false);
-        try
+        try {
-        {
             dateFormat.parse(seconds);
             return true;
-         }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             // 如果throw java.text.ParseException或者NullPointerException，就说明格式不对
             return false;
         }
@@ -162,6 +156,7 @@ public class Common {
 
     /**
      * 时间戳转换成日期格式字符串
+     * 
      * @param seconds   精确到秒的字符串
      * @param formatStr
      * @return
@@ -170,12 +165,15 @@ public class Common {
         if (seconds == null || seconds.isEmpty() || seconds.equals("null")) {
             return "";
         }
-        if(format == null || format.isEmpty()) format = "yyyy-MM-dd HH:mm:ss";  
+        if (format == null || format.isEmpty())
+            format = "yyyy-MM-dd HH:mm:ss";
         SimpleDateFormat sdf = new SimpleDateFormat(format);
         return sdf.format(new Date(Long.valueOf(seconds + "000")));
     }
+
     /**
      * 日期格式字符串转换成时间戳
+     * 
      * @param date   字符串日期
      * @param format 如：yyyy-MM-dd HH:mm:ss
      * @return
@@ -192,6 +190,7 @@ public class Common {
 
     /**
      * 取得当前时间戳（精确到秒）
+     * 
      * @return
      */
     public static long timeStamp() {
@@ -646,15 +645,13 @@ public class Common {
         pJavaStu.read();
     }
 
-	public static void GetPointerData(Pointer pNativeData, Structure pJavaStu)
+    public static void GetPointerData(Pointer pNativeData, Structure pJavaStu) {
-	{
         GetPointerDataToStruct(pNativeData, 0, pJavaStu);
     }
 
     public static void GetPointerDataToStructArr(Pointer pNativeData, Structure[] pJavaStuArr) {
         long offset = 0;
-		for (int i=0; i<pJavaStuArr.length; ++i)
+        for (int i = 0; i < pJavaStuArr.length; ++i) {
-		{
             GetPointerDataToStruct(pNativeData, offset, pJavaStuArr[i]);
             offset += pJavaStuArr[i].size();
         }
@@ -674,7 +671,6 @@ public class Common {
         }
     }
 
-	
     // 获取当前时间
     public static String getDate() {
         SimpleDateFormat simpleDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss SSS");
@@ -684,10 +680,8 @@ public class Common {
     }
 
     //Point类型转byte数组写文件
-	public static void savePicture(Pointer pBuf, int dwBufSize, String strFileName)
+    public static void savePicture(Pointer pBuf, int dwBufSize, String strFileName) {
-	{
+        try {
-        try
-        {
             FileOutputStream fos = new FileOutputStream(strFileName);
             fos.write(pBuf.getByteArray(0, dwBufSize), 0, dwBufSize);
             fos.close();
@@ -697,10 +691,8 @@ public class Common {
     }
 
     //byte数组写文件
-	public static void savePicture(byte[] pBuf, int dwBufOffset, int dwBufSize, String sDstFile)
+    public static void savePicture(byte[] pBuf, int dwBufOffset, int dwBufSize, String sDstFile) {
-	{
+        try {
-        try
-        {       	
             FileOutputStream fos = new FileOutputStream(sDstFile);
             fos.write(pBuf, dwBufOffset, dwBufSize);
             fos.close();
@@ -728,8 +720,7 @@ public class Common {
         }
 
         try {
-            @SuppressWarnings("unchecked")
+            @SuppressWarnings("unchecked") T[] array = (T[])Array.newInstance(clazz, size);
-			T[] array = (T[]) Array.newInstance(clazz, size);
             for (int i = 0; i < size; i++) {
                 T t = clazz.newInstance();
                 Pointer offsetPointer = pointer.share(t.size() * i);
@@ -780,33 +771,29 @@ public class Common {
         }
     }
 
-	
     /**
      * 读取图片数据
+     * 
      * @param file   图片路径
      * @param memory 图片数据缓存
      * @return
      */
     public static boolean ReadAllFileToMemory(String file, Memory memory) {
-		if (memory != Memory.NULL)
+        if (memory != Memory.NULL) {
-		{
             long fileLen = GetFileSize(file);
-			if (fileLen <= 0)
+            if (fileLen <= 0) {
-			{
                 return false;
             }
 
             try {
                 File infile = new File(file);
-				if (infile.canRead())
+                if (infile.canRead()) {
-				{
                     FileInputStream in = new FileInputStream(infile);
                     int buffLen = 1024;
                     byte[] buffer = new byte[buffLen];
                     long currFileLen = 0;
                     int readLen = 0;
-					while (currFileLen < fileLen)
+                    while (currFileLen < fileLen) {
-					{
                         readLen = in.read(buffer);
                         memory.write(currFileLen, buffer, 0, readLen);
                         currFileLen += readLen;
@@ -814,14 +801,11 @@ public class Common {
 
                     in.close();
                     return true;
-				}
+                } else {
-		        else
-		        {
                     System.err.println("Failed to open file %s for read!!!\n");
                     return false;
                 }
-			}catch (Exception e)
+            } catch (Exception e) {
-			{
                 System.err.println("Failed to open file %s for read!!!\n");
                 e.printStackTrace();
             }
@@ -834,9 +818,7 @@ public class Common {
         File f = new File(filePath);
         if (f.exists() && f.isFile()) {
             return f.length();
-		}
+        } else {
-		else
-		{
             return 0;
         }
     }
@@ -870,8 +852,7 @@ public class Common {
         return memory;
     }
 
-	public static String EnumNETDEV_PLATE_COLOR_EConventToString(int dwEnum)
+    public static String EnumNETDEV_PLATE_COLOR_EConventToString(int dwEnum) {
-	{
         String strTempString = "";
         switch (dwEnum) {
             case NETDEV_PLATE_COLOR_E.NETDEV_PLATE_COLOR_BLACK_E:
@@ -950,8 +931,7 @@ public class Common {
         return strTempString;
     }
 
-	public static int StringConventToEnumNETDEV_PLATE_COLOR_E(String strColor)
+    public static int StringConventToEnumNETDEV_PLATE_COLOR_E(String strColor) {
-	{
         int dwTemp = 0;
         switch (strColor) {
             case "BLACK":
@@ -1030,8 +1010,7 @@ public class Common {
         return dwTemp;
     }
 
-	public static String EnumNETDEV_PLATE_TYPE_EConventToString(int dwEnum)
+    public static String EnumNETDEV_PLATE_TYPE_EConventToString(int dwEnum) {
-	{
         String strTempString = "";
         switch (dwEnum) {
             case NETDEV_PLATE_TYPE_E.NETDEV_PLATE_TYPE_BIG_CAR_E:
@@ -1124,8 +1103,7 @@ public class Common {
         return strTempString;
     }
 
-	public static int StringConventToEnumNETDEV_PLATE_TYPE_E(String strEnum)
+    public static int StringConventToEnumNETDEV_PLATE_TYPE_E(String strEnum) {
-	{
         int dwRet = 0;
         switch (strEnum) {
             case "BIG_CAR":
@@ -1218,8 +1196,7 @@ public class Common {
         return dwRet;
     }
 
-	public static int StringConventToEnumNETDEV_VEHICLE_MONITOR_TYPE_E(String strMonitorType)
+    public static int StringConventToEnumNETDEV_VEHICLE_MONITOR_TYPE_E(String strMonitorType) {
-	{
         int dwTemp = 0;
         switch (strMonitorType) {
             case "Robbed car":
@@ -1245,8 +1222,7 @@ public class Common {
         return dwTemp;
     }
 
-	public static String EnumNETDEV_DISK_WORK_STATUS_EConventToString(int dwEnum)
+    public static String EnumNETDEV_DISK_WORK_STATUS_EConventToString(int dwEnum) {
-	{
         String strTempString = "";
         switch (dwEnum) {
             case NETDEV_DISK_WORK_STATUS_E.NETDEV_DISK_WORK_STATUS_EMPTY:
@@ -1276,8 +1252,7 @@ public class Common {
         return strTempString;
     }
 
-	public static String EnumNETDEV_VIDEO_QUALITY_EConventToString(int dwEnum)
+    public static String EnumNETDEV_VIDEO_QUALITY_EConventToString(int dwEnum) {
-	{
         String strTempString = "";
         switch (dwEnum) {
             case NETDEV_VIDEO_QUALITY_E.NETDEV_VQ_L0:
@@ -1319,8 +1294,7 @@ public class Common {
         return strTempString;
     }
 
-	public static int StringConventToEnumNETDEV_VIDEO_QUALITY_E(String strVideoQuality)
+    public static int StringConventToEnumNETDEV_VIDEO_QUALITY_E(String strVideoQuality) {
-	{
         int dwTemp = 0;
         switch (strVideoQuality) {
             case "L0":

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

@@ -1,6 +1,5 @@
 package top.wms.admin.controller.ys.utils;
 
-
 import javax.swing.*;
 import javax.swing.border.LineBorder;
 import javax.swing.event.ChangeEvent;
@@ -11,8 +10,7 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 
-public class DateChooser extends JPanel
+public class DateChooser extends JPanel {
-{
 
     private int width = 200;  // 日期控件的宽度
     private int height = 220;  // 日期控件的高度
@@ -24,7 +22,6 @@ public class DateChooser extends JPanel
     private Container owner;
     private int length = 140;
 
-   
     /**
      * @wbp.parser.constructor
      */
@@ -34,11 +31,11 @@ public class DateChooser extends JPanel
         this.length = length;
         try {
             init();
-      }
+        } catch (Exception ex) {
-       catch  (Exception ex) {
             ex.printStackTrace();
         }
     }
+
     /* *
     * 根据一个所有者和一个日期的显示格式构造一个DateChooser对象。
      */
@@ -48,11 +45,11 @@ public class DateChooser extends JPanel
         this.length = length;
         try {
             init();
-       }
+        } catch (Exception ex) {
-        catch  (Exception ex) {
             ex.printStackTrace();
         }
     }
+
     /* *
     * 根据一个所有者和一个日期的显示格式构造一个DateChooser对象。
      */
@@ -61,12 +58,12 @@ public class DateChooser extends JPanel
         this.parten = partten;
         try {
             init();
-       }
+        } catch (Exception ex) {
-        catch  (Exception ex) {
             ex.printStackTrace();
         }
 
     }
+
     /* *
     * 以缺省的partten构建DateChooser对象
     * 日期选择框的所有者必须是Frame或者是JFrame对象。
@@ -76,8 +73,7 @@ public class DateChooser extends JPanel
         this.parten = " yyyy-MM-dd HH:mm:ss";
         try {
             init();
-       }
+        } catch (Exception ex) {
-        catch  (Exception ex) {
             ex.printStackTrace();
         }
     }
@@ -102,18 +98,15 @@ public class DateChooser extends JPanel
         Date date = new Date();
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat(parten);
         this.setText(simpleDateFormat.format(date));
-        this .add(jTextFieldDate,  new  GridBagConstraints( 0 ,  0 ,  1 ,  1 ,  20.0 ,  0.0
+        this.add(jTextFieldDate, new GridBagConstraints(0, 0, 1, 1, 20.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 60, 0));
-           , GridBagConstraints.CENTER,
+        this.add(btnChoose, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-           GridBagConstraints.NONE,
-            new  Insets( 0 ,  0 ,  0 ,  0 ),  60,  0 ));
-        this .add(btnChoose,  new  GridBagConstraints( 1 ,  0 ,  1 ,  1 ,  0.0 ,  0.0
-           , GridBagConstraints.CENTER, GridBagConstraints.NONE,
-            new  Insets( 0 ,  0 ,  0 ,  0 ),  0 ,  0 ));
     }
+
     public void setToolTipText(String text) {
         jTextFieldDate.setToolTipText(text);
         jTextFieldDate.setToolTipText(text);
     }
+
     /* *
     * 下拉按钮的事件处理
     * @param e ActionEvent
@@ -154,6 +147,7 @@ public class DateChooser extends JPanel
         dateFrame.getContentPane().add(datePanel);
         dateFrame.setVisible(true);
     }
+
     /* *
     * 得到日期控件中的值
     * @return String
@@ -161,6 +155,7 @@ public class DateChooser extends JPanel
     public String getText() {
         return this.jTextFieldDate.getText();
     }
+
     /* *
     * 设置文本域的值
     * @param text String
@@ -168,6 +163,7 @@ public class DateChooser extends JPanel
     public void setText(String text) {
         this.jTextFieldDate.setText(text);
     }
+
     /* *
     * 该方法非常有用，是外部直接访问的TextField对象。
     * @return JTextField
@@ -175,12 +171,11 @@ public class DateChooser extends JPanel
     public JTextField getDateField() {
         return jTextFieldDate;
     }
+
     /* *
     * 内部类，日期选择控件的主体，封装了所有日期选择的内容，主要是一个Panel
      */
-    class  DatePanel
+    class DatePanel extends JPanel implements MouseListener, ChangeListener {
-       extends JPanel implements MouseListener,
-       ChangeListener {
 
         int startYear = 1970;  // 默认【最小】显示年份
         int lastYear = 2050;  // 默认【最大】显示年份
@@ -240,8 +235,7 @@ public class DateChooser extends JPanel
                     JButton numberButton = new JButton();
                     numberButton.setBorder(BorderFactory.createEmptyBorder());
                     numberButton.setHorizontalAlignment(SwingConstants.CENTER);
-                   numberButton.setActionCommand(String.valueOf(
+                    numberButton.setActionCommand(String.valueOf(actionCommandId));
-                       actionCommandId));
 
                     numberButton.addMouseListener(this);
 
@@ -254,13 +248,16 @@ public class DateChooser extends JPanel
                 }
             }
         }
+
         private Date getNowDate() {
             return Calendar.getInstance().getTime();
         }
+
         private Calendar getNowCalendar() {
             Calendar result = Calendar.getInstance();
             return result;
         }
+
         private Date getSelectDate() {
             return calendar.getTime();
         }
@@ -273,12 +270,8 @@ public class DateChooser extends JPanel
             int currentYear = c.get(Calendar.YEAR);
             int currentMonth = c.get(Calendar.MONTH) + 1;
             int currentHour = c.get(Calendar.DAY_OF_MONTH);
-           yearSpin  =   new  JSpinner( new  SpinnerNumberModel(
+            yearSpin = new JSpinner(new SpinnerNumberModel(currentYear, startYear, lastYear, 1));
-               currentYear,
+            monthSpin = new JSpinner(new SpinnerNumberModel(currentMonth, 1, 12, 1));
-               startYear, lastYear,  1 ));
-           monthSpin  =   new  JSpinner( new  SpinnerNumberModel(
-               currentMonth,  1 ,  12 ,
-                1 ));
             //           hourSpin  =   new  JSpinner( new  javax.swing.SpinnerNumberModel(
             //               currentHour,  0 ,  23 ,
             //                1 ));
@@ -306,6 +299,7 @@ public class DateChooser extends JPanel
             yearPanel.add(monthLabel);
 
         }
+
         /* *
         * 根据日期刷新显示面板
          */
@@ -315,8 +309,7 @@ public class DateChooser extends JPanel
             c.setFirstDayOfWeek(0);
             int firstdayofWeek = c.get(Calendar.DAY_OF_WEEK);
             int lastdayofWeek = c.getActualMaximum(Calendar.DAY_OF_MONTH);
-           String colname[]  =  {
+            String colname[] = {" 日 ", " 一 ", " 二 ", " 三 ", " 四 ", " 五 ", " 六 "};
-                " 日 " ,  " 一 " ,  " 二 " ,  " 三 " ,  " 四 " ,  " 五 " ,  " 六 " };
             int today = getNowCalendar().get(Calendar.DAY_OF_MONTH);
             // 设置固定字体，以免调用环境改变影响界面美观
             dayPanel.setFont(new Font(" 宋体 ", Font.PLAIN, 12));
@@ -331,15 +324,11 @@ public class DateChooser extends JPanel
                 cell.setPreferredSize(new Dimension(25, 25));
                 if (i == 0 || i == 6) {
                     cell.setForeground(weekendFontColor);
-               }
+                } else {
-                else  {
                     cell.setForeground(weekFontColor);
                 }
-               dayPanel.add(cell,  new  GridBagConstraints(i,  0 ,  1 ,  1 ,  0.0 ,  0.0
+                dayPanel
-                   , GridBagConstraints.CENTER,
+                    .add(cell, new GridBagConstraints(i, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-                   GridBagConstraints.NONE,
-                    new  Insets( 0 ,  0 ,  0 ,  0 ),  0 ,  0 )
-                   );
             }
 
             int actionCommandId = 1;
@@ -347,37 +336,25 @@ public class DateChooser extends JPanel
                 for (int j = 0; j < 7; j++) {
 
                     JButton numberButton = daysButton[i][j];
-                   actionCommandId  =  Integer.parseInt(numberButton.
+                    actionCommandId = Integer.parseInt(numberButton.getActionCommand());
-                       getActionCommand());
                     if (actionCommandId == today) {
                         numberButton.setBackground(todayBtnColor);
                     }
-                    if  ( (actionCommandId  +  firstdayofWeek  -   2 )  %   7   ==   6   ||
+                    if ((actionCommandId + firstdayofWeek - 2) % 7 == 6 || (actionCommandId + firstdayofWeek - 2) % 7 == 0) {
-                       (actionCommandId  +  firstdayofWeek  -   2 )  %   7   ==   0 ) {
                         numberButton.setForeground(weekendFontColor);
-                   }
+                    } else {
-                    else  {
                         numberButton.setForeground(dateFontColor);
                     }
 
                     if (actionCommandId <= lastdayofWeek) {
                         int y = 0;
-                        if  ( (firstdayofWeek  -   1 )  <=
+                        if ((firstdayofWeek - 1) <= (j + firstdayofWeek - 1) % 7) {
-                           (j  +  firstdayofWeek  -   1 )  %   7 ) {
                             y = i + 1;
-                       }
+                        } else {
-                        else  {
                             y = i + 2;
                         }
-                       dayPanel.add(numberButton,
+                        dayPanel
-                                     new  GridBagConstraints( (j  +
+                            .add(numberButton, new GridBagConstraints((j + firstdayofWeek - 1) % 7, y, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-                           firstdayofWeek  -
-                            1 )  %
-                            7 , y,  1 ,  1 ,  0.0 ,  0.0
-                           , GridBagConstraints.CENTER,
-                           GridBagConstraints.NONE,
-                            new  Insets( 0 ,  0 ,  0 ,  0 ),  0 ,  0 )
-                           );
                     }
                 }
             }
@@ -391,8 +368,6 @@ public class DateChooser extends JPanel
             return ((Integer)monthSpin.getValue()).intValue();
         }
 
-      
-
         /* *
         * 年月小时的事件处理
         * @param e ChangeEvent
@@ -433,8 +408,7 @@ public class DateChooser extends JPanel
                 int day = Integer.parseInt(value);
                 calendar.set(Calendar.DAY_OF_MONTH, day);
                 Date selectDate = this.getSelectDate();
-               SimpleDateFormat simpleDateFormat  =   new  SimpleDateFormat(
+                SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern);
-                   pattern);
                 DateChooser.this.setText(simpleDateFormat.format(selectDate));
 
                 int year = calendar.get(Calendar.YEAR);
@@ -472,8 +446,7 @@ public class DateChooser extends JPanel
             int today = getNowCalendar().get(Calendar.DAY_OF_MONTH);
             if (comm == today) {
                 jbutton.setBackground(todayBtnColor);
-           }
+            } else {
-            else  {
                 jbutton.setBackground(palletTableColor);
             }
         }
@@ -482,15 +455,14 @@ public class DateChooser extends JPanel
     /* *
     * 内部类，改变按钮的边框不可编辑区，使外观更加协调。
      */
-    class  DateChooserButton
+    class DateChooserButton extends JButton {
-       extends JButton {
         public DateChooserButton(String text) {
             super(text);
         }
+
         public Insets getInsets() {
             return new Insets(4, 2, 0, 2);
         }
 
-       
     }
 }

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

@@ -110,8 +110,9 @@ public class ysNetController {
             boolean isSDKInitialized = NetCommon.isSDKInitialized();
             boolean isDeviceLoggedIn = NetCommon.isDeviceLoggedIn();
 
-            return R.ok("SDK初始化状态：" + (isSDKInitialized ? "已初始化" : "未初始化") + "，" +
+            return R.ok("SDK初始化状态：" + (isSDKInitialized ? "已初始化" : "未初始化") + "，" + "设备登录状态：" + (isDeviceLoggedIn
-                   "设备登录状态：" + (isDeviceLoggedIn ? "已登录" : "未登录"));
+                ? "已登录"
+                : "未登录"));
         } catch (Exception e) {
             return R.fail("500", "检查状态失败：" + e.getMessage());
         }