Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-28 5f72ddd4ca8a10d5dcb4e1ab79463593317ffbe6

Merge remote-tracking branch 'origin/master'

 base-server/pom.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <artifactId>mom</artifactId>
        <groupId>com.yuanchu.mom</groupId>
        <version>1.0.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>base-server</artifactId>

    <properties>
        <maven.compiler.source>8</maven.compiler.source>
        <maven.compiler.target>8</maven.compiler.target>
    </properties>

    <dependencies>
        <dependency>
            <groupId>com.yuanchu.mom</groupId>
            <artifactId>framework</artifactId>
            <version>0.0.1-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.yuanchu.mom</groupId>
            <artifactId>user-server</artifactId>
            <version>0.0.1-SNAPSHOT</version>
        </dependency>

        <dependency>
            <groupId>com.yuanchu.mom</groupId>
            <artifactId>standard-server</artifactId>
            <version>0.0.1-SNAPSHOT</version>
        </dependency>
    </dependencies>

</project>

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

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


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.dto.TechnologyTemplateDto;
import com.yuanchu.mom.service.DeviceService;
import com.yuanchu.mom.utils.JackSonUtil;
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.TechnologyTemplateService;

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


/**
 * å·¥è‰ºè·¯çº¿ç»´æŠ¤è¡¨(TechnologyTemplate)表控制层
 *
 * @author zss
 * @since 2023-08-18 16:59:14
 */
@Api(tags = "基础数据-->工艺路线维护表接口")
@RestController
@RequestMapping("/technologyTemplate")
public class TechnologyTemplateController {

    @Autowired
    private TechnologyTemplateService technologyTemplateService;


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

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

    @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)
    })
    @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);
    }

    @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(technologyTemplateService.getById(id));
    }

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

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

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


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

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.TechnologyTemplate;

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

/**
 * å·¥è‰ºè·¯çº¿ç»´æŠ¤è¡¨(TechnologyTemplate)表数据库访问层
 *
 * @author zss
 * @since 2023-08-18 16:59:14
 */
public interface TechnologyTemplateMapper extends BaseMapper<TechnologyTemplate> {

    //查询工艺路线列表
    IPage<Map<String, Object>> selectAllTechTem(Page<Object> page, Integer type, String name, String father);

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


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

ÎļþÃû´Ó standard-server/src/main/java/com/yuanchu/mom/pojo/TechnologyTemplate.java ÐÞ¸Ä
@@ -3,41 +3,44 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
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;

/**
 * å·¥è‰ºæ¨¡ç‰ˆè¡¨(TechnologyTemplate)表实体类
 * å·¥è‰ºè·¯çº¿ç»´æŠ¤è¡¨(TechnologyTemplate)表实体类
 *
 * @author zss
 * @since 2023-08-09 11:20:20
 * @since 2023-08-18 16:59:14
 */
@Data
@Accessors(chain = true)
@AllArgsConstructor
@NoArgsConstructor
@EqualsAndHashCode(callSuper = false)
@Builder
@TableName("technology_template")
public class TechnologyTemplate implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
     * å·¥åºid
     * å·¥è‰ºid
     **/
    @TableId(type = IdType.AUTO)
    private Integer id;

    /**
     * å·¥åºåç§°
     * å·¥è‰º
     **/
    private String name;

    /**
     * å·¥åºçˆ¶çº§
     * å·¥åº(父类)
     **/
    private String father;

@@ -50,33 +53,23 @@
    private Integer state;

    @TableField(fill = FieldFill.INSERT)
    @ApiModelProperty(value = "创建时间", hidden = true)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date createTime;

    @TableField(fill = FieldFill.INSERT_UPDATE)
    @ApiModelProperty(value = "更新时间", hidden = true)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date updateTime;

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

    /**
     * æŽ§åˆ¶è¦ç‚¹
     * è®¾å¤‡ç»„
     **/
    private String control;

    /**
     * åŸºæœ¬è¦æ±‚
     **/
    private String base;

    /**
     * å¤‡æ³¨
     **/
    private String note;
    private String deviceGroup;
}


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,33 @@
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 TechnologyTemplateDto {

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

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

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

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

    @JsonSerialize
    @NotBlank(message = "设备组不能为空")
    private String deviceGroup;

}

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

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

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.pojo.TechnologyTemplate;
import com.yuanchu.mom.pojo.dto.TechnologyTemplateDto;

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

/**
 * å·¥è‰ºè·¯çº¿ç»´æŠ¤è¡¨(TechnologyTemplate)表服务接口
 *
 * @author zss
 * @since 2023-08-18 16:59:14
 */
public interface TechnologyTemplateService extends IService<TechnologyTemplate> {

    /**
     * é€‰æ‹©è®¾å¤‡ç»„
     * @return
     */
    List<Map<String,Object>> chooseDevGroup();

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

    /**
     * æŸ¥è¯¢å·¥è‰ºè·¯çº¿åˆ—表
     * @param page
     * @param type
     * @param name
     * @param father
     * @return
     */
    IPage<Map<String, Object>> selectAllTechTem(Page<Object> page, Integer type, String name, String father);


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

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

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


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

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

import com.baomidou.mybatisplus.core.metadata.IPage;
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.pojo.TechnologyTemplate;
import com.yuanchu.mom.pojo.dto.TechnologyTemplateDto;
import com.yuanchu.mom.service.TechnologyTemplateService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

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

/**
 * å·¥è‰ºè·¯çº¿ç»´æŠ¤è¡¨(TechnologyTemplate)表服务实现类
 *
 * @author zss
 * @since 2023-08-18 16:59:14
 */
@Service
public class TechnologyTemplateServiceImpl extends ServiceImpl<TechnologyTemplateMapper, TechnologyTemplate> implements TechnologyTemplateService {

    @Resource
    TechnologyTemplateMapper technologyTemplateMapper;

    @Resource
    DeviceMapper deviceMapper;


    //选择设备组
    @Override
    public List<Map<String, Object>> chooseDevGroup() {
        return deviceMapper.chooseDevGroup();
    }

    //新增工艺路线
    @Override
    public void addSale(TechnologyTemplateDto technologyTemplateDto) {
        TechnologyTemplate technologyTemplate = new TechnologyTemplate();
        BeanUtils.copyProperties(technologyTemplateDto,technologyTemplate);
        technologyTemplateMapper.insert(technologyTemplate);
    }

    //查询工艺路线列表
    @Override
    public IPage<Map<String, Object>> selectAllTechTem(Page<Object> page, Integer type, String name, String father) {
        return technologyTemplateMapper.selectAllTechTem(page,type,name,father);
    }

    //编辑
    @Override
    public void writeTechById(Integer id, TechnologyTemplateDto technologyTemplateDto) {
        TechnologyTemplate technologyTemplate = new TechnologyTemplate();
        BeanUtils.copyProperties(technologyTemplateDto,technologyTemplate);
        technologyTemplate.setId(id);
        technologyTemplateMapper.updateById(technologyTemplate);
    }

    //删除
    @Override
    public void delTechById(Integer id) {
        TechnologyTemplate technologyTemplate = new TechnologyTemplate();
        technologyTemplate.setId(id).setState(0);
        technologyTemplateMapper.updateById(technologyTemplate);
    }

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


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,27 @@
<?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.TechnologyTemplateMapper">
    <update id="delAllTech">
        update mom_ocean.technology_template
        set state=0
        where id in (${ids})
    </update>
    <select id="selectAllTechTem" resultType="java.util.Map">
        select id,
        name,
        father,
        element,
        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>
    </select>
</mapper>

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

@@ -74,6 +74,7 @@
                .downtime(sale.getCreateTime())
                .deltime(sale.getDelTime())
                .qualityTraceability(MyUtil.getTimeSixNumberCode("GPT", "GPT"))
                .downman(sale.getOrderName())
                .build();
        //新增生产订单
        manufactureOrderMapper.insert(manufactureOrder);
@@ -87,6 +88,7 @@
                    .techfather(technology.getFather())
                    .deviceGroup(technology.getDeviceGroup())
                    .manufactureOrderId(manufactureOrder.getId())
                    .period((int) Math.ceil((double)manufactureOrder.getNumber()/technology.getProductionQuota()))
                    .build();
            //新增编制工序表
            manualTechnologyMapper.insert(manualTechnology);

 pom.xml

@@ -23,6 +23,7 @@
        <module>inventory-server</module>
        <module>system-run</module>
        <module>production-server</module>
        <module>base-server</module>
    </modules>

    <properties>

 production-server/src/main/java/com/yuanchu/mom/controller/ManualTechnologyController.java

ÎļþÒÑɾ³ý

 production-server/src/main/java/com/yuanchu/mom/controller/ManufactureOrderController.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.mapper.ManualTechnologyMapper;
import com.yuanchu.mom.pojo.ManualTechnology;
import com.yuanchu.mom.pojo.dto.ManualTechnologyDto;
import com.yuanchu.mom.service.DeviceService;
import com.yuanchu.mom.service.ManualTechnologyService;
import com.yuanchu.mom.vo.Result;
@@ -13,11 +14,16 @@
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.ManufactureOrderService;

import javax.annotation.Resource;
import javax.xml.crypto.Data;
import java.text.ParseException;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;


@@ -78,10 +84,33 @@
    }

    @ApiOperation(value = "排产-->3.更新")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "date", value = "排产开始日期", dataTypeClass = String.class, required = true)
    })
    @PostMapping("/output")
    public Result output(String deviceGroup) {
    public Result output(String date ,@Validated @RequestBody List<ManualTechnologyDto> manualTechnologyDtoList) throws ParseException {
        manualTechnologyService.output(date,manualTechnologyDtoList);
        return Result.success();
    }

    @ApiOperation(value = "查看排产详情")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "manOrdId", value = "生产订单id", dataTypeClass = Integer.class, required = true)
    })
    @GetMapping("/sePros")
    public Result sePros(Integer manOrdId) {
        return Result.success(manufactureOrderService.sePros(manOrdId));
    }

    @ApiOperation(value = "下达")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "manOrdId", value = "生产订单id", dataTypeClass = Integer.class, required = true)
    })
    @PostMapping("/down")
    public Result down(Integer manOrdId) {
        manufactureOrderService.down(manOrdId);
        return Result.success("下达成功!");
    }

}


 production-server/src/main/java/com/yuanchu/mom/controller/ProductionPlanController.java

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


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.service.ProductionPlanService;
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.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

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

@Api(tags = "生产管理-->生产计划")
@RestController
@RequestMapping("/productionPlan")
public class ProductionPlanController {

    @Resource
    ProductionPlanService productionPlanService;


    @ApiOperation(value = "查询设备列表")
    @GetMapping("/selectAllDev")
    public Result selectAllDev() {
        return Result.success(productionPlanService.selectAllDev());
    }

    @ApiOperation(value = "查询生产计划列表")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "deviceId", value = "设备id", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "orderCode", value = "订单号", dataTypeClass = String.class),
            @ApiImplicitParam(name = "name", value = "产品名称", dataTypeClass = String.class),
            @ApiImplicitParam(name = "startTime", value = "计划开始日期", dataTypeClass = String.class),
            @ApiImplicitParam(name = "endTime", value = "计划结束日期", dataTypeClass = String.class)
    })
    @GetMapping("/selectAllPlan")
    public Result selectAllPlan(Integer deviceId, String orderCode, String name, String startTime, String endTime) {
        return Result.success(productionPlanService.selectAllPlan(deviceId,orderCode,name,startTime,endTime));
    }
}

 production-server/src/main/java/com/yuanchu/mom/mapper/ManualTechnologyMapper.java

@@ -16,5 +16,12 @@

    //排产-->查看
    List<Map<String, Object>> seleDatil(Integer manOrdId);

    //批量更新
    void updateBatchManualTechnology(List<ManualTechnology> manualTechnologies);

    //查询所有设备列表
    List<Map<String, Object>> selectAllDev();

}


 production-server/src/main/java/com/yuanchu/mom/mapper/ManufactureOrderMapper.java

@@ -4,7 +4,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.ManufactureOrder;
import com.yuanchu.mom.pojo.dto.ManufactureOrderDto;

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

/**
@@ -17,5 +19,9 @@

    //查询生产订单列表
    IPage<Map<String, Object>> selectAllManord(Page<Object> page, String downTime, String delTime, String customerCode, Integer type);


    //查看生产计划
    List<Map<String, Object>> selectAllPlan(Integer deviceId, String orderCode, String name, String startTime, String endTime);
}


 production-server/src/main/java/com/yuanchu/mom/pojo/ManualTechnology.java

@@ -50,7 +50,7 @@
    /**
     * å…³è” è®¾å¤‡id
     **/
    private String deviceId;
    private Integer deviceId;

    /**
     * å…³è” ç”Ÿäº§è®¢å•id
@@ -69,5 +69,24 @@
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date updateTime;

    /**
     * å¼€å§‹æ—¥æœŸ(计划)
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date startTime;

    /**
     * ç»“束日期(计划)
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date endTime;

    /**
     * å‘¨æœŸ
     **/
    private Integer period;
}


 production-server/src/main/java/com/yuanchu/mom/pojo/ManufactureOrder.java

@@ -108,5 +108,15 @@
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date updateTime;

    /**
     * ä¸‹è¾¾çŠ¶æ€0:待下达;1:已下达
     **/
    private Integer goState;

    /**
     * ä¸‹å•äºº
     **/
    private String downman;
}


 production-server/src/main/java/com/yuanchu/mom/pojo/dto/ManualTechnologyDto.java

@@ -1,11 +1,46 @@
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 ManualTechnologyDto {

    //工序id
    @NotNull(message = "id不能为空")
    @JsonSerialize
    private Integer id;

    /**
     * å·¥åºåç§°
     **/
    @NotBlank(message = "工序名称不能为空")
    @JsonSerialize
    private String techname;

    /**
     * å·¥åºçˆ¶ç±»
     **/
    @NotBlank(message = "工序父类不能为空")
    @JsonSerialize
    private String techfather;

    /**
     * è®¾å¤‡ç»„
     **/
    @NotBlank(message = "设备组不能为空")
    @JsonSerialize
    private String deviceGroup;

    /**
     * å…³è” è®¾å¤‡id
     **/
    @NotNull(message = "设备id不能为空")
    @JsonSerialize
    private Integer  deviceId;

}

 production-server/src/main/java/com/yuanchu/mom/pojo/dto/ManualTechnologyDto1.java

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


import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;

//查看排产详情中的计划编制
@Data
public class ManualTechnologyDto1 {

    /**
     * å·¥åºid
     **/
    private Integer mtechId;

    /**
     * å·¥åºåç§°
     **/
    private String techname;

    /**
     * å·¥åºçˆ¶ç±»
     **/
    private String techfather;


    /**
     * è®¾å¤‡å(机台)
     **/
    private String deviceName;


    /**
     * å¼€å§‹æ—¥æœŸ(计划)
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date startTime;

    /**
     * ç»“束日期(计划)
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date endTime;

    /**
     * å‘¨æœŸ
     **/
    private Integer period;
}

 production-server/src/main/java/com/yuanchu/mom/pojo/dto/ManufactureOrderDto.java

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


import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;
import java.util.List;

@Data
//查看排产详情
public class ManufactureOrderDto {

    /**
     * è®¢å•id
     **/
    private Integer id;

    /**
     * è®¢å•ç¼–号
     **/
    private String orderCode;

    /**
     * åˆåŒç¼–号(客户订单号)
     **/
    private String customerCode;

    /**
     * äº§å“åç§°
     **/
    private String name;

    /**
     * è§„格型号
     **/
    private String specifications;

    /**
     * æ•°é‡
     **/
    private Integer number;

    /**
     * ä¸‹å•æ—¥æœŸ
     **/
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date downtime;

    /**
     * äº¤è´§æ—¥æœŸ
     **/
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date deltime;

    /*计划编制*/
    private List<ManualTechnologyDto1> message;

}

 production-server/src/main/java/com/yuanchu/mom/service/ManualTechnologyService.java

@@ -2,7 +2,10 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.pojo.ManualTechnology;
import com.yuanchu.mom.pojo.dto.ManualTechnologyDto;

import java.text.ParseException;
import java.util.Date;
import java.util.List;
import java.util.Map;

@@ -20,5 +23,12 @@
     * @return
     */
    List<Map<String,Object>> seleDatil(Integer manOrdId);

    /**
     * æŽ’产==>更新
     * @param manualTechnologyDtoList
     */
    void output(String date, List<ManualTechnologyDto> manualTechnologyDtoList) throws ParseException;

}


 production-server/src/main/java/com/yuanchu/mom/service/ManufactureOrderService.java

@@ -4,7 +4,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.pojo.ManufactureOrder;
import com.yuanchu.mom.pojo.dto.ManufactureOrderDto;

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

/**
@@ -25,5 +27,18 @@
     * @return
     */
    IPage<Map<String, Object>> selectAllManord(Page<Object> page, String downTime, String delTime, String customerCode, Integer type);

    /**
     * æŸ¥çœ‹æŽ’产详情
     * @param manOrdId
     * @return
     */
    ManufactureOrderDto sePros(Integer manOrdId);

    /**
     * ä¸‹è¾¾
     * @param manOrdId
     */
    void down(Integer manOrdId);
}


 production-server/src/main/java/com/yuanchu/mom/service/ProductionPlanService.java

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


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

public interface ProductionPlanService {


    /**
     * æŸ¥è¯¢è®¾å¤‡åˆ—表
     * @return
     */
    List<Map<String,Object>> selectAllDev();

    /**
     * æŸ¥è¯¢ç”Ÿäº§è®¡åˆ’列表
     * @param deviceId
     * @param orderCode
     * @param name
     * @param startTime
     * @param endTime
     * @return
     */
    List<Map<String,Object>> selectAllPlan(Integer deviceId, String orderCode, String name, String startTime, String endTime);



}

 production-server/src/main/java/com/yuanchu/mom/service/impl/ManualTechnologyServiceImpl.java

@@ -4,13 +4,24 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.DeviceMapper;
import com.yuanchu.mom.mapper.ManualTechnologyMapper;
import com.yuanchu.mom.mapper.ManufactureOrderMapper;
import com.yuanchu.mom.pojo.ManualTechnology;
import com.yuanchu.mom.pojo.ManufactureOrder;
import com.yuanchu.mom.pojo.dto.ManualTechnologyDto;
import com.yuanchu.mom.service.ManualTechnologyService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * ç¼–制工序表(ManualTechnology)表服务实现类
@@ -25,12 +36,68 @@
    ManualTechnologyMapper manualTechnologyMapper;

    @Resource
    DeviceMapper deviceMapper;
    ManufactureOrderMapper manufactureOrderMapper;


    //排产-->查看
    @Override
    public List<Map<String,Object>> seleDatil(Integer manOrdId) {
    public List<Map<String, Object>> seleDatil(Integer manOrdId) {
        return manualTechnologyMapper.seleDatil(manOrdId);
    }

    //排产-->更新
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void output(String date, List<ManualTechnologyDto> manualTechnologyDtoList) throws ParseException {
        //更新每个工序的设备
        List<ManualTechnology> manualTechnologies = manualTechnologyDtoList.stream().map(manualTechnologyDto -> {
            ManualTechnology manualTechnology = new ManualTechnology();
            BeanUtils.copyProperties(manualTechnologyDto, manualTechnology);
            return manualTechnology;
        }).collect(Collectors.toList());
        //批量更新设备id
        manualTechnologyMapper.updateBatchManualTechnology(manualTechnologies);
        Integer manufactureOrderId = manualTechnologyMapper.selectById(manualTechnologyDtoList.get(1).getId()).getManufactureOrderId();
        List<ManualTechnology> manualTechnologyList = manualTechnologyMapper.selectList(Wrappers.<ManualTechnology>query().eq("manufacture_order_id", manufactureOrderId));
        /*赋值(最开始第一个工序的开始日期)*/
        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
        Date parse = dateFormat.parse(date);
        //将起始日期赋值给Calendar对象
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(parse);
        //第一个工序
        ManualTechnology manualTechnology = manualTechnologyList.get(0);
        calendar.add(Calendar.DATE, manualTechnology.getPeriod());
        manualTechnology.setStartTime(parse).setEndTime(calendar.getTime());
        //循环赋值时间
        for (int i = 0; i < manualTechnologyList.size()-1 ; i++) {
            Calendar calendar1 = Calendar.getInstance();
            calendar1.setTime(manualTechnologyList.get(i).getEndTime());
            ManualTechnology technology = manualTechnologyList.get(i + 1);
            calendar1.add(Calendar.DATE,1);
            technology.setStartTime(calendar1.getTime());
            calendar1.add(Calendar.DATE,technology.getPeriod());
            technology.setEndTime(calendar1.getTime());
        }
        //批量更新
        manualTechnologyMapper.updateBatchManualTechnology(manualTechnologyList);
        //如果该产品下的所有工序都安排了,则将状态改为已排产还有待下达
        if (checkFieldExistence(manualTechnologies)) {
            ManufactureOrder manufactureOrder = new ManufactureOrder();
            manufactureOrder.setId(manufactureOrderId).setType(1).setGoState(0);
            manufactureOrderMapper.updateById(manufactureOrder);
        }
    }


    /*判断是否所有工序全部都安排了设备*/
    public static boolean checkFieldExistence(List<ManualTechnology> dataList) {
        for (ManualTechnology data : dataList) {
            if (data.getDeviceId() == null) {
                return false;
            }
        }
        return true;
    }
}


 production-server/src/main/java/com/yuanchu/mom/service/impl/ManufactureOrderServiceImpl.java

@@ -1,15 +1,24 @@
package com.yuanchu.mom.service.impl;

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.ManualTechnologyMapper;
import com.yuanchu.mom.mapper.ManufactureOrderMapper;
import com.yuanchu.mom.pojo.ManualTechnology;
import com.yuanchu.mom.pojo.ManufactureOrder;
import com.yuanchu.mom.pojo.dto.ManualTechnologyDto1;
import com.yuanchu.mom.pojo.dto.ManufactureOrderDto;
import com.yuanchu.mom.service.ManufactureOrderService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

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

/**
 * ç”Ÿäº§è®¢å•è¡¨(ManufactureOrder)表服务实现类
@@ -23,10 +32,44 @@
    @Resource
    ManufactureOrderMapper manufactureOrderMapper;

    @Resource
    ManualTechnologyMapper manualTechnologyMapper;

    @Resource
    DeviceMapper deviceMapper;

    //查询生产订单的列表
    @Override
    public IPage<Map<String, Object>> selectAllManord(Page<Object> page, String downTime, String delTime, String customerCode, Integer type) {
        return manufactureOrderMapper.selectAllManord(page,downTime,delTime,customerCode,type);
    }


    //查看排产详情
    @Override
    public ManufactureOrderDto sePros(Integer manOrdId) {
        ManufactureOrderDto manufactureOrderDto = new ManufactureOrderDto();
        //基本信息
        ManufactureOrder manufactureOrder = manufactureOrderMapper.selectById(manOrdId);
        BeanUtils.copyProperties(manufactureOrder,manufactureOrderDto);
        //计划编制
        List<ManualTechnology> manualTechnologies = manualTechnologyMapper.selectList(Wrappers.<ManualTechnology>query().eq("manufacture_order_id", manOrdId));
        List<ManualTechnologyDto1> manualTechnologyDto1s = manualTechnologies.stream().map(manualTechnology -> {
            ManualTechnologyDto1 manualTechnologyDto1 = new ManualTechnologyDto1();
            BeanUtils.copyProperties(manualTechnology, manualTechnologyDto1);
            manualTechnologyDto1.setMtechId(manualTechnology.getId());
            manualTechnologyDto1.setDeviceName(deviceMapper.selectById(manualTechnology.getDeviceId()).getName());
            return manualTechnologyDto1;
        }).collect(Collectors.toList());
        manufactureOrderDto.setMessage(manualTechnologyDto1s);
        return manufactureOrderDto;
    }

    //下达
    @Override
    public void down(Integer manOrdId) {
        ManufactureOrder manufactureOrder = new ManufactureOrder().setId(manOrdId).setGoState(1);
        manufactureOrderMapper.updateById(manufactureOrder);
    }
}


 production-server/src/main/java/com/yuanchu/mom/service/impl/ProductionPlanServiceImpl.java

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

import com.yuanchu.mom.mapper.ManualTechnologyMapper;
import com.yuanchu.mom.mapper.ManufactureOrderMapper;
import com.yuanchu.mom.service.ProductionPlanService;
import org.springframework.stereotype.Service;

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

@Service
public class ProductionPlanServiceImpl implements ProductionPlanService {

    @Resource
    ManufactureOrderMapper manufactureOrderMapper;

    @Resource
    ManualTechnologyMapper manualTechnologyMapper;

    //查询设备列表
    @Override
    public List<Map<String, Object>> selectAllDev() {
        return manualTechnologyMapper.selectAllDev();
    }

    //查询生产计划列表
    @Override
    public List<Map<String, Object>> selectAllPlan(Integer deviceId, String orderCode, String name, String startTime, String endTime) {
        return manufactureOrderMapper.selectAllPlan(deviceId,orderCode,name,startTime,endTime);
    }
}

 production-server/src/main/resources/mapper/ManualTechnologyMapper.xml

@@ -1,6 +1,33 @@
<?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.ManualTechnologyMapper">
    <!--批量更新-->
    <update id="updateBatchManualTechnology">
        UPDATE mom_ocean.manual_technology
        <trim prefix="set" suffixOverrides=",">
            <trim prefix="device_id=case" suffix="end,">
                <foreach collection="manualTechnologies" item="manualTechnologie">
                    WHEN id =#{manualTechnologie.id} THEN #{manualTechnologie.deviceId}
                </foreach>
            </trim>
            <trim prefix="start_time=case" suffix="end,">
                <foreach collection="manualTechnologies" item="manualTechnologie">
                    WHEN id =#{manualTechnologie.id} THEN #{manualTechnologie.startTime}
                </foreach>
            </trim>
            <trim prefix="end_time=case" suffix="end,">
                <foreach collection="manualTechnologies" item="manualTechnologie">
                    WHEN id =#{manualTechnologie.id} THEN #{manualTechnologie.endTime}
                </foreach>
            </trim>
        </trim>
        <where>
            <foreach collection="manualTechnologies" separator="or" item="manualTechnologie">
                id =#{manualTechnologie.id}
            </foreach>
        </where>
    </update>

    <select id="seleDatil" resultType="java.util.Map">
        select manual_technology.id,
               techfather,
@@ -10,6 +37,16 @@
        from mom_ocean.manual_technology
                 left join mom_ocean.device
                           on device.id = device_id
        where manufacture_order_id=#{manOrdId}
        where manufacture_order_id = #{manOrdId}
    </select>
    <!--查询所有设备列表-->
    <select id="selectAllDev" resultType="java.util.Map">
        select distinct manual_technology.id,
                        device_group,
                        name
        from mom_ocean.manual_technology
                 left join mom_ocean.device
                           on device.id = manual_technology.device_id
        order by device_group
    </select>
</mapper>

 production-server/src/main/resources/mapper/ManufactureOrderMapper.xml

@@ -14,6 +14,7 @@
        number,
        DATE_FORMAT(downTime, '%Y-%m-%d') '下单日期',
        DATE_FORMAT(delTime, '%Y-%m-%d') '交货日期',
        go_state,
        type
        from mom_ocean.manufacture_order
        where state=1
@@ -30,4 +31,34 @@
            and type=#{type}
        </if>
    </select>
    <!--查看生产计划-->
    <select id="selectAllPlan" resultType="java.util.Map">
        select order_code,
               name,
               specifications,
               unit,
               number,
               proname,
               saleman,
               downman,
               techname,
               DATE_FORMAT(start_time, '%Y-%m-%d') '计划开始日期',
               DATE_FORMAT(end_time, '%Y-%m-%d') '计划结束日期'
        from mom_ocean.manual_technology mt
                 left join mom_ocean.manufacture_order mo
                           on mt.manufacture_order_id = mo.id
        where mo.state=1
        and go_state=1
        and device_id=#{deviceId}
        <if test="orderCode!=null and orderCode!=''">
            and order_code like concat('%',#{orderCode},'%')
        </if>
        <if test="startTime!=null and startTime!=''">
            and DATE_FORMAT(start_time, '%Y-%m-%d')=#{startTime}
        </if>
        <if test="endTime!=null and endTime!=''">
            and DATE_FORMAT(end_time, '%Y-%m-%d')=#{endTime}
        </if>
        order by start_time
    </select>
</mapper>

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

ÎļþÒÑɾ³ý

 standard-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java

@@ -21,4 +21,8 @@
    List<Map<String, Object>> DevicePageList(String codeNameModel, Integer type, Integer deviceStatue, Integer deviceId, String fatherName);

    List<Map<String, Object>> getDeviceNameByGroup(String deviceGroup);

    //选择设备组
    List<Map<String, Object>> chooseDevGroup();

}

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

ÎļþÒÑɾ³ý

 standard-server/src/main/java/com/yuanchu/mom/pojo/Technology.java

@@ -54,9 +54,11 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime;

    @ApiModelProperty(value = "关联 è§„æ ¼id")
    @ApiModelProperty(value = "关联 åž‹å·id")
    private Integer specificationsId;

    @ApiModelProperty(value = "生产定额(个/天)")
    private Integer productionQuota;


}

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

ÎļþÒÑɾ³ý

 standard-server/src/main/java/com/yuanchu/mom/pojo/vo/TechnologyTemplateVo1.java

ÎļþÒÑɾ³ý

 standard-server/src/main/java/com/yuanchu/mom/pojo/vo/TechnologyTemplateVo2.java

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

 standard-server/src/main/resources/mapper/DeviceMapper.xml

@@ -59,7 +59,14 @@
    <select id="getDeviceNameByGroup" resultType="java.util.Map">
        select id, name
        from mom_ocean.device
        where state=1
        and father=#{deviceGroup}
        where state = 1
          and father = #{deviceGroup}
          and device_status in (1, 5)
    </select>
    <!--选择设备组-->
    <select id="chooseDevGroup" resultType="java.util.Map">
        select distinct father
        from mom_ocean.device
        where state=1 and device_status in(1,5)
    </select>
</mapper>

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

ÎļþÒÑɾ³ý

 system-run/pom.xml

@@ -50,6 +50,11 @@
            <artifactId>production-server</artifactId>
            <version>1.0.0</version>
        </dependency>
        <dependency>
            <groupId>com.yuanchu.mom</groupId>
            <artifactId>base-server</artifactId>
            <version>1.0.0</version>
        </dependency>

        <!--druid-->
        <dependency>