新增物料类别 更新部分功能

ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppGoodsTypeController.java

@@ -0,0 +1,96 @@
+package com.ruoyi.web.controller.app;
+
+import com.ruoyi.app.domain.AppGoodsType;
+import com.ruoyi.app.service.IAppGoodsTypeService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 物料类别管理Controller
+ *
+ * @author ruoyi
+ * @date 2025-03-04
+ */
+@RestController
+@RequestMapping("/system/goodsType")
+public class AppGoodsTypeController extends BaseController
+{
+    @Autowired
+    private IAppGoodsTypeService appGoodsTypeService;
+
+    /**
+     * 查询物料类别管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:type:list')")
+    @GetMapping("/list")
+    public AjaxResult list(AppGoodsType appGoodsType)
+    {
+        List<AppGoodsType> list = appGoodsTypeService.selectAppGoodsTypeList(appGoodsType);
+        return success(list);
+    }
+
+    /**
+     * 导出物料类别管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:type:export')")
+    @Log(title = "物料类别管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, AppGoodsType appGoodsType)
+    {
+        List<AppGoodsType> list = appGoodsTypeService.selectAppGoodsTypeList(appGoodsType);
+        ExcelUtil<AppGoodsType> util = new ExcelUtil<AppGoodsType>(AppGoodsType.class);
+        util.exportExcel(response, list, "物料类别管理数据");
+    }
+
+    /**
+     * 获取物料类别管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:type:query')")
+    @GetMapping(value = "/{typeId}")
+    public AjaxResult getInfo(@PathVariable("typeId") Long typeId)
+    {
+        return success(appGoodsTypeService.selectAppGoodsTypeByTypeId(typeId));
+    }
+
+    /**
+     * 新增物料类别管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:type:add')")
+    @Log(title = "物料类别管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody AppGoodsType appGoodsType)
+    {
+        return toAjax(appGoodsTypeService.insertAppGoodsType(appGoodsType));
+    }
+
+    /**
+     * 修改物料类别管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:type:edit')")
+    @Log(title = "物料类别管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody AppGoodsType appGoodsType)
+    {
+        return toAjax(appGoodsTypeService.updateAppGoodsType(appGoodsType));
+    }
+
+    /**
+     * 删除物料类别管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:type:remove')")
+    @Log(title = "物料类别管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{typeIds}")
+    public AjaxResult remove(@PathVariable Long[] typeIds)
+    {
+        return toAjax(appGoodsTypeService.deleteAppGoodsTypeByTypeIds(typeIds));
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/app/domain/AppGoodsType.java

@@ -0,0 +1,52 @@
+package com.ruoyi.app.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.TreeEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 物料类别管理对象 app_goods_type
+ * 
+ * @author ruoyi
+ * @date 2025-03-04
+ */
+public class AppGoodsType extends TreeEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键标识 */
+    private Long typeId;
+
+    /** 物料类别名称 */
+    @Excel(name = "物料类别名称")
+    private String typeName;
+
+    public void setTypeId(Long typeId) 
+    {
+        this.typeId = typeId;
+    }
+
+    public Long getTypeId() 
+    {
+        return typeId;
+    }
+    public void setTypeName(String typeName) 
+    {
+        this.typeName = typeName;
+    }
+
+    public String getTypeName() 
+    {
+        return typeName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("typeId", getTypeId())
+            .append("typeName", getTypeName())
+            .append("parentId", getParentId())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/app/domain/AppLocation.java

@@ -1,9 +1,9 @@
 package com.ruoyi.app.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 【请填写功能名称】对象 app_location
@@ -15,60 +15,55 @@ public class AppLocation extends BaseEntity
 {
     private static final Long serialVersionUID = 1L;
 
-    /** 库位号 */
-    @Excel(name = "库位号")
-    private String locationId;
-
-    /** 库位类型 */
-    @Excel(name = "库位类型")
-    private Integer locationType;
-
-    /** 库位状态 */
-    @Excel(name = "库位状态")
-    private Integer locationStatus;
-
-    /** 外部库位号 */
-    @Excel(name = "外部库位号")
-    private String outerId;
-
-    /** 库区号 */
-    @Excel(name = "库区号")
-    private Integer areaId;
-
-    /** 巷道号 */
-    @Excel(name = "巷道号")
-    private Integer tunnelId;
-
-    /** 设备号 */
-    @Excel(name = "设备号")
-    private Integer equipmentId;
-
     /** 排 */
-    @Excel(name = "排")
+    @Excel(name = "货架排")
     private Integer wRow;
 
     /** 列 */
-    @Excel(name = "列")
+    @Excel(name = "货架列")
     private Integer wCol;
 
     /** 层 */
-    @Excel(name = "层")
+    @Excel(name = "货架层")
     private Integer wLayer;
 
+    /** 库位编码 */
+    @Excel(name = "库位编码")
+    private String locationId;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+
+    /** 库位状态 1 空闲 2 有货 3 锁定 4 禁用*/
+    @Excel(name = "库位状态")
+    private Integer locationStatus;
+
+    /** 库位类型 */
+    private Integer locationType;
+
+    /** 库位编码 */
+    private String outerId;
+
+    /** 库区号 */
+    private Integer areaId;
+
+    /** 巷道号 */
+    private Integer tunnelId;
+
+    /** 设备号 */
+    private Integer equipmentId;
+
     /** 深度 */
-    @Excel(name = "深度")
     private Integer wDepth;
 
     /** 是否锁定 */
-    @Excel(name = "是否锁定")
     private Integer isLock;
 
     /** 载具号 */
-    @Excel(name = "载具号")
     private String vehicleId;
 
     /** 是否在工作中 */
-    @Excel(name = "是否在工作中")
     private Integer isWorking;
 
     public void setLocationId(String locationId)
@@ -189,6 +184,16 @@ public class AppLocation extends BaseEntity
         return vehicleId;
     }
 
+    @Override
+    public String getRemark() {
+        return remark;
+    }
+
+    @Override
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
     public Integer getIsWorking() {
         return isWorking;
     }

ruoyi-system/src/main/java/com/ruoyi/app/domain/AppProvider.java

@@ -1,11 +1,12 @@
 package com.ruoyi.app.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
 
 /**
  * 【请填写功能名称】对象 app_provider
@@ -24,25 +25,28 @@ public class AppProvider extends BaseEntity
     @Excel(name = "供应商名称")
     private String providerName;
 
-    /** 联系方式 */
+    /** 电话 */
-    @Excel(name = "联系方式")
+    @Excel(name = "电话")
-    private Long providerContact;
+    private String providerContact;
 
     /** 地址 */
     @Excel(name = "地址")
     private String providerAddress;
 
     /** 供应商状态 */
-    @Excel(name = "供应商状态")
+    @Excel(name = "状态")
     private Long providerStatus;
 
+    /** 类型 1 供应商 2 客户 */
+    private Long providerType;
+
     /** 最近更新用户 */
-    @Excel(name = "最近更新用户")
+//    @Excel(name = "最近更新用户")
     private String lastUpdateUser;
 
     /** 最近更新时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "最近更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+//    @Excel(name = "最近更新时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date lastUpdateTime;
 
     private Integer type;
@@ -73,12 +77,12 @@ public class AppProvider extends BaseEntity
     {
         return providerName;
     }
-    public void setProviderContact(Long providerContact)
+    public void setProviderContact(String providerContact)
     {
         this.providerContact = providerContact;
     }
 
-    public Long getProviderContact()
+    public String getProviderContact()
     {
         return providerContact;
     }
@@ -119,6 +123,14 @@ public class AppProvider extends BaseEntity
         return lastUpdateTime;
     }
 
+    public Long getProviderType() {
+        return providerType;
+    }
+
+    public void setProviderType(Long providerType) {
+        this.providerType = providerType;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-system/src/main/java/com/ruoyi/app/domain/AppStand.java

@@ -1,9 +1,9 @@
 package com.ruoyi.app.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 【请填写功能名称】对象 app_stand
@@ -15,31 +15,35 @@ public class AppStand extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 站台id */
+    /** 站点编码 */
+    @Excel(name = "站点编码")
     private String standId;
 
-    /** 站台名称 */
+    /** 站点名称 */
-    @Excel(name = "站台名称")
+    @Excel(name = "站点名称")
     private String standName;
 
-    /** 站台类型 */
+    /** 站点类型 */
-    @Excel(name = "站台类型")
+    @Excel(name = "站点类型")
     private String standType;
 
-    /** 站台区域 */
+    /** 所在区域 */
-    @Excel(name = "站台区域")
+    @Excel(name = "所在区域")
     private String standArea;
 
-    /** 站台属性 */
+    /** 属性 */
-    @Excel(name = "站台属性")
+    @Excel(name = "属性")
     private String standProperty;
 
-    /** 站台状态 */
+    /** 备注 */
-    @Excel(name = "站台状态")
+    @Excel(name = "备注")
+    private String remark;
+
+    /** 状态 */
+    @Excel(name = "状态")
     private Long standStatus;
 
     /** 是否锁定 */
-    @Excel(name = "是否锁定")
     private Long isLock;
 
     public void setStandId(String standId)

ruoyi-system/src/main/java/com/ruoyi/app/domain/AppVehicle.java

@@ -1,11 +1,12 @@
 package com.ruoyi.app.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
 
 /**
  * 【请填写功能名称】对象 app_vehicle
@@ -17,7 +18,8 @@ public class AppVehicle extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 载具号 */
+    /** 载具编码 */
+    @Excel(name = "载具编码")
     private String vehicleId;
 
     /** 载具类型 */
@@ -28,25 +30,24 @@ public class AppVehicle extends BaseEntity
     @Excel(name = "载具状态")
     private Long vehicleStatus;
 
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+
     /** 库位号 */
-    @Excel(name = "库位号")
     private String locationId;
 
     /** 是否空载具 */
-    @Excel(name = "是否空载具")
     private Long isEmpty;
 
     /** 是否锁定 */
-    @Excel(name = "是否锁定")
     private Long isLock;
 
     /** 上次入库时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "上次入库时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date lastInTime;
 
     /** 上次入库用户 */
-    @Excel(name = "上次入库用户")
     private String lastInUser;
 
     public void setVehicleId(String vehicleId)
@@ -128,6 +129,16 @@ public class AppVehicle extends BaseEntity
         return lastInUser;
     }
 
+    @Override
+    public String getRemark() {
+        return remark;
+    }
+
+    @Override
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppGoodsTypeMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.app.mapper;
+
+import com.ruoyi.app.domain.AppGoodsType;
+
+import java.util.List;
+
+/**
+ * 物料类别管理Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-03-04
+ */
+public interface AppGoodsTypeMapper 
+{
+    /**
+     * 查询物料类别管理
+     * 
+     * @param typeId 物料类别管理主键
+     * @return 物料类别管理
+     */
+    public AppGoodsType selectAppGoodsTypeByTypeId(Long typeId);
+
+    /**
+     * 查询物料类别管理列表
+     * 
+     * @param appGoodsType 物料类别管理
+     * @return 物料类别管理集合
+     */
+    public List<AppGoodsType> selectAppGoodsTypeList(AppGoodsType appGoodsType);
+
+    /**
+     * 新增物料类别管理
+     * 
+     * @param appGoodsType 物料类别管理
+     * @return 结果
+     */
+    public int insertAppGoodsType(AppGoodsType appGoodsType);
+
+    /**
+     * 修改物料类别管理
+     * 
+     * @param appGoodsType 物料类别管理
+     * @return 结果
+     */
+    public int updateAppGoodsType(AppGoodsType appGoodsType);
+
+    /**
+     * 删除物料类别管理
+     * 
+     * @param typeId 物料类别管理主键
+     * @return 结果
+     */
+    public int deleteAppGoodsTypeByTypeId(Long typeId);
+
+    /**
+     * 批量删除物料类别管理
+     * 
+     * @param typeIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAppGoodsTypeByTypeIds(Long[] typeIds);
+}

ruoyi-system/src/main/java/com/ruoyi/app/service/IAppGoodsTypeService.java

@@ -0,0 +1,62 @@
+package com.ruoyi.app.service;
+
+import com.ruoyi.app.domain.AppGoodsType;
+
+import java.util.List;
+
+/**
+ * 物料类别管理Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-03-04
+ */
+public interface IAppGoodsTypeService 
+{
+    /**
+     * 查询物料类别管理
+     * 
+     * @param typeId 物料类别管理主键
+     * @return 物料类别管理
+     */
+    public AppGoodsType selectAppGoodsTypeByTypeId(Long typeId);
+
+    /**
+     * 查询物料类别管理列表
+     * 
+     * @param appGoodsType 物料类别管理
+     * @return 物料类别管理集合
+     */
+    public List<AppGoodsType> selectAppGoodsTypeList(AppGoodsType appGoodsType);
+
+    /**
+     * 新增物料类别管理
+     * 
+     * @param appGoodsType 物料类别管理
+     * @return 结果
+     */
+    public int insertAppGoodsType(AppGoodsType appGoodsType);
+
+    /**
+     * 修改物料类别管理
+     * 
+     * @param appGoodsType 物料类别管理
+     * @return 结果
+     */
+    public int updateAppGoodsType(AppGoodsType appGoodsType);
+
+    /**
+     * 批量删除物料类别管理
+     * 
+     * @param typeIds 需要删除的物料类别管理主键集合
+     * @return 结果
+     */
+    public int deleteAppGoodsTypeByTypeIds(Long[] typeIds);
+
+    /**
+     * 删除物料类别管理信息
+     * 
+     * @param typeId 物料类别管理主键
+     * @return 结果
+     */
+    public int deleteAppGoodsTypeByTypeId(Long typeId);
+}

ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppGoodsTypeServiceImpl.java

@@ -0,0 +1,87 @@
+package com.ruoyi.app.service.impl;
+
+import com.ruoyi.app.domain.AppGoodsType;
+import com.ruoyi.app.mapper.AppGoodsTypeMapper;
+import com.ruoyi.app.service.IAppGoodsTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 物料类别管理Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2025-03-04
+ */
+@Service
+public class AppGoodsTypeServiceImpl implements IAppGoodsTypeService {
+    @Autowired
+    private AppGoodsTypeMapper appGoodsTypeMapper;
+
+    /**
+     * 查询物料类别管理
+     *
+     * @param typeId 物料类别管理主键
+     * @return 物料类别管理
+     */
+    @Override
+    public AppGoodsType selectAppGoodsTypeByTypeId(Long typeId) {
+        return appGoodsTypeMapper.selectAppGoodsTypeByTypeId(typeId);
+    }
+
+    /**
+     * 查询物料类别管理列表
+     *
+     * @param appGoodsType 物料类别管理
+     * @return 物料类别管理
+     */
+    @Override
+    public List<AppGoodsType> selectAppGoodsTypeList(AppGoodsType appGoodsType) {
+        return appGoodsTypeMapper.selectAppGoodsTypeList(appGoodsType);
+    }
+
+    /**
+     * 新增物料类别管理
+     *
+     * @param appGoodsType 物料类别管理
+     * @return 结果
+     */
+    @Override
+    public int insertAppGoodsType(AppGoodsType appGoodsType) {
+        return appGoodsTypeMapper.insertAppGoodsType(appGoodsType);
+    }
+
+    /**
+     * 修改物料类别管理
+     *
+     * @param appGoodsType 物料类别管理
+     * @return 结果
+     */
+    @Override
+    public int updateAppGoodsType(AppGoodsType appGoodsType) {
+        return appGoodsTypeMapper.updateAppGoodsType(appGoodsType);
+    }
+
+    /**
+     * 批量删除物料类别管理
+     *
+     * @param typeIds 需要删除的物料类别管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAppGoodsTypeByTypeIds(Long[] typeIds) {
+        return appGoodsTypeMapper.deleteAppGoodsTypeByTypeIds(typeIds);
+    }
+
+    /**
+     * 删除物料类别管理信息
+     *
+     * @param typeId 物料类别管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAppGoodsTypeByTypeId(Long typeId) {
+        return appGoodsTypeMapper.deleteAppGoodsTypeByTypeId(typeId);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppProviderServiceImpl.java

@@ -1,13 +1,13 @@
 package com.ruoyi.app.service.impl;
 
-import java.util.List;
-
 import com.ruoyi.app.domain.AppProvider;
 import com.ruoyi.app.mapper.AppProviderMapper;
 import com.ruoyi.app.service.IAppProviderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Service业务层处理
  *
@@ -15,8 +15,7 @@ import org.springframework.stereotype.Service;
  * @date 2025-01-15
  */
 @Service
-public class AppProviderServiceImpl implements IAppProviderService
+public class AppProviderServiceImpl implements IAppProviderService {
-{
     @Autowired
     private AppProviderMapper appProviderMapper;
 
@@ -27,8 +26,7 @@ public class AppProviderServiceImpl implements IAppProviderService
      * @return 【请填写功能名称】
      */
     @Override
-    public AppProvider selectAppProviderByProviderId(String providerId)
+    public AppProvider selectAppProviderByProviderId(String providerId) {
-    {
         return appProviderMapper.selectAppProviderByProviderId(providerId);
     }
 
@@ -39,8 +37,7 @@ public class AppProviderServiceImpl implements IAppProviderService
      * @return 【请填写功能名称】
      */
     @Override
-    public List<AppProvider> selectAppProviderList(AppProvider appProvider)
+    public List<AppProvider> selectAppProviderList(AppProvider appProvider) {
-    {
         return appProviderMapper.selectAppProviderList(appProvider);
     }
 
@@ -51,8 +48,7 @@ public class AppProviderServiceImpl implements IAppProviderService
      * @return 结果
      */
     @Override
-    public int insertAppProvider(AppProvider appProvider)
+    public int insertAppProvider(AppProvider appProvider) {
-    {
         return appProviderMapper.insertAppProvider(appProvider);
     }
 
@@ -63,8 +59,7 @@ public class AppProviderServiceImpl implements IAppProviderService
      * @return 结果
      */
     @Override
-    public int updateAppProvider(AppProvider appProvider)
+    public int updateAppProvider(AppProvider appProvider) {
-    {
         return appProviderMapper.updateAppProvider(appProvider);
     }
 
@@ -75,8 +70,7 @@ public class AppProviderServiceImpl implements IAppProviderService
      * @return 结果
      */
     @Override
-    public int deleteAppProviderByProviderIds(String[] providerIds)
+    public int deleteAppProviderByProviderIds(String[] providerIds) {
-    {
         return appProviderMapper.deleteAppProviderByProviderIds(providerIds);
     }
 
@@ -87,8 +81,7 @@ public class AppProviderServiceImpl implements IAppProviderService
      * @return 结果
      */
     @Override
-    public int deleteAppProviderByProviderId(String providerId)
+    public int deleteAppProviderByProviderId(String providerId) {
-    {
         return appProviderMapper.deleteAppProviderByProviderId(providerId);
     }
 }

ruoyi-system/src/main/resources/mapper/app/AppGoodsTypeMapper.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.app.mapper.AppGoodsTypeMapper">
+    
+    <resultMap type="AppGoodsType" id="AppGoodsTypeResult">
+        <result property="typeId"    column="type_id"    />
+        <result property="typeName"    column="type_name"    />
+        <result property="parentId"    column="parent_id"    />
+    </resultMap>
+
+    <sql id="selectAppGoodsTypeVo">
+        select type_id, type_name, parent_id from app_goods_type
+    </sql>
+
+    <select id="selectAppGoodsTypeList" parameterType="AppGoodsType" resultMap="AppGoodsTypeResult">
+        <include refid="selectAppGoodsTypeVo"/>
+        <where>  
+            <if test="typeName != null  and typeName != ''"> and type_name like concat('%', #{typeName}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectAppGoodsTypeByTypeId" parameterType="Long" resultMap="AppGoodsTypeResult">
+        <include refid="selectAppGoodsTypeVo"/>
+        where type_id = #{typeId}
+    </select>
+
+    <insert id="insertAppGoodsType" parameterType="AppGoodsType" useGeneratedKeys="true" keyProperty="typeId">
+        insert into app_goods_type
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="typeName != null">type_name,</if>
+            <if test="parentId != null">parent_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="typeName != null">#{typeName},</if>
+            <if test="parentId != null">#{parentId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateAppGoodsType" parameterType="AppGoodsType">
+        update app_goods_type
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="typeName != null">type_name = #{typeName},</if>
+            <if test="parentId != null">parent_id = #{parentId},</if>
+        </trim>
+        where type_id = #{typeId}
+    </update>
+
+    <delete id="deleteAppGoodsTypeByTypeId" parameterType="Long">
+        delete from app_goods_type where type_id = #{typeId}
+    </delete>
+
+    <delete id="deleteAppGoodsTypeByTypeIds" parameterType="String">
+        delete from app_goods_type where type_id in 
+        <foreach item="typeId" collection="array" open="(" separator="," close=")">
+            #{typeId}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/app/AppProviderMapper.xml

@@ -10,13 +10,13 @@
         <result property="providerContact"    column="provider_contact"    />
         <result property="providerAddress"    column="provider_address"    />
         <result property="providerStatus"    column="provider_status"    />
+        <result property="providerType"    column="provider_type"    />
         <result property="lastUpdateUser"    column="last_update_user"    />
         <result property="lastUpdateTime"    column="last_update_time"    />
-        <result property="type"    column="type"    />
     </resultMap>
 
     <sql id="selectAppProviderVo">
-        select provider_id, provider_name, provider_contact, provider_address, provider_status, last_update_user, last_update_time,type from app_provider
+        select provider_id, provider_name, provider_contact, provider_address, provider_status,  provider_type,last_update_user, last_update_time from app_provider
     </sql>
 
     <select id="selectAppProviderList" parameterType="AppProvider" resultMap="AppProviderResult">
@@ -26,9 +26,9 @@
             <if test="providerContact != null "> and provider_contact = #{providerContact}</if>
             <if test="providerAddress != null  and providerAddress != ''"> and provider_address = #{providerAddress}</if>
             <if test="providerStatus != null "> and provider_status = #{providerStatus}</if>
+            <if test="providerType != null "> and provider_type = #{providerType}</if>
             <if test="lastUpdateUser != null  and lastUpdateUser != ''"> and last_update_user = #{lastUpdateUser}</if>
             <if test="lastUpdateTime != null "> and last_update_time = #{lastUpdateTime}</if>
-            <if test="type != null "> and type = #{type}</if>
         </where>
     </select>
 
@@ -45,9 +45,9 @@
             <if test="providerContact != null">provider_contact,</if>
             <if test="providerAddress != null">provider_address,</if>
             <if test="providerStatus != null">provider_status,</if>
+            <if test="providerType != null">provider_type,</if>
             <if test="lastUpdateUser != null">last_update_user,</if>
             <if test="lastUpdateTime != null">last_update_time,</if>
-            <if test="type != null">type,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="providerId != null">#{providerId},</if>
@@ -55,9 +55,9 @@
             <if test="providerContact != null">#{providerContact},</if>
             <if test="providerAddress != null">#{providerAddress},</if>
             <if test="providerStatus != null">#{providerStatus},</if>
+            <if test="providerType != null">#{providerType},</if>
             <if test="lastUpdateUser != null">#{lastUpdateUser},</if>
             <if test="lastUpdateTime != null">#{lastUpdateTime},</if>
-            <if test="type != null">#{type},</if>
         </trim>
     </insert>
 
@@ -68,6 +68,7 @@
             <if test="providerContact != null">provider_contact = #{providerContact},</if>
             <if test="providerAddress != null">provider_address = #{providerAddress},</if>
             <if test="providerStatus != null">provider_status = #{providerStatus},</if>
+            <if test="providerType != null">provider_type = #{providerType},</if>
             <if test="lastUpdateUser != null">last_update_user = #{lastUpdateUser},</if>
             <if test="lastUpdateTime != null">last_update_time = #{lastUpdateTime},</if>
         </trim>