Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-29 844ffa2181d698f3871a62553fe10dd4054b63fa

Merge remote-tracking branch 'origin/master'

 base-server/src/main/java/com/yuanchu/mom/controller/TechnicalModelController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,119 @@
package com.yuanchu.mom.controller;


import com.yuanchu.mom.pojo.dto.TechnicalModelDto;
import com.yuanchu.mom.pojo.dto.TechnologyTemplateDto;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.yuanchu.mom.service.TechnicalModelService;


/**
 * æŠ€æœ¯æŒ‡æ ‡ç»´æŠ¤è¡¨(TechnicalModel)表控制层
 *
 * @author zss
 * @since 2023-08-28 16:09:19
 */
@Api(tags = "基础数据-->技术指标维护")
@RestController
@RequestMapping("/technicalModel")
public class TechnicalModelController {

    @Autowired
    private TechnicalModelService technicalModelService;


    @ApiOperation(value = "查询技术指标维护列表-->左边二级展示工序和工艺")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "type", value = "类型(为空=0橡胶连接器)", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "message", value = "搜索内容", dataTypeClass = String.class)
    })
    @GetMapping("/selectAllTechTem")
    public Result selectAllTechTem(Integer type, String message) {
        return Result.success(technicalModelService.selectAllTechTem(type, message));
    }

    @ApiOperation(value = "查询技术指标维护列表-->右边展示该工艺下的检验项目")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "工艺路线id", dataTypeClass = Integer.class, required = true)
    })
    @GetMapping("/selectAllTechNam")
    public Result selectAllTechNam(Integer id) {
        return Result.success(technicalModelService.selectAllTechNam(id));
    }

    @ApiOperation(value = "新增技术指标维护-->选择工序和工艺")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "type", value = "类型", dataTypeClass = Integer.class, required = true)
    })
    @GetMapping("/chooseTechFath")
    public Result chooseTechFath(Integer type) {
        return Result.success(technicalModelService.chooseTechFath(type));
    }

    @ApiOperation(value = "新增技术指标维护-->选择项目父类")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "工艺路线id", dataTypeClass = Integer.class, required = true)
    })
    @GetMapping("/chooseProFath")
    public Result chooseProFath(Integer id) {
        return Result.success(technicalModelService.chooseProFath(id));
    }

    @ApiOperation(value = "新增技术指标维护")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "工艺路线id", dataTypeClass = Integer.class, required = true)
    })
    @PostMapping("/addTechMode")
    public Result addTechMode(Integer id, @Validated @RequestBody TechnicalModelDto technicalModelDto) {
        technicalModelService.addTechMode(id, technicalModelDto);
        return Result.success("新增成功!");
    }

    @ApiOperation(value = "根据id查询详情")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "技术指标id", dataTypeClass = Integer.class,required = true)
    })
    @GetMapping("/selecTechById")
    public Result selecTechById(Integer id) {
        return Result.success(technicalModelService.selecTechById(id));
    }

    @ApiOperation(value = "编辑")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "技术指标id", dataTypeClass = Integer.class,required = true)
    })
    @PostMapping("/writeTechById")
    public Result writeTechById(Integer id,@Validated @RequestBody TechnicalModelDto technicalModelDto) {
        technicalModelService.writeTechById(id,technicalModelDto);
        return Result.success("修改"+id+"成功!");
    }

    @ApiOperation(value = "删除")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "技术指标id", dataTypeClass = Integer.class,required = true)
    })
    @PostMapping("/delTechById")
    public Result delTechById(Integer id) {
        technicalModelService.delTechById(id);
        return Result.success("删除"+id+"成功!");
    }

    @ApiOperation(value = "批量删除")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "ids", value = "技术指标id", dataTypeClass = String.class,required = true)
    })
    @PostMapping("/delAllTech")
    public Result delAllTech(String ids) {
        technicalModelService.delAllTech(ids);
        return Result.success("批量删除成功!");
    }

}


 base-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java

@@ -28,7 +28,7 @@
 * @author zss
 * @since 2023-08-18 16:59:14
 */
@Api(tags = "基础数据-->工艺路线维护表接口")
@Api(tags = "基础数据-->工艺路线维护")
@RestController
@RequestMapping("/technologyTemplate")
public class TechnologyTemplateController {
@@ -43,62 +43,76 @@
        return Result.success(technologyTemplateService.chooseDevGroup());
    }

    @ApiOperation(value = "新增工艺路线维护-->选择工序")
    @GetMapping("/chooseTech")
    public Result chooseTech() {
        return Result.success(technologyTemplateService.chooseTech());
    }

    @ApiOperation(value = "新增工艺路线维护-->选择元件")
    @GetMapping("/chooseElement")
    public Result chooseElement() {
        return Result.success(technologyTemplateService.chooseElement());
    }

    @ApiOperation(value = "新增工艺路线维护")
    @PostMapping("/addTechTemp")
    public Result addSale(@Validated @RequestBody TechnologyTemplateDto technologyTemplateDto) {
        technologyTemplateService.addSale(technologyTemplateDto);
    public Result addTechTemp(@Validated @RequestBody TechnologyTemplateDto technologyTemplateDto) {
        technologyTemplateService.addTechTemp(technologyTemplateDto);
        return Result.success("新增成功!");
    }

    @ApiOperation(value = "查询工艺路线列表")
    @ApiOperation(value = "查询工艺路线列表-->左边二级展示")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "pageSize", value = "页数", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "countSize", value = "条数/页", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "type", value = "类型", dataTypeClass = Integer.class),
            @ApiImplicitParam(name = "name", value = "工艺", dataTypeClass = String.class),
            @ApiImplicitParam(name = "father", value = "工序", dataTypeClass = String.class)
            @ApiImplicitParam(name = "type", value = "类型(为空=0橡胶连接器)", dataTypeClass = Integer.class,required = true),
            @ApiImplicitParam(name = "message", value = "搜索内容", dataTypeClass = String.class)
    })
    @GetMapping("/selectAllTechTem")
    public Result selectAllTechTem(int pageSize, int countSize, Integer type, String name, String father) {
        IPage<Map<String, Object>> technologyTemplatePage = technologyTemplateService.selectAllTechTem(new Page<Object>(pageSize, countSize), type, name, father);
        Map<String, Object> map = new HashMap<>();
        map.put("total", technologyTemplatePage.getTotal());
        map.put("row", technologyTemplatePage.getRecords());
        return Result.success(map);
    public Result selectAllTechTem(Integer type,String message) {
        return Result.success(technologyTemplateService.selectAllTechTem(type,message));
    }

    @ApiOperation(value = "查询工艺路线列表-->右边展示工艺和设备")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "father", value = "工序(父类)", dataTypeClass = String.class,required = true)
    })
    @GetMapping("/selectAllTechNam")
    public Result selectAllTechNam(String father) {
        return Result.success(technologyTemplateService.selectAllTechNam(father));
    }

    @ApiOperation(value = "根据id查询详情")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "工艺id", dataTypeClass = Integer.class,required = true)
            @ApiImplicitParam(name = "id", value = "工艺路线id", dataTypeClass = Integer.class,required = true)
    })
    @GetMapping("/selecTechById")
    public Result selecTechById(Integer id) {
        return Result.success(technologyTemplateService.getById(id));
        return Result.success(technologyTemplateService.selecTechById(id));
    }

    @ApiOperation(value = "编辑")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "工艺id", dataTypeClass = Integer.class,required = true)
            @ApiImplicitParam(name = "id", value = "工艺路线id", dataTypeClass = Integer.class,required = true)
    })
    @PostMapping("/writeTechById")
    public Result writeTechById(Integer id,@RequestBody TechnologyTemplateDto technologyTemplateDto) {
    public Result writeTechById(Integer id,@Validated @RequestBody TechnologyTemplateDto technologyTemplateDto) {
        technologyTemplateService.writeTechById(id,technologyTemplateDto);
        return Result.success("修改成功!");
        return Result.success("修改"+id+"成功!");
    }

    @ApiOperation(value = "删除")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "工艺id", dataTypeClass = Integer.class,required = true)
            @ApiImplicitParam(name = "id", value = "工艺路线id", dataTypeClass = Integer.class,required = true)
    })
    @PostMapping("/delTechById")
    public Result delTechById(Integer id) {
        technologyTemplateService.delTechById(id);
        return Result.success("删除成功!");
        return Result.success("删除"+id+"成功!");
    }

    @ApiOperation(value = "批量删除")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "ids", value = "工艺id", dataTypeClass = String.class,required = true)
            @ApiImplicitParam(name = "ids", value = "工艺路线id", dataTypeClass = String.class,required = true)
    })
    @PostMapping("/delAllTech")
    public Result delAllTech(String ids) {

 base-server/src/main/java/com/yuanchu/mom/mapper/ElementMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package com.yuanchu.mom.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.mom.pojo.Element;

import java.util.List;
import java.util.Map;

/**
 * å…ƒä»¶è¡¨(Element)表数据库访问层
 *
 * @author zss
 * @since 2023-08-28 10:48:45
 */
public interface ElementMapper extends BaseMapper<Element> {

    //新增工艺路线-->选择元件
    List<Map<String,Object>> chooseElement();
}


 base-server/src/main/java/com/yuanchu/mom/mapper/ElementTechnologyMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
package com.yuanchu.mom.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.mom.pojo.ElementTechnology;

import java.util.List;

/**
 * å…ƒä»¶å·¥è‰ºä¸­é—´è¡¨(ElementTechnology)表数据库访问层
 *
 * @author zss
 * @since 2023-08-28 10:49:07
 */
public interface ElementTechnologyMapper extends BaseMapper<ElementTechnology> {

    //删除中间表(根据工序id)
    void delElemaByTechsId(Integer id);

    //批量删除中间表(根据工序id)
    void delAllByTechId(String ids);
}


 base-server/src/main/java/com/yuanchu/mom/mapper/TechnicalModelMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,42 @@
package com.yuanchu.mom.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.mom.pojo.TechnicalModel;

import java.util.List;
import java.util.Map;


/**
 * æŠ€æœ¯æŒ‡æ ‡ç»´æŠ¤è¡¨(TechnicalModel)表数据库访问层
 *
 * @author zss
 * @since 2023-08-28 16:09:19
 */
public interface TechnicalModelMapper extends BaseMapper<TechnicalModel> {

    //查询技术指标维护列表-->左边二级展示工序和工艺
    List<Map<String, Object>> selectAllTechTem(Integer type, String message);

    //查询技术指标维护列表-->右边展示该工艺下的检验项目
    List<Map<String, Object>> selectAllTechNam(Integer id);

    //新增技术指标维护-->选择工序和工艺
    List<Map<String,Object>> chooseTechFath(Integer type);

    //新增技术指标维护-->选择项目父类
    List<String> chooseProFath(Integer id);

    //根据id查询详情
    List<Map<String, Object>> selecTechById(Integer id);

    //批量删除根据技术指标id
    void delAllTech(String ids);

    //删除根据工艺路线id
    void delTeMoByTechId(Integer id);

    //批量删除根据工艺路线id
    void delAllByTechId(String ids);
}


 base-server/src/main/java/com/yuanchu/mom/mapper/TechnologyTemplateMapper.java

@@ -16,10 +16,29 @@
 */
public interface TechnologyTemplateMapper extends BaseMapper<TechnologyTemplate> {

    //查询工艺路线列表
    IPage<Map<String, Object>> selectAllTechTem(Page<Object> page, Integer type, String name, String father);
    //新增工艺路线-->选择工序
    List<String> chooseTech();

    //查询工艺路线列表-->左边二级展示
    List<Map<String,Object>> selectAllTechTem(Integer type,String message);

    //查询工艺路线列表-->右边展示工艺和设备
    List<Map<String, Object>> selectAllTechNam(String father);

    /**
     * æ ¹æ®id查看详情
     * @param id å·¥è‰ºid
     * @return
     */
    List<Map<String, Object>> selecTechById(Integer id);


    //批量删除
    void delAllTech(String ids);





}


 base-server/src/main/java/com/yuanchu/mom/pojo/Element.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,55 @@
package com.yuanchu.mom.pojo;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;
import java.io.Serializable;

/**
 * å…ƒä»¶è¡¨(Element)表实体类
 *
 * @author zss
 * @since 2023-08-28 10:48:45
 */
@Data
@Accessors(chain = true)
@AllArgsConstructor
@NoArgsConstructor
@EqualsAndHashCode(callSuper = false)
@TableName("element")
public class Element implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
     * id
     **/
    @TableId(type = IdType.AUTO)
    private Integer id;

    /**
     * å…ƒä»¶åç§°
     **/
    private String name;

    @ApiModelProperty(value = "逻辑删除 æ­£å¸¸>=1,删除<=0", hidden = true)
    private Integer state;

    @TableField(fill = FieldFill.INSERT)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date createTime;

    @TableField(fill = FieldFill.INSERT_UPDATE)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date updateTime;
}


 base-server/src/main/java/com/yuanchu/mom/pojo/ElementTechnology.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,62 @@
package com.yuanchu.mom.pojo;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;
import java.io.Serializable;

/**
 * å…ƒä»¶å·¥è‰ºä¸­é—´è¡¨(ElementTechnology)表实体类
 *
 * @author zss
 * @since 2023-08-28 10:49:07
 */
@Data
@Accessors(chain = true)
@AllArgsConstructor
@NoArgsConstructor
@EqualsAndHashCode(callSuper = false)
@TableName("element_technology")
public class ElementTechnology implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
     * id
     **/
    @TableId(type = IdType.AUTO)
    private Integer id;

    /**
     * å…³è” å·¥è‰ºid
     **/
    private Integer techTemId;


    /**
     * å…³è” å…ƒä»¶id
     **/
    private Integer elementId;


    @ApiModelProperty(value = "逻辑删除 æ­£å¸¸>=1,删除<=0", hidden = true)
    private Integer state;

    @TableField(fill = FieldFill.INSERT)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date createTime;

    @TableField(fill = FieldFill.INSERT_UPDATE)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date updateTime;
}


 base-server/src/main/java/com/yuanchu/mom/pojo/TechnicalModel.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,70 @@
package com.yuanchu.mom.pojo;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;
import java.io.Serializable;

/**
 * æŠ€æœ¯æŒ‡æ ‡ç»´æŠ¤è¡¨(TechnicalModel)表实体类
 *
 * @author zss
 * @since 2023-08-28 16:09:19
 */
@Data
@Accessors(chain = true)
@AllArgsConstructor
@NoArgsConstructor
@EqualsAndHashCode(callSuper = false)
@TableName("technical_model")
public class TechnicalModel implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
     * id
     **/
    @TableId(type = IdType.AUTO)
    private Integer id;

    /**
     * å…³è” å·¥è‰ºid
     **/
    private Integer techTemId;

    /**
     * é¡¹ç›®çˆ¶ç±»
     **/
    private String father;

    /**
     * é¡¹ç›®åç§°
     **/
    private String name;

    /**
     * å•ä½
     **/
    private String unit;

    @ApiModelProperty(value = "逻辑删除 æ­£å¸¸>=1,删除<=0", hidden = true)
    private Integer state;

    @TableField(fill = FieldFill.INSERT)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date createTime;

    @TableField(fill = FieldFill.INSERT_UPDATE)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date updateTime;
}


 base-server/src/main/java/com/yuanchu/mom/pojo/TechnologyTemplate.java

@@ -62,10 +62,6 @@
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date updateTime;

    /**
     * å…ƒä»¶0:插头1:插件
     **/
    private String element;

    /**
     * è®¾å¤‡ç»„

 base-server/src/main/java/com/yuanchu/mom/pojo/dto/TechnicalModelDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,37 @@
package com.yuanchu.mom.pojo.dto;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Data;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;

@Data
//新增技术指标维护参数
public class TechnicalModelDto {


    @JsonSerialize
    @NotNull(message = "类型不能为空")
    private Integer type;

    @JsonSerialize
    @NotBlank(message = "工序不能为空")
    private String TechFather;

    @JsonSerialize
    @NotBlank(message = "工艺不能为空")
    private String TechName;

    @JsonSerialize
    @NotBlank(message = "项目父类不能为空")
    private String father;

    @JsonSerialize
    @NotBlank(message = "项目不能为空")
    private String name;

    @JsonSerialize
    @NotBlank(message = "单位不能为空")
    private String unit;
}

 base-server/src/main/java/com/yuanchu/mom/pojo/dto/TechnologyTemplateDto.java

@@ -23,8 +23,8 @@
    private String name;

    @JsonSerialize
    @NotBlank(message = "元件不能为空")
    private String element;
    @NotBlank(message = "元件id不能为空")
    private String elementId;

    @JsonSerialize
    @NotBlank(message = "设备组不能为空")

 base-server/src/main/java/com/yuanchu/mom/service/ElementService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
package com.yuanchu.mom.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.pojo.Element;

/**
 * å…ƒä»¶è¡¨(Element)表服务接口
 *
 * @author zss
 * @since 2023-08-28 10:48:45
 */
public interface ElementService extends IService<Element> {

}


 base-server/src/main/java/com/yuanchu/mom/service/ElementTechnologyService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
package com.yuanchu.mom.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.pojo.ElementTechnology;

import java.util.List;

/**
 * å…ƒä»¶å·¥è‰ºä¸­é—´è¡¨(ElementTechnology)表服务接口
 *
 * @author zss
 * @since 2023-08-28 10:49:07
 */
public interface ElementTechnologyService extends IService<ElementTechnology> {

    //删除中间表(根据工序id)
    void delElemaByTechsId(Integer id);

    //批量删除中间表(根据工序id)
    void delAllByTechId(String ids);
}


 base-server/src/main/java/com/yuanchu/mom/service/TechnicalModelService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,82 @@
package com.yuanchu.mom.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.pojo.TechnicalModel;
import com.yuanchu.mom.pojo.dto.TechnicalModelDto;

import java.util.List;
import java.util.Map;

/**
 * æŠ€æœ¯æŒ‡æ ‡ç»´æŠ¤è¡¨(TechnicalModel)表服务接口
 *
 * @author zss
 * @since 2023-08-28 16:09:19
 */
public interface TechnicalModelService extends IService<TechnicalModel> {

    /**
     * æŸ¥è¯¢æŠ€æœ¯æŒ‡æ ‡ç»´æŠ¤åˆ—表-->左边二级展示工序和工艺
     *
     * @param type
     * @param message
     * @return
     */
    List<Map<String, Object>> selectAllTechTem(Integer type, String message);

    /**
     * æŸ¥è¯¢æŠ€æœ¯æŒ‡æ ‡ç»´æŠ¤åˆ—表-->右边展示该工艺下的检验项目
     *
     * @param id å·¥è‰ºid
     * @return
     */
    List<Map<String, Object>> selectAllTechNam(Integer id);

    /**
     * æ–°å¢žæŠ€æœ¯æŒ‡æ ‡ç»´æŠ¤-->选择工序和工艺
     *
     * @return
     */
    List<Map<String, Object>> chooseTechFath(Integer type);

    /**
     * æ–°å¢žæŠ€æœ¯æŒ‡æ ‡ç»´æŠ¤-->选择项目(父类)
     *
     * @return
     */
    List<String> chooseProFath(Integer id);

    /**
     * æ–°å¢žæŠ€æœ¯æŒ‡æ ‡ç»´æŠ¤
     *
     * @param technicalModelDto
     */
    void addTechMode(Integer id, TechnicalModelDto technicalModelDto);

    /**
     * æ ¹æ®id查询详情
     * @param id æŠ€æœ¯æŒ‡æ ‡id
     * @return
     */
    List<Map<String,Object>> selecTechById(Integer id);

    /**
     * ç¼–辑
     * @param id
     * @param technicalModelDto
     */
    void writeTechById(Integer id, TechnicalModelDto technicalModelDto);

    /**
     * åˆ é™¤
     * @param id
     */
    void delTechById(Integer id);

    /**
     * æ‰¹é‡åˆ é™¤
     * @param ids
     */
    void delAllTech(String ids);
}


 base-server/src/main/java/com/yuanchu/mom/service/TechnologyTemplateService.java

@@ -18,26 +18,49 @@
public interface TechnologyTemplateService extends IService<TechnologyTemplate> {

    /**
     * é€‰æ‹©è®¾å¤‡ç»„
     * æ–°å¢žå·¥è‰ºè·¯çº¿-->选择设备组
     * @return
     */
    List<Map<String,Object>> chooseDevGroup();

    /**
     *新增工艺路线-->选择工序
     * @return
     */
    List<String> chooseTech();

    /**
     * æ–°å¢žå·¥è‰ºè·¯çº¿-->选择元件
     * @return
     */
    List<Map<String,Object>> chooseElement();

    /**
     * æ–°å¢žå·¥è‰ºè·¯çº¿
     * @param technologyTemplateDto
     */
    void addSale(TechnologyTemplateDto technologyTemplateDto);
    void addTechTemp(TechnologyTemplateDto technologyTemplateDto);

    /**
     * æŸ¥è¯¢å·¥è‰ºè·¯çº¿åˆ—表
     * @param page
     * æŸ¥è¯¢å·¥è‰ºè·¯çº¿åˆ—表-->左边二级展示
     * @param type
     * @param name
     * @return
     */
    List<Map<String,Object>> selectAllTechTem(Integer type,String message);

    /**
     * æŸ¥è¯¢å·¥è‰ºè·¯çº¿åˆ—表-->右边展示工艺和设备
     * @param father
     * @return
     */
    IPage<Map<String, Object>> selectAllTechTem(Page<Object> page, Integer type, String name, String father);
    List<Map<String,Object>> selectAllTechNam(String father);

    /**
     * æ ¹æ®id查询详情
     * @param id å·¥è‰ºid
     * @return
     */
    List<Map<String,Object>> selecTechById(Integer id);


    /**
@@ -49,7 +72,7 @@

    /**
     * åˆ é™¤
     * @param id
     * @param id å·¥è‰ºè·¯çº¿id
     */
    void delTechById(Integer id);

@@ -58,5 +81,7 @@
     * @param ids
     */
    void delAllTech(String ids);


}


 base-server/src/main/java/com/yuanchu/mom/service/impl/ElementServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package com.yuanchu.mom.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.ElementMapper;
import com.yuanchu.mom.pojo.Element;
import com.yuanchu.mom.service.ElementService;
import org.springframework.stereotype.Service;

/**
 * å…ƒä»¶è¡¨(Element)表服务实现类
 *
 * @author zss
 * @since 2023-08-28 10:48:45
 */
@Service
public class ElementServiceImpl extends ServiceImpl<ElementMapper, Element> implements ElementService {

}


 base-server/src/main/java/com/yuanchu/mom/service/impl/ElementTechnologyServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,36 @@
package com.yuanchu.mom.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.ElementTechnologyMapper;
import com.yuanchu.mom.pojo.ElementTechnology;
import com.yuanchu.mom.service.ElementTechnologyService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;

/**
 * å…ƒä»¶å·¥è‰ºä¸­é—´è¡¨(ElementTechnology)表服务实现类
 *
 * @author zss
 * @since 2023-08-28 10:49:07
 */
@Service
public class ElementTechnologyServiceImpl extends ServiceImpl<ElementTechnologyMapper, ElementTechnology> implements ElementTechnologyService {

    @Resource
    ElementTechnologyMapper elementTechnologyMapper;

    //删除中间表(根据工序id)
    @Override
    public void delElemaByTechsId(Integer id) {
        elementTechnologyMapper.delElemaByTechsId(id);
    }

    //批量删除中间表(根据工序id)
    @Override
    public void delAllByTechId(String ids) {
        elementTechnologyMapper.delAllByTechId(ids);
    }
}


 base-server/src/main/java/com/yuanchu/mom/service/impl/TechnicalModelServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,91 @@
package com.yuanchu.mom.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.TechnicalModelMapper;
import com.yuanchu.mom.pojo.TechnicalModel;
import com.yuanchu.mom.pojo.dto.TechnicalModelDto;
import com.yuanchu.mom.service.TechnicalModelService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;
import java.util.Map;

/**
 * æŠ€æœ¯æŒ‡æ ‡ç»´æŠ¤è¡¨(TechnicalModel)表服务实现类
 *
 * @author zss
 * @since 2023-08-28 16:09:19
 */
@Service
public class TechnicalModelServiceImpl extends ServiceImpl<TechnicalModelMapper, TechnicalModel> implements TechnicalModelService {

    @Resource
    TechnicalModelMapper technicalModelMapper;

    //查询技术指标维护列表-->左边二级展示工序和工艺
    @Override
    public List<Map<String, Object>> selectAllTechTem(Integer type, String message) {
        return technicalModelMapper.selectAllTechTem(type, message);
    }

    //查询技术指标维护列表-->右边展示该工艺下的检验项目
    @Override
    public List<Map<String, Object>> selectAllTechNam(Integer id) {
        return technicalModelMapper.selectAllTechNam(id);
    }

    //新增技术指标维护-->选择工序和工艺
    @Override
    public List<Map<String, Object>> chooseTechFath(Integer type) {
        return technicalModelMapper.chooseTechFath(type);
    }


    //新增技术指标维护-->选择项目父类
    @Override
    public List<String> chooseProFath(Integer id) {
        return technicalModelMapper.chooseProFath(id);
    }

    //新增技术指标维护
    @Override
    public void addTechMode(Integer id, TechnicalModelDto technicalModelDto) {
        TechnicalModel technicalModel = new TechnicalModel();
        BeanUtils.copyProperties(technicalModelDto, technicalModel);
        technicalModel.setTechTemId(id);
        technicalModelMapper.insert(technicalModel);
    }

    //根据id查询详情
    @Override
    public List<Map<String, Object>> selecTechById(Integer id) {
        return technicalModelMapper.selecTechById(id);
    }

    //编辑
    @Override
    public void writeTechById(Integer id, TechnicalModelDto technicalModelDto) {
        TechnicalModel technicalModel = new TechnicalModel();
        BeanUtils.copyProperties(technicalModelDto, technicalModel);
        technicalModel.setId(id);
        technicalModelMapper.updateById(technicalModel);
    }

    //删除
    @Override
    public void delTechById(Integer id) {
        TechnicalModel technicalModel = new TechnicalModel();
        technicalModel.setState(0);
        technicalModel.setId(id);
        technicalModelMapper.updateById(technicalModel);
    }

    //批量删除
    @Override
    public void delAllTech(String ids) {
        technicalModelMapper.delAllTech(ids);
    }
}


 base-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java

@@ -1,19 +1,25 @@
package com.yuanchu.mom.service.impl;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.DeviceMapper;
import com.yuanchu.mom.mapper.TechnologyTemplateMapper;
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.ElementTechnology;
import com.yuanchu.mom.pojo.TechnologyTemplate;
import com.yuanchu.mom.pojo.dto.TechnologyTemplateDto;
import com.yuanchu.mom.service.ElementTechnologyService;
import com.yuanchu.mom.service.TechnologyTemplateService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * å·¥è‰ºè·¯çº¿ç»´æŠ¤è¡¨(TechnologyTemplate)表服务实现类
@@ -30,48 +36,119 @@
    @Resource
    DeviceMapper deviceMapper;

    @Resource
    ElementMapper elementMapper;

    //选择设备组
    @Resource
    ElementTechnologyService elementTechnologyService;

    @Resource
    TechnicalModelMapper technicalModelMapper;


    //新增工艺路线-->选择设备组
    @Override
    public List<Map<String, Object>> chooseDevGroup() {
        return deviceMapper.chooseDevGroup();
    }

    //新增工艺路线-->选择工序
    @Override
    public List<String> chooseTech() {
        return technologyTemplateMapper.chooseTech();
    }

    //新增工艺路线-->选择元件
    @Override
    public List<Map<String, Object>> chooseElement() {
        return elementMapper.chooseElement();
    }

    //新增工艺路线
    @Override
    public void addSale(TechnologyTemplateDto technologyTemplateDto) {
    @Transactional(rollbackFor = Exception.class)
    public void addTechTemp(TechnologyTemplateDto technologyTemplateDto) {
        /*新增工艺*/
        TechnologyTemplate technologyTemplate = new TechnologyTemplate();
        BeanUtils.copyProperties(technologyTemplateDto,technologyTemplate);
        BeanUtils.copyProperties(technologyTemplateDto, technologyTemplate);
        technologyTemplateMapper.insert(technologyTemplate);
        /*新增工艺元件中间表*/
        String[] split = technologyTemplateDto.getElementId().split(",");
        List<ElementTechnology> elementTechnologies = Arrays.stream(split).map(s -> {
            ElementTechnology elementTechnology = new ElementTechnology();
            elementTechnology.setTechTemId(technologyTemplate.getId());
            elementTechnology.setElementId(Integer.parseInt(s));
            return elementTechnology;
        }).collect(Collectors.toList());
        elementTechnologyService.saveBatch(elementTechnologies);
    }

    //查询工艺路线列表
    //查询工艺路线列表-->左边二级展示
    @Override
    public IPage<Map<String, Object>> selectAllTechTem(Page<Object> page, Integer type, String name, String father) {
        return technologyTemplateMapper.selectAllTechTem(page,type,name,father);
    public List<Map<String, Object>> selectAllTechTem(Integer type, String message) {
        return technologyTemplateMapper.selectAllTechTem(type, message);
    }

    //编辑
    //查询工艺路线列表-->右边展示工艺和设备
    @Override
    public List<Map<String, Object>> selectAllTechNam(String father) {
        return technologyTemplateMapper.selectAllTechNam(father);
    }

    //根据id查看详情
    @Override
    public List<Map<String, Object>> selecTechById(Integer id) {
        return technologyTemplateMapper.selecTechById(id);
    }

    //编辑 (工艺id)
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void writeTechById(Integer id, TechnologyTemplateDto technologyTemplateDto) {
        /*工艺表更新*/
        TechnologyTemplate technologyTemplate = new TechnologyTemplate();
        BeanUtils.copyProperties(technologyTemplateDto,technologyTemplate);
        BeanUtils.copyProperties(technologyTemplateDto, technologyTemplate);
        technologyTemplate.setId(id);
        technologyTemplateMapper.updateById(technologyTemplate);
        /*更改中间表*/
        //批量删除原有的中间表(根据工序id)
        elementTechnologyService.delElemaByTechsId(id);
        //批量添加中间表
        String[] split = technologyTemplateDto.getElementId().split(",");
        List<ElementTechnology> elementTechnologies = Arrays.stream(split).map(s -> {
            ElementTechnology elementTechnology = new ElementTechnology();
            elementTechnology.setTechTemId(technologyTemplate.getId());
            elementTechnology.setElementId(Integer.parseInt(s));
            return elementTechnology;
        }).collect(Collectors.toList());
        elementTechnologyService.saveBatch(elementTechnologies);
    }

    //删除
    //删除(工艺路线id)
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void delTechById(Integer id) {
        //删除工艺表
        TechnologyTemplate technologyTemplate = new TechnologyTemplate();
        technologyTemplate.setId(id).setState(0);
        technologyTemplateMapper.updateById(technologyTemplate);
        //删除中间表
        elementTechnologyService.delElemaByTechsId(id);
        //删除技术指标维护表
        technicalModelMapper.delTeMoByTechId(id);
        //todo:删除未完待续
    }

    //批量删除
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void delAllTech(String ids) {
        //批量删除工艺表
        technologyTemplateMapper.delAllTech(ids);
        //批量删除中间表
        elementTechnologyService.delAllByTechId(ids);
        //批量删除指标维护表
        technicalModelMapper.delAllByTechId(ids);
    }
}


 base-server/src/main/resources/mapper/ElementMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
<?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.yuanchu.mom.mapper.ElementMapper">
    <!--新增工艺路线 é€‰æ‹©å…ƒä»¶-->
    <select id="chooseElement" resultType="java.util.Map">
        select id, name
        from mom_ocean.element
        where state=1
    </select>
</mapper>

 base-server/src/main/resources/mapper/ElementTechnologyMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
<?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.yuanchu.mom.mapper.ElementTechnologyMapper">
    <!--删除中间表(根据工序id)-->
    <update id="delElemaByTechsId">
        update mom_ocean.element_technology
        set state=0
        where tech_tem_id = #{id}
    </update>

    <!--批量删除中间表(根据工序id)-->
    <update id="delAllByTechId">
        update mom_ocean.element_technology
        set state=0
        where tech_tem_id in (${id})
    </update>
</mapper>

 base-server/src/main/resources/mapper/TechnicalModelMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,106 @@
<?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.yuanchu.mom.mapper.TechnicalModelMapper">
    <!--查询技术指标维护列表 å·¦è¾¹äºŒçº§å±•ç¤ºå·¥åºå’Œå·¥è‰º  -->
    <resultMap id="selectAllTechTemMap" type="map">
        <id property="father" column="father"/>
        <collection property="children" resultMap="selectAllTechTemTowMap" javaType="List"/>
    </resultMap>
    <resultMap id="selectAllTechTemTowMap" type="map">
        <id property="id" column="id"/>
        <result property="name" column="name"/>
    </resultMap>
    <select id="selectAllTechTem" resultMap="selectAllTechTemMap">
        select id,
        name,
        father
        from mom_ocean.technology_template
        where state=1
        and type=#{type}
        <if test="message!=null and message!=''">
            and name like concat('%',#{message},'%')
        </if>
    </select>

    <!--查询技术指标维护列表 å³è¾¹å±•ç¤ºè¯¥å·¥è‰ºä¸‹çš„检验项目-->
    <resultMap id="selectAllTechNamMap" type="map">
        <id property="father" column="father"/>
        <collection property="children" resultMap="selectAllTechNamTowMap" javaType="List"/>
    </resultMap>
    <resultMap id="selectAllTechNamTowMap" type="map">
        <id property="id" column="id"/>
        <result property="name" column="name"/>
        <result property="unit" column="unit"/>
    </resultMap>
    <select id="selectAllTechNam" resultMap="selectAllTechNamMap">
        select id,
               father,
               name,
               unit
        from mom_ocean.technical_model
        where state = 1
          and tech_tem_id = #{id}
    </select>

    <!--新增技术指标维护 é€‰æ‹©å·¥åºå’Œå·¥è‰º-->
    <resultMap id="chooseTechFathMap" type="map">
        <id property="techFather" column="techFather"/>
        <collection property="children" resultMap="chooseTechFathTowMap" javaType="List"/>
    </resultMap>
    <resultMap id="chooseTechFathTowMap" type="map">
        <id property="id" column="id"/>
        <result property="techName" column="techName"/>
    </resultMap>
    <select id="chooseTechFath" resultMap="chooseTechFathMap">
        select id,
               name   techName,
               father techFather
        from mom_ocean.technology_template
        where state = 1
          and type = #{type}
    </select>

    <!--新增技术指标维护 é€‰æ‹©é¡¹ç›®çˆ¶ç±»-->
    <select id="chooseProFath" resultType="java.lang.String">
        select distinct father
        from mom_ocean.technical_model
        where state = 1
          and tech_tem_id = #{id}
    </select>

    <!--根据id查询详情-->
    <select id="selecTechById" resultType="java.util.Map">
        select technical_model.father,
               technical_model.name,
               unit,
               technology_template.name   techName,
               technology_template.father techFather,
               type
        from mom_ocean.technical_model,
             mom_ocean.technology_template
        where technical_model.state = 1
          and technology_template.id = tech_tem_id
          and technical_model.id = #{id}
    </select>

    <!--批量删除根据技术指标id-->
    <update id="delAllTech">
        update mom_ocean.technical_model
        set state=0
        where id in (${ids})
    </update>

    <!--删除根据工艺路线id-->
    <update id="delTeMoByTechId">
        update mom_ocean.technical_model
            set state=0
        where tech_tem_id=#{id}
    </update>

    <!--批量删除根据工艺路线id-->
    <update id="delAllByTechId">
        update mom_ocean.technical_model
        set state=0
        where tech_tem_id in (${ids})
    </update>
</mapper>

 base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml

@@ -6,22 +6,70 @@
        set state=0
        where id in (${ids})
    </update>
    <select id="selectAllTechTem" resultType="java.util.Map">

    <!--查询工艺路线列表  å·¦è¾¹äºŒçº§å±•ç¤º-->
    <resultMap id="selectAllTechTemMap" type="map">
        <id property="elname" column="elname"/>
        <collection property="children" resultMap="selectAllTechTemTowMap" javaType="List"/>
    </resultMap>
    <resultMap id="selectAllTechTemTowMap" type="map">
        <result property="father" column="father"/>
    </resultMap>
    <select id="selectAllTechTem" resultMap="selectAllTechTemMap">
        select e.name elname,
        father
        from mom_ocean.technology_template t,
        mom_ocean.element e,
        mom_ocean.element_technology et
        where e.id = et.element_id
        and t.id = tech_tem_id
        and t.state = 1
        and type=#{type}
        <if test="message!=null and message!=''">
            and father like concat('%',#{message},'%')
        </if>
    </select>

    <!--查询工艺路线列表 å³è¾¹å±•ç¤ºå·¥è‰ºå’Œè®¾å¤‡-->
    <select id="selectAllTechNam" resultType="java.util.Map">
        select id,
        name,
        father,
        element,
        device_group
               name,
               device_group
        from mom_ocean.technology_template
        where state=1
        <if test="type!=null">
            and type=#{type}
        </if>
        <if test="name!=null and name!=''">
            and name like concat('%',#{name},'%')
        </if>
        <if test="father!=null and father!=''">
            and father like concat('%',#{father},'%')
        </if>
        where state = 1
          and father = #{father}
    </select>

    <!--新增工艺路线 é€‰æ‹©å·¥åº-->
    <select id="chooseTech" resultType="java.lang.String">
        select distinct father
        from mom_ocean.technology_template
        where state = 1
    </select>

    <!--根据id查看详情-->
    <resultMap id="selecTechByIdMap" type="map">
        <id property="type" column="type"/>
        <result property="father" column="father"/>
        <result property="name" column="name"/>
        <result property="deviceGroup" column="device_group"/>
        <collection property="children" resultMap="selecTechByIdsMap" javaType="List"/>
    </resultMap>
    <resultMap id="selecTechByIdsMap" type="map">
        <id property="id" column="id"/>
    </resultMap>
    <select id="selecTechById" resultMap="selecTechByIdMap">
        select e.id,
               father,
               t.name,
               type,
               device_group
        from mom_ocean.technology_template t,
             mom_ocean.element e,
             mom_ocean.element_technology et
        where e.id = et.element_id
          and t.id = tech_tem_id
          and t.state = 1
          and t.id = #{id}
    </select>
</mapper>

 inspect-server/src/main/java/com/yuanchu/mom/pojo/StatisticsData.java

@@ -3,6 +3,8 @@

import lombok.Data;

import java.math.BigDecimal;

@Data
public class StatisticsData {
  private int material;  //原材料合格
@@ -11,6 +13,12 @@
  private int unmaterial;  //原材料不合格
  private int unprocess;   //过程不合格
  private int unfinished;  //成品不合格
  /*private BigDecimal imaterial;  //原材料合格率
  private BigDecimal iprocess;   //过程合格率
  private BigDecimal ifinished;  //成品合格率
  private BigDecimal iunmaterial;  //原材料不合格率
  private BigDecimal iunprocess;   //过程不合格率
  private BigDecimal iunfinished;  //成品不合格率*/




 inspect-server/src/main/java/com/yuanchu/mom/service/impl/ResportServiceImpl.java

@@ -12,6 +12,7 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
@@ -141,4 +142,16 @@
                .finishedList(StringUtils.join(finishedList, ','))
                .build();
    }


    /*计算百分比*/
    private BigDecimal getRadio(Integer all, Long num) {
        if (all.intValue() == 0) {
            return new BigDecimal(0);
        }
        BigDecimal numBigDecimal = new BigDecimal(num);
        BigDecimal allBigDecimal = new BigDecimal(all);
        BigDecimal divide = numBigDecimal.divide(allBigDecimal, 4, BigDecimal.ROUND_HALF_UP);
        return divide.multiply(new BigDecimal(100));
    }
}

 inventory-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java

@@ -58,7 +58,7 @@
    @PostMapping("/compile")
    public Result compile(Integer id) {
        ordersService.compile(id);
        return Result.success("编制完成!");
        return Result.success("编制产品"+id+"完成!");
    }

}

 inventory-server/src/main/java/com/yuanchu/mom/service/impl/OrdersServiceImpl.java

@@ -3,15 +3,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.*;
import com.yuanchu.mom.service.ManufactureOrderService;
import com.yuanchu.mom.service.OrdersService;
import com.yuanchu.mom.utils.MyUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.List;
import java.util.Map;