wu
2024-06-26 f36894cddd51b70b83a54f77693b331c4e1ab4d9
增加sd,pp数据库模块
5个文件已修改
19个文件已添加
2个文件已删除
1131 ■■■■■ 已修改文件
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/controller/OrderController.java 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Order.java 232 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orders.java 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/OrderMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/OrderdetailMapper.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/OrdersMapper.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/xml/OrderMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/OrdersService.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/impl/OrdersServiceImpl.java 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/ReportingWorkController.java 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/ReportingWork.java 176 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/AwaitingRepair.java 162 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/Reportingdamage.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/ReportingWorkMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/request/AwaitingRepairMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/request/ReportingDamageMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeLayoutService.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/ReportingWorkService.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeLayoutServiceImpl.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-prod.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/ApplicationTest.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/controller/OrderController.java
New file
@@ -0,0 +1,39 @@
package com.mes.order.controller;
import com.mes.order.entity.Orderdetail;
import com.mes.order.entity.Orders;
import com.mes.order.service.OrdersService;
import com.mes.utils.Result;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author wu
 * @since 2024-06-17
 */
@RestController
@RequestMapping("/order/order")
@Slf4j
public class OrderController {
    @Autowired
    //获取待选择的工程号
    private OrdersService ordersService;
    @ApiOperation("显示订单详细")
    @PostMapping("/selectOrderdetail") //显示工程选择信息
    @ResponseBody
    public Result<List<Orderdetail>> listByState(@RequestBody Orders orders) {
        log.info("将请求参数封装在请求类里面");
        List<Orderdetail> glass = ordersService.selectOrderdetail(orders);
        log.info("显示订单详情信息:{}", glass);
        return Result.build(200, "", glass);
    }
}
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Order.java
New file
@@ -0,0 +1,232 @@
package com.mes.order.entity;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
 * <p>
 *
 * </p>
 *
 * @author wu
 * @since 2024-06-17
 */
@Data
@EqualsAndHashCode(callSuper = false)
public class Order implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * <订单表>
     */
      @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
     * 订单Id
     */
    private String orderId;
    /**
     * 项目名称
     */
    private String project;
    /**
     * 客户Id
     */
    private Long customerId;
    /**
     * 客户名称
     */
    private String customerName;
    /**
     * 订单类型
     */
    private String orderType;
    /**
     * 订单分类
     */
    private String orderClassify;
    /**
     * 商标选项
     */
    private String icon;
    /**
     * 包装方式
     */
    private String packType;
    /**
     * 送货时间
     */
    private LocalDateTime deliveryDate;
    /**
     * 批次
     */
    private String batch;
    /**
     * 计算方式
     */
    private Integer calculateType;
    /**
     * 销售人员Id
     */
    private String salesmanId;
    /**
     * 销售人
     */
    private String salesman;
    /**
     * 铝条方式
     */
    private String alType;
    /**
     * 金额
     */
    private BigDecimal money;
    /**
     * 合同编号
     */
    private String contractId;
    /**
     * 客户批次
     */
    private String customerBatch;
    /**
     * 联系人
     */
    private String contacts;
    /**
     * 联系电话
     */
    private String contactNumber;
    /**
     * 送货地址
     */
    private String deliveryAddress;
    /**
     * 其他金额
     */
    private BigDecimal otherMoney;
    /**
     * 其他金额备注
     */
    private String otherMoneyRemarks;
    /**
     * 订单加工备注
     */
    private String processingNote;
    /**
     * 其他备注
     */
    private String otherRemarks;
    /**
     * 面积
     */
    private BigDecimal area;
    /**
     * 数量
     */
    private Long quantity;
    /**
     * 周长
     */
    private String perimeter;
    /**
     * 审核人id
     */
    private String verifierId;
    /**
     * 审核人
     */
    private String verifier;
    /**
     * 创建人id
     */
    private String creatorId;
    /**
     * 创建人
     */
    private String creator;
    /**
     * 下单
     */
    private Integer createOrder;
    /**
     * 工艺审核
     */
    private Integer processReview;
    /**
     * 订单审核
     */
    private Integer orderReview;
    /**
     * 生产订单
     */
    private Integer productionOrder;
    /**
     * 流程卡
     */
    private Integer processingCard;
    /**
     * 入库    未入库状态0,未完全入库状态1,完全入库状态2
     */
    private Integer warehousing;
    /**
     * 发货
     */
    private Integer delivery;
    /**
     * 创建日期
     */
    private LocalDateTime createTime;
    /**
     * 修改时间
     */
    private LocalDateTime updateTime;
}
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java
New file
@@ -0,0 +1,65 @@
package com.mes.order.entity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
/**
 * <p>
 *
 * </p>
 *
 * @author wu
 * @since 2024-06-17
 */
@Data
@EqualsAndHashCode(callSuper = false)
public class Orderdetail implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * 订单Id
     */
    private String orderId;
    /**
     * 项目名称
     */
    private String project;
    /**
     * 产品名称
     */
    private String productName;
    /**
     * 宽
     */
    private String width;
    /**
     * 高
     */
    private String height;
    /**
     * 面积
     */
    private Double area;
    /**
     * 包装方式
     */
    private Integer quantity;
    /**
     * 状态
     */
    private String processingNote;
    /**
     * 送货时间
     */
    private String deliveryDate;
}
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orders.java
New file
@@ -0,0 +1,67 @@
package com.mes.order.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
 * <p>
 *
 * </p>
 *
 * @author wu
 * @since 2024-06-17
 */
@Data
@EqualsAndHashCode(callSuper = false)
public class Orders implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * <订单表>
     */
    /**
     * 订单Id
     */
    private String orderId;
    /**
     * 客户名称
     */
    private String customerName;
    /**
     * 项目名称
     */
    private String project;
    /**
     * 面积
     */
    private Double area;
    /**
     * 包装方式
     */
    private Integer quantity;
    /**
     * 状态
     */
    private Integer warehousing;
    /**
     * 送货时间
     */
    private String deliveryDate;
}
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/OrderMapper.java
New file
@@ -0,0 +1,16 @@
package com.mes.order.mapper;
import com.mes.order.entity.Order;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author wu
 * @since 2024-06-17
 */
public interface OrderMapper extends BaseMapper<Order> {
}
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/OrderdetailMapper.java
New file
@@ -0,0 +1,15 @@
package com.mes.order.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.order.entity.Orderdetail;
/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author wu
 * @since 2024-06-17
 */
public interface OrderdetailMapper extends BaseMapper<Orderdetail> {
}
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/OrdersMapper.java
New file
@@ -0,0 +1,15 @@
package com.mes.order.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.order.entity.Orders;
/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author wu
 * @since 2024-06-17
 */
public interface OrdersMapper extends BaseMapper<Orders> {
}
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/xml/OrderMapper.xml
New file
@@ -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.mes.order.mapper.OrderMapper">
</mapper>
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/OrdersService.java
New file
@@ -0,0 +1,23 @@
package com.mes.order.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.order.entity.Order;
import com.mes.order.entity.Orderdetail;
import com.mes.order.entity.Orders;
import java.util.List;
/**
 * <p>
 *  服务类
 * </p>
 *
 * @author wu
 * @since 2024-06-17
 */
public interface OrdersService extends IService<Orders> {
    List<Orders> selectOrders();
    List<Orderdetail> selectOrderdetail(Orders orders);
}
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/impl/OrdersServiceImpl.java
New file
@@ -0,0 +1,44 @@
package com.mes.order.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.order.entity.Orderdetail;
import com.mes.order.entity.Orders;
import com.mes.order.mapper.OrderdetailMapper;
import com.mes.order.mapper.OrdersMapper;
import com.mes.order.service.OrdersService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.List;
/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author wu
 * @since 2024-06-17
 */
@Service
@DS("sd")
public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, Orders> implements OrdersService {
@Autowired
private OrderdetailMapper orderdetailMapper;
    @Override
    public List<Orders> selectOrders() {
        //获取所有未完成的订单
        QueryWrapper<Orders> queryWrapper = new QueryWrapper<>();
        queryWrapper.ne("warehousing", "2");
        return baseMapper.selectList(queryWrapper);
    }
    @Override
    public List<Orderdetail> selectOrderdetail(Orders orders) {
        QueryWrapper<Orderdetail> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("order_id", orders.getOrderId());
        return orderdetailMapper.selectList(queryWrapper);
    }
}
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/ReportingWorkController.java
New file
@@ -0,0 +1,40 @@
package com.mes.pp.controller;
import com.mes.pp.entity.request.OptimizeRequest;
import com.mes.pp.entity.request.Reportingdamage;
import com.mes.pp.service.ReportingWorkService;
import com.mes.utils.Result;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author wu
 * @since 2024-06-26
 */
@RestController
@RequestMapping("/reporting_work/reporting-work")
@Slf4j
public class ReportingWorkController {
    @Autowired
    private ReportingWorkService reportingWorkService;
    @ApiOperation("显示工程选择信息")
    @PostMapping("/selectDamage") //显示工程选择信息
    @ResponseBody
    public Result<List<Reportingdamage>> selectDamage(@RequestBody Reportingdamage reportingdamage) {
        log.info("将请求参数封装在请求类里面");
        List<Reportingdamage> glass = reportingWorkService.selectDamage(reportingdamage);
        log.info("显示工程选择信息:{}", glass);
        return Result.build(200, "", glass);
    }
}
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/ReportingWork.java
New file
@@ -0,0 +1,176 @@
package com.mes.pp.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
 * <p>
 *
 * </p>
 *
 * @author wu
 * @since 2024-06-26
 */
@Data
@EqualsAndHashCode(callSuper = false)
public class ReportingWork implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * <报工主表>
     */
      @TableId(value = "id", type = IdType.AUTO)
    private Long id;
    /**
     * 报工编号
     */
    private String reportingWorkId;
    /**
     * 销售单号
     */
    private String orderId;
    /**
     * 生产订单号
     */
    private String productionId;
    /**
     * 流程卡号
     */
    private String processId;
    /**
     * 本工序
     */
    private String thisProcess;
    /**
     * 设备编号
     */
    private byte[] deviceId;
    /**
     * 设备名称
     */
    private String deviceName;
    /**
     * 上工序
     */
    private String previousProcess;
    /**
     * 上工序数量
     */
    private Integer previousProcessQuantity;
    /**
     * 本工序数量
     */
    private Integer thisProcessQuantity;
    /**
     * 本工序完工数
     */
    private Integer thisCompletedQuantity;
    /**
     * 本工序次破数
     */
    private Integer thisWornQuantity;
    /**
     * 下工序
     */
    private String nextProcess;
    /**
     * 班次
     */
    private String classes;
    /**
     * 班组编号
     */
    private String teamsGroupsId;
    /**
     * 班组名称
     */
    private String teamsGroupsName;
    /**
     * 报工状态
     */
    private Integer reportingWorkState;
    /**
     * 审核人
     */
    private String reviewed;
    /**
     * 审核状态(默认0,审核通过1,不通过2,小于0删除)
     */
    private Integer reviewedState;
    /**
     * 备注
     */
    private String notes;
    /**
     * 质检员
     */
    private String qualityInspector;
    /**
     * 包装方式
     */
    private String packagingMethod;
    /**
     * 报工时间
     */
    private LocalDateTime reportingWorkTime;
    /**
     * 审核时间
     */
    private LocalDateTime examineTime;
    /**
     * 质检时间
     */
    private LocalDateTime qualityInsTime;
    /**
     * 创建者id
     */
    private String creatorId;
    /**
     * 创建者
     */
    private String creator;
    /**
     * 建立时间
     */
    private LocalDateTime createTime;
    /**
     * 修改时间
     */
    private LocalDateTime updateTime;
}
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/AwaitingRepair.java
New file
@@ -0,0 +1,162 @@
package com.mes.pp.entity.request;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
 * <p>
 *
 * </p>
 *
 * @author wu
 * @since 2024-06-26
 */
@Data
@EqualsAndHashCode(callSuper = false)
public class AwaitingRepair implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * 次破时间
     */
    private String reportingWorkTime;
    /**
     * 订单号
     */
    private String orderId;
    /**
     * 报工编号
     */
    private String reportingWorkId;
    /**
     * 生产订单号
     */
    private String productionId;
    /**
     * 流程卡号
     */
    private String processId;
    /**
     * 项目名称
     */
    private String project;
    /**
     * 批次
     */
    private String batch;
    /**
     * 明细id
     */
    private String reviewer;
    /**
     * 楼号
     */
    private String buildingNumber;
    /**
     * 订单序号
     */
    private Integer orderSort;
    /**
     * 产品名称
     */
    private String productName;
    /**
     * 工艺确认序号
     */
    private Integer technologyNumber;
    /**
     * 片标记(位置)
     */
    private Integer glassAddress;
    /**
     * 补片数量
     */
    private Integer patchNum;
    /**
     * 宽
     */
    private Double width;
    /**
     * 高
     */
    private Double height;
    /**
     * 形状
     */
    private String shape;
    /**
     * 责任工序
     */
    private String responsibleProcess;
    /**
     * 本工序
     */
    private String patchProcesses;
    /**
     * 次破未补数量
     */
    private Integer breakageQuantity;
    /**
     * 退回工序
     */
    private String returnProcesses;
    /**
     * 次破原因
     */
    private String patchReason;
    /**
     * 次破类型
     */
    private String patchType;
    /**
     * 责任人员
     */
    private String responsiblePersonnel;
    /**
     * 责任设备
     */
    private String responsibleEquipment;
    /**
     * 责任班组
     */
    private String responsibleTeam;
    /**
     * 次破面积
     */
    private LocalDateTime patchArea;
    /**
     * 质检员
     */
    private LocalDateTime qualityInspector;
}
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/Reportingdamage.java
New file
@@ -0,0 +1,35 @@
package com.mes.pp.entity.request;
import lombok.Data;
/**
 * @author wu
 */
@Data
public class Reportingdamage {
    /**
     * 工序
     */
    private String thisProcess;
    /**
     * 设备
     */
    private String deviceName;
    /**
     * 加工数量
     */
    private Integer completedQuantity;
    /**
     * 次破数量
     */
    private Integer breakageQuantity;
    /**
     * 次破时间
     */
    private String reportingWorkTime;
}
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/ReportingWorkMapper.java
New file
@@ -0,0 +1,16 @@
package com.mes.pp.mapper;
import com.mes.pp.entity.ReportingWork;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author wu
 * @since 2024-06-26
 */
public interface ReportingWorkMapper extends BaseMapper<ReportingWork> {
}
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/request/AwaitingRepairMapper.java
New file
@@ -0,0 +1,16 @@
package com.mes.pp.mapper.request;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.pp.entity.request.AwaitingRepair;
/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author wu
 * @since 2024-06-26
 */
public interface AwaitingRepairMapper extends BaseMapper<AwaitingRepair> {
}
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/request/ReportingDamageMapper.java
New file
@@ -0,0 +1,16 @@
package com.mes.pp.mapper.request;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.pp.entity.request.Reportingdamage;
/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author wu
 * @since 2024-06-26
 */
public interface ReportingDamageMapper extends BaseMapper<Reportingdamage> {
}
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeLayoutService.java
File was deleted
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/ReportingWorkService.java
New file
@@ -0,0 +1,21 @@
package com.mes.pp.service;
import com.mes.pp.entity.ReportingWork;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.pp.entity.request.Reportingdamage;
import java.util.List;
/**
 * <p>
 *  服务类
 * </p>
 *
 * @author wu
 * @since 2024-06-26
 */
public interface ReportingWorkService extends IService<ReportingWork> {
     //获取顶部扇形图破损加工数量
     List<Reportingdamage> selectDamage(Reportingdamage reportingdamage);
}
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeLayoutServiceImpl.java
File was deleted
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java
New file
@@ -0,0 +1,46 @@
package com.mes.pp.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.mes.pp.entity.ReportingWork;
import com.mes.pp.entity.request.Reportingdamage;
import com.mes.pp.mapper.ReportingWorkMapper;
import com.mes.pp.mapper.request.AwaitingRepairMapper;
import com.mes.pp.mapper.request.ReportingDamageMapper;
import com.mes.pp.service.ReportingWorkService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.Collections;
import java.util.List;
/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author wu
 * @since 2024-06-26
 */
@Service
@DS("pp")
@Slf4j
public class ReportingWorkServiceImpl extends ServiceImpl<ReportingWorkMapper, ReportingWork> implements ReportingWorkService {
@Autowired
private ReportingDamageMapper reportingDamageMapper;
@Autowired
private AwaitingRepairMapper awaitingRepairMapper;
    @Override
    public List<Reportingdamage> selectDamage(Reportingdamage reportingdamage) {
        QueryWrapper<Reportingdamage>queryWrapper=new QueryWrapper<>();
        queryWrapper.eq("this_process",reportingdamage.getThisProcess())
                .eq("device_name",reportingdamage.getDeviceName())
                .le("reporting_work_time", LocalDateTime.now());
        return reportingDamageMapper.selectList(queryWrapper);
//  rw.reporting_work_time BETWEEN '2024/05/12'and'2024/06/20' and rw.this_process = '磨边' and  rw.device_name = '快速磨'
    }
}
hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java
@@ -22,7 +22,7 @@
        // 2、全局配置
        // 全局配置
        GlobalConfig gc = new GlobalConfig();
        gc.setOutputDir("D:\\Documents\\hangzhoumesParent6\\");
        gc.setOutputDir("D:\\Documents\\hangzhoumesParent5\\");
        gc.setServiceName("%sService");    //去掉Service接口的首字母I
        gc.setAuthor("wu");
@@ -31,7 +31,7 @@
        // 3、数据源配置
        DataSourceConfig dsc = new DataSourceConfig();
        dsc.setUrl("jdbc:mysql://10.153.19.150:3306/sd?serverTimezone=GMT%2b8");
        dsc.setUrl("jdbc:mysql://10.153.19.150:3306/pp?serverTimezone=GMT%2b8");
        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
        dsc.setUsername("root");
        dsc.setPassword("beibo.123/");
@@ -41,7 +41,7 @@
        // 4、包配置
        PackageConfig pc = new PackageConfig();
        pc.setParent("com.mes");
        pc.setModuleName("orderdetail"); //模块名
        pc.setModuleName("reporting_work"); //模块名
        pc.setController("controller");
        pc.setService("service");
        pc.setMapper("mapper");
@@ -50,7 +50,7 @@
        // 5、策略配置
        StrategyConfig strategy = new StrategyConfig();
        strategy.setInclude("order_detail");
        strategy.setInclude("reporting_work");
        strategy.setNaming(NamingStrategy.underline_to_camel);//数据库表映射到实体的命名策略
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml
@@ -15,7 +15,7 @@
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        sd:
          url: jdbc:mysql://192.168.1.199:3306/sd?serverTimezone=GMT%2b8
          url: jdbc:mysql://127.0.0.1:3306/sd?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-prod.yml
@@ -15,7 +15,7 @@
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        sd:
            url: jdbc:mysql://192.168.1.199:3306/sd?serverTimezone=GMT%2b8
            url: jdbc:mysql://10.153.19.150:3306/sd?serverTimezone=GMT%2b8
            username: root
            password: beibo.123/
            driver-class-name: com.mysql.cj.jdbc.Driver
hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/ApplicationTest.java
@@ -30,4 +30,5 @@
        List<OptimizeDetail> list = optimizationDetailService.list();
        System.out.println("获取记录数:" + list.size());
    }
}
hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java
@@ -3,9 +3,14 @@
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.service.EngineeringService;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.order.entity.Orderdetail;
import com.mes.order.entity.Orders;
import com.mes.order.service.OrdersService;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.entity.request.OptimizeRequest;
import com.mes.pp.entity.request.Reportingdamage;
import com.mes.pp.service.OptimizeProjectService;
import com.mes.pp.service.ReportingWorkService;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.service.impl.UpPattenUsageServiceImpl;
import com.mes.workstation.entity.UpWorkstation;
@@ -40,6 +45,10 @@
    private UpWorkstationService workstationService;
    @Autowired
    private OptimizeProjectService optimizeProjectService;
    @Autowired
    private OrdersService ordersService;
    @Autowired
    private ReportingWorkService reportingWorkService;
    @Test
    public void test() {
//        List<OptimizeProject> list = optimizeProjectMapper.saveProject("P24032204");
@@ -109,5 +118,26 @@
        boolean isOver= upPattenUsageService.updateGlassState(upPattenUsage);
        log.info("更改是否成功{}",isOver);
    }
    @Test
    public void test2() {
        List<Orders> list = ordersService.selectOrders();
        System.out.println("获取记录数:" + list);
    }
    @Test
    public void test3() {
        Orders orders = new Orders();
        orders.setOrderId("P24051103");
        List<Orderdetail> list = ordersService.selectOrderdetail(orders);
        System.out.println("订单详细数据:" + list);
    }
    @Test
    public void test4() {
        Reportingdamage orders = new Reportingdamage();
        orders.setThisProcess("磨边");
        orders.setDeviceName("快速磨");
        List<Reportingdamage> list = reportingWorkService.selectDamage(orders);
        System.out.println("订单详细数据:" + list);
    }
}