diff --git a/Corperate_Project/.classpath b/Corperate_Project/.classpath index 26f980f..bef3552 100644 --- a/Corperate_Project/.classpath +++ b/Corperate_Project/.classpath @@ -30,7 +30,7 @@ - + diff --git a/Corperate_Project/src/main/java/com/basicinfo/controller/ClientController.java b/Corperate_Project/src/main/java/com/basicinfo/controller/ClientController.java index eb86345..ce8c9ca 100644 --- a/Corperate_Project/src/main/java/com/basicinfo/controller/ClientController.java +++ b/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"; diff --git a/Corperate_Project/src/main/java/com/basicinfo/controller/LotRestController.java b/Corperate_Project/src/main/java/com/basicinfo/controller/LotRestController.java index 9030242..4b9f288 100644 --- a/Corperate_Project/src/main/java/com/basicinfo/controller/LotRestController.java +++ b/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> getLot(@PathVariable("itemNo") int no) { + public ResponseEntity> getLot(@PathVariable("itemNo") String no) { System.out.println("?:" + no); return new ResponseEntity<>(service.getLot(no), HttpStatus.OK); diff --git a/Corperate_Project/src/main/java/com/ordersheet/controller/OrderSheetController.java b/Corperate_Project/src/main/java/com/ordersheet/controller/OrderSheetController.java index 7f98604..f2100e3 100644 --- a/Corperate_Project/src/main/java/com/ordersheet/controller/OrderSheetController.java +++ b/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"; diff --git a/Corperate_Project/src/main/java/com/ordersheet/controller/OrderSheetRestController.java b/Corperate_Project/src/main/java/com/ordersheet/controller/OrderSheetRestController.java index eb5bd1b..1c0c0e1 100644 --- a/Corperate_Project/src/main/java/com/ordersheet/controller/OrderSheetRestController.java +++ b/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> selectOrder(@PathVariable("no") int n //수주 디테일 조회 List list = service.getSubList(no); + List lot_lists; + List itemDTOlist = new ArrayList(); for(OrderSheetDetailVO osdv : list) { osdv.setNo(osdv.getNo()); @@ -89,6 +97,11 @@ public ResponseEntity> 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> selectOrder(@PathVariable("no") int n map.put("detailList", list); map.put("order", vo); + map.put("itemDTOlist", itemDTOlist); return new ResponseEntity<>(map, HttpStatus.OK); diff --git a/Corperate_Project/src/main/java/com/sell/controller/SellController.java b/Corperate_Project/src/main/java/com/sell/controller/SellController.java index 468b65a..1a7e73d 100644 --- a/Corperate_Project/src/main/java/com/sell/controller/SellController.java +++ b/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); diff --git a/Corperate_Project/src/main/java/com/sell/controller/SellRestController.java b/Corperate_Project/src/main/java/com/sell/controller/SellRestController.java index 7c1ecb3..3d5c1e8 100644 --- a/Corperate_Project/src/main/java/com/sell/controller/SellRestController.java +++ b/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> clientlist(@PathVariable("mainNo") int mainNo) { + public ResponseEntity> 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(@PathVariable("orderSheetNo") int orderSheetNo) { - return new ResponseEntity<>(service_detail.getSubListByOrderSheetNo(orderSheetNo), HttpStatus.OK); - } -} \ No newline at end of file + +} diff --git a/Corperate_Project/src/main/java/com/spring/domain/ItemDTO.java b/Corperate_Project/src/main/java/com/spring/domain/ItemDTO.java new file mode 100644 index 0000000..2b7b4e3 --- /dev/null +++ b/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 lotList; + +} + +// Generic이 적용된 클래스 정의방식. +// 이렇게 정의한 이유는 ClientVO의 list를 담거나 MemverVO의 list를 모두 담을 수 있는 재사용성 높은 코드를 작성하기 위함. \ No newline at end of file diff --git a/Corperate_Project/src/main/java/com/spring/domain/SellDetailVO.java b/Corperate_Project/src/main/java/com/spring/domain/SellDetailVO.java index 185a0cf..ac4a40f 100644 --- a/Corperate_Project/src/main/java/com/spring/domain/SellDetailVO.java +++ b/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 item_no; + private ArrayList amount; + private ArrayList sell_price; + private ArrayList 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; diff --git a/Corperate_Project/src/main/java/com/spring/domain/SellVO.java b/Corperate_Project/src/main/java/com/spring/domain/SellVO.java index b43a03b..540a49f 100644 --- a/Corperate_Project/src/main/java/com/spring/domain/SellVO.java +++ b/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; } diff --git a/Corperate_Project/src/main/java/com/spring/mapper/LotRestMapper.java b/Corperate_Project/src/main/java/com/spring/mapper/LotRestMapper.java index b98fb53..c74dd0d 100644 --- a/Corperate_Project/src/main/java/com/spring/mapper/LotRestMapper.java +++ b/Corperate_Project/src/main/java/com/spring/mapper/LotRestMapper.java @@ -6,6 +6,6 @@ public interface LotRestMapper { - public List getLot(int no); + public List getLot(String no); } diff --git a/Corperate_Project/src/main/java/com/spring/mapper/OrderSheetMapper.java b/Corperate_Project/src/main/java/com/spring/mapper/OrderSheetMapper.java index 7657cd3..419ae6e 100644 --- a/Corperate_Project/src/main/java/com/spring/mapper/OrderSheetMapper.java +++ b/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); } diff --git a/Corperate_Project/src/main/java/com/spring/mapper/SellDetailMapper.java b/Corperate_Project/src/main/java/com/spring/mapper/SellDetailMapper.java index 1c72fd5..cca647e 100644 --- a/Corperate_Project/src/main/java/com/spring/mapper/SellDetailMapper.java +++ b/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 read(); public List selectAll(Client_Paging pageInfo); public int getTotalCount(SearchVO searchvo); - - public List 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); } diff --git a/Corperate_Project/src/main/java/com/spring/mapper/SellMapper.java b/Corperate_Project/src/main/java/com/spring/mapper/SellMapper.java index 50eddf4..88a077e 100644 --- a/Corperate_Project/src/main/java/com/spring/mapper/SellMapper.java +++ b/Corperate_Project/src/main/java/com/spring/mapper/SellMapper.java @@ -16,5 +16,6 @@ public interface SellMapper { public void update(SellVO sell); - public List getSubList(int mainNo); + public List getSubList(int mainNo); + } diff --git a/Corperate_Project/src/main/java/com/spring/service/LotRestService.java b/Corperate_Project/src/main/java/com/spring/service/LotRestService.java index 1b1c758..a89e76e 100644 --- a/Corperate_Project/src/main/java/com/spring/service/LotRestService.java +++ b/Corperate_Project/src/main/java/com/spring/service/LotRestService.java @@ -6,6 +6,8 @@ public interface LotRestService { - public List getLot(int no); + public List getLot(String string); + + } diff --git a/Corperate_Project/src/main/java/com/spring/service/LotRestServiceImpl.java b/Corperate_Project/src/main/java/com/spring/service/LotRestServiceImpl.java index 1dc7157..66674a8 100644 --- a/Corperate_Project/src/main/java/com/spring/service/LotRestServiceImpl.java +++ b/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 getLot(int no) { + public List getLot(String no) { System.out.println("리스트 사이즈 : " + mapper.getLot(no).size() + "/ 아이템 넘버 :"+ no ); + List lists = mapper.getLot(no); + + for(int i = 0 ; i < lists.size();i++) { + System.out.println(lists.get(i)); + } return mapper.getLot(no); } } diff --git a/Corperate_Project/src/main/java/com/spring/service/OrderSheetService.java b/Corperate_Project/src/main/java/com/spring/service/OrderSheetService.java index 82a655e..ed65c4f 100644 --- a/Corperate_Project/src/main/java/com/spring/service/OrderSheetService.java +++ b/Corperate_Project/src/main/java/com/spring/service/OrderSheetService.java @@ -19,11 +19,13 @@ public interface OrderSheetService { public int getTotalCount(SearchVO searchvo); public List 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 getListPage(Criteria cri); //발주할때 수주참조하면 수주상태 준비완료>발주중 - public void updateStatus(String order_no); + public void updateStatus(int order_no); + public void updateStatusToSold(int order_no); + } diff --git a/Corperate_Project/src/main/java/com/spring/service/OrderSheetServiceImpl.java b/Corperate_Project/src/main/java/com/spring/service/OrderSheetServiceImpl.java index 0871e3d..b102dec 100644 --- a/Corperate_Project/src/main/java/com/spring/service/OrderSheetServiceImpl.java +++ b/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 getListPage(Criteria cri) { - // 검색이 item 이름으로 들어온 경우는 따로 처리 - if(cri.getWhatColumn() != null && cri.getWhatColumn().equals("item")) { - ArrayList 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 list = mapper.getListWithPaging(cri); @@ -228,10 +221,16 @@ public PageDTO 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) { diff --git a/Corperate_Project/src/main/java/com/spring/service/SellDetailService.java b/Corperate_Project/src/main/java/com/spring/service/SellDetailService.java index 6839669..0c54e15 100644 --- a/Corperate_Project/src/main/java/com/spring/service/SellDetailService.java +++ b/Corperate_Project/src/main/java/com/spring/service/SellDetailService.java @@ -15,7 +15,5 @@ public interface SellDetailService { public int getTotalCount(SearchVO searchvo); public List selectAll(Client_Paging pageInfo); - - public List getSubListByOrderSheetNo(int orderSheetNo); } diff --git a/Corperate_Project/src/main/java/com/spring/service/SellDetailServiceImpl.java b/Corperate_Project/src/main/java/com/spring/service/SellDetailServiceImpl.java index 85f3813..ed9d133 100644 --- a/Corperate_Project/src/main/java/com/spring/service/SellDetailServiceImpl.java +++ b/Corperate_Project/src/main/java/com/spring/service/SellDetailServiceImpl.java @@ -19,8 +19,18 @@ public class SellDetailServiceImpl implements SellDetailService{ @Override public void insert(SellDetailVO selldetail) { - mapper.insert(selldetail); // 존재하지 않는 레코드를 얻으려고하면 null이 반환됨 - } + + int len = selldetail.getItem_no().size(); + + for (int i = 0; i < len; i++) { + int itemNo = selldetail.getItem_no().get(i); + int itemAmount = selldetail.getAmount().get(i); + int itemPrice = selldetail.getSell_price().get(i); + String lot_code = selldetail.getLot_code().get(i); + mapper.insert(itemNo,itemAmount,itemPrice,lot_code,selldetail.getOrder_sheet_no()); + } + } + @Override public List read() { @@ -35,12 +45,6 @@ public int getTotalCount(SearchVO searchvo) { @Override public List selectAll(Client_Paging pageInfo) { - List dlists =mapper.selectAll(pageInfo); - return dlists; - } - - @Override - public List getSubListByOrderSheetNo(int orderSheetNo) { - return mapper.selectSubListByOrderSheetNo(orderSheetNo); + return mapper.selectAll(pageInfo); } } diff --git a/Corperate_Project/src/main/java/com/spring/service/SellService.java b/Corperate_Project/src/main/java/com/spring/service/SellService.java index d104444..00e6237 100644 --- a/Corperate_Project/src/main/java/com/spring/service/SellService.java +++ b/Corperate_Project/src/main/java/com/spring/service/SellService.java @@ -16,5 +16,7 @@ public interface SellService { public void update(SellVO sell); - public List getSubList(int mainNo); + public List getSubList(int mainNo); + + } diff --git a/Corperate_Project/src/main/java/com/spring/service/SellServiceImpl.java b/Corperate_Project/src/main/java/com/spring/service/SellServiceImpl.java index c365572..42f3f8d 100644 --- a/Corperate_Project/src/main/java/com/spring/service/SellServiceImpl.java +++ b/Corperate_Project/src/main/java/com/spring/service/SellServiceImpl.java @@ -20,7 +20,6 @@ public class SellServiceImpl implements SellService{ public void insert(SellVO sell) { System.out.println("SellServiceImpl member_no :"+sell.getMember_no()); - System.out.println("SellServiceImpl order_no :"+sell.getOrder_no()); System.out.println("SellServiceImpl day :"+sell.getDay()); mapper.insert(sell); // 존재하지 않는 레코드를 얻으려고하면 null이 반환됨 @@ -45,8 +44,8 @@ public void update(SellVO sell) { } @Override - public List getSubList(int mainNo) { - System.out.println("판매 리스트 불러오기"); + public List getSubList(int mainNo) { + System.out.println("판매 리스트 불러오기13"); return mapper.getSubList(mainNo); // 존재하지 않는 레코드를 얻으려고하면 null이 반환됨 } } diff --git a/Corperate_Project/src/main/resources/com/spring/mapper/LotRestMapper.xml b/Corperate_Project/src/main/resources/com/spring/mapper/LotRestMapper.xml new file mode 100644 index 0000000..acb1c59 --- /dev/null +++ b/Corperate_Project/src/main/resources/com/spring/mapper/LotRestMapper.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/Corperate_Project/src/main/resources/com/spring/mapper/OrderSheetMapper.xml b/Corperate_Project/src/main/resources/com/spring/mapper/OrderSheetMapper.xml index e6136a9..d20a17f 100644 --- a/Corperate_Project/src/main/resources/com/spring/mapper/OrderSheetMapper.xml +++ b/Corperate_Project/src/main/resources/com/spring/mapper/OrderSheetMapper.xml @@ -87,22 +87,13 @@ @@ -140,14 +131,12 @@ order by no desc) where rownum <= #{cri.pageNum} * #{cri.amount} )where rn > (#{cri.pageNum} - 1) * #{cri.amount} - and status = 0 ]]> @@ -158,6 +147,13 @@ and status = 0 + + + update ORDER_SHEET + set status = 2 + where no = #{order_no} + + update ORDER_SHEET set status = #{status} diff --git a/Corperate_Project/src/main/resources/com/spring/mapper/SellMapper.xml b/Corperate_Project/src/main/resources/com/spring/mapper/SellMapper.xml index e89b0aa..7e5e786 100644 --- a/Corperate_Project/src/main/resources/com/spring/mapper/SellMapper.xml +++ b/Corperate_Project/src/main/resources/com/spring/mapper/SellMapper.xml @@ -7,11 +7,11 @@ insert into sell - values(sell_seq.nextval,#{member_no},#{order_no},#{day}) + values(sell_seq.nextval,#{member_no},#{day}) @@ -21,13 +21,12 @@ on se.member_no = me.no order by no desc - update sell set member_no = #{member_no}, order_no = - #{order_no}, day = + update sell set member_no = #{member_no}, day = #{day} where no = #{no} - select sn.no, sn.sell_no, sn.amount, sn.sell_price, sn.lot_code, sn.item_no, it.code code, it.name name from(select * diff --git a/Corperate_Project/src/main/webapp/WEB-INF/views/sell/origin/list.jsp b/Corperate_Project/src/main/webapp/WEB-INF/views/sell/origin/list.jsp index 32d8028..dbca463 100644 --- a/Corperate_Project/src/main/webapp/WEB-INF/views/sell/origin/list.jsp +++ b/Corperate_Project/src/main/webapp/WEB-INF/views/sell/origin/list.jsp @@ -9,16 +9,6 @@ Date nowTime = new Date(); SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd"); %>