待出库,车间配置,产线配置

code/src/test/java/mesDataSource.java

@@ -0,0 +1,17 @@
+import fly.generator.GeneratorApplication;
+
+public class mesDataSource {
+
+    public static void main(String[] args) {
+        GeneratorApplication.builder()
+                .url("jdbc:mysql://36.134.91.96:17330/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
+                .username("fjhx2012mysql")
+                .password("3PN-Mzn#vnP&q6d")
+                .port(9989)
+                .module("hx-mes")
+                .parent("com.fjhx.mes")
+                .superServiceClass("com.ruoyi.common.core.service.BaseService")
+                .build();
+    }
+
+}

hx-admin/pom.xml

@@ -41,7 +41,7 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>hx-wms</artifactId>
+            <artifactId>hx-mes</artifactId>
         </dependency>
 
     </dependencies>

hx-admin/src/main/resources/application-dev.yml

@@ -5,6 +5,10 @@ spring:
             strict: true
             driver-class-name: com.mysql.cj.jdbc.Driver
             datasource:
+                mes:
+                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: fjhx2012mysql
+                    password: 3PN-Mzn#vnP&q6d
                 wms:
                     url: jdbc:mysql://36.134.91.96:17330/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql

hx-common/src/main/java/com/fjhx/common/constant/SourceConstant.java

@@ -10,4 +10,6 @@ public interface SourceConstant {
 
     String WMS = "wms";
 
+    String MES = "mes";
+
 }

hx-mes/pom.xml

@@ -11,6 +11,17 @@
     </parent>
 
     <artifactId>hx-mes</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-base</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-common</artifactId>
+        </dependency>
+    </dependencies>
 
 
 </project>

hx-mes/src/main/java/com/fjhx/mes/controller/assembly/AssemblyLineController.java

@@ -0,0 +1,71 @@
+package com.fjhx.mes.controller.assembly;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.fjhx.common.constant.SourceConstant;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mes.entity.assembly.vo.AssemblyLineVo;
+import com.fjhx.mes.entity.assembly.dto.AssemblyLineSelectDto;
+import com.fjhx.mes.entity.assembly.dto.AssemblyLineDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.mes.service.assembly.AssemblyLineService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 产线 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-23
+ */
+@DS(SourceConstant.MES)
+@RestController
+@RequestMapping("/assemblyLine")
+public class AssemblyLineController {
+
+    @Autowired
+    private AssemblyLineService assemblyLineService;
+
+    /**
+     * 产线分页
+     */
+    @PostMapping("/page")
+    public Page<AssemblyLineVo> page(@RequestBody AssemblyLineSelectDto dto) {
+        return assemblyLineService.getPage(dto);
+    }
+
+    /**
+     * 产线明细
+     */
+    @PostMapping("/detail")
+    public AssemblyLineVo detail(@RequestBody BaseSelectDto dto) {
+        return assemblyLineService.detail(dto.getId());
+    }
+
+    /**
+     * 产线新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody AssemblyLineDto assemblyLineDto) {
+        assemblyLineService.add(assemblyLineDto);
+    }
+
+    /**
+     * 产线编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody AssemblyLineDto assemblyLineDto) {
+        assemblyLineService.edit(assemblyLineDto);
+    }
+
+    /**
+     * 产线删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        assemblyLineService.delete(dto.getId());
+    }
+
+}

hx-mes/src/main/java/com/fjhx/mes/controller/workshop/WorkshopController.java

@@ -0,0 +1,71 @@
+package com.fjhx.mes.controller.workshop;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.fjhx.common.constant.SourceConstant;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mes.entity.workshop.vo.WorkshopVo;
+import com.fjhx.mes.entity.workshop.dto.WorkshopSelectDto;
+import com.fjhx.mes.entity.workshop.dto.WorkshopDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.mes.service.workshop.WorkshopService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 车间 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-23
+ */
+@DS(SourceConstant.MES)
+@RestController
+@RequestMapping("/workshop")
+public class WorkshopController {
+
+    @Autowired
+    private WorkshopService workshopService;
+
+    /**
+     * 车间分页
+     */
+    @PostMapping("/page")
+    public Page<WorkshopVo> page(@RequestBody WorkshopSelectDto dto) {
+        return workshopService.getPage(dto);
+    }
+
+    /**
+     * 车间明细
+     */
+    @PostMapping("/detail")
+    public WorkshopVo detail(@RequestBody BaseSelectDto dto) {
+        return workshopService.detail(dto.getId());
+    }
+
+    /**
+     * 车间新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody WorkshopDto workshopDto) {
+        workshopService.add(workshopDto);
+    }
+
+    /**
+     * 车间编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody WorkshopDto workshopDto) {
+        workshopService.edit(workshopDto);
+    }
+
+    /**
+     * 车间删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        workshopService.delete(dto.getId());
+    }
+
+}

hx-mes/src/main/java/com/fjhx/mes/entity/assembly/dto/AssemblyLineDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.mes.entity.assembly.dto;
+
+import com.fjhx.mes.entity.assembly.po.AssemblyLine;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 产线新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-03-23
+ */
+@Getter
+@Setter
+public class AssemblyLineDto extends AssemblyLine {
+
+}

hx-mes/src/main/java/com/fjhx/mes/entity/assembly/dto/AssemblyLineSelectDto.java

@@ -0,0 +1,27 @@
+package com.fjhx.mes.entity.assembly.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 产线列表查询入参实体
+ *
+ * @author
+ * @since 2023-03-23
+ */
+@Getter
+@Setter
+public class AssemblyLineSelectDto extends BaseSelectDto {
+
+    /**
+     * 车间id
+     */
+    private Long workshopId;
+
+    /**
+     * 产线类型
+     */
+    private Integer type;
+
+}

hx-mes/src/main/java/com/fjhx/mes/entity/assembly/po/AssemblyLine.java

@@ -0,0 +1,46 @@
+package com.fjhx.mes.entity.assembly.po;
+
+import com.ruoyi.common.core.domain.BaseIdPo;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 产线
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-23
+ */
+@Getter
+@Setter
+@TableName("assembly_line")
+public class AssemblyLine extends BaseIdPo {
+
+    /**
+     * 车间id
+     */
+    private Long workshopId;
+
+    /**
+     * 产线类型
+     */
+    private Integer type;
+
+    /**
+     * 产线名称
+     */
+    private String name;
+
+    /**
+     * 负责人id
+     */
+    private Long personLiableId;
+
+    /**
+     * 说明
+     */
+    private String remarks;
+
+}

hx-mes/src/main/java/com/fjhx/mes/entity/assembly/vo/AssemblyLineVo.java

@@ -0,0 +1,23 @@
+package com.fjhx.mes.entity.assembly.vo;
+
+import com.fjhx.mes.entity.assembly.po.AssemblyLine;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 产线列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-03-23
+ */
+@Getter
+@Setter
+public class AssemblyLineVo extends AssemblyLine {
+
+    /**车间名字*/
+    private String workshopName;
+
+    /**负责人名字*/
+    private String personLiableName;
+
+}

hx-mes/src/main/java/com/fjhx/mes/entity/workshop/dto/WorkshopDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.mes.entity.workshop.dto;
+
+import com.fjhx.mes.entity.workshop.po.Workshop;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 车间新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-03-23
+ */
+@Getter
+@Setter
+public class WorkshopDto extends Workshop {
+
+}

hx-mes/src/main/java/com/fjhx/mes/entity/workshop/dto/WorkshopSelectDto.java

@@ -0,0 +1,20 @@
+package com.fjhx.mes.entity.workshop.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 车间列表查询入参实体
+ *
+ * @author 
+ * @since 2023-03-23
+ */
+@Getter
+@Setter
+public class WorkshopSelectDto extends BaseSelectDto {
+
+    /**车间类型*/
+    private Integer type;
+
+}

hx-mes/src/main/java/com/fjhx/mes/entity/workshop/po/Workshop.java

@@ -0,0 +1,41 @@
+package com.fjhx.mes.entity.workshop.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseIdPo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 车间
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-23
+ */
+@Getter
+@Setter
+@TableName("workshop")
+public class Workshop extends BaseIdPo {
+
+    /**
+     * 车间类型
+     */
+    private Integer type;
+
+    /**
+     * 车间名称
+     */
+    private String name;
+
+    /**
+     * 负责人id
+     */
+    private Long personLiableId;
+
+    /**
+     * 说明
+     */
+    private String remarks;
+
+}

hx-mes/src/main/java/com/fjhx/mes/entity/workshop/vo/WorkshopVo.java

@@ -0,0 +1,20 @@
+package com.fjhx.mes.entity.workshop.vo;
+
+import com.fjhx.mes.entity.workshop.po.Workshop;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 车间列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-03-23
+ */
+@Getter
+@Setter
+public class WorkshopVo extends Workshop {
+
+    /**负责人名字*/
+    private String personLiableName;
+
+}

hx-mes/src/main/java/com/fjhx/mes/mapper/assembly/AssemblyLineMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.mes.mapper.assembly;
+
+import com.fjhx.mes.entity.assembly.po.AssemblyLine;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mes.entity.assembly.vo.AssemblyLineVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 产线 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-23
+ */
+public interface AssemblyLineMapper extends BaseMapper<AssemblyLine> {
+
+    /**
+     * 产线分页
+     */
+    Page<AssemblyLineVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<AssemblyLine> wrapper);
+
+}

hx-mes/src/main/java/com/fjhx/mes/mapper/workshop/WorkshopMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.mes.mapper.workshop;
+
+import com.fjhx.mes.entity.workshop.po.Workshop;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mes.entity.workshop.vo.WorkshopVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 车间 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-23
+ */
+public interface WorkshopMapper extends BaseMapper<Workshop> {
+
+    /**
+     * 车间分页
+     */
+    Page<WorkshopVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<Workshop> wrapper);
+
+}

hx-mes/src/main/java/com/fjhx/mes/service/assembly/AssemblyLineService.java

@@ -0,0 +1,46 @@
+package com.fjhx.mes.service.assembly;
+
+import com.fjhx.mes.entity.assembly.po.AssemblyLine;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mes.entity.assembly.vo.AssemblyLineVo;
+import com.fjhx.mes.entity.assembly.dto.AssemblyLineSelectDto;
+import com.fjhx.mes.entity.assembly.dto.AssemblyLineDto;
+
+
+/**
+ * <p>
+ * 产线 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-23
+ */
+public interface AssemblyLineService extends BaseService<AssemblyLine> {
+
+    /**
+     * 产线分页
+     */
+    Page<AssemblyLineVo> getPage(AssemblyLineSelectDto dto);
+
+    /**
+     * 产线明细
+     */
+    AssemblyLineVo detail(Long id);
+
+    /**
+     * 产线新增
+     */
+    void add(AssemblyLineDto assemblyLineDto);
+
+    /**
+     * 产线编辑
+     */
+    void edit(AssemblyLineDto assemblyLineDto);
+
+    /**
+     * 产线删除
+     */
+    void delete(Long id);
+
+}

hx-mes/src/main/java/com/fjhx/mes/service/assembly/impl/AssemblyLineServiceImpl.java

@@ -0,0 +1,68 @@
+package com.fjhx.mes.service.assembly.impl;
+
+import com.fjhx.mes.entity.assembly.po.AssemblyLine;
+import com.fjhx.mes.entity.workshop.vo.WorkshopVo;
+import com.fjhx.mes.mapper.assembly.AssemblyLineMapper;
+import com.fjhx.mes.service.assembly.AssemblyLineService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.utils.UserUtil;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mes.entity.assembly.vo.AssemblyLineVo;
+import com.fjhx.mes.entity.assembly.dto.AssemblyLineSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.mes.entity.assembly.dto.AssemblyLineDto;
+import cn.hutool.core.bean.BeanUtil;
+
+
+/**
+ * <p>
+ * 产线 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-23
+ */
+@Service
+public class AssemblyLineServiceImpl extends ServiceImpl<AssemblyLineMapper, AssemblyLine> implements AssemblyLineService {
+
+    @Override
+    public Page<AssemblyLineVo> getPage(AssemblyLineSelectDto dto) {
+        IWrapper<AssemblyLine> wrapper = getWrapper();
+        wrapper.orderByDesc("al", AssemblyLine::getId);
+        wrapper.like("al",AssemblyLineVo::getName,dto.getKeyword())
+                .or()
+                .like("w",WorkshopVo::getName,dto.getKeyword())
+                .or()
+                .like("al",AssemblyLineVo::getRemarks,dto.getKeyword());
+        wrapper.eq("al",AssemblyLineVo::getWorkshopId,dto.getWorkshopId());
+        wrapper.eq("al",AssemblyLineVo::getType,dto.getType());
+        Page<AssemblyLineVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        //根据id赋值操作人名称
+        UserUtil.assignmentNickName(page.getRecords(), AssemblyLineVo::getPersonLiableId, AssemblyLineVo::setPersonLiableName);
+        return page;
+    }
+
+    @Override
+    public AssemblyLineVo detail(Long id) {
+        AssemblyLine AssemblyLine = this.getById(id);
+        AssemblyLineVo result = BeanUtil.toBean(AssemblyLine, AssemblyLineVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(AssemblyLineDto assemblyLineDto) {
+        this.save(assemblyLineDto);
+    }
+
+    @Override
+    public void edit(AssemblyLineDto assemblyLineDto) {
+        this.updateById(assemblyLineDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-mes/src/main/java/com/fjhx/mes/service/workshop/WorkshopService.java

@@ -0,0 +1,46 @@
+package com.fjhx.mes.service.workshop;
+
+import com.fjhx.mes.entity.workshop.po.Workshop;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mes.entity.workshop.vo.WorkshopVo;
+import com.fjhx.mes.entity.workshop.dto.WorkshopSelectDto;
+import com.fjhx.mes.entity.workshop.dto.WorkshopDto;
+
+
+/**
+ * <p>
+ * 车间 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-23
+ */
+public interface WorkshopService extends BaseService<Workshop> {
+
+    /**
+     * 车间分页
+     */
+    Page<WorkshopVo> getPage(WorkshopSelectDto dto);
+
+    /**
+     * 车间明细
+     */
+    WorkshopVo detail(Long id);
+
+    /**
+     * 车间新增
+     */
+    void add(WorkshopDto workshopDto);
+
+    /**
+     * 车间编辑
+     */
+    void edit(WorkshopDto workshopDto);
+
+    /**
+     * 车间删除
+     */
+    void delete(Long id);
+
+}

hx-mes/src/main/java/com/fjhx/mes/service/workshop/impl/WorkshopServiceImpl.java

@@ -0,0 +1,64 @@
+package com.fjhx.mes.service.workshop.impl;
+
+import com.fjhx.mes.entity.workshop.po.Workshop;
+import com.fjhx.mes.mapper.workshop.WorkshopMapper;
+import com.fjhx.mes.service.workshop.WorkshopService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.utils.UserUtil;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mes.entity.workshop.vo.WorkshopVo;
+import com.fjhx.mes.entity.workshop.dto.WorkshopSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.mes.entity.workshop.dto.WorkshopDto;
+import cn.hutool.core.bean.BeanUtil;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 车间 服务实现类
+ * </p>
+ *
+ * @author E
+ * @since 2023-03-23
+ */
+@Service
+public class WorkshopServiceImpl extends ServiceImpl<WorkshopMapper, Workshop> implements WorkshopService {
+
+    @Override
+    public Page<WorkshopVo> getPage(WorkshopSelectDto dto) {
+        IWrapper<Workshop> wrapper = getWrapper();
+        wrapper.orderByDesc("w", Workshop::getId);
+        wrapper.like("w",Workshop::getName,dto.getKeyword());
+        wrapper.like("w",Workshop::getType,dto.getType());
+        Page<WorkshopVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        //根据id赋值操作人名称
+        UserUtil.assignmentNickName(page.getRecords(), WorkshopVo::getPersonLiableId, WorkshopVo::setPersonLiableName);
+        return page;
+    }
+
+    @Override
+    public WorkshopVo detail(Long id) {
+        Workshop Workshop = this.getById(id);
+        WorkshopVo result = BeanUtil.toBean(Workshop, WorkshopVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(WorkshopDto workshopDto) {
+        this.save(workshopDto);
+    }
+
+    @Override
+    public void edit(WorkshopDto workshopDto) {
+        this.updateById(workshopDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-mes/src/main/resources/mapper/assembly/AssemblyLineMapper.xml

@@ -0,0 +1,19 @@
+<?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.fjhx.mes.mapper.assembly.AssemblyLineMapper">
+    <select id="getPage" resultType="com.fjhx.mes.entity.assembly.vo.AssemblyLineVo">
+        SELECT
+            al.id,
+            al.workshop_id,
+            w.`name` workshopName,
+            al.type,
+            al.NAME,
+            al.person_liable_id,
+            al.remarks
+        FROM
+            assembly_line al
+                JOIN workshop w ON al.workshop_id = w.id
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-mes/src/main/resources/mapper/workshop/WorkshopMapper.xml

@@ -0,0 +1,15 @@
+<?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.fjhx.mes.mapper.workshop.WorkshopMapper">
+    <select id="getPage" resultType="com.fjhx.mes.entity.workshop.vo.WorkshopVo">
+        select
+            w.id,
+            w.type,
+            w.name,
+            w.person_liable_id,
+            w.remarks
+        from workshop w
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-wms/src/main/java/com/fjhx/wms/entity/stock/dto/StockJournalSelectDto.java

@@ -14,9 +14,6 @@ import lombok.Setter;
 @Setter
 public class StockJournalSelectDto extends BaseSelectDto {
 
-    /**搜索关键字*/
-    private String keywords;
-
     /**记录类型 1为手动入库 2为手动出库*/
     private Integer type;
 

hx-wms/src/main/java/com/fjhx/wms/entity/warehouse/dto/WarehouseSelectDto.java

@@ -14,7 +14,5 @@ import lombok.Setter;
 @Setter
 public class WarehouseSelectDto extends BaseSelectDto {
 
-    /**搜索关键字*/
-    private String keywords;
 
 }

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockJournalDetailsServiceImpl.java

@@ -42,7 +42,7 @@ public class StockJournalDetailsServiceImpl extends ServiceImpl<StockJournalDeta
     public Page<StockJournalDetailsVo> getPage(StockJournalSelectDto dto) {
         IWrapper<StockJournalDetails> wrapper = getWrapper();
         wrapper.eq( StockJournal::getType,dto.getType());
-        wrapper.like("w.name",dto.getKeywords());
+        wrapper.like("w.name",dto.getKeyword());
         wrapper.eq("w.id",dto.getWarehouseId());
         wrapper.eq("sjd.product_id",dto.getProductId());
         Page<StockJournalDetailsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockJournalServiceImpl.java

@@ -5,6 +5,7 @@ import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.wms.entity.stock.po.StockJournal;
 import com.fjhx.wms.entity.stock.vo.StockVo;
 import com.fjhx.wms.entity.warehouse.po.Warehouse;
+import com.fjhx.wms.entity.warehouse.vo.WarehouseVo;
 import com.fjhx.wms.mapper.stock.StockJournalMapper;
 import com.fjhx.wms.service.stock.StockJournalService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -50,7 +51,7 @@ public class StockJournalServiceImpl extends ServiceImpl<StockJournalMapper, Sto
         IWrapper<StockJournal> wrapper = getWrapper();
         wrapper.orderByDesc("sj", StockJournal::getId);
         wrapper.eq("sj", StockJournal::getType, dto.getType());
-        wrapper.like("w", StockJournalSelectDto::getKeywords, dto.getKeywords());
+        wrapper.like("w", WarehouseVo::getName, dto.getKeyword());
         Page<StockJournalVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<StockJournalVo> records = page.getRecords();
         //根据id赋值操作人名称

hx-wms/src/main/java/com/fjhx/wms/service/warehouse/impl/WarehouseServiceImpl.java

@@ -28,7 +28,7 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper, Warehouse
     public Page<WarehouseVo> getPage(WarehouseSelectDto dto) {
         IWrapper<Warehouse> wrapper = getWrapper();
         wrapper.orderByDesc("w", Warehouse::getId);
-        wrapper.like("w",WarehouseSelectDto::getKeywords,dto.getKeywords());
+        wrapper.like("w",Warehouse::getName,dto.getKeyword());
         Page<WarehouseVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;
     }