woong2

Corperate_Project/.classpath

@@ -30,7 +30,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="C:/Users/admin/.m2/repository/com/oracle/database/jdbc/ojdbc8/21.7.0.0/ojdbc8-21.7.0.0.jar">
+	<classpathentry kind="lib" path="C:/Users/USER/.m2/repository/com/oracle/database/jdbc/ojdbc8/21.7.0.0/ojdbc8-21.7.0.0.jar">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>

Corperate_Project/src/main/java/com/basicinfo/controller/ClientController.java

@@ -29,7 +29,7 @@
 @RequestMapping("/basicinfo/client/*")
 public class ClientController {
 
-	@Autowired
+	@Autowired(required = false)
 	private ClientService service;
 
 	private final String redirect = "redirect:/basicinfo/client/list";

Corperate_Project/src/main/java/com/basicinfo/controller/LotRestController.java

@@ -26,7 +26,7 @@ public class LotRestController {
 
 		// 판매에서 로트 불러오기
 		@GetMapping(value="/getLot/{itemNo}", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-		public ResponseEntity<List<LotVO>> getLot(@PathVariable("itemNo") int no) {
+		public ResponseEntity<List<String>> getLot(@PathVariable("itemNo") String no) {
 			System.out.println("?:" + no);
 			return new ResponseEntity<>(service.getLot(no), HttpStatus.OK);		
 

Corperate_Project/src/main/java/com/ordersheet/controller/OrderSheetController.java

@@ -24,7 +24,7 @@
 @RequestMapping("/ordersheet/*")
 public class OrderSheetController {
 
-	@Autowired
+	@Autowired(required = false)
 	private OrderSheetService service;
 
 	private final String redirect = "redirect:/ordersheet/list";

Corperate_Project/src/main/java/com/ordersheet/controller/OrderSheetRestController.java

@@ -1,5 +1,6 @@
 package com.ordersheet.controller;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -14,12 +15,14 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import com.spring.domain.ClientVO;
+import com.spring.domain.ItemDTO;
 import com.spring.domain.MemberVO;
 import com.spring.domain.OrderSheetDetailVO;
 import com.spring.domain.OrderSheetVO;
 import com.spring.domain.PageDTO;
 import com.spring.paging.Criteria;
 import com.spring.service.ClientService;
+import com.spring.service.LotRestService;
 import com.spring.service.MemberService;
 import com.spring.service.OrderSheetService;
 
@@ -37,6 +40,9 @@ public class OrderSheetRestController {
 	@Autowired 
 	private MemberService ms;
 
+	@Autowired
+	private LotRestService ls;
+
 
 	//testURL : http://localhost:8080/ordersheet/orderdetail/11
 	@GetMapping(value={"/orderdetail/{mainNo}"}, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@@ -77,6 +83,8 @@ public ResponseEntity<Map<String, Object>> selectOrder(@PathVariable("no") int n
 
 		//수주 디테일 조회
 		List<OrderSheetDetailVO> list = service.getSubList(no);
+		List<String> lot_lists;
+		List<ItemDTO> itemDTOlist = new ArrayList<ItemDTO>(); 
 
 		for(OrderSheetDetailVO osdv : list) {
 			osdv.setNo(osdv.getNo());
@@ -89,6 +97,11 @@ public ResponseEntity<Map<String, Object>> selectOrder(@PathVariable("no") int n
 			ClientVO osdvCv = cs.selectOne(Integer.toString(osdv.getClient_no()));
 			osdv.setClient_name(osdvCv.getName());
 
+
+			lot_lists = ls.getLot(osdv.getItem_no());
+
+			itemDTOlist.add(new ItemDTO(osdv,lot_lists));
+
 		}
 
 		for(OrderSheetDetailVO osdv : list) {
@@ -124,6 +137,7 @@ public ResponseEntity<Map<String, Object>> selectOrder(@PathVariable("no") int n
 
 		map.put("detailList", list);
 		map.put("order", vo);
+		map.put("itemDTOlist", itemDTOlist);
 
 
 		return new ResponseEntity<>(map, HttpStatus.OK);		

Corperate_Project/src/main/java/com/sell/controller/SellController.java

@@ -67,7 +67,6 @@ public String insertSold(Model model, SellVO sell, SellDetailVO selldetail) {
 //			System.out.println(memlists.get(i));
 //		}
 
-		System.out.println(sell.getOrder_no());
 		System.out.println(sell.getDay());
 		service.insert(sell);
 		System.out.println("selldetail 판매상세번호:"+selldetail.getNo());
@@ -95,7 +94,7 @@ public String deleteSold(Model model, @RequestParam(value="no") int no) {
 	@PostMapping(value="/update")
 	public String updateSold(Model model, SellVO sell) {
 
-		System.out.println(sell.getNo()+"/"+sell.getOrder_no()+"/"+sell.getMember_no()+"/"+sell.getDay());
+		System.out.println(sell.getNo()+"/"+"/"+sell.getMember_no()+"/"+sell.getDay());
 
 		service.update(sell);
 

Corperate_Project/src/main/java/com/sell/controller/SellRestController.java

@@ -11,8 +11,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.spring.domain.SellDetailVO;
-import com.spring.service.SellDetailService;
+import com.spring.domain.SellVO;
 import com.spring.service.SellService;
 
 @RestController
@@ -21,18 +20,12 @@ public class SellRestController {
 
 		@Autowired
 		private SellService service;
-
-		@Autowired
-		private SellDetailService service_detail;
 
 		//testURL : http://localhost:8080/ordersheet/orderdetail/11
 		@GetMapping(value={"/more/{mainNo}"}, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-		public ResponseEntity<List<SellDetailVO>> clientlist(@PathVariable("mainNo") int mainNo) {				
+		public ResponseEntity<List<SellVO>> clientlist(@PathVariable("mainNo") int mainNo) {	
+			System.out.println("mainNo : " + mainNo);
 			return new ResponseEntity<>(service.getSubList(mainNo), HttpStatus.OK);		
 		}
-
-		@GetMapping(value={"/more/ordersheetbase/{orderSheetNo}"}, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-		public ResponseEntity<List<SellDetailVO>> list(@PathVariable("orderSheetNo") int orderSheetNo) {	
-			return new ResponseEntity<>(service_detail.getSubListByOrderSheetNo(orderSheetNo), HttpStatus.OK);		
-		}
-}
+
+}

Corperate_Project/src/main/java/com/spring/domain/ItemDTO.java

@@ -0,0 +1,20 @@
+package com.spring.domain;
+
+import java.util.List;
+
+import com.spring.paging.Paging;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class ItemDTO {
+
+	private OrderSheetDetailVO orderSheetDetailVO; 
+	private List<String> lotList;
+
+}
+
+// Generic이 적용된 클래스 정의방식.
+// 이렇게 정의한 이유는 ClientVO의 list를 담거나 MemverVO의 list를 모두 담을 수 있는 재사용성 높은 코드를 작성하기 위함.

Corperate_Project/src/main/java/com/spring/domain/SellDetailVO.java

@@ -1,21 +1,24 @@
 package com.spring.domain;
 
+import java.util.ArrayList;
+
 import lombok.Data;
 
 @Data
 public class SellDetailVO {
-
+	
 	private int no;
-	private int item_no;
-	private int amount;
-	private int sell_price;
-	private String lot_code;
+	private ArrayList<Integer> item_no;
+	private ArrayList<Integer> amount;
+	private ArrayList<Integer> sell_price;
+	private ArrayList<String> lot_code;
 	private int sell_no;
 	private String item_name;
 	private int in_price;
 	private int out_price;
 	private String sell_day;
-	private String profit;
+	private int order_sheet_no;
+
 
 	private String code;
 	private String name;

Corperate_Project/src/main/java/com/spring/domain/SellVO.java

@@ -9,10 +9,22 @@ public class SellVO {
 
 	private int no;
 	private int member_no;
-	private int order_no;
 	private String day;
 
 	private String name;
 
+	private int item_no;
+	private int amount;
+	private int sell_price;
+	private String lot_code;
+	private int sell_no;
+	private String item_name;
+	private int in_price;
+	private int out_price;
+	private String sell_day;
+	private int order_sheet_no;
+
+
+	private String code;
 
 }

Corperate_Project/src/main/java/com/spring/mapper/LotRestMapper.java

@@ -6,6 +6,6 @@
 
 public interface LotRestMapper {
 
-	public List<LotVO> getLot(int no);
+	public List<String> getLot(String no);
 
 }

Corperate_Project/src/main/java/com/spring/mapper/OrderSheetMapper.java

@@ -40,10 +40,11 @@ public int insertDetailSheet(
 	public int getCountAll(@Param("cri") Criteria cri);
 
 	//수주상태 준비완료 > 발주중
+	public void updateStatus(int order_no);
 
-	// 사실상 거의 같은 기능으로 수주서의 상태를 변경하는 메소드
-	int updateStatusOrderSheet(@Param("ordersheetno") int ordersheetno, @Param("status") int status);
-	public void updateStatus(String order_no);
+	//판매 완료시, 발주중 상태에서 판매 완료 상태로 변경
+	public void updateStatusToSold(int order_no);
+	public int updateStatusOrderSheet(int ordersheetno, int status);
 }
 
 

Corperate_Project/src/main/java/com/spring/mapper/SellDetailMapper.java

@@ -2,19 +2,19 @@
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.spring.domain.SearchVO;
 import com.spring.domain.SellDetailVO;
 import com.spring.paging.Client_Paging;
 
 public interface SellDetailMapper {
 
-	void insert(SellDetailVO selldetail);
-
 	public List<SellDetailVO> read();
 
 	public List<SellDetailVO> selectAll(Client_Paging pageInfo);
 
 	public int getTotalCount(SearchVO searchvo);
-	
-	public List<SellDetailVO> selectSubListByOrderSheetNo(int orderSheetNo);
+
+	void insert(@Param("itemNo")int itemNo,@Param("itemAmount") int itemAmount,@Param("itemPrice") int itemPrice,@Param("lot_code") String lot_code,@Param("order_sheet_no") int order_sheet_no);
 }

Corperate_Project/src/main/java/com/spring/mapper/SellMapper.java

@@ -16,5 +16,6 @@ public interface SellMapper {
 
 		public void update(SellVO sell);
 
-		public List<SellDetailVO> getSubList(int mainNo); 
+		public List<SellVO> getSubList(int mainNo); 
+
 }

Corperate_Project/src/main/java/com/spring/service/LotRestService.java

@@ -6,6 +6,8 @@
 
 public interface LotRestService {
 
-	public List<LotVO> getLot(int no);
+	public List<String> getLot(String string);
+
+
 
 }

Corperate_Project/src/main/java/com/spring/service/LotRestServiceImpl.java

@@ -15,8 +15,13 @@ public class LotRestServiceImpl implements LotRestService{
 	private LotRestMapper mapper;
 
 	@Override
-	public List<LotVO> getLot(int no) {
+	public List<String> getLot(String no) {
 		System.out.println("리스트 사이즈 : " + mapper.getLot(no).size() + "/ 아이템 넘버 :"+ no );
+		List<String> lists = mapper.getLot(no);
+
+		for(int i = 0 ; i < lists.size();i++) {
+		System.out.println(lists.get(i));
+		}
 		return mapper.getLot(no);
 	}
 }

Corperate_Project/src/main/java/com/spring/service/OrderSheetService.java

@@ -19,11 +19,13 @@ public interface OrderSheetService {
 	public int getTotalCount(SearchVO searchvo);
 	public List<OrderSheetDetailVO> getSubList(int mainNo);		// 수주서 번호로 품목 디테일들 모두 가져오는 것	
 	public OrderSheetVO selectOneByMainNo(int no);
-	int changeStatusOrderSheet(int ordersheetno, int status);
-	
+	public int changeStatusOrderSheet(int ordersheetno, int status);
+
 	/* ajax paging */
 	public PageDTO<OrderSheetVO> getListPage(Criteria cri);
 
 	//발주할때 수주참조하면 수주상태 준비완료>발주중
-	public void updateStatus(String order_no);
+	public void updateStatus(int order_no);
+	public void updateStatusToSold(int order_no);
+
 }

Corperate_Project/src/main/java/com/spring/service/OrderSheetServiceImpl.java

@@ -6,6 +6,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.spring.domain.MemberVO;
 import com.spring.domain.OrderSheetDetailVO;
 import com.spring.domain.OrderSheetVO;
 import com.spring.domain.PageDTO;
@@ -187,14 +188,6 @@ public OrderSheetVO selectOneByMainNo(int no) {
 	@Override
 	public PageDTO<OrderSheetVO> getListPage(Criteria cri) {
 
-		// 검색이 item 이름으로 들어온 경우는 따로 처리
-		if(cri.getWhatColumn() != null && cri.getWhatColumn().equals("item")) {
-			ArrayList<Integer> main_nos = mapper.selectAllMainNoByItemName(cri.getKeyword());
-			cri.setMain_nos(main_nos);
-			System.out.println("cri.getMain_nos()"+ cri.getMain_nos());
-		}
-
-		// 메인 레코드 가져오기
 		int totalCount = mapper.getCountAll(cri);
 		List<OrderSheetVO> list = mapper.getListWithPaging(cri); 
 
@@ -228,10 +221,16 @@ public PageDTO<OrderSheetVO> getListPage(Criteria cri) {
 	}
 
 	@Override
-	public void updateStatus(String order_no) {
+	public void updateStatus(int order_no) {
 		mapper.updateStatus(order_no);
 
 	}
+
+	@Override
+	public void updateStatusToSold(int order_no) {
+		mapper.updateStatusToSold(order_no);
+
+	}
 
 	@Override
 	public int changeStatusOrderSheet(int ordersheetno, int status) {

Corperate_Project/src/main/java/com/spring/service/SellDetailService.java

@@ -15,7 +15,5 @@ public interface SellDetailService {
 	public int getTotalCount(SearchVO searchvo);
 
 	public List<SellDetailVO> selectAll(Client_Paging pageInfo);
-
-	public List<SellDetailVO> getSubListByOrderSheetNo(int orderSheetNo);
 
 }