From 4f6c7d6b1a70131d64049577e3c28430e3aa8feb Mon Sep 17 00:00:00 2001
From: syruan <15555146157@163.com>
Date: Mon, 15 Sep 2025 00:09:22 +0800
Subject: [PATCH] =?UTF-8?q?feat(device):=20=E6=96=B0=E5=A2=9E=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=AE=A1=E7=90=86=E6=96=B9=E5=BC=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 DevInfo 类中添加 deviceType 字段，用于表示设备管理方式（0: 编码, 1: 数量）- 在 DevInfoMapper.xml 中添加
---
 .../main/java/com/bonus/material/device/domain/DevInfo.java    | 3 +++
 .../main/resources/mapper/material/device/DevInfoMapper.xml    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java
index 60bf9df..cde8acc 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java
@@ -68,6 +68,9 @@ public class DevInfo extends BaseEntity {
     @ApiModelProperty(value = "整机装备重量")
     private String deviceWeight;
 
+    @ApiModelProperty(value = "设备管理方式： 0编码 1数量")
+    private Byte deviceType;
+
     @Excel(name = "设备数量")
     @ApiModelProperty(value = "设备数量")
     private Integer deviceCount;
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
index 93dff3a..200ada2 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
@@ -227,6 +227,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             d.ma_id as maId,
             d.code as code,
             d.buy_price as buyPrice,
+            d.device_type as deviceType,
             d.item_type_model as itemTypeModel,
             identify_code as identifyCode,
             d.device_name as deviceName,
@@ -288,6 +289,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="deviceName != null and  deviceName != '' ">device_name,</if>
             <if test="deviceWeight != null and  deviceWeight != '' ">device_weight,</if>
+            <if test="deviceType != null">device_type,</if>
             <if test="deviceCount != null">device_count,</if>
             <if test="code != null and  code != '' ">code,</if>
             <if test="identifyCode != null and  identifyCode != '' ">identify_code,</if>
@@ -331,6 +333,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deviceName != null and deviceName != ''">#{deviceName},</if>
             <if test="deviceWeight != null and deviceWeight != ''">#{deviceWeight},</if>
+            <if test="deviceType != null">#{deviceType},</if>
             <if test="deviceCount != null">#{deviceCount},</if>
             <if test="code != null and code != ''">#{code},</if>
             <if test="identifyCode != null and identifyCode != ''">#{identifyCode},</if>