Merge remote-tracking branch 'origin/develop' into develop

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/controller/SupplierController.java

@@ -3,21 +3,23 @@ package org.dromara.dataManagement.controller;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
 import org.dromara.dataManagement.domain.bo.SupplierBo;
 import org.dromara.dataManagement.domain.vo.SupplierVo;
 import org.dromara.dataManagement.service.SupplierService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 
 @SaIgnore
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/dataManagement/supplier")
-public class SupplierController {
+public class SupplierController extends BaseController {
 
     private final SupplierService supplierService;
 
@@ -29,4 +31,16 @@ public class SupplierController {
         return supplierService.selectPageSupplierList(supplierBo, pageQuery);
     }
 
+    /**
+     * 导入供应商文件
+     */
+
+    /**
+     * 删除供应商信息
+     */
+    @DeleteMapping("/delete/{ids}")
+    public R<Void> deleteSupplierByIds(@PathVariable("ids") List<Integer> supplyertypeId) {
+        return toAjax(supplierService.deleteRecycleFactoryByIds(supplyertypeId));
+    }
+
 }

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/controller/WorkShopController.java

@@ -1,15 +1,50 @@
 package org.dromara.dataManagement.controller;
 
+import cn.dev33.satoken.annotation.SaIgnore;
+import cn.hutool.core.collection.CollUtil;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
+import org.dromara.dataManagement.domain.bo.WorkShopBo;
+import org.dromara.dataManagement.domain.vo.WorkShopVo;
 import org.dromara.dataManagement.service.WorkShopService;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+
+@SaIgnore
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/dataManagement/workshop")
 public class WorkShopController extends BaseController {
     private final WorkShopService workShopService;
-
+    @GetMapping("/PageList")
+    public TableDataInfo<WorkShopVo> selectPageWorkshopList(WorkShopBo workshopBo, PageQuery pageQuery) {
+        return workShopService.selectPageWorkshopList(workshopBo, pageQuery);
+    }
+    @PostMapping()
+    public R<Void> insertWorkShop(@Validated @RequestBody WorkShopBo workshopBo){
+        return toAjax(workShopService.insertWorkShop(workshopBo));
+    }
+    @PutMapping()
+    public R<Void> updateWorkShop(@Validated @RequestBody WorkShopBo workshopBo){
+        return toAjax(workShopService.updateWorkShop(workshopBo));
+    }
+    @DeleteMapping("/{workshopIds}")
+    public R<Void> deleteWorkShopByIds(@PathVariable Long[] workshopIds){
+        return toAjax(workShopService.deleteWorkShopByIds(workshopIds));
+    }
+    @GetMapping("/exportExcel")
+    public void exportWorkShopExcel(HttpServletResponse response){
+        ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),workShopService.selectList()),"车间列表.xlsx","excel/车间导出模板.xlsx",response);
+    }
+    @GetMapping("/exportExcelByIds")
+    public void exportWorkShopExcel(@RequestParam("ids")Long[] workshopIds,HttpServletResponse response){
+        ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),workShopService.selectWorkshopListByIds(workshopIds)),"车间列表.xlsx","excel/车间导出模板.xlsx",response);
+    }
 }

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/domain/Supplier.java

@@ -10,8 +10,6 @@ import org.dromara.common.tenant.core.TenantEntity;
 @TableName("fa_kuyou_suppliers")
 public class Supplier extends TenantEntity {
 
-    private Integer id;
-
     /**
      * 供应商类别
      */

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/domain/WorkShop.java

@@ -1,23 +1,20 @@
 package org.dromara.dataManagement.domain;
-
 import com.baomidou.mybatisplus.annotation.TableName;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.common.tenant.core.TenantEntity;
 
 @Data
-@EqualsAndHashCode(callSuper = true)
+//@EqualsAndHashCode(callSuper = true)
 @TableName("fa_kuyou_workshop")
-public class WorkShop extends TenantEntity {
+public class WorkShop {
     /**
      * 车间id
      */
-    @NotBlank(message = "编号不能为空")
-    private long id;
+    private int id;
     /**
      * 车间编号
      */
+    @NotBlank(message = "编号不能为空")
     private String code;
     /**
      * 车间名称
@@ -27,13 +24,5 @@ public class WorkShop extends TenantEntity {
     /**
      * 状态:0=关闭,1=正常
      */
-    private int status;
-    /**
-     * 创建时间
-     */
-    private String createtime;
-    /**
-     * 更新时间
-     */
-    private String updatetime;
+    private String status;
 }

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/domain/bo/WorkShopBo.java

@@ -1,7 +1,6 @@
 package org.dromara.dataManagement.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
-import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
@@ -9,13 +8,12 @@ import org.dromara.dataManagement.domain.WorkShop;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = WorkShop.class, reverseConvertGenerate = false)
+@AutoMapper(target = WorkShop.class,reverseConvertGenerate = false)
 public class WorkShopBo extends BaseEntity {
     /**
      * 车间id
      */
-    @NotBlank(message = "编号不能为空")
-    private long id;
+    private int id;
     /**
      * 车间编号
      */
@@ -23,18 +21,9 @@ public class WorkShopBo extends BaseEntity {
     /**
      * 车间名称
      */
-    @NotBlank(message = "名称不能为空")
     private String name;
     /**
      * 状态:0=关闭,1=正常
      */
-    private int status;
-    /**
-     * 创建时间
-     */
-    private String createtime;
-    /**
-     * 更新时间
-     */
-    private String updatetime;
+    private String status;
 }

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/domain/vo/SupplierVo.java

@@ -12,8 +12,6 @@ import org.dromara.dataManagement.domain.Supplier;
 @AutoMapper(target = Supplier.class)
 public class SupplierVo extends BaseEntity {
 
-    private Integer id;
-
     /**
      * 供应商类别
      */

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/domain/vo/WorkShopVo.java

@@ -1,7 +1,6 @@
 package org.dromara.dataManagement.domain.vo;
 
 import io.github.linpeilie.annotations.AutoMapper;
-import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
@@ -14,8 +13,7 @@ public class WorkShopVo extends BaseEntity {
     /**
      * 车间id
      */
-    @NotBlank(message = "编号不能为空")
-    private long id;
+    private int id;
     /**
      * 车间编号
      */
@@ -23,12 +21,11 @@ public class WorkShopVo extends BaseEntity {
     /**
      * 车间名称
      */
-    @NotBlank(message = "名称不能为空")
     private String name;
     /**
      * 状态:0=关闭,1=正常
      */
-    private int status;
+    private String status;
     /**
      * 创建时间
      */

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/service/SupplierService.java

@@ -6,8 +6,11 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.dataManagement.domain.bo.SupplierBo;
 import org.dromara.dataManagement.domain.vo.SupplierVo;
 
+import java.util.List;
+
 public interface SupplierService {
 
     TableDataInfo<SupplierVo> selectPageSupplierList(SupplierBo supplierBo, PageQuery pageQuery);
 
+    int deleteRecycleFactoryByIds(List<Integer> supplyertypeId);
 }

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/service/WorkShopService.java

@@ -1,4 +1,18 @@
 package org.dromara.dataManagement.service;
 
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.dataManagement.domain.WorkShop;
+import org.dromara.dataManagement.domain.bo.WorkShopBo;
+import org.dromara.dataManagement.domain.vo.WorkShopVo;
+
+import java.util.List;
+
 public interface WorkShopService {
+    TableDataInfo<WorkShopVo> selectPageWorkshopList(WorkShopBo workshopBo, PageQuery pageQuery);
+    int insertWorkShop(WorkShopBo workshopBo);
+    int updateWorkShop(WorkShopBo workshopBo);
+    int deleteWorkShopByIds(Long[] workshopIds);
+    List<WorkShop> selectList();
+    List<WorkShop> selectWorkshopListByIds(Long[] workshopIds);
 }

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/service/impl/SupplierServiceImpl.java

@@ -23,15 +23,32 @@ public class SupplierServiceImpl implements SupplierService {
 
     private final SupplierMapper supplierMapper;
 
+    /**
+     * 查询供应商信息
+     * @param supplierBo
+     * @param pageQuery
+     * @return
+     */
     @Override
     public TableDataInfo<SupplierVo> selectPageSupplierList(SupplierBo supplierBo, PageQuery pageQuery) {
         QueryWrapper<Supplier> qw = new QueryWrapper<>();
-        qw.eq(StringUtils.isNotBlank(supplierBo.getSupplyerCode()), "supplyer_code", supplierBo.getSupplyerCode());
-        qw.eq(StringUtils.isNotBlank(supplierBo.getSupplyerName()), "supplyer_name", supplierBo.getSupplyerName());
+        qw.like(StringUtils.isNotBlank(supplierBo.getSupplyerCode()), "supplyer_code", supplierBo.getSupplyerCode());
+        qw.like(StringUtils.isNotBlank(supplierBo.getSupplyerName()), "supplyer_name", supplierBo.getSupplyerName());
         qw.eq(StringUtils.isNotBlank(supplierBo.getStatus()), "status", supplierBo.getStatus());
-//        Supplier supplier = MapstructUtils.convert(supplierBo, Supplier.class);
         List<Supplier> page = supplierMapper.selectList(pageQuery.build(), qw);
         List<SupplierVo> supplierVoList = MapstructUtils.convert(page, SupplierVo.class);
         return TableDataInfo.build(supplierVoList);
     }
+
+    /**
+     * 批量删除供应商信息
+     * @param supplyertypeId
+     * @return
+     */
+    @Override
+    public int deleteRecycleFactoryByIds(List<Integer> supplyertypeId) {
+        QueryWrapper<Supplier> qw = new QueryWrapper<>();
+        qw.in("supplyertype_id",supplyertypeId);
+        return supplierMapper.delete(qw);
+    }
 }

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/service/impl/WorkShopServiceImpl.java

@@ -1,10 +1,58 @@
 package org.dromara.dataManagement.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.dataManagement.domain.WorkShop;
+import org.dromara.dataManagement.domain.bo.WorkShopBo;
+import org.dromara.dataManagement.domain.vo.WorkShopVo;
+import org.dromara.dataManagement.mapper.WorkShopMapper;
 import org.dromara.dataManagement.service.WorkShopService;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
+import java.util.List;
+
 @Service
 @RequiredArgsConstructor
 public class WorkShopServiceImpl implements WorkShopService {
-}
+    private final WorkShopMapper workShopMapper;
+
+    @Override
+    public TableDataInfo<WorkShopVo> selectPageWorkshopList(WorkShopBo workshopBo, PageQuery pageQuery) {
+        QueryWrapper<WorkShop> qw=new QueryWrapper<>();
+        qw.like(null!=workshopBo.getCode(),"code",workshopBo.getCode());
+        qw.like(null!=workshopBo.getName(),"name",workshopBo.getName());
+        qw.eq(StringUtils.isNotBlank(workshopBo.getStatus()),"status",workshopBo.getStatus());
+        Page<WorkShopVo>page =workShopMapper.selectVoPage(pageQuery.build(),qw);
+        return TableDataInfo.build(page);
+    }
+    @Override
+    public int insertWorkShop(WorkShopBo workshopBo) {
+        WorkShop workShop= MapstructUtils.convert(workshopBo,WorkShop.class);
+        return workShopMapper.insert(workShop);
+    }
+    @Override
+    public int updateWorkShop(WorkShopBo workshopBo) {
+        WorkShop workShop= MapstructUtils.convert(workshopBo,WorkShop.class);
+        QueryWrapper<WorkShop> qw=new QueryWrapper<>();
+        qw.eq("id",workshopBo.getId());
+        return workShopMapper.updateById(workShop);
+    }
+    @Override
+    public int deleteWorkShopByIds(Long[] ids) {
+        return workShopMapper.deleteByIds(Arrays.asList(ids));
+    }
+    @Override
+    public List<WorkShop> selectWorkshopListByIds(Long[] workshopIds) {
+        return MapstructUtils.convert(workShopMapper.selectVoByIds(Arrays.asList(workshopIds)),WorkShop.class);
+    }
+    @Override
+    public List<WorkShop> selectList() {
+        return workShopMapper.selectList();
+    }
+    }