Merge branch 'develop' into release

ruoyi-modules/ruoyi-customerManagement/src/main/java/org/dromara/customerManagement/service/CustomerService.java

@@ -8,6 +8,9 @@ import org.dromara.customerManagement.domain.vo.CustomerVo;
 
 import java.util.List;
 
+/**
+ * 客户Service接口
+ */
 public interface CustomerService {
     /**
      * 查询客户管理列表

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

@@ -2,8 +2,11 @@ package org.dromara.dataManagement.controller;
 
 
 import cn.dev33.satoken.annotation.SaIgnore;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.core.DropDownOptions;
+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;
@@ -12,6 +15,8 @@ import org.dromara.dataManagement.domain.vo.SupplierVo;
 import org.dromara.dataManagement.service.SupplierService;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 
@@ -32,8 +37,12 @@ public class SupplierController extends BaseController {
     }
 
     /**
-     * 导入供应商文件
+     * 下载供应商导入模版
      */
+    @GetMapping("/downloadTemplate")
+    public void getExampleExcel(HttpServletResponse response){
+        ExcelUtil.exportExcel(new ArrayList<>(), "供应商导入模板", SupplierVo.class, response);
+    }
 
     /**
      * 删除供应商信息

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

@@ -1,5 +1,4 @@
 package org.dromara.dataManagement.controller;
-
 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.core.collection.CollUtil;
 import jakarta.servlet.http.HttpServletResponse;
@@ -14,35 +13,73 @@ import org.dromara.dataManagement.domain.vo.WorkShopVo;
 import org.dromara.dataManagement.service.WorkShopService;
 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;
+
+    /**
+     * 查询车间管理列表
+     * @param workshopBo 车间Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
     @GetMapping("/PageList")
     public TableDataInfo<WorkShopVo> selectPageWorkshopList(WorkShopBo workshopBo, PageQuery pageQuery) {
         return workShopService.selectPageWorkshopList(workshopBo, pageQuery);
     }
+
+    /**
+     * 新增车间
+     * @param workshopBo 车间Bo对象
+     * @return 新增结果
+     */
     @PostMapping()
     public R<Void> insertWorkShop(@Validated @RequestBody WorkShopBo workshopBo){
         return toAjax(workShopService.insertWorkShop(workshopBo));
     }
+
+    /**
+     * 修改车间
+     * @param workshopBo 车间Bo对象
+     * @return 修改结果
+     */
     @PutMapping()
     public R<Void> updateWorkShop(@Validated @RequestBody WorkShopBo workshopBo){
         return toAjax(workShopService.updateWorkShop(workshopBo));
     }
+
+    /**
+     * 删除车间
+     * @param workshopIds 车间ID数组
+     * @return 删除结果
+     */
     @DeleteMapping("/{workshopIds}")
     public R<Void> deleteWorkShopByIds(@PathVariable Long[] workshopIds){
         return toAjax(workShopService.deleteWorkShopByIds(workshopIds));
     }
+
+    /**
+     * 通过Excel导出车间数据
+     * @param response 响应对象
+     */
     @GetMapping("/exportExcel")
     public void exportWorkShopExcel(HttpServletResponse response){
         ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),workShopService.selectList()),"车间列表.xlsx","excel/车间导出模板.xlsx",response);
     }
+
+    /**
+     * 根据车间Ids导出Excel
+     * @param workshopIds 车间Ids数组
+     * @param 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/bo/WorkShopBo.java

@@ -2,14 +2,15 @@ package org.dromara.dataManagement.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.dataManagement.domain.WorkShop;
 
+/**
+ * 车间业务对象
+ */
 @Data
-@EqualsAndHashCode(callSuper = true)
+//@EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = WorkShop.class,reverseConvertGenerate = false)
-public class WorkShopBo extends BaseEntity {
+public class WorkShopBo {
     /**
      * 车间id
      */

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

@@ -1,6 +1,7 @@
 package org.dromara.dataManagement.domain.vo;
 
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -15,56 +16,67 @@ public class SupplierVo extends BaseEntity {
     /**
      * 供应商类别
      */
+    @ExcelProperty(value = "供应商类别", order = 1)
     private int supplyertypeId;
 
     /**
      * 供应商编号
      */
+    @ExcelProperty(value = "供应商编号", order = 2)
     private String supplyerCode;
 
     /**
      * 供应商名称
      */
+    @ExcelProperty(value = "供应商名称", order = 3)
     private String supplyerName;
 
     /**
      * 首要联系人
      */
+    @ExcelProperty(value = "首要联系人", order = 4)
     private String firstConnectName;
 
     /**
      * 首要联系人手机号
      */
+    @ExcelProperty(value = "首要联系人手机号", order = 5)
     private String firstConnectMobile;
 
     /**
      * 首要联系人座机号
      */
+    @ExcelProperty(value = "首要联系人座机号", order = 6)
     private String firstConnectPhone;
 
     /**
      * 首要联系人QQ/微信/Email
      */
+    @ExcelProperty(value = "首要联系人QQ/微信/Email", order = 7)
     private String qqWxEmail;
 
     /**
      * 联系地址
      */
+    @ExcelProperty(value = "联系地址", order = 8)
     private String connectAddress;
 
     /**
      * 备注
      */
+    @ExcelProperty(value = "备注", order = 9)
     private String note;
 
     /**
      * 应付余额
      */
+    @ExcelProperty(value = "应付余额", order = 10)
     private double needGiveAccount;
 
     /**
      * 状态
      */
+    @ExcelProperty(value = "状态", order = 11)
     private String status;
 
 }

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

@@ -2,14 +2,15 @@ package org.dromara.dataManagement.domain.vo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.dataManagement.domain.WorkShop;
 
+/**
+ * 车间值对象
+ */
 @Data
-@EqualsAndHashCode(callSuper = true)
+//@EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = WorkShop.class)
-public class WorkShopVo extends BaseEntity {
+public class WorkShopVo {
     /**
      * 车间id
      */

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

@@ -5,14 +5,52 @@ 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;
 
+/**
+ * 车间Service接口
+ */
+
 public interface WorkShopService {
+    /**
+     * 查询车间列表
+     * @param workshopBo 车间Bo对象
+     * @param pageQuery 分页信息
+     * @return 分页结果
+     */
     TableDataInfo<WorkShopVo> selectPageWorkshopList(WorkShopBo workshopBo, PageQuery pageQuery);
+
+    /**
+     * 新增车间
+     * @param workshopBo 车间Bo对象
+     * @return 影响行数
+     */
     int insertWorkShop(WorkShopBo workshopBo);
+
+    /**
+     * 更新车间
+     * @param workshopBo 车间Bo对象
+     * @return 影响行数
+     */
     int updateWorkShop(WorkShopBo workshopBo);
+
+    /**
+     * 删除车间
+     * @param workshopIds 车间id数组
+     * @return 影响行数
+     */
     int deleteWorkShopByIds(Long[] workshopIds);
+
+    /**
+     * 查询车间列表
+     * @return 车间列表
+     */
     List<WorkShop> selectList();
+
+    /**
+     * 根据车间Ids查询车间列表
+     * @param workshopIds 车间id数组
+     * @return 车间列表
+     */
     List<WorkShop> selectWorkshopListByIds(Long[] workshopIds);
 }

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

@@ -22,6 +22,12 @@ import java.util.List;
 public class WorkShopServiceImpl implements WorkShopService {
     private final WorkShopMapper workShopMapper;
 
+    /**
+     * 查询车间对象分页查询车间数据
+     * @param workshopBo 车间Bo对象
+     * @param pageQuery 查询条件
+     * @return 分页结果
+     */
     @Override
     public TableDataInfo<WorkShopVo> selectPageWorkshopList(WorkShopBo workshopBo, PageQuery pageQuery) {
         QueryWrapper<WorkShop> qw=new QueryWrapper<>();
@@ -31,11 +37,23 @@ public class WorkShopServiceImpl implements WorkShopService {
         Page<WorkShopVo>page =workShopMapper.selectVoPage(pageQuery.build(),qw);
         return TableDataInfo.build(page);
     }
+
+    /**
+     * 新增车间
+     * @param workshopBo 车间Bo对象
+     * @return 结果
+     */
     @Override
     public int insertWorkShop(WorkShopBo workshopBo) {
         WorkShop workShop= MapstructUtils.convert(workshopBo,WorkShop.class);
         return workShopMapper.insert(workShop);
     }
+
+    /**
+     * 修改车间
+     * @param workshopBo 车间Bo对象
+     * @return 结果
+     */
     @Override
     public int updateWorkShop(WorkShopBo workshopBo) {
         WorkShop workShop= MapstructUtils.convert(workshopBo,WorkShop.class);
@@ -43,6 +61,12 @@ public class WorkShopServiceImpl implements WorkShopService {
         qw.eq("id",workshopBo.getId());
         return workShopMapper.updateById(workShop);
     }
+
+    /**
+     * 删除车间
+     * @param ids 车间id数组
+     * @return 结果
+     */
     @Override
     public int deleteWorkShopByIds(Long[] ids) {
         return workShopMapper.deleteByIds(Arrays.asList(ids));

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/controller/FactoryController.java

@@ -1,5 +1,6 @@
 package org.dromara.productionManagement.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;
@@ -15,6 +16,7 @@ import java.util.List;
 /**
  * 工厂管理接口
  */
+@SaIgnore
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/productionManagement/factory")
@@ -99,7 +101,11 @@ public class FactoryController extends BaseController {
      */
     @DeleteMapping("/recycle/{ids}")
     public R<Void> deleteRecycleFactoryByIds(@PathVariable List<Integer> ids) {
-        return toAjax(factoryService.deleteRecycleFactoryByIds(ids));
+        int status = factoryService.deleteRecycleFactoryByIds(ids);
+        if (status==1){
+            return toAjax(1);
+        }
+        return R.fail("该回收站中不存在此工厂或已被删除");
     }
 
     /**

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/controller/ShaoHuaFactoryController.java

@@ -59,8 +59,11 @@ public class ShaoHuaFactoryController extends BaseController {
      * @return
      */
     @DeleteMapping("/{ids}")
-    public R<Void> deleteFactoryByIds(@PathVariable int [] ids) {
-        return toAjax(shaoHuaFactoryService.deleteFactoryByIds(ids));
+    public R<Void> deleteFactoryByIds(@PathVariable List<Integer> ids) {
+        if(shaoHuaFactoryService.deleteFactoryByIds(ids) > 0){
+            return R.ok();
+        }
+        return R.fail("不存在此工厂或此工厂已被删除");
     }
 
     /**
@@ -100,7 +103,11 @@ public class ShaoHuaFactoryController extends BaseController {
      */
     @DeleteMapping("/recycle/{ids}")
     public R<Void> deleteRecycleFactoryByIds(@PathVariable List<Integer> ids) {
-        return toAjax(shaoHuaFactoryService.deleteRecycleFactoryByIds(ids));
+        int status = shaoHuaFactoryService.deleteRecycleFactoryByIds(ids);
+        if (status==1){
+            return toAjax(1);
+        }
+        return R.fail("该回收站中不存在此工厂或已被删除");
     }
 
     /**

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/service/ShaoHuaFactoryService.java

@@ -15,7 +15,7 @@ public interface ShaoHuaFactoryService {
 
     int updateFactory(ShaoHuaFactoryBo shaohuaFactoryBo);
 
-    int deleteFactoryByIds(int[] ids);
+    int deleteFactoryByIds(List<Integer> ids);
 
     TableDataInfo<ShaoHuaFactoryVo> selectRecycleFactoryList(ShaoHuaFactoryBo shaohuafactoryBo, PageQuery pageQuery);
 

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/service/impl/ShaoHuaFactoryImpl.java

@@ -25,6 +25,7 @@ public class ShaoHuaFactoryImpl implements ShaoHuaFactoryService {
 
     /**
      * 分页查询烧花工厂信息
+     *
      * @param shaohuaFactoryBo
      * @param pageQuery
      * @return
@@ -42,6 +43,7 @@ public class ShaoHuaFactoryImpl implements ShaoHuaFactoryService {
 
     /**
      * 新增烧花工厂信息
+     *
      * @param shaohuaFactoryBo
      * @return
      */
@@ -53,6 +55,7 @@ public class ShaoHuaFactoryImpl implements ShaoHuaFactoryService {
 
     /**
      * 修改烧花工厂信息
+     *
      * @param shaohuaFactoryBo
      * @return
      */
@@ -64,19 +67,23 @@ public class ShaoHuaFactoryImpl implements ShaoHuaFactoryService {
 
     /**
      * 删除烧花工厂信息（删除到回收站）
+     *
      * @param ids
      * @return
      */
     @Override
-    public int deleteFactoryByIds(int[] ids) {
-        List<ShaoHuaFactory> list = new ArrayList<>();
-        for (int factoryId : ids) {
-            ShaoHuaFactory factory = new ShaoHuaFactory();
-            factory.setId(factoryId);
-            factory.setDeleteTime(new Date());
-            list.add(factory);
+    public int deleteFactoryByIds(List<Integer> ids) {
+        if (ids == null) {
+            return -1;
         }
-        return shaoHuaFactoryMapper.updateById(list).size();
+        if (ids.isEmpty()) {
+            return -1;
+        }
+        UpdateWrapper<ShaoHuaFactory> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id", ids)
+            .isNull("deletetime")
+            .set("deletetime",new Date());
+        return shaoHuaFactoryMapper.update(updateWrapper);
     }
 
     /**
@@ -89,48 +96,51 @@ public class ShaoHuaFactoryImpl implements ShaoHuaFactoryService {
     public TableDataInfo<ShaoHuaFactoryVo> selectRecycleFactoryList(ShaoHuaFactoryBo shaohuafactoryBo, PageQuery pageQuery) {
         QueryWrapper<ShaoHuaFactory> qw = new QueryWrapper<>();
         Map<String, Object> params = shaohuafactoryBo.getParams();
-        qw.eq(0 != shaohuafactoryBo.getId(),"id", shaohuafactoryBo.getId());
-        qw.like(StringUtils.isNotBlank(shaohuafactoryBo.getName()),"name",shaohuafactoryBo.getName());
+        qw.eq(0 != shaohuafactoryBo.getId(), "id", shaohuafactoryBo.getId());
+        qw.like(StringUtils.isNotBlank(shaohuafactoryBo.getName()), "name", shaohuafactoryBo.getName());
         qw.between(params.get("begindeletetime") != null && params.get("enddeletetime") != null,
-                "deletetime", params.get("begindeletetime"), params.get("enddeletetime"));
+            "deletetime", params.get("begindeletetime"), params.get("enddeletetime"));
         qw.isNotNull("deletetime");
-        Page<ShaoHuaFactoryVo> page = shaoHuaFactoryMapper.selectVoPage(pageQuery.build(),qw);
+        Page<ShaoHuaFactoryVo> page = shaoHuaFactoryMapper.selectVoPage(pageQuery.build(), qw);
         return TableDataInfo.build(page);
     }
 
     /**
      * 回收站还原（id还原）
+     *
      * @param ids
      * @return
      */
     @Override
     public int backFactoryByIds(List<Integer> ids) {
         UpdateWrapper<ShaoHuaFactory> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.in("id",ids);
-        updateWrapper.set("deletetime",null);
+        updateWrapper.in("id", ids);
+        updateWrapper.set("deletetime", null);
         return shaoHuaFactoryMapper.update(updateWrapper);
     }
 
     /**
      * 回收站还原（全部还原）
+     *
      * @return
      */
     @Override
     public int backFactoryAll() {
         UpdateWrapper<ShaoHuaFactory> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.set("deletetime",null);
+        updateWrapper.set("deletetime", null);
         return shaoHuaFactoryMapper.update(updateWrapper);
     }
 
     /**
      * 回收站删除（id删除）
+     *
      * @param ids
      * @return
      */
     @Override
     public int deleteRecycleFactoryByIds(List<Integer> ids) {
         QueryWrapper<ShaoHuaFactory> qw = new QueryWrapper<>();
-        qw.in("id",ids);
+        qw.in("id", ids);
         qw.isNotNull("deletetime");
         return shaoHuaFactoryMapper.delete(qw);
     }
@@ -146,5 +156,4 @@ public class ShaoHuaFactoryImpl implements ShaoHuaFactoryService {
         return shaoHuaFactoryMapper.delete(qw);
     }
 
-
 }