From f36894cddd51b70b83a54f77693b331c4e1ab4d9 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 26 六月 2024 14:49:29 +0800
Subject: [PATCH] 增加sd,pp数据库模块
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orders.java | 67 +++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/Reportingdamage.java | 35 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Order.java | 232 ++++++++++++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/request/ReportingDamageMapper.java | 16
hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java | 30 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java | 46 ++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java | 65 +++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/ReportingWorkMapper.java | 16
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/ReportingWorkController.java | 40 ++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/impl/OrdersServiceImpl.java | 44 ++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/ReportingWork.java | 176 +++++++++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/xml/OrderMapper.xml | 5
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/OrdersMapper.java | 15
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/OrderMapper.java | 16
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/OrdersService.java | 23 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/controller/OrderController.java | 39 ++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/OrderdetailMapper.java | 15
hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java | 8
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/AwaitingRepair.java | 162 ++++++++
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-prod.yml | 2
/dev/null | 23 -
hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/ApplicationTest.java | 1
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/ReportingWorkService.java | 21 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/request/AwaitingRepairMapper.java | 16
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml | 2
25 files changed, 1,086 insertions(+), 29 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/controller/OrderController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/controller/OrderController.java
new file mode 100644
index 0000000..06f0c22
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/controller/OrderController.java
@@ -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);
+ }
+}
+
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Order.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Order.java
new file mode 100644
index 0000000..0547f19
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Order.java
@@ -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;
+
+ /**
+ * 閿�鍞汉鍛業d
+ */
+ 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;
+
+ /**
+ * 瀹℃牳浜篿d
+ */
+ private String verifierId;
+
+ /**
+ * 瀹℃牳浜�
+ */
+ private String verifier;
+
+ /**
+ * 鍒涘缓浜篿d
+ */
+ 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;
+
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java
new file mode 100644
index 0000000..0d667e2
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java
@@ -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;
+
+
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orders.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orders.java
new file mode 100644
index 0000000..62ccec2
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orders.java
@@ -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;
+
+
+
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/OrderMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/OrderMapper.java
new file mode 100644
index 0000000..f9ed0af
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/OrderMapper.java
@@ -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> {
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/OrderdetailMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/OrderdetailMapper.java
new file mode 100644
index 0000000..87657fb
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/OrderdetailMapper.java
@@ -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> {
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/OrdersMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/OrdersMapper.java
new file mode 100644
index 0000000..d7365d0
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/OrdersMapper.java
@@ -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> {
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/xml/OrderMapper.xml b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/xml/OrderMapper.xml
new file mode 100644
index 0000000..39b3ea8
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/xml/OrderMapper.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.mes.order.mapper.OrderMapper">
+
+</mapper>
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/OrdersService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/OrdersService.java
new file mode 100644
index 0000000..90702fa
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/OrdersService.java
@@ -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);
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/impl/OrdersServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/impl/OrdersServiceImpl.java
new file mode 100644
index 0000000..938d4bf
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/impl/OrdersServiceImpl.java
@@ -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);
+ }
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/ReportingWorkController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/ReportingWorkController.java
new file mode 100644
index 0000000..375cbc7
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/ReportingWorkController.java
@@ -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);
+ }
+}
+
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/ReportingWork.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/ReportingWork.java
new file mode 100644
index 0000000..d0f7876
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/ReportingWork.java
@@ -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;
+
+ /**
+ * 鍒涘缓鑰卛d
+ */
+ private String creatorId;
+
+ /**
+ * 鍒涘缓鑰�
+ */
+ private String creator;
+
+ /**
+ * 寤虹珛鏃堕棿
+ */
+ private LocalDateTime createTime;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ private LocalDateTime updateTime;
+
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/AwaitingRepair.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/AwaitingRepair.java
new file mode 100644
index 0000000..13d0253
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/AwaitingRepair.java
@@ -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;
+
+
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/Reportingdamage.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/Reportingdamage.java
new file mode 100644
index 0000000..402a774
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/Reportingdamage.java
@@ -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;
+
+
+}
+
+
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/ReportingWorkMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/ReportingWorkMapper.java
new file mode 100644
index 0000000..3c5b64e
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/ReportingWorkMapper.java
@@ -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> {
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/request/AwaitingRepairMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/request/AwaitingRepairMapper.java
new file mode 100644
index 0000000..a932fff
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/request/AwaitingRepairMapper.java
@@ -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> {
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/request/ReportingDamageMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/request/ReportingDamageMapper.java
new file mode 100644
index 0000000..c9ca9e2
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/request/ReportingDamageMapper.java
@@ -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> {
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeLayoutService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeLayoutService.java
deleted file mode 100644
index ec7dc25..0000000
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeLayoutService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mes.pp.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.mes.pp.entity.OptimizeLayout;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author zhoush
- * @since 2024-04-16
- */
-public interface OptimizeLayoutService extends IService<OptimizeLayout> {
-
-}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/ReportingWorkService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/ReportingWorkService.java
new file mode 100644
index 0000000..fa13034
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/ReportingWorkService.java
@@ -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);
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeLayoutServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeLayoutServiceImpl.java
deleted file mode 100644
index 4881d52..0000000
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeLayoutServiceImpl.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.mes.pp.service.impl;
-
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.mes.pp.entity.OptimizeLayout;
-import com.mes.pp.mapper.OptimizeLayoutMapper;
-import com.mes.pp.service.OptimizeLayoutService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author zhoush
- * @since 2024-04-16
- */
-@Service
-@DS("pp")
-public class OptimizeLayoutServiceImpl extends ServiceImpl<OptimizeLayoutMapper, OptimizeLayout> implements OptimizeLayoutService {
-
-}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java
new file mode 100644
index 0000000..ce35e08
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java
@@ -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 = '蹇�熺（'
+
+ }
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java
index eba025b..da7da7a 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java
+++ b/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);//鏁版嵁搴撹〃鏄犲皠鍒板疄浣撶殑鍛藉悕绛栫暐
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml
index a8a4157..d4558c8 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml
+++ b/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
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-prod.yml b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-prod.yml
index 2c49cb7..a218f03 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-prod.yml
+++ b/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
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/ApplicationTest.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/ApplicationTest.java
index 9f636a1..3d9b452 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/ApplicationTest.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/ApplicationTest.java
@@ -30,4 +30,5 @@
List<OptimizeDetail> list = optimizationDetailService.list();
System.out.println("鑾峰彇璁板綍鏁帮細" + list.size());
}
+
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java
index d052648..15be7ab 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java
+++ b/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);
+ }
+
}
--
Gitblit v1.8.0