B_ORDER_03 - 주문 목록 (거래처) api 생성

demo2/src/main/java/main/spring/login/demo2/CorsMvcConfig.java

@@ -0,0 +1,15 @@
+package main.spring.login.demo2;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+@Configuration
+public class CorsMvcConfig implements WebMvcConfigurer {
+
+    @Override
+    public void addCorsMappings(CorsRegistry corsRegistry)
+    {
+        corsRegistry.addMapping("/**")
+                .allowedOrigins("http://localhost:8082");
+    }
+}

demo2/src/main/java/main/spring/login/demo2/controller/OrderMasterController.java

@@ -1,7 +1,9 @@
 package main.spring.login.demo2.controller;
 
 import main.spring.login.demo2.entity.OrderMaster;
+import main.spring.login.demo2.entity.OrderProduct;
 import main.spring.login.demo2.service.OrderMasterService;
+import main.spring.login.demo2.service.OrderProductService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -17,8 +19,18 @@ public class OrderMasterController {
     @Autowired
     private OrderMasterService orderMasterService;
 
+    @GetMapping("/customer")
+    public List<OrderMaster> getOrders() {
+        return orderMasterService.getOrderMaster();
+    }
+
     @GetMapping("/customer/{customerCode}")
     public List<OrderMaster> getOrdersByCustomerCode(@PathVariable("customerCode") String customerCode) {
         return orderMasterService.getOrderMastersByCustomerCode(customerCode);
     }
+
+
+
+
+
 }

demo2/src/main/java/main/spring/login/demo2/controller/OrderProductController.java

@@ -1,8 +1,28 @@
 package main.spring.login.demo2.controller;
 
+import main.spring.login.demo2.entity.OrderProduct;
+import main.spring.login.demo2.service.OrderProductService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/order")
 public class OrderProductController {
 
+    @Autowired
+    private OrderProductService orderProductService;
+    //private OrderProductService orderProductService;
+
+    @GetMapping("/detail/{orderNumber}")
+    public List<OrderProduct> getOrderProductsByOrderNumber(@PathVariable("orderNumber") Integer orderNumber) {
+        System.out.println(orderNumber);
+        return orderProductService.getOrderProductsByOrderNumber(orderNumber);
+    }
 
 
-}
+}

demo2/src/main/java/main/spring/login/demo2/entity/CStorage.java

@@ -23,7 +23,11 @@ public class CStorage {
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "customer_code", referencedColumnName = "contact_code", insertable = false, updatable = false)
-    private Contact contact;
+    private Contact contactC;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "storage_code", referencedColumnName = "storage_code", insertable = false, updatable = false)
+    private Contact contactS;
 
     // Getters and Setters
 }

demo2/src/main/java/main/spring/login/demo2/entity/GradePrice.java

@@ -14,7 +14,7 @@
 @JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
 public class GradePrice {
     @Id
-    @Column(name = "goods_grade")
+    @Column(name = "goods_grade", length = 2)
     private String goodsGrade;
 
     @Id

demo2/src/main/java/main/spring/login/demo2/entity/Input.java

@@ -23,7 +23,7 @@ public class Input {
     @Column(name = "goods_code", nullable = false)
     private String goodsCode;
 
-    @Column(name = "goods_grade", nullable = false)
+    @Column(name = "goods_grade", nullable = false, length = 2)
     private String goodsGrade;
 
     @Column(name = "input_quantity", nullable = false, columnDefinition = "MEDIUMTEXT")

demo2/src/main/java/main/spring/login/demo2/entity/Inventory.java

@@ -25,7 +25,7 @@ public class Inventory {
     private String goodsCode;
 
     @Id
-    @Column(name = "goods_grade", nullable = false)
+    @Column(name = "goods_grade", nullable = false, length = 2)
     private String goodsGrade;
 
     @Column(name = "inventory_quantity", nullable = false, columnDefinition = "MEDIUMTEXT")

demo2/src/main/java/main/spring/login/demo2/entity/InventoryTotal.java

@@ -0,0 +1,39 @@
+package main.spring.login.demo2.entity;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@Entity
+@Table(name = "inventory_total")
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
+public class InventoryTotal {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "goods_code")
+    private String goodsCode;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "goods_grade")
+    private String goodsGrade;
+
+    @Column(name = "total_quantity", nullable = false)
+    private int totalQuantity;
+
+    @ManyToOne
+    @JoinColumn(name = "goods_code", referencedColumnName = "goods_code", insertable = false, updatable = false)
+    private Inventory inventoryC;
+
+    @ManyToOne
+    @JoinColumn(name = "goods_grade", referencedColumnName = "goods_grade", insertable = false, updatable = false)
+    private Inventory inventoryG;
+    // Constructors, getters, and setters
+}

demo2/src/main/java/main/spring/login/demo2/entity/OrderMaster.java

@@ -33,7 +33,7 @@ public class OrderMaster {
     private String adjustmentStatus;
 
     @Column(name = "order_price", nullable = false)
-    private int orderPrices;
+    private int orderPrice;
 
     @Column(name = "customer_code")
     private String customerCode;

demo2/src/main/java/main/spring/login/demo2/entity/OrderProduct.java

@@ -6,39 +6,38 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-@Table(name = "order_product")
+
 @Entity
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
+@Table(name = "order_product")
+//@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
 public class OrderProduct {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "order_number")
     private int orderNumber;
 
-//    @Id
-//    @Column(name = "goods_code")
-//    private String goodsCode;
-//
-//    @Id
-//    @Column(name = "goods_grade")
-//    private String goodsGrade;
+    @Column(name = "order_quantity", nullable = false)
+    private int orderQuantity;
+
+    @Column(name = "order_price", nullable = false)
+    private int orderPrice;
 
-    @Column(name = "ordered_quantity", nullable = false)
-    private int orderedQuantity;
+    @Column(name = "goods_grade", nullable = false)
+    private String goodsGrade;
 
-    @Column(name = "ordered_price", nullable = false)
-    private int orderedPrice;
+    @Column(name = "goods_code", nullable = false)
+    private String goodsCode;
 
-    @OneToOne
-    @JoinColumn(name = "goods_grade", referencedColumnName = "goods_grade")
-    private Inventory inventoryG;
+    @OneToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "goods_grade", referencedColumnName = "goods_grade", insertable = false, updatable = false)
+    private InventoryTotal inventoryTotalG;
 
-    @OneToOne
-    @JoinColumn(name = "goods_code", referencedColumnName = "goods_code")
-    private Inventory inventoryC;
+    @OneToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "goods_code", referencedColumnName = "goods_code", insertable=false, updatable=false)
+    private InventoryTotal inventoryTotalC;
 
     @ManyToOne
     @JoinColumn(name = "order_number", referencedColumnName = "order_number", insertable = false, updatable = false)

demo2/src/main/java/main/spring/login/demo2/entity/data.sql

@@ -8,30 +8,30 @@ VALUES
 INSERT INTO `contact` (`contact_code`, `contact_delimiter`, `contact_name`, `contact_address`, `customer_password`, `storage_code`, `business_id`)
 VALUES
     ('CON001', 'C', 'Customer1', '123 Street, City1', 'custpass1', NULL, 'BUS002'),
-    ('CON001', 'C', 'Customer2', '321 Street, City2', 'custpass2', NULL, 'BUS002'),
-    ('SUP001', 'V', 'Supplier1', '456 Street, City2', null, 'STRO01', 'BUS002'),
     ('STR001', 'S', 'Storage1', '789 Street, City3', null, null, 'BUS002'),
-    ('STR002', 'S', 'Storage2', '987 Street, City4', null, null, 'BUS002');
-
+    ('STR002', 'S', 'Storage2', '987 Street, City4', null, null, 'BUS002'),
+    ('SUP001', 'V', 'Supplier1', '456 Street, City2', null, 'STR001', 'BUS002');
 -- c_storage 테이블에 더미 데이터 삽입 /판매처별 노출 창고
 INSERT INTO `c_storage` (`storage_code`, `customer_code`)
 VALUES
     ('STRO01', 'CON001'),
-    ('STR002', 'CON002');
+    ('STR002', 'CON001');
 
 -- goods_master 테이블에 더미 데이터 삽입
 INSERT INTO `goods_master` (`goods_code`, `goods_name`, `margin_rate`, `discount_rate`, `business_id`)
 VALUES
-    ('ABC123', 'Good1', 10, 5, 'BUS001'),
-    ('DEF456', 'Good2', 15, 7, 'BUS002');
+    ('GHI789', '', 20, 8, 'BUS002'),
+    ('ABC123', '사과', 10, 5, 'BUS001'),
+    ('DEF456', '오렌지', 15, 7, 'BUS002');
+
 
 
 -- input 테이블에 더미 데이터 삽입 /입고 상품 (내역)
 INSERT INTO `input` (`input_id`, `goods_code`, `goods_grade`, `input_quantity`, `input_day`, `supply_code`)
 VALUES
     (1, 'ABC123', 'A', 100, '2024-03-21', 'SUP001'),
-    (2, 'DEF456', 'B', 150, '2024-03-22', 'SUP002'),
-    (3, 'GHI789', 'C', 200, '2024-03-23', 'SUP003');
+    (2, 'DEF456', 'B', 150, '2024-03-22', 'SUP001'),
+    (3, 'GHI789', 'C', 200, '2024-03-23', 'SUP001');
 
 -- grade_price 테이블에 더미 데이터 삽입 /등급별 단가
 INSERT INTO `grade_price` (`goods_grade`, `goods_code`, `input_stock`)
@@ -43,12 +43,13 @@ VALUES
 -- inventory 테이블에 더미 데이터 삽입 /재고
 INSERT INTO `inventory` (`first_stock_date`, `goods_code`, `goods_grade`, `inventory_quantity`, `sales_price`, `grade_evaluation_dates`, `storage_code`)
 VALUES
-    ('2024-03-21', 'ABC123', 'A', 50, 1000, '2024-03-21', 'STRO01'),
-    ('2024-03-22', 'DEF456', 'B', 75, 1500, '2024-03-22', 'STRO01'),
-    ('2024-03-23', 'GHI789', 'C', 100, 2000, '2024-03-23', 'STRO01');
     ('2024-03-24', 'ABC123', 'A', 130, 2500, '2024-03-24', 'STR002'),
     ('2024-03-25', 'DEF456', 'B', 80, 2200, '2024-03-25', 'STR002');
-    ('2024-03-26', 'GHI789', 'C', 100, 2000, '2024-03-26', 'STR002');
+    ('2024-03-25', 'GHI789', 'C', 100, 2000, '2024-03-26', 'STR002');
+    ('2024-03-21', 'ABC123', 'A', 50, 1000, '2024-03-21', 'STR001'),
+    ('2024-03-22', 'DEF456', 'B', 75, 1500, '2024-03-22', 'STR001'),
+    ('2024-03-23', 'GHI789', 'C', 100, 2000, '2024-03-23', 'STR001');
+
 
 
 -- delivery 테이블에 더미 데이터 삽입 /배송
@@ -58,13 +59,13 @@ VALUES
     ('DEL002', '456 Street, City4', '2024-03-26', '2024-03-25', 2);
 
 -- order 테이블에 더미 데이터 삽입 /주문header
-INSERT INTO `order_master` (`order_number`, `order_date`, `adjustment_status`, `price`, `customer_code`, `storage_code`)
+INSERT INTO `order_master` (`order_number`, `order_date`, `adjustment_status`, `order_price`, `customer_code`, `storage_code`)
 VALUES
-    (1, '2024-03-20', '미정산', 5000, 'CON001', 'STRO01'),
-    (2, '2024-03-21', '미정산', 7500, 'CON002', 'STRO02');
+    (1, '2024-03-20', '미정산', 5000, 'CON001', 'STR001'),
+    (2, '2024-03-21', '미정산', 7500, 'CON001', 'STR002');
 
 -- order_product 테이블에 더미 데이터 삽입 /주문 detail
-INSERT INTO `order_product` (`order_number`, `quantity`, `price`, `goods_grade`, `goods_code`)
+INSERT INTO `order_product` (`order_number`, `order_quantity`, `order_price`, `goods_grade`, `goods_code`)
 VALUES
     (1, 10, 1000, 'A', 'ABC123'),
     (1, 15, 1500, 'B', 'DEF456'),