From e0fa0221d82f3b800cf7a6389f8cd592e0582212 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 24 六月 2024 16:29:42 +0800
Subject: [PATCH] 增加order模块，更改小片表需求数据,删除无用模块
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java | 13 +-
hangzhoumesParent/common/pom.xml | 1
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml | 2
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-dev.yml | 14 +++
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-prod.yml | 2
/dev/null | 18 ----
hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java | 120 +++++++++++++++---------------
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-cz.yml | 2
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-cz.yml | 15 +++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java | 2
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java | 19 ++++
hangzhoumesParent/common/springsecurity/pom.xml | 1
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml | 12 --
13 files changed, 117 insertions(+), 104 deletions(-)
diff --git a/hangzhoumesParent/common/displayscreen/pom.xml b/hangzhoumesParent/common/displayscreen/pom.xml
deleted file mode 100644
index a06119b..0000000
--- a/hangzhoumesParent/common/displayscreen/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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>common</artifactId>
- <groupId>com.mes</groupId>
- <version>1.0-SNAPSHOT</version>
-
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>displayscreen</artifactId>
-
- <properties>
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>sqljdbc4</artifactId>
- <version>4.0</version>
- </dependency>
- <dependency>
- <groupId>com.mes</groupId>
- <artifactId>servicebase</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/displayscreen/controller/DisplayScreenController.java b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/displayscreen/controller/DisplayScreenController.java
deleted file mode 100644
index cf76dd4..0000000
--- a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/displayscreen/controller/DisplayScreenController.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.mes.displayscreen.controller;
-import com.mes.displayscreen.service.DisplayScreenService;
-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 zhoush
- * @since 2024-04-07
- */
-@RestController
-@RequestMapping("/DisplayScreen")
-@Slf4j
-public class DisplayScreenController {
- @Autowired
- //鑾峰彇寰呴�夋嫨鐨勫伐绋嬪彿
- private DisplayScreenService displayScreenService;
-
-// @ApiOperation("鏄剧ず宸ョ▼閫夋嫨淇℃伅")
-// @PostMapping("/listByState") //鏄剧ず宸ョ▼閫夋嫨淇℃伅
-// @ResponseBody
-// public Result<List<OptimizeProject>> listByState(@RequestBody OptimizeRequest optimizeRequest) {
-// log.info("灏嗚姹傚弬鏁板皝瑁呭湪璇锋眰绫婚噷闈�");
-// List<OptimizeProject> glass = displayScreenService.listByState(optimizeRequest);
-// log.info("鏄剧ず宸ョ▼閫夋嫨淇℃伅:{}", glass);
-// return Result.build(200, "", glass);
-// }
-
-}
-
diff --git a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/displayscreen/service/DisplayScreenService.java b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/displayscreen/service/DisplayScreenService.java
deleted file mode 100644
index 0fa99d9..0000000
--- a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/displayscreen/service/DisplayScreenService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.mes.displayscreen.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.mes.order.entity.Order;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author zhoush
- * @since 2024-04-07
- */
-public interface DisplayScreenService extends IService<Order> {
-
-}
-
diff --git a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/displayscreen/service/impl/DisplayScreenServiceImpl.java b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/displayscreen/service/impl/DisplayScreenServiceImpl.java
deleted file mode 100644
index d3db065..0000000
--- a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/displayscreen/service/impl/DisplayScreenServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.mes.displayscreen.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import com.mes.displayscreen.service.DisplayScreenService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author zhoush
- * @since 2024-04-07
- */
-//@Service
-//@Slf4j
-//
-//public class DisplayScreenServiceImpl extends ServiceImpl<> implements DisplayScreenService {
-//
-//
-//}
\ No newline at end of file
diff --git a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/controller/OrderController.java b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/controller/OrderController.java
deleted file mode 100644
index f3bec96..0000000
--- a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/controller/OrderController.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.mes.order.controller;
-import com.mes.displayscreen.service.DisplayScreenService;
-import com.mes.order.entity.Order;
-import com.mes.order.service.OrderService;
-import com.mes.utils.Result;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-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 {
- private OrderService orderService;
- @ApiOperation("鏄剧ず澶у睆璁㈠崟鏁版嵁")
- @PostMapping("/selectOrder") //鏄剧ず澶у睆璁㈠崟鏁版嵁
- @ResponseBody
- public Result<List<Order>> selectOrder(@RequestBody Order order) {
- log.info("灏嗚姹傚弬鏁板皝瑁呭湪璇锋眰绫婚噷闈�");
- List<Order> orders = orderService.selectOrder(order);
- log.info("鏄剧ず璁㈠崟琛�:{}", orders);
- return Result.build(200, "", orders);
- }
-
- @ApiOperation("鏄剧ず澶у睆璁㈠崟鏄庣粏鏁版嵁")
- @PostMapping("/selectOrderDetail") //鏄剧ず澶у睆璁㈠崟鏄庣粏鏁版嵁
- @ResponseBody
- public Result<List<Order>> selectOrderDetail(@RequestBody Order order) {
- log.info("灏嗚姹傚弬鏁板皝瑁呭湪璇锋眰绫婚噷闈�");
- List<Order> orders = orderService.selectOrderDetail(order);
- log.info("鏄剧ず璁㈠崟鏄庣粏琛�:{}", orders);
- return Result.build(200, "", orders);
- }
-
-
-}
-
diff --git a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/entity/Order.java b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/entity/Order.java
deleted file mode 100644
index 0547f19..0000000
--- a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/entity/Order.java
+++ /dev/null
@@ -1,232 +0,0 @@
-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/displayscreen/src/main/java/com/mes/order/mapper/OrderMapper.java b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/mapper/OrderMapper.java
deleted file mode 100644
index f9ed0af..0000000
--- a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/mapper/OrderMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-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/displayscreen/src/main/java/com/mes/order/mapper/xml/OrderMapper.xml b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/mapper/xml/OrderMapper.xml
deleted file mode 100644
index 39b3ea8..0000000
--- a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/mapper/xml/OrderMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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/displayscreen/src/main/java/com/mes/order/service/OrderService.java b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/service/OrderService.java
deleted file mode 100644
index edf1951..0000000
--- a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/service/OrderService.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.mes.order.service;
-
-import com.mes.order.entity.Order;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author wu
- * @since 2024-06-17
- */
-public interface OrderService extends IService<Order> {
-
- List<Order> selectOrder(Order order);
-
- List<Order> selectOrderDetail(Order order);
-}
-
diff --git a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/service/impl/OrderServiceImpl.java b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/service/impl/OrderServiceImpl.java
deleted file mode 100644
index f9e7d26..0000000
--- a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/order/service/impl/OrderServiceImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.mes.order.service.impl;
-
-import com.mes.order.entity.Order;
-import com.mes.order.mapper.OrderMapper;
-import com.mes.order.service.OrderService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author wu
- * @since 2024-06-17
- */
-@Service
-public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {
-
- @Override
- public List<Order> selectOrder(Order order) {
- return Collections.emptyList();
- }
-
- @Override
- public List<Order> selectOrderDetail(Order order) {
- return Collections.emptyList();
- }
-}
diff --git a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/controller/OrderDetailController.java b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/controller/OrderDetailController.java
deleted file mode 100644
index 27398a8..0000000
--- a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/controller/OrderDetailController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.mes.orderdetail.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author wu
- * @since 2024-06-18
- */
-@RestController
-@RequestMapping("/orderdetail/order-detail")
-public class OrderDetailController {
-
-}
-
diff --git a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/entity/OrderDetail.java b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/entity/OrderDetail.java
deleted file mode 100644
index a4931f9..0000000
--- a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/entity/OrderDetail.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package com.mes.orderdetail.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-18
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class OrderDetail implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * <璁㈠崟浜у搧鏄庣粏>
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 璁㈠崟Id
- */
- private String orderId;
-
- /**
- * 璁㈠崟浜у搧鑷簭
- */
- private Integer orderNumber;
-
- /**
- * 妤煎彿
- */
- private String buildingNumber;
-
- /**
- * 浜у搧Id
- */
- private Long productId;
-
- /**
- * 浜у搧鍚嶇О
- */
- private String productName;
-
- /**
- * 鍗曚环
- */
- private BigDecimal price;
-
- /**
- * 鏁伴噺
- */
- private Long quantity;
-
- /**
- * 鎬婚噾棰�
- */
- private BigDecimal grossAmount;
-
- /**
- * 瀹�
- */
- private BigDecimal width;
-
- /**
- * 楂�
- */
- private BigDecimal height;
-
- /**
- * 褰㈢姸
- */
- private String shape;
-
- /**
- * 瀹為檯闈㈢Н
- */
- private BigDecimal area;
-
- /**
- * 瀹為檯鎬婚潰绉�
- */
- private BigDecimal grossArea;
-
- /**
- * 缁撶畻鍗曠墖闈㈢Н
- */
- private BigDecimal computeArea;
-
- /**
- * 缁撶畻鎬婚潰绉�
- */
- private BigDecimal computeGrossArea;
-
- /**
- * 鍔犲伐瑕佹眰
- */
- private String processingNote;
-
- /**
- * 澶囨敞
- */
- private String remarks;
-
- /**
- * 寮挗寮у害
- */
- private Double bendRadius;
-
- /**
- * 纾ㄨ竟绫诲瀷
- */
- private String edgingType;
-
- /**
- * 鎷遍珮
- */
- private Double archRise;
-
- /**
- * 閲嶉噺
- */
- private String weight;
-
- /**
- * 鍛ㄩ暱
- */
- private String perimeter;
-
- /**
- * 鍏朵粬鍒�
- */
- private String otherColumns;
-
- /**
- * 鍏ュ簱鍙敤鏁伴噺
- */
- private Integer warehouseNum;
-
- /**
- * 鍙戣揣鏁伴噺
- */
- private Integer deliveryNum;
-
- /**
- * 閫�璐ф暟閲�
- */
- private Integer returnNum;
-
- /**
- * 鐘舵��
- */
- private Integer state;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- private LocalDateTime createTime;
-
- /**
- * 淇敼鏃堕棿
- */
- private LocalDateTime updateTime;
-
-
-}
diff --git a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/mapper/OrderDetailMapper.java b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/mapper/OrderDetailMapper.java
deleted file mode 100644
index dd6a8c2..0000000
--- a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/mapper/OrderDetailMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mes.orderdetail.mapper;
-
-import com.mes.orderdetail.entity.OrderDetail;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author wu
- * @since 2024-06-18
- */
-public interface OrderDetailMapper extends BaseMapper<OrderDetail> {
-
-}
diff --git a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/mapper/xml/OrderDetailMapper.xml b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/mapper/xml/OrderDetailMapper.xml
deleted file mode 100644
index 37b0072..0000000
--- a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/mapper/xml/OrderDetailMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.orderdetail.mapper.OrderDetailMapper">
-
-</mapper>
diff --git a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/service/OrderDetailService.java b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/service/OrderDetailService.java
deleted file mode 100644
index fc7039f..0000000
--- a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/service/OrderDetailService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mes.orderdetail.service;
-
-import com.mes.orderdetail.entity.OrderDetail;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author wu
- * @since 2024-06-18
- */
-public interface OrderDetailService extends IService<OrderDetail> {
-
-}
diff --git a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/service/impl/OrderDetailServiceImpl.java b/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/service/impl/OrderDetailServiceImpl.java
deleted file mode 100644
index 4e08615..0000000
--- a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/service/impl/OrderDetailServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.mes.orderdetail.service.impl;
-
-import com.mes.orderdetail.entity.OrderDetail;
-import com.mes.orderdetail.mapper.OrderDetailMapper;
-import com.mes.orderdetail.service.OrderDetailService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author wu
- * @since 2024-06-18
- */
-@Service
-public class OrderDetailServiceImpl extends ServiceImpl<OrderDetailMapper, OrderDetail> implements OrderDetailService {
-
-}
diff --git a/hangzhoumesParent/common/displayscreen/src/main/resources/banner.txt b/hangzhoumesParent/common/displayscreen/src/main/resources/banner.txt
deleted file mode 100644
index b4027f0..0000000
--- a/hangzhoumesParent/common/displayscreen/src/main/resources/banner.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-________ ________ ___ _____________ ____
-`MMMMMMMb. 68b `MMMMMMMb. `MMb dMM'`MMMMMMMMM 6MMMMb\
- MM `Mb Y89 MM `Mb MMM. ,PMM MM \ 6M' `
- MM MM ____ ___ MM MM _____ M`Mb d'MM MM MM
- MM .M9 6MMMMb `MM MM .M9 6MMMMMb M YM. ,P MM MM , YM.
- MMMMMMM( 6M' `Mb MM MMMMMMM( 6M' `Mb M `Mb d' MM MMMMMMM YMMMMb
- MM `Mb MM MM MM MM `Mb MM MM M YM.P MM MM ` `Mb
- MM MM MMMMMMMM MM MM MM MM MM M `Mb' MM MM MM
- MM MM MM MM MM MM MM MM M YP MM MM MM
- MM .M9 YM d9 MM MM .M9 YM. ,M9 68b M `' MM MM / L ,M9
-_MMMMMMM9' YMMMM9 _MM__MMMMMMM9' YMMMMM9 Y89 _M_ _MM__MMMMMMMMM MYMMMM9
-
-// _ooOoo_ //
-// o8888888o //
-// 88" . "88 //
-// (| ^_^ |) //
-// O\ = /O //
-// ____/`---'\____ //
-// .' \\| |// `. //
-// / \\||| : |||// \ //
-// / _||||| -:- |||||- \ //
-// | | \\\ - /// | | //
-// | \_| ''\---/'' | | //
-// \ .-\__ `-` ___/-. / //
-// ___`. .' /--.--\ `. . ___ //
-// ."" '< `.___\_<|>_/___.' >'"". //
-// | | : `- \`.;`\ _ /`;.`/ - ` : | | //
-// \ \ `-. \_ __\ /__ _/ .-` / / //
-// ========`-.____`-.___\_____/___.-`____.-'======== //
-// `=---=' //
-// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ //
-// 浣涚淇濅綉 姘镐笉瀹曟満 姘告棤BUG 銆�銆�//
\ No newline at end of file
diff --git a/hangzhoumesParent/common/pom.xml b/hangzhoumesParent/common/pom.xml
index 443bd66..9da0bc0 100644
--- a/hangzhoumesParent/common/pom.xml
+++ b/hangzhoumesParent/common/pom.xml
@@ -15,7 +15,6 @@
<modules>
<module>servicebase</module>
<module>springsecurity</module>
- <module>displayscreen</module>
</modules>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
index f69a142..5fe46f1 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
@@ -125,7 +125,7 @@
/**
* 鏃嬭浆瑙掑害锛堥�嗘椂閽堬級
*/
- private Integer angle;
+ private Double angle;
/**
* 宸ョ▼鍙�
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java
index 19cb029..c83bc33 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java
@@ -33,6 +33,17 @@
private Double height;
/**
+ * 瀹�
+ */
+ private Double oHeight;
+
+ /**
+ * 楂�
+ */
+ private Double oWidth;
+
+
+ /**
* 鍘氬害
*/
private Double glassThickness;
@@ -88,5 +99,13 @@
* 灏忕墖缂栧彿
*/
private String glassId;
+ /**
+ * 璁㈠崟搴忓彿
+ */
+ private String orderSort;
+ /**
+ * 鏃嬭浆瑙掑害
+ */
+ private Double rotateAngle;
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
index 8ba557f..5dd8f54 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
@@ -39,12 +39,13 @@
List<OptimizeGlassinfo> optimizeGlassinfos=null;
if (engineeringId != null) {
optimizeGlassinfos = optimizeProjectMapper.selectJoinList(OptimizeGlassinfo.class, new MPJQueryWrapper<OptimizeProject>()
- .select("b.process_id,t.type,b.width,b.height,t.glass_thickness,t.glass_type,b.p_width,b.p_height,b.layer, b.total_layer, b.stock_id,b.heat_layout_id,b.heat_layout_sort,b.x_axis,b.y_axis,b.project_no,b.glass_id")
+ .select("b.process_id,t.glass_type,b.o_width,b.o_height,t.glass_thickness,b.order_sort,b.p_width,b.p_height,b.layer, b.total_layer, b.stock_id,b.heat_layout_id,b.heat_layout_sort,c.x_axis,c.y_axis,b.project_no,b.glass_id,c.rotate_angle")
.leftJoin("optimize_detail b on t.project_no=b.project_no")
+ .leftJoin("optimize_heat_detail c on c.project_no=t.project_no and b.heat_layout_id=c.layout_id and b.heat_layout_sort=c.sort")
//.eq("t.state",100)
.eq("t.project_no", engineeringId));
}
-
+ //order_sort,o_width,o_height
// 鍒涘缓涓�涓� List 鐢ㄤ簬淇濆瓨鏄犲皠鍚庣殑瀹炰綋瀵硅薄
List<GlassInfo> resultList = new ArrayList<>();
@@ -56,9 +57,9 @@
glassInfo.setEngineerId(map.getProjectNo());
glassInfo.setFlowCardId(map.getProcessId());
glassInfo.setFilmsid(map.getGlassType());
- glassInfo.setGlassType(map.getType());
- glassInfo.setWidth(map.getWidth());
- glassInfo.setHeight(map.getHeight());
+ glassInfo.setGlassType(map.getOrderSort());//璁㈠崟搴忓彿
+ glassInfo.setWidth(map.getOWidth());//璁㈠崟瀹�
+ glassInfo.setHeight(map.getOHeight());//璁㈠崟楂�
glassInfo.setEdgWidth(map.getPWidth());
glassInfo.setLayer(map.getLayer());
glassInfo.setTotalLayer(map.getTotalLayer());
@@ -69,7 +70,7 @@
glassInfo.setTemperingFeedSequence(map.getHeatLayoutSort());//閽㈠寲鐗堝浘椤哄簭
glassInfo.setXCoordinate(map.getXAxis());
glassInfo.setYCoordinate(map.getYAxis());
-
+ glassInfo.setAngle(map.getRotateAngle());
glassInfo.setGlassId(map.getGlassId());
// 灏嗘槧灏勫悗鐨勫璞℃坊鍔犲埌缁撴灉鍒楄〃涓�
resultList.add(glassInfo);
diff --git a/hangzhoumesParent/common/springsecurity/pom.xml b/hangzhoumesParent/common/springsecurity/pom.xml
index 70e572c..9278822 100644
--- a/hangzhoumesParent/common/springsecurity/pom.xml
+++ b/hangzhoumesParent/common/springsecurity/pom.xml
@@ -23,6 +23,7 @@
<artifactId>servicebase</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
+
<!-- Spring Security渚濊禆 -->
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/LoadGlassMapper.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/LoadGlassMapper.java
deleted file mode 100644
index 93ba7fb..0000000
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/LoadGlassMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.mes.workstation.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mes.workstation.entity.UpWorkstation;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.Map;
-
-@Mapper
-public interface LoadGlassMapper extends BaseMapper<UpWorkstation> {
- //鍒ゆ柇浼樺厛宸ヤ綅鍚哥墖
- @Select("select b.layout_sequence,a.number from up_workstation a left join up_patten_usage b " +
- "on a.pattern_width=b.width and a.pattern_height=b.height " +
- "and a.pattern_thickness=b.thickness where a.workstation_id=#{id}")
- Map<String, Object> selectPriority(int id);
-
-}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-cz.yml b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-cz.yml
index 8182abe..1d19003 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-cz.yml
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-cz.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/pp?serverTimezone=GMT%2b8
+ url: jdbc:mysql://192.168.1.199: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-dev.yml b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml
index 1f47fa6..a8a4157 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml
@@ -15,20 +15,10 @@
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
sd:
- url: jdbc:mysql://192.168.1.199:3306/pp?serverTimezone=GMT%2b8
+ url: jdbc:mysql://192.168.1.199:3306/sd?serverTimezone=GMT%2b8
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
-# hangzhoumes:
-# url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8
-# username: root
-# password: beibo.123/
-# driver-class-name: com.mysql.cj.jdbc.Driver
-# pp:
-# url: jdbc:mysql://10.153.19.150:3306/pp?serverTimezone=GMT%2b8
-# username: root
-# password: beibo.123/
-# driver-class-name: com.mysql.cj.jdbc.Driver
cloud:
nacos:
discovery:
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-prod.yml b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-prod.yml
index d5eeae7..2c49cb7 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/pp?serverTimezone=GMT%2b8
+ url: jdbc:mysql://192.168.1.199:3306/sd?serverTimezone=GMT%2b8
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-cz.yml b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-cz.yml
index 0b433b2..a3a77e9 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-cz.yml
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-cz.yml
@@ -4,14 +4,25 @@
primary: hangzhoumes #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
datasource:
+# hangzhoumes:
+# url: jdbc:mysql://192.168.1.199:3306/hangzhoumes?serverTimezone=GMT%2b8
+# username: root
+# password: beibo.123/
+# driver-class-name: com.mysql.cj.jdbc.Driver
+#
+# salve_hangzhoumes:
+# url: jdbc:sqlserver://192.168.10.2:1433;databasename=hangzhoumes
+# username: sa
+# password: beibo.123/
+# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
hangzhoumes:
- url: jdbc:mysql://192.168.1.199:3306/hangzhoumes?serverTimezone=GMT%2b8
+ url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
salve_hangzhoumes:
- url: jdbc:sqlserver://192.168.10.2:1433;databasename=hangzhoumes
+ url: jdbc:sqlserver://10.153.19.150:1433;databasename=hangzhoumes
username: sa
password: beibo.123/
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-dev.yml b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-dev.yml
index a5bc31d..b3eae47 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-dev.yml
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-dev.yml
@@ -4,13 +4,23 @@
primary: hangzhoumes #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
datasource:
+# hangzhoumes:
+# url: jdbc:mysql://127.0.0.1:3306/hangzhoumes?serverTimezone=GMT%2b8
+# username: root
+# password: beibo.123/
+# driver-class-name: com.mysql.cj.jdbc.Driver
+# salve_hangzhoumes:
+# url: jdbc:sqlserver://127.0.0.1:1433;databasename=hangzhoumes
+# username: sa
+# password: beibo.123/
+# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
hangzhoumes:
- url: jdbc:mysql://127.0.0.1:3306/hangzhoumes?serverTimezone=GMT%2b8
+ url: jdbc:mysql:10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
salve_hangzhoumes:
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=hangzhoumes
+ url: jdbc:sqlserver://10.153.19.150:1433;databasename=hangzhoumes
username: sa
password: beibo.123/
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
index 0a70a4a..12e113b 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
@@ -2,7 +2,7 @@
port: 8084
spring:
profiles:
- active: cz
+ active: dev
application:
name: temperingGlass
mybatis-plus:
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java
index e5e4608..d6edffc 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java
@@ -1,60 +1,60 @@
-//package com.mes;
-//
-//import com.mes.temperingglass.entity.TemperingGlassInfo;
-//import com.mes.temperingglass.service.TemperingAgoService;
-//import lombok.extern.slf4j.Slf4j;
-//import org.junit.Test;
-//import org.junit.runner.RunWith;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.boot.test.context.SpringBootTest;
-//import org.springframework.test.context.junit4.SpringRunner;
-//
-//import java.util.Arrays;
-//import java.util.List;
-//
-///**
-// * @Author : zhoush
-// * @Date: 2024/3/27 16:37
-// * @Description:
-// */
-//@Slf4j
-//@RunWith(SpringRunner.class)
-//@SpringBootTest(classes = TemperingGlassModuleApplication.class)
-//public class TemperingApplicationTest {
-//
-// @Autowired
-// private TemperingAgoService temperingAgoService;
-//
-//
-// @Test
-// public void testFindPa() {
-// List<TemperingGlassInfo> glass = temperingAgoService.selectIntoGlass(12);
-// log.info("杩涚倝涓殑鐜荤拑锛歿}", Arrays.asList(glass));
-// }
-// @Test
-// public void testFindPa2() {
-// List<TemperingGlassInfo> glass = temperingAgoService.selectOutGlass();
-// log.info("宸插嚭涓殑鐜荤拑锛歿}", Arrays.asList(glass));
-// }
-//
-// @Test
-// public void testFindPa3() {
-// List<TemperingGlassInfo> glass = temperingAgoService.selectWaitingGlass();
-// log.info("绛夊緟涓殑鐜荤拑锛歿}", Arrays.asList(glass));
-// }
-// @Test
-// public void testFindPa4() {
-// List<TemperingGlassInfo> glass = temperingAgoService.selectOverGlass();
-// log.info("绛夊緟涓殑鐜荤拑锛歿}", Arrays.asList(glass));
-// }
-// @Test
-// public void testFindPa5() {
-// List<TemperingGlassInfo> layoutId = temperingAgoService.selectLayoutId();
-// //杩涚倝涓殑鐜荤拑
-// log.info("鐗堝浘id锛歿}", Arrays.asList(layoutId.get(0).getTemperingLayoutId()));
-// List<TemperingGlassInfo> intoGlass = temperingAgoService.selectIntoGlass(layoutId.get(0).getTemperingLayoutId());
-// log.info("鐜荤拑鐗堝浘id锛歿}", Arrays.asList(intoGlass));
-// List<TemperingGlassInfo> intoGlass2 = temperingAgoService.selectIntoGlass(layoutId.get(1).getTemperingLayoutId());
-// log.info("鐜荤拑鐗堝浘id锛歿}", Arrays.asList(intoGlass2));
-// }
-//}
+package com.mes;
+
+import com.mes.temperingglass.entity.TemperingGlassInfo;
+import com.mes.temperingglass.service.TemperingAgoService;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @Author : zhoush
+ * @Date: 2024/3/27 16:37
+ * @Description:
+ */
+@Slf4j
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = TemperingGlassModuleApplication.class)
+public class TemperingApplicationTest {
+
+ @Autowired
+ private TemperingAgoService temperingAgoService;
+
+
+ @Test
+ public void testFindPa() {
+ List<TemperingGlassInfo> glass = temperingAgoService.selectIntoGlass(12);
+ log.info("杩涚倝涓殑鐜荤拑锛歿}", Arrays.asList(glass));
+ }
+ @Test
+ public void testFindPa2() {
+ List<TemperingGlassInfo> glass = temperingAgoService.selectOutGlass();
+ log.info("宸插嚭涓殑鐜荤拑锛歿}", Arrays.asList(glass));
+ }
+
+ @Test
+ public void testFindPa3() {
+ List<TemperingGlassInfo> glass = temperingAgoService.selectWaitingGlass();
+ log.info("绛夊緟涓殑鐜荤拑锛歿}", Arrays.asList(glass));
+ }
+ @Test
+ public void testFindPa4() {
+ List<TemperingGlassInfo> glass = temperingAgoService.selectOverGlass();
+ log.info("绛夊緟涓殑鐜荤拑锛歿}", Arrays.asList(glass));
+ }
+ @Test
+ public void testFindPa5() {
+ List<TemperingGlassInfo> layoutId = temperingAgoService.selectLayoutId();
+ //杩涚倝涓殑鐜荤拑
+ log.info("鐗堝浘id锛歿}", Arrays.asList(layoutId.get(0).getTemperingLayoutId()));
+ List<TemperingGlassInfo> intoGlass = temperingAgoService.selectIntoGlass(layoutId.get(0).getTemperingLayoutId());
+ log.info("鐜荤拑鐗堝浘id锛歿}", Arrays.asList(intoGlass));
+ List<TemperingGlassInfo> intoGlass2 = temperingAgoService.selectIntoGlass(layoutId.get(1).getTemperingLayoutId());
+ log.info("鐜荤拑鐗堝浘id锛歿}", Arrays.asList(intoGlass2));
+ }
+}
--
Gitblit v1.8.0