MOM系统-9-04 三个不合格查询

XiaoRuby

2023-09-04 f1400115f582ae795913e360c0f5a70ea4513544

MOM系统-9-04 三个不合格查询

 inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java

@@ -21,7 +21,6 @@
 * @author zss
 * @since 2023-08-07 10:04:01
 */
@Api(tags = "QMS管理-->不合格品")
@RestController
@RequestMapping("/inspectUnaccepted")
public class InspectUnacceptedController {
@@ -30,7 +29,7 @@
    private InspectUnacceptedService inspectUnacceptedService;


    @ApiOperation(value = "查询成品不合格品检验单列表")
    @ApiOperation(value = "查询成品不合格品检验单列表", tags = "QMS管理-->不合格品管理")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "pageSize",value = "页数",dataTypeClass  = Integer.class,required = true),
            @ApiImplicitParam(name = "countSize",value = "条数/页",dataTypeClass  = Integer.class,required = true),
@@ -38,12 +37,68 @@
            @ApiImplicitParam(name = "dealState",value = "处理状态(为空=全部)",dataTypeClass  = Integer.class)
    })
    @GetMapping("/selectUnRawInspectsList")
    public Result selectUnRawInspectsList(int pageSize, int countSize, String formTime, Integer dealState){
    public Result<?> selectUnRawInspectsList(int pageSize, int countSize, String formTime, Integer dealState){
        IPage<Map<String, Object>> inspectionPage = inspectUnacceptedService.selectUnRawInspectsList(new Page<Object>(pageSize, countSize), formTime,dealState);
        Map<String, Object> map = new HashMap<>();
        map.put("total", inspectionPage.getTotal());
        map.put("row", inspectionPage.getRecords());
        return Result.success(map);
    }

    @ApiOperation(value = "查询原材料不合格品检验单列表", tags = "QMS管理-->原材料不合格品")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "pageSize",value = "页数",dataTypeClass  = Integer.class,required = true),
            @ApiImplicitParam(name = "countSize",value = "条数/页",dataTypeClass  = Integer.class,required = true),
            @ApiImplicitParam(name = "formTime",value = "来料日期",dataTypeClass  = String.class),
            @ApiImplicitParam(name = "productName",value = "产品名称",dataTypeClass  = String.class),
            @ApiImplicitParam(name = "supplier",value = "供应商",dataTypeClass  = String.class),
            @ApiImplicitParam(name = "processingStatus",value = "处理状态",dataTypeClass  = Integer.class)
    })
    @GetMapping("/selectURawMaterials")
    public Result<?> selectUnqualifiedRawMaterials(int pageSize,
                                             int countSize,
                                             String formTime,
                                             String productName,
                                             String supplier,
                                             Integer processingStatus){
        IPage<Map<String, Object>> inspectionPage = inspectUnacceptedService.selectUnqualifiedRawMaterials(
                new Page<Object>(pageSize, countSize),
                formTime,
                productName,
                supplier,
                processingStatus);
        Map<String, Object> map = new HashMap<>();
        map.put("total", inspectionPage.getTotal());
        map.put("row", inspectionPage.getRecords());
        return Result.success(map);
    }

    @ApiOperation(value = "不合格品分页列表", tags = "QMS管理-->不合格品处置")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "pageSize",value = "页数",dataTypeClass  = Integer.class,required = true),
            @ApiImplicitParam(name = "countSize",value = "条数/页",dataTypeClass  = Integer.class,required = true),
            @ApiImplicitParam(name = "specificationModel",value = "规格型号",dataTypeClass  = String.class),
            @ApiImplicitParam(name = "productName",value = "产品名称",dataTypeClass  = String.class),
            @ApiImplicitParam(name = "productCategories",value = "产品大类",dataTypeClass  = String.class),
            @ApiImplicitParam(name = "state",value = "状态",dataTypeClass  = Integer.class)
    })
    @GetMapping("/selectDisposal")
    public Result<?> selectDisposal(int pageSize,
                                                   int countSize,
                                                   String specificationModel,
                                                   String productName,
                                                   String productCategories,
                                                   Integer state){
        IPage<Map<String, Object>> inspectionPage = inspectUnacceptedService.selectDisposal(
                new Page<Object>(pageSize, countSize),
                specificationModel,
                productName,
                productCategories,
                state);
        Map<String, Object> map = new HashMap<>();
        map.put("total", inspectionPage.getTotal());
        map.put("row", inspectionPage.getRecords());
        return Result.success(map);
    }
}


 inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java

@@ -17,5 +17,7 @@

    //查询成品检验中不合格品检验单列表
    IPage<Map<String, Object>> selectInsList(Page<Object> page, String formTime, Integer dealState);

    IPage<Map<String, Object>> selectUnqualifiedRawMaterials(Page<Object> page, String formTime, String productName, String supplier, Integer processingStatus);
}


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

@@ -32,6 +32,9 @@
    @TableId(type = IdType.AUTO)
    private Integer id;

    @ApiModelProperty(value = "0：原材料检验单；1：成品检验单；2：半成品检验单")
    private Integer type;

    /**
     * ç¼ºé™·åç§°(理由)
     **/

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

@@ -16,7 +16,7 @@
public interface InspectUnacceptedService extends IService<InspectUnaccepted> {

    /**
     *查询原材料不合格品检验单列表
     *查询成品不合格品检验单列表
     * @param
     * @param formTime
     * @param dealState
@@ -24,5 +24,26 @@
     */
    IPage<Map<String, Object>> selectUnRawInspectsList(Page<Object> page, String formTime, Integer dealState);

    /**
     * æŸ¥è¯¢åŽŸææ–™ä¸åˆæ ¼å“æ£€éªŒå•åˆ—表
     * @param page
     * @param formTime
     * @param productName
     * @param supplier
     * @param processingStatus
     * @return
     */
    IPage<Map<String, Object>> selectUnqualifiedRawMaterials(Page<Object> page, String formTime, String productName, String supplier, Integer processingStatus);

    /**
     * ä¸åˆæ ¼å“å¤„置分页列表
     * @param page
     * @param specificationModel
     * @param productName
     * @param productCategories
     * @param state
     * @return
     */
    IPage<Map<String, Object>> selectDisposal(Page<Object> page, String specificationModel, String productName, String productCategories, Integer state);
}


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

@@ -30,5 +30,15 @@
    public IPage<Map<String, Object>> selectUnRawInspectsList(Page<Object> page, String formTime, Integer dealState) {
        return inspectUnacceptedMapper.selectInsList(page, formTime, dealState);
    }

    @Override
    public IPage<Map<String, Object>> selectUnqualifiedRawMaterials(Page<Object> page, String formTime, String productName, String supplier, Integer processingStatus) {
        return inspectUnacceptedMapper.selectUnqualifiedRawMaterials(page, formTime, productName, supplier, processingStatus);
    }

    @Override
    public IPage<Map<String, Object>> selectDisposal(Page<Object> page, String specificationModel, String productName, String productCategories, Integer state) {
        return null;
    }
}


 inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml

@@ -1,60 +1,69 @@
<?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.InspectUnacceptedMapper">
    <select id="selectUnRawInspectsList" resultType="java.util.Map">
        select ru.id,
        DATE_FORMAT(form_time, '%Y-%m-%d') '来料日期',
        reason,
        code,
        name,
        specifications,
        unit,
        number,
        DATE_FORMAT(ri.create_time, '%Y-%m-%d') '报检日期',
        user_name,
        DATE_FORMAT(ins_time, '%Y-%m-%d') '检验日期',
        deal_state,
        deal_reasult,
        DATE_FORMAT(deal_time, '%Y-%m-%d') '处理日期'
        from mom_ocean.raw_inspect ri inner join mom_ocean.inspect_unaccepted ru on ri.id = ru.raw_inspect_id
        <where>
        <if test="dealState!=null and dealState!=''">
           and deal_state=#{dealState}
        </if>
        <if test="formTime!=null and formTime!=''">
            and form_time=#{formTime}
        </if>
        and ru.state=1
        </where>
        order by ru.id desc
    </select>

    <select id="selectInsList" resultType="java.util.Map">
        select ru.id,
        DATE_FORMAT(fi.create_time, '%Y-%m-%d') '来料日期',
        SELECT ru.id,
        DATE_FORMAT(fi.create_time, '%Y-%m-%d') dateArrival,
        reason,
        material_code,
        name,
        project_name,
        u.`name`,
        specifications_model,
        unit,
        quantity,
        DATE_FORMAT(fi.create_time, '%Y-%m-%d') '报检日期',
        DATE_FORMAT(fi.create_time, '%Y-%m-%d') inspectionDate,
        u.name,
        DATE_FORMAT(fi.update_time, '%Y-%m-%d') '检验日期',
        deal_state,
        deal_reasult,
        DATE_FORMAT(deal_time, '%Y-%m-%d') '处理日期'
        from mom_ocean.inspect_unaccepted ru,
        mom_ocean.finished_inspect fi ,
        mom_ocean.user u
        DATE_FORMAT(deal_time, '%Y-%m-%d') processingDate
        FROM (inspect_unaccepted ru,
        `user` u)
        LEFT JOIN finished_inspect fi ON fi.`id` = ru.`raw_inspect_id`
        where fi.id = ru.raw_inspect_id
        and fi.user_id=u.id
        AND ru.type = 1
        AND ru.state=1
        AND fi.`user_id` = u.`id`
        <if test="dealState!=null and dealState!=''">
            and deal_state=#{dealState}
        </if>
        <if test="formTime!=null and formTime!=''">
            and fi.create_time=#{formTime}
        </if>
        and ru.state=1
        order by ru.id desc
    </select>

    <select id="selectUnqualifiedRawMaterials" resultType="map">
        SELECT i.id,
               DATE_FORMAT(r.create_time, '%Y-%m-%d') dateArrival,
               i.`reason`,
               r.`code`,
               r.`name`,
               r.`specifications`,
               r.`unit`,
               r.`number`,
               DATE_FORMAT(r.`create_time`,'%Y-%m-%d') inspectionDate,
               r.`user_name`,
               DATE_FORMAT(r.`ins_time`,'%Y-%m-%d') processingDate,
               r.`supplier`,
               i.`deal_state`,
               i.`deal_reasult`
        FROM inspect_unaccepted i
                 LEFT JOIN raw_inspect r ON i.`raw_inspect_id` = r.`id`
        WHERE i.`state` = 1
          AND i.`type` = 0
        <if test="formTime != null and formTime != ''">
            AND r.create_time = #{formTime}
        </if>
        <if test="productName != null and productName != ''">
            AND r.name LIKE CONCAT('%', #{productName}, '%')
        </if>
        <if test="supplier != null and supplier != ''">
            AND r.supplier LIKE CONCAT('%', #{supplier}, '%')
        </if>
        <if test="processingStatus != null">
            AND i.deal_state = #{processingStatus}
        </if>
        ORDER BY i.`id` DESC
    </select>
</mapper>

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

@@ -42,8 +42,7 @@
    @ApiOperation(value = "点击新增-->查询所有排产计划")
    @PostMapping("add_show_scheduling")
    public Result<?> reportSelectScheduling() {
        manufactureSchedulingService.reportSelectScheduling();
        return Result.success();
        return Result.success(manufactureSchedulingService.reportSelectScheduling());
    }

    @ApiOperation(value = "报工增加")

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

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

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

/**
 * <p>
 * ç”Ÿäº§æŠ¥å·¥-->原材料领用 Mapper æŽ¥å£
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-09-04 10:39:07
 */
public interface ManualRawMaterialMapper extends BaseMapper<ManualRawMaterial> {

}

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

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

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

/**
 * <p>
 * ç”Ÿäº§æŠ¥å·¥-->半成品领用 Mapper æŽ¥å£
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-09-04 10:39:26
 */
public interface ManualUnfinishedProductMapper extends BaseMapper<ManualUnfinishedProduct> {

}

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

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

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

/**
 * <p>
 * ç”Ÿäº§ç®¡ç†-->生产报工 Mapper æŽ¥å£
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-09-04 10:43:26
 */
public interface ManufactureReportMapper extends BaseMapper<ManufactureReport> {

}

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

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

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.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;

/**
 * <p>
 * ç”Ÿäº§æŠ¥å·¥-->原材料领用
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-09-04 10:39:07
 */
@Getter
@Setter
@TableName("manual_raw_material")
@ApiModel(value = "ManualRawMaterial对象", description = "生产报工-->原材料领用")
public class ManualRawMaterial implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty("主键Id")
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @ApiModelProperty("供应商名称")
    private String supplierName;

    @ApiModelProperty("质量追溯号")
    private String qualityNumber;

    @ApiModelProperty("规格型号")
    private String specificationsModels;

    @ApiModelProperty("单位")
    private String unit;

    @ApiModelProperty("数量")
    private Integer number;

    @ApiModelProperty("创建时间")
    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    @ApiModelProperty("更新时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    @ApiModelProperty("逻辑删除")
    @TableLogic
    private Integer state;

    @ApiModelProperty("关联 ç”Ÿäº§æŠ¥å·¥Id")
    private Integer manufactureReportId;
}

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

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

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.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;

/**
 * <p>
 * ç”Ÿäº§æŠ¥å·¥-->半成品领用
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-09-04 10:39:26
 */
@Getter
@Setter
@TableName("manual_unfinished_product")
@ApiModel(value = "ManualUnfinishedProduct对象", description = "生产报工-->半成品领用")
public class ManualUnfinishedProduct implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty("主键Id")
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @ApiModelProperty("生产班组")
    private String productionTeam;

    @ApiModelProperty("质量追溯号")
    private String qualityNumber;

    @ApiModelProperty("半成品名称")
    private String unfinishedName;

    @ApiModelProperty("规格型号")
    private String specificationsModels;

    @ApiModelProperty("单位")
    private String unit;

    @ApiModelProperty("数量")
    private Integer number;

    @ApiModelProperty("创建时间")
    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    @ApiModelProperty("更新时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    @ApiModelProperty("逻辑删除")
    @TableLogic
    private Integer state;

    @ApiModelProperty("关联 ç”Ÿäº§æŠ¥å…±Id")
    private Integer manufactureReportId;
}

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

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

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.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;

/**
 * <p>
 * ç”Ÿäº§ç®¡ç†-->生产报工
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-09-04 10:43:26
 */
@Getter
@Setter
@TableName("manufacture_report")
@ApiModel(value = "ManufactureReport对象", description = "生产管理-->生产报工")
public class ManufactureReport implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty("生产报工 ä¸»é”®ID")
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @ApiModelProperty("班次")
    private String orderClasses;

    @ApiModelProperty("班组")
    private String workingTeam;

    @ApiModelProperty("班组长")
    private String jobForeman;

    @ApiModelProperty("出勤人员")
    private String attendant;

    @ApiModelProperty("创建时间")
    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    @ApiModelProperty("更新时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    @ApiModelProperty("逻辑删除")
    @TableLogic
    private Integer state;

    @ApiModelProperty("关联 å·¥åºå·¥è‰ºId")
    private Integer processTechnology;

    @ApiModelProperty("关联 ç”Ÿäº§è®¢å•å·Id")
    private Integer manufactureOrderId;
}

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

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

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

// æŠ¥å·¥æ·»åŠ 
@Data
public class ReportAddDto {

    @ApiModelProperty("班次")
    private String orderClasses;

    @ApiModelProperty("班组")
    private String workingTeam;

    @ApiModelProperty("班组长")
    private String jobForeman;

    @ApiModelProperty("出勤人员")
    private String attendant;

}

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

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

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

/**
 * <p>
 * ç”Ÿäº§æŠ¥å·¥-->原材料领用 æœåŠ¡ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-09-04 10:39:07
 */
public interface ManualRawMaterialService extends IService<ManualRawMaterial> {

}

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

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

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

/**
 * <p>
 * ç”Ÿäº§æŠ¥å·¥-->半成品领用 æœåŠ¡ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-09-04 10:39:26
 */
public interface ManualUnfinishedProductService extends IService<ManualUnfinishedProduct> {

}

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

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

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

/**
 * <p>
 * ç”Ÿäº§ç®¡ç†-->生产报工 æœåŠ¡ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-09-04 10:43:26
 */
public interface ManufactureReportService extends IService<ManufactureReport> {

}

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

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

import com.yuanchu.mom.pojo.ManualRawMaterial;
import com.yuanchu.mom.mapper.ManualRawMaterialMapper;
import com.yuanchu.mom.service.ManualRawMaterialService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * ç”Ÿäº§æŠ¥å·¥-->原材料领用 æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-09-04 10:39:07
 */
@Service
public class ManualRawMaterialServiceImpl extends ServiceImpl<ManualRawMaterialMapper, ManualRawMaterial> implements ManualRawMaterialService {

}

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

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

import com.yuanchu.mom.pojo.ManualUnfinishedProduct;
import com.yuanchu.mom.mapper.ManualUnfinishedProductMapper;
import com.yuanchu.mom.service.ManualUnfinishedProductService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * ç”Ÿäº§æŠ¥å·¥-->半成品领用 æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-09-04 10:39:26
 */
@Service
public class ManualUnfinishedProductServiceImpl extends ServiceImpl<ManualUnfinishedProductMapper, ManualUnfinishedProduct> implements ManualUnfinishedProductService {

}

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

@@ -51,7 +51,6 @@
    public Map<String, Object> sePros(Integer schedulingId) {
        //基本信息
        Map<String, Object> manufactureOrder = manufactureSchedulingService.sePros(schedulingId);
        MyUtil.PrintLog(manufactureOrder.toString());
        //计划编制
        List<Map<String, Object>> mapList = manualTechnologyMapper.selectListTowTree(schedulingId);
        manufactureOrder.put("message",mapList);

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

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

import com.yuanchu.mom.pojo.ManufactureReport;
import com.yuanchu.mom.mapper.ManufactureReportMapper;
import com.yuanchu.mom.service.ManufactureReportService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * ç”Ÿäº§ç®¡ç†-->生产报工 æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-09-04 10:43:26
 */
@Service
public class ManufactureReportServiceImpl extends ServiceImpl<ManufactureReportMapper, ManufactureReport> implements ManufactureReportService {

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,5 @@
<?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.ManualRawMaterialMapper">

</mapper>

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

@@ -44,5 +44,6 @@
                 LEFT JOIN manual_technology t ON t.`id` = p.`manual_technology_id`
        WHERE p.`state` = 1
          AND p.`manufacture_scheduling_id` = #{schedulingId}
        ORDER BY p.`create_time` DESC
    </select>
</mapper>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,5 @@
<?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.ManualUnfinishedProductMapper">

</mapper>

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

@@ -15,7 +15,7 @@
        scheduled_production,
        DATE_FORMAT(downTime, '%Y-%m-%d') downTime,
        DATE_FORMAT(delTime, '%Y-%m-%d') delTime,
        go_state,
        go_state
        from mom_ocean.manufacture_order
        where state=1
        <if test="downTime!=null and downTime!=''">
@@ -28,8 +28,9 @@
            and customer_code like concat('%',#{customerCode},'%')
        </if>
        <if test="type!=null">
            and type=#{type}
            and go_state=#{type}
        </if>
        ORDER BY create_time DESC
    </select>

    <update id="deleteManufacture">
@@ -55,6 +56,7 @@
        SELECT m.`order_code`, m.`name`, m.`id`
        FROM manufacture_order m
        WHERE m.`state` = 1
        ORDER BY m.`create_time` DESC
    </select>

    <update id="updateManufacture">

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,5 @@
<?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.ManufactureReportMapper">

</mapper>

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

@@ -9,6 +9,7 @@
        FROM manufacture_scheduling m
        WHERE m.`manufacture_order_id` = 3
          AND m.`state` = 1
        ORDER BY m.`create_time` DESC
    </select>

    <select id="selectProduceTable" resultType="map">
@@ -18,6 +19,7 @@
        WHERE m.`manufacture_order_id` = #{manOrdId}
          AND m.`manufacture_order_id` = o.`id`
          AND m.`state` = 1
          AND m.`go_state` = 1
        <if test="productName != null and productName != ''">
            AND o.`name` LIKE CONCAT('%', #{productName}, '%')
        </if>
@@ -27,6 +29,7 @@
        <if test="endTime != null and endTime != ''">
            AND m.`end_time` <![CDATA[ <= ]]> #{endTime}
        </if>
        ORDER BY m.`create_time` DESC
    </select>

    <select id="sePros" resultType="map">
@@ -35,9 +38,15 @@
        FROM manufacture_scheduling s, manufacture_order o
        WHERE s.`manufacture_order_id` = o.`id`
          AND s.`id` = #{schedulingId}
        ORDER BY s.`create_time` DESC
    </select>

    <select id="reportSelectScheduling" resultType="map">

        SELECT m.`id`, o.`customer_code`, o.`proname`, o.`name`, o.`specifications`, o.`unit`, m.`scheduled`
        FROM manufacture_scheduling m, manufacture_order o
        WHERE m.`state` = 1
          AND m.`manufacture_order_id` = o.`id`
          AND m.`go_state` = 1
        ORDER BY m.`create_time` DESC
    </select>
</mapper>

 system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java

@@ -15,7 +15,7 @@
// æ¼”示例子，执行 main æ–¹æ³•æŽ§åˆ¶å°è¾“入模块表名回车自动生成对应项目目录中
public class CodeGenerator {

    public static String database_url = "jdbc:mysql://192.168.110.209:3306/mom_ocean?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai";
    public static String database_url = "jdbc:mysql://192.168.191.113:3306/mom_ocean?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai";
    public static String database_username = "user";
    public static String database_password= "123456";
    public static String author = "江苏鵷雏网络科技有限公司";

 system-run/src/main/resources/application-dev.yml

@@ -34,7 +34,7 @@
  datasource:
    type: com.alibaba.druid.pool.DruidDataSource
    driverClassName: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://192.168.191.113:3306/mom_ocean?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
    url: jdbc:mysql://192.168.73.113:3306/mom_ocean?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
    username: user
    password: 123456
    druid:
@@ -59,7 +59,7 @@
    # redis数据库索引(默认为0)，我们使用索引为3的数据库，避免和其他数据库冲突
    database: 0
    # redis服务器地址（默认为localhost）
    host: 192.168.191.113
    host: 192.168.73.113
    # redis端口（默认为6379）
    port: 6379
    # redis访问密码（默认为空）