Merge branch 'develop' into release

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/controller/BulkOrderListController.java

@@ -31,16 +31,6 @@ public class BulkOrderListController extends BaseController {
         return bulkOrderListService.selectPageBulkOrderList(bulkOrderListBo, pageQuery);
     }
 
-    /**
-     * 新增大货订单列表
-     * @param bulkOrderListBo 大货订单列表BO对象
-     * @return 新增行数
-     */
-    @PostMapping()
-    public R<Void> insertBulkOrder(@Validated @RequestBody BulkOrderListBo bulkOrderListBo) {
-        return toAjax(bulkOrderListService.insertBulkOrder(bulkOrderListBo));
-    }
-
     /**
      * 修改大货订单列表
      * @param bulkOrderListBo 大货订单列表BO对象

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/bo/CraftAttrBo.java

@@ -0,0 +1,76 @@
+package org.dromara.bulk.domain.bo;
+
+import lombok.Data;
+
+@Data
+public class CraftAttrBo {
+    /**
+     * 工艺价格
+     */
+    private String price;
+
+    /**
+     * 工艺ID
+     */
+    private Long id;
+
+    /**
+     * pid
+     */
+    private int pid;
+
+    /**
+     * 状态
+     */
+    private String status = "1";
+
+    /**
+     * 订单状态
+     */
+    private String order_status = "1";
+
+    /**
+     * 类型
+     */
+    private int type = 3;
+
+    /**
+     * 重量
+     */
+    private int weigh;
+
+    /**
+     * 工艺名称
+     */
+    private String title;
+
+    /**
+     * 工艺图片
+     */
+    private String image = "";
+
+    /**
+     * 创建时间
+     */
+    private String createtime;
+
+    /**
+     * 状态文本
+     */
+    private String status_text = "正常";
+
+    /**
+     * 垫片
+     */
+    private String spacer = "";
+
+    /**
+     * 是否有子工艺
+     */
+    private String haschild = "0";
+
+    /**
+     * 类型名称
+     */
+    private String type_name = "工艺类型";
+}

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/bo/MaterialAttrBo.java

@@ -0,0 +1,76 @@
+package org.dromara.bulk.domain.bo;
+
+import lombok.Data;
+
+@Data
+public class MaterialAttrBo {
+    /**
+     * 价格
+     */
+    private String price = "";
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * pid
+     */
+    private int pid;
+
+    /**
+     * 状态
+     */
+    private String status = "1";
+
+    /**
+     * 订单状态
+     */
+    private String order_status = "1";
+
+    /**
+     * 类型
+     */
+    private int type = 2;
+
+    /**
+     * 重量
+     */
+    private int weigh = 0;
+
+    /**
+     * 名称
+     */
+    private String title;
+
+    /**
+     * 图片
+     */
+    private String image = "";
+
+    /**
+     * 创建时间
+     */
+    private String createtime;
+
+    /**
+     * 状态文本
+     */
+    private String status_text = "正常";
+
+    /**
+     * 垫片
+     */
+    private String spacer = "";
+
+    /**
+     * 是否有子物料
+     */
+    private String haschild = "0";
+
+    /**
+     * 类型名称
+     */
+    private String type_name = "供货商名称";
+}

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/bo/OemAttrBo.java

@@ -0,0 +1,37 @@
+package org.dromara.bulk.domain.bo;
+
+import lombok.Data;
+
+@Data
+public class OemAttrBo {
+    /**
+     * 花型号 ID
+     */
+    private int id;
+
+    /**
+     * 花型号图片
+     */
+    private String image;
+
+    /**
+     * 花型号名称
+     */
+    private String code;
+
+    /**
+     * 创建时间
+     */
+    private String createTime;
+
+    /**
+     * 用户订单id
+     */
+    private Long user_order_id;
+
+    /**
+     * 用户id
+     */
+    private Long user_id;
+
+}

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/bo/OrderListBo.java

@@ -28,6 +28,11 @@ public class OrderListBo {
     @NotNull(message = "大货编号id不能为空")
     private Long daHuoNumberId;
 
+    /**
+     * 物料对象
+     */
+    private MaterialAttrBo material;
+
     /**
      * 款号
      */
@@ -36,6 +41,7 @@ public class OrderListBo {
     /**
      * 工厂名称
      */
+    @NotBlank(message = "工厂名称不能为空")
     private String garmentFactory;
 
     /**
@@ -91,12 +97,13 @@ public class OrderListBo {
     /**
      * 品牌组
      */
+    @NotBlank(message = "品牌组不能为空")
     private String brandGroup;
 
     /**
-     * 工艺id
+     * 工艺BO对象
      */
-    private String craftId;
+    private CraftAttrBo craft;
 
     /**
      * 工艺价格
@@ -157,10 +164,9 @@ public class OrderListBo {
     private String isSys = "0";
 
     /**
-     * 花型号
+     * 花型号BO对象
      */
-    @Size(max = 1,message = "0否，1是")
-    private String oemId;
+    private OemAttrBo oem;
 
     /**
      * 款式图的Url

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/mapper/BulkOrderListMapper.java

@@ -23,6 +23,8 @@ public interface BulkOrderListMapper extends BaseMapperPlus<BulkOrderList, BulkO
      */
     Page<BulkOrderListVo> selectVoPageWithImage(IPage<BulkOrderListVo> page, @Param(Constants.WRAPPER) Wrapper<BulkOrderList> wrapper);
 
+
+
 }
 
 

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/mapstruct/NewBulkOrderMapstruct.java

@@ -27,7 +27,6 @@ public interface NewBulkOrderMapstruct {
     @Mapping(target = "unitId", constant = "5")
     @Mapping(target = "defaultUnit", constant = "5")
     @Mapping(target = "goodsTypeExtend1Id", source = "orderList.daHuoNumberName")
-    @Mapping(target = "goodsTypeExtend4Id", source = "orderList.oemId")
     @Mapping(target = "craftPrice", source = "orderList.craftPrice")
     @Mapping(target = "duizhangStatus", constant = "0")
     BulkOrderList toBulkOrderList(NewBulkOrderBo newBulkOrderBo,

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/service/BulkOrderListService.java

@@ -15,13 +15,6 @@ public interface BulkOrderListService {
      */
     TableDataInfo<BulkOrderListVo> selectPageBulkOrderList(BulkOrderListBo bulkOrderListBo, PageQuery pageQuery);
 
-    /**
-     * 新增大货订单
-     * @param bulkOrderListBo 大货订单BO对象
-     * @return 影响行数
-     */
-    int insertBulkOrder(BulkOrderListBo bulkOrderListBo);
-
     /**
      * 修改大货订单
      * @param bulkOrderListBo 大货订单BO对象

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/service/impl/BulkOrderListServiceImpl.java

@@ -6,16 +6,15 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.bulk.domain.BulkOrderList;
 import org.dromara.bulk.domain.bo.BulkOrderListBo;
 import org.dromara.bulk.domain.vo.BulkOrderListVo;
-import org.dromara.bulk.mapper.BulkOrderListMapper;
+import org.dromara.bulk.mapper.*;
+import org.dromara.bulk.mapstruct.NewBulkOrderMapstruct;
 import org.dromara.bulk.service.BulkOrderListService;
 import org.dromara.common.core.utils.MapstructUtils;
-import org.dromara.common.core.utils.OrderNumberGenerator;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.productionManagement.mapper.ProductionPlanMapper;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
-
 
 /**
  * 大货订单列表服务层实现
@@ -24,7 +23,14 @@ import java.util.Arrays;
 @RequiredArgsConstructor
 public class BulkOrderListServiceImpl implements BulkOrderListService {
 
+    private final ProductionPlanMapper productionPlanMapper;
     private final BulkOrderListMapper bulkOrderListMapper;
+    private final UserOrderMapper userOrderMapper;
+    private final UserOrderTemplateMapper userOrderTemplateMapper;
+    private final AttachmentMapper attachmentMapper;
+    private final FlowerPatternMapper flowerPatternMapper;
+
+    private final NewBulkOrderMapstruct newBulkOrderMapstruct;
 
     /**
      * 查询大货订单列表分页信息
@@ -40,19 +46,6 @@ public class BulkOrderListServiceImpl implements BulkOrderListService {
         return TableDataInfo.build(page);
     }
 
-    /**
-     * 添加大货订单
-     * @param bulkOrderListBo 大货订单BO对象
-     * @return 添加行数
-     */
-    @Override
-    public int insertBulkOrder(BulkOrderListBo bulkOrderListBo) {
-        OrderNumberGenerator orderNumberGenerator = OrderNumberGenerator.getInstance();
-        bulkOrderListBo.setScNo(orderNumberGenerator.generateOrderNumber("SC"));
-        bulkOrderListBo.setSysNo(orderNumberGenerator.generateOrderNumber("SYS"));
-        return bulkOrderListMapper.insert(MapstructUtils.convert(bulkOrderListBo, BulkOrderList.class));
-    }
-
     /**
      * 修改大货订单
      * @param bulkOrderListBo 大货订单BO对象
@@ -70,7 +63,10 @@ public class BulkOrderListServiceImpl implements BulkOrderListService {
      */
     @Override
     public int deleteBulkOrderById(Long[] bulkOrderListIds) {
-        return bulkOrderListMapper.deleteByIds(Arrays.asList(bulkOrderListIds));
+        for (Long bulkOrderListId : bulkOrderListIds) {
+
+        }
+        return 1;
     }
 }
 

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/service/impl/BulkOrderManagementServiceImpl.java

@@ -12,6 +12,7 @@ import org.dromara.bulk.mapstruct.NewBulkOrderMapstruct;
 import org.dromara.bulk.service.BulkOrderManagementService;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.OrderNumberGenerator;
+import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.productionManagement.domain.ProductionPlan;
 import org.dromara.productionManagement.mapper.ProductionPlanMapper;
 import org.dromara.system.domain.vo.SysOssVo;
@@ -41,7 +42,6 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
 
     /**
      * 新增生产订单
-     *
      * @param newBulkOrderBo 生产订单的BO对象
      * @return 添加结果
      */
@@ -81,10 +81,17 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
                 // 订单列表映射
                 BulkOrderList bulkOrderList = newBulkOrderMapstruct.toBulkOrderList(
                     newBulkOrderBo,
-                    orderList, sysNo,
+                    orderList,
+                    sysNo,
                     purchaseCode,
                     userOrder.getId(),
                     productionPlan.getId());
+                bulkOrderList.setGoodsTypeExtend2Attr(JsonUtils.toJsonString(orderList.getMaterial()));
+                bulkOrderList.setGoodsTypeExtend3Attr(JsonUtils.toJsonString(orderList.getCraft()));
+
+                orderList.getOem().setUser_order_id(userOrder.getId());
+                orderList.getOem().setUser_id(newBulkOrderBo.getUserId());
+                bulkOrderList.setGoodsTypeExtend4Attr(JsonUtils.toJsonString(orderList.getOem()));
                 bulkOrderListMapper.insert(bulkOrderList);
 
                 // 处理模板

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

@@ -21,42 +21,93 @@ import org.springframework.web.multipart.MultipartFile;
 import java.util.ArrayList;
 import java.util.HashMap;
 
+/**
+ * 职员管理接口
+ */
 @SaIgnore
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/dataManagement/staff")
 public class StaffController extends BaseController {
     private final StaffService staffService;
+
+    /**
+     * 查询职员管理列表
+     * @param staffBo 职员Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
     @GetMapping("/PageList")
     public TableDataInfo<StaffVo> selectPageStaffList(StaffBo staffBo, PageQuery pageQuery) {
         return staffService.selectPageStaffList(staffBo, pageQuery);
     }
+
+    /**
+     * 新增职员
+     * @param staffBo 职员Bo对象
+     * @return 新增结果
+     */
     @PostMapping()
     public R<Void> insertStaff(@Validated @RequestBody StaffBo staffBo) {
         return toAjax(staffService.insertStaff(staffBo));
     }
+
+    /**
+     * 修改职员
+     * @param staffBo 职员Bo对象
+     * @return 修改结果
+     */
     @PutMapping()
     public R<Void> updateStaff(@Validated @RequestBody StaffBo staffBo) {
         return toAjax(staffService.updateStaff(staffBo));
     }
+
+    /**
+     * 删除职员
+     * @param staffIds 职员ids
+     * @return 删除结果
+     */
     @DeleteMapping("/{staffIds}")
     public R<Void> deleteStaffByIds(@PathVariable Long[] staffIds) {
         return toAjax(staffService.deleteStaffByIds(staffIds));
     }
+
+    /**
+     * 下载职员导入模板
+     * @param response 响应对象
+     */
     @GetMapping("/downloadTemplate")
     public void getExampleExcel(HttpServletResponse response) {
         ExcelUtil.exportExcel(new ArrayList<>(),"职员导入模板", StaffExcelVo.class, response);
     }
+
+    /**
+     * 导入职员Excel
+     * @param file 文件对象
+     * @return 是否解析成功
+     * @throws Exception 运行错误
+     */
     @PostMapping("/importExcel")
     public R<Void> importExcel(@RequestPart("file") MultipartFile file) throws Exception {
         ExcelResult<StaffExcelVo> result = ExcelUtil.importExcel(file.getInputStream(), StaffExcelVo.class,false);
         staffService.insertImportExcel(result);
         return R.ok(result.getAnalysis());
     }
+
+    /**
+     * 通过Excel导出所有职员数据
+     * @param response 响应对象
+     */
     @GetMapping("/exportExcel")
     public void exportStaffExcel(HttpServletResponse response) {
         ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),staffService.selectList()),"职员列表.xlsx","excel/职员导出模板.xlsx",response);
     }
+
+    /**
+     * 根据职员Ids导出Excel
+     * @param staffIds 职员Ids
+     * @param response 响应对象
+     */
     @GetMapping("/exportExcelByIds")
     public void exportStaffExcel(@RequestParam("ids") Long[] staffIds, HttpServletResponse response) {
         ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),staffService.selectStaffListByIds(staffIds)),"职员列表.xlsx","excel/职员导出模板.xlsx",response);

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

@@ -1,7 +1,7 @@
 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;
@@ -11,7 +11,6 @@ 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.bo.WorkShopBo;
 import org.dromara.dataManagement.domain.vo.SupplierExcelVo;
 import org.dromara.dataManagement.domain.vo.SupplierVo;
 import org.dromara.dataManagement.service.SupplierService;
@@ -20,10 +19,10 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 
-@SaIgnore
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/dataManagement/supplier")
@@ -79,9 +78,25 @@ public class SupplierController extends BaseController {
         return R.fail("不存在此工厂或此工厂已被删除");
     }
 
+    /**
+     * 根据id修改供应商信息
+     * @param supplierBo
+     * @return
+     */
     @PutMapping
     public R<Void> updateSupplier(@Validated @RequestBody SupplierBo supplierBo){
         return toAjax(supplierService.updateSupplier(supplierBo));
     }
 
+    /**
+     * 导出供应商信息
+     * @param supplierIds
+     * @param response
+     */
+    @GetMapping("/exportExcelByIds")
+    public void exportWorkShopExcel(@RequestParam("ids") Long[] supplierIds,HttpServletResponse response){
+        ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),supplierService.selectSupplierByIds(supplierIds)),
+                "供应商列表.xlsx","excel/供应商导出模板.xlsx",response);
+    }
+
 }

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

@@ -3,6 +3,9 @@ package org.dromara.dataManagement.domain;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+/**
+ * 职员管理基类
+ */
 @Data
 @TableName("fa_kuyou_staff_member")
 public class Staff {
@@ -13,11 +16,11 @@ public class Staff {
     /**
      * 管理员id
      */
-    private int admin_id;
+    private int adminId;
     /**
      * 职员编号
      */
-    private String men_code;
+    private String menCode;
     /**
      * 职员名称
      */

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

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

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

@@ -3,6 +3,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
+/**
+ * 车间管理基类
+ */
 @Data
 //@EqualsAndHashCode(callSuper = true)
 @TableName("fa_kuyou_workshop")

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

@@ -3,6 +3,9 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.dataManagement.domain.Staff;
 
+/**
+ * 职员管理业务对象
+ */
 @Data
 @AutoMapper(target = Staff.class, reverseConvertGenerate = false)
 public class StaffBo {
@@ -13,11 +16,11 @@ public class StaffBo {
     /**
      * 管理员id
      */
-    private int admin_id;
+    private int adminId;
     /**
      * 职员编号
      */
-    private String men_code;
+    private String menCode;
     /**
      * 职员名称
      */

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

@@ -3,6 +3,7 @@ package org.dromara.dataManagement.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
@@ -13,9 +14,15 @@ import org.dromara.dataManagement.domain.Supplier;
 @AutoMapper(target = Supplier.class, reverseConvertGenerate = false)
 public class SupplierBo extends BaseEntity {
 
+    /**
+     * 主键Id
+     */
+    private int id;
+
     /**
      * 供应商类别
      */
+    @NotNull
     private int supplyertypeId;
 
     /**

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

@@ -5,7 +5,7 @@ import lombok.Data;
 import org.dromara.dataManagement.domain.WorkShop;
 
 /**
- * 车间业务对象
+ * 车间管理业务对象
  */
 @Data
 //@EqualsAndHashCode(callSuper = true)

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

@@ -7,6 +7,9 @@ import org.dromara.dataManagement.domain.Staff;
 
 import java.io.Serializable;
 
+/**
+ * 职员管理视图对象
+ */
 @Data
 @AutoMapper(target = Staff.class)
 public class StaffExcelVo implements Serializable {

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

@@ -4,6 +4,9 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.dataManagement.domain.Staff;
 
+/**
+ * 职员值对象
+ */
 @Data
 @AutoMapper(target = Staff.class)
 public class StaffVo {
@@ -14,11 +17,11 @@ public class StaffVo {
     /**
      * 管理员id
      */
-    private int admin_id;
+    private int adminId;
     /**
      * 职员编号
      */
-    private String men_code;
+    private String menCode;
     /**
      * 职员名称
      */

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/mapper/StaffMapper.java

@@ -5,6 +5,9 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.dataManagement.domain.Staff;
 import org.dromara.dataManagement.domain.vo.StaffVo;
 
+/**
+ * 职员管理Mapper
+ */
 @Mapper
 public interface StaffMapper extends BaseMapperPlus<Staff, StaffVo> {
 }

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/mapper/WorkShopMapper.java

@@ -5,6 +5,9 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.dataManagement.domain.WorkShop;
 import org.dromara.dataManagement.domain.vo.WorkShopVo;
 
+/**
+ * 车间管理Mapper
+ */
 @Mapper
 public interface WorkShopMapper extends BaseMapperPlus<WorkShop, WorkShopVo> {
 }

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

@@ -10,18 +10,55 @@ import org.dromara.dataManagement.domain.vo.StaffVo;
 
 import java.util.List;
 
+/**
+ * 职员Service接口
+ */
 public interface StaffService {
+    /**
+     * 查询职员列表
+     * @param staffBo 职员Bo对象
+     * @param pageQuery 分页信息
+     * @return 分页结果
+     */
     TableDataInfo<StaffVo> selectPageStaffList(StaffBo staffBo, PageQuery pageQuery);
 
+    /**
+     * 新增职员
+     * @param staffBo 职员Bo对象
+     * @return 影响行数
+     */
     int insertStaff(StaffBo staffBo);
 
+    /**
+     * 修改职员
+     * @param staffBo 职员Bo对象
+     * @return 影响行数
+     */
     int updateStaff(StaffBo staffBo);
 
+    /**
+     * 删除职员
+     * @param staffIds 职员Ids
+     * @return 影响行数
+     */
     int deleteStaffByIds(Long[] staffIds);
 
+    /**
+     * 导入职员Excel
+     * @param result 导入结果
+     */
     void insertImportExcel(ExcelResult<StaffExcelVo> result);
 
+    /**
+     * 查询职员列表
+     * @return 职员列表
+     */
     List<Staff> selectList();
 
+    /**
+     * 根据职员Ids查询职员列表
+     * @param staffIds 职员Ids
+     * @return 职员列表
+     */
     List<Staff> selectStaffListByIds(Long[] staffIds);
 }

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

@@ -4,6 +4,7 @@ package org.dromara.dataManagement.service;
 import org.dromara.common.excel.core.ExcelResult;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.dataManagement.domain.Supplier;
 import org.dromara.dataManagement.domain.bo.SupplierBo;
 import org.dromara.dataManagement.domain.vo.SupplierExcelVo;
 import org.dromara.dataManagement.domain.vo.SupplierVo;
@@ -21,4 +22,6 @@ public interface SupplierService {
     void insertImportExcel(ExcelResult<SupplierExcelVo> result);
 
     int updateSupplier(SupplierBo supplierBo);
+
+    List<Supplier> selectSupplierByIds(Long[] supplierIds);
 }

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

@@ -28,7 +28,7 @@ public interface WorkShopService {
     int insertWorkShop(WorkShopBo workshopBo);
 
     /**
-     * 更新车间
+     * 修改车间
      * @param workshopBo 车间Bo对象
      * @return 影响行数
      */
@@ -36,7 +36,7 @@ public interface WorkShopService {
 
     /**
      * 删除车间
-     * @param workshopIds 车间id数组
+     * @param workshopIds 车间ids
      * @return 影响行数
      */
     int deleteWorkShopByIds(Long[] workshopIds);
@@ -49,7 +49,7 @@ public interface WorkShopService {
 
     /**
      * 根据车间Ids查询车间列表
-     * @param workshopIds 车间id数组
+     * @param workshopIds 车间ids
      * @return 车间列表
      */
     List<WorkShop> selectWorkshopListByIds(Long[] workshopIds);

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

@@ -19,25 +19,47 @@ import org.springframework.stereotype.Service;
 import java.util.Arrays;
 import java.util.List;
 
+/**
+ * 职员管理业务实现
+ */
 @Service
 @RequiredArgsConstructor
 public class StaffServiceImpl implements StaffService {
     private final StaffMapper staffMapper;
+
+    /**
+     * 查询职员对象分页查询职员数据
+     * @param staffBo 职员Bo对象
+     * @param pageQuery 查询条件
+     * @return 分页结果
+     */
     @Override
     public TableDataInfo<StaffVo> selectPageStaffList(StaffBo staffBo, PageQuery pageQuery) {
         QueryWrapper<Staff> qw=new QueryWrapper<>();
-        qw.like(null!=staffBo.getMen_code(),"men_code",staffBo.getMen_code());
+        qw.like(null!=staffBo.getMenCode(),"men_code",staffBo.getMenCode());
         qw.like(null!=staffBo.getName(),"name",staffBo.getName());
         qw.like(null!=staffBo.getPhone(),"phone",staffBo.getPhone());
         qw.eq(StringUtils.isNotBlank(staffBo.getStatus()),"status",staffBo.getStatus());
         Page<StaffVo> page =staffMapper.selectVoPage(pageQuery.build(),qw);
         return TableDataInfo.build(page);
     }
+
+    /**
+     * 新增职员
+     * @param staffBo 职员Bo对象
+     * @return 新增结果
+     */
     @Override
     public int insertStaff(StaffBo staffBo) {
         Staff staff= MapstructUtils.convert(staffBo, Staff.class);
         return staffMapper.insert(staff);
     }
+
+    /**
+     * 修改职员
+     * @param staffBo 职员Bo对象
+     * @return 修改结果
+     */
     @Override
     public int updateStaff(StaffBo staffBo) {
         Staff staff= MapstructUtils.convert(staffBo, Staff.class);
@@ -45,10 +67,21 @@ public class StaffServiceImpl implements StaffService {
         qw.eq("id",staffBo.getId());
         return staffMapper.updateById(staff);
     }
+
+    /**
+     * 删除职员
+     * @param staffIds 职员ids
+     * @return 删除结果
+     */
     @Override
     public int deleteStaffByIds(Long[] staffIds) {
         return staffMapper.deleteByIds(Arrays.asList(staffIds));
     }
+
+    /**
+     * 处理导入的Excel数据
+     * @param result Excel数据
+     */
     @Override
     public void insertImportExcel(ExcelResult<StaffExcelVo> result){
         for(StaffExcelVo staffExcelVo:result.getList()){

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

@@ -2,14 +2,12 @@ package org.dromara.dataManagement.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.excel.core.ExcelResult;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.dataManagement.domain.Supplier;
-import org.dromara.dataManagement.domain.WorkShop;
 import org.dromara.dataManagement.domain.bo.SupplierBo;
 import org.dromara.dataManagement.domain.vo.SupplierExcelVo;
 import org.dromara.dataManagement.domain.vo.SupplierVo;
@@ -17,6 +15,7 @@ import org.dromara.dataManagement.mapper.SupplierMapper;
 import org.dromara.dataManagement.service.SupplierService;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.List;
 
 
@@ -75,7 +74,7 @@ public class SupplierServiceImpl implements SupplierService {
     public int updateSupplier(SupplierBo supplierBo) {
         Supplier supplier = MapstructUtils.convert(supplierBo,Supplier.class);
         QueryWrapper<Supplier> qw = new QueryWrapper<>();
-        qw.eq("supplyertype_id",supplierBo.getSupplyertypeId());
+        qw.eq("id",supplierBo.getId());
         return supplierMapper.updateById(supplier);
     }
 
@@ -91,4 +90,13 @@ public class SupplierServiceImpl implements SupplierService {
         return supplierMapper.delete(qw);
     }
 
+    /**
+     * 根据供应商Ids导出Excel
+     * @param supplierIds
+     * @return
+     */
+    @Override
+    public List<Supplier> selectSupplierByIds(Long[] supplierIds) {
+        return MapstructUtils.convert(supplierMapper.selectVoByIds(Arrays.asList(supplierIds)),Supplier.class);
+    }
 }

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

@@ -17,6 +17,9 @@ import org.springframework.stereotype.Service;
 import java.util.Arrays;
 import java.util.List;
 
+/**
+ * 车间管理业务实现
+ */
 @Service
 @RequiredArgsConstructor
 public class WorkShopServiceImpl implements WorkShopService {

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/domain/Factory.java

@@ -7,6 +7,9 @@ import org.dromara.common.tenant.core.TenantEntity;
 
 import java.util.Date;
 
+/**
+ * 数码印花厂基类
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("fa_out_factory")

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/domain/bo/FactoryBo.java

@@ -10,7 +10,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 工厂业务对象
+ * 数码印花厂业务对象
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/domain/vo/FactoryVo.java

@@ -9,7 +9,7 @@ import org.dromara.productionManagement.domain.Factory;
 import java.util.Date;
 
 /**
- * 工厂值对象
+ * 数码印花厂值对象
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/mapper/FactoryMapper.java

@@ -4,7 +4,9 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.productionManagement.domain.Factory;
 import org.dromara.productionManagement.domain.vo.FactoryVo;
 
-
+/**
+ * 数码印花厂Mapper
+ */
 @Mapper
 public interface FactoryMapper extends BaseMapperPlus<Factory, FactoryVo> {
     /**

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

@@ -7,6 +7,9 @@ import org.dromara.productionManagement.domain.vo.FactoryVo;
 
 import java.util.List;
 
+/**
+ * 数码印花厂服务层
+ */
 public interface FactoryService {
     /**
      * 根据条件查询工厂列表

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

@@ -17,6 +17,9 @@ import org.springframework.stereotype.Service;
 
 import java.util.*;
 
+/**
+ * 数码印花厂业务实现
+ */
 @Service
 @RequiredArgsConstructor
 public class FactoryServiceImpl implements FactoryService {