매장POS 수정 및 정리 오픈안된화면임. 반영되어도 영향도 없음.

src/main/java/com/style24/scm/biz/service/TssPosService.java

@@ -242,10 +242,10 @@ public class TssPosService {
 		};
 		Collection<GagaMap> dataList = posDao.getOrderExcelList(pos); // map형식으로 조회
 		try {
-			GagaExcelUtil.createExcel(excelFilenameWithPath, dataList,"" ,listTitles, cellNames, cellTypes);
+			GagaExcelUtil.createExcel(excelFilenameWithPath, dataList, listTitles, cellNames, cellTypes);
 			//GagaExcelUtil.createExcel(excelFilenameWithPath, dataList,"테스트" ,listTitles, cellNames, cellTypes,"",true);
 			//GagaExcelUtil.createExcel(excelFilenameWithPath, dataList , cellNames, cellTypes);
- 
+	
 		} catch (Exception e) {
 			throw new IllegalStateException(e);
 		}
@@ -506,10 +506,11 @@ public class TssPosService {
 			
 		}
 		
-		// API 호출 재고이동
-		hansaeErp.erpStockRt(HansaeErp.ErpGb.HANSAE_DR.value(), rtList);
+		// API 호출 재고이동  -- 한세드림, 한세MK인지 추후 확인 후 주석 제거 
+		// hansaeErp.erpStockRt(HansaeErp.ErpGb.HANSAE_MK.value(), rtList);
+		// hansaeErp.erpStockRt(HansaeErp.ErpGb.HANSAE_DR.value(), rtList);
 		
-		// API 호출 매출정보 
+		// API 호출 매출정보   (매출배치에 포함되면  사용안함.)
 		//GagaMap resultMap = hansaeErp.uploadErpSales(HansaeErp.ErpGb.HANSAE_DR.value(), salesList);
 		
 		// 주문상세 업데이트
@@ -526,15 +527,12 @@ public class TssPosService {
 		order.setRegNo(userNo);
 		orderDao.createOrderDetailHst(order);
 		
-		// 주문상세단품 HST 등록???
+		// 주문상세단품 HST 등록
 		for(Pos data : list) {
 			Order ordItem = new Order();
 			ordItem.setUpdNo(userNo);
 			ordItem.setRegNo(userNo);
-			ordItem.setOrdDtlStat(""); // ???
 			ordItem.setOrdDtlItemSq(data.getOrdDtlItemSq());
-			//orderChangeDao.createOrderDetailItemHst(ordItem);
-			
 			// 2021.06.25 POS 배송중 (정산구분값추가)
 			order.setOrdDtlStat(TscConstants.OrdDtlItemStat.SALE_SHIPPING.value());
 			orderDao.createOrderDetailItemHst(order);

src/main/java/com/style24/scm/biz/web/TssPosController.java

@@ -354,7 +354,6 @@ public class TssPosController extends TssBaseController {
 		boolean validation = result.getBoolean("validation");
 		String resultMsg   = result.getString("resultMsg");
 		
-		//deliveryService.savePosDeliveryLocRejectCancel(delivery);
 		if (validation) {
 			posService.savePosDeliveryLocRejectCancel(pos);
 		}
@@ -395,8 +394,6 @@ public class TssPosController extends TssBaseController {
 				data.setInvoiceNo(posParam.getInvoiceNo());
 				data.setShipCompCd(posParam.getShipCompCd());
 
-				//GagaMap result = posService.saveConfirmation(data,cnt);
-
 				dtlNoList.add(data);
 			}
 		}
@@ -407,20 +404,6 @@ public class TssPosController extends TssBaseController {
 	}
 	
 
-	/**
-	 * 정산내역
-	 * 
-	 * @param pos - 매장정보
-	 * @return Collection<Pos>
-	 * @author moon
-	 * @since 2021. 06. 21
-	 */
-	@PostMapping("/usac/list")
-	@ResponseBody
-	public Collection<Pos> getPosUsacList(@RequestBody Pos pos) {
-		return posService.getPosUsacList(pos);
-	}
-
 	/**
 	 * 출고거부이력 목록
 	 * 
@@ -432,185 +415,16 @@ public class TssPosController extends TssBaseController {
 	@PostMapping("/ban/delivery/list")
 	@ResponseBody
 	public Collection<Pos> getPosBanDeliveryList(@RequestBody Pos pos) {
-		/*
-		 * Delivery delivery = new Delivery();
-		 * delivery.setDelvLocCd(TsaSession.getPosInfo().getDelvLocCd());
-		 * delivery.setGoodsGb("goodsCd"); delivery.setSearchTxt(pos.getGoodsCd());
-		 * Collection<Delivery> rejectList = new ArrayList<Delivery>(); return
-		 * rejectList; //deliveryService.getDeliveryAssignList(delivery);
-		 */		
+	
 		return posService.getDeliveryAssignList(pos);
 		
 	}
 
-	/**
-	 * 출고수락목록 배송준비중
-	 * 
-	 * @param pos - 매장정보
-	 * @return Collection<Pos>
-	 * @author moon
-	 * @since 2020. 11. 13
-	 */
-//	@PostMapping("/invoice/save")
-//	@ResponseBody
-//	public Collection<GagaMap> saveInvoice(@RequestBody Collection<Pos> posList) {
-//		String delvLocCd = TsaSession.getPosInfo().getDelvLocCd();
-//		Double delvFeeRate = TsaSession.getPosInfo().getDelvFeeRate();
-//
-//		Collection<GagaMap> resultList = new ArrayList<>();
-//		Collection<Pos> dtlNoList = new ArrayList<Pos>();
-//
-//		for (Pos posParam : posList) {
-//
-//			// 세트상품일경우 주문상세번호 중복제거 
-//			String chk = "N";
-//			for (Pos param : dtlNoList) {
-//				if (param.getOrdDtlNo() == posParam.getOrdDtlNo()) {
-//					chk = "Y";
-//				}
-//			}
-//			if (!"Y".equals(chk)) {
-//				Delivery delivery = new Delivery();
-//				delivery.setOrdNo(posParam.getOrdNo());
-//				delivery.setOrdDtlNo(posParam.getOrdDtlNo());
-//				// TODO: 매장코드는 id 생성후 매핑???
-//				//delivery.setUpdNo(delvLocCd);
-//				//delivery.setRegNo(delvLocCd);
-//				delivery.setDelvFeeRate(delvFeeRate);
-//
-//
-//				GagaMap result = null;//deliveryService.savePos(delivery);
-//
-//				dtlNoList.add(posParam);
-//				resultList.add(result);
-//			}
-//
-//		}
-//		return resultList;
-//	}
-
-
-	/**
-	 * 엑셀다운로드
-	 * 
-	 * @param pos - 매장정보
-	 * @return Collection<Pos>
-	 * @author moon
-	 * @since 2020. 11. 13
-	 */	
-//	@GetMapping("/order/excel/list")
-//	public ResponseEntity<InputStreamResource> downloadOrderExcelList(HttpServletRequest request, Pos pos) throws Exception {
-//		if (StringUtils.isBlank(pos.getOrdDtlNos())) {
-//			throw new IllegalStateException(message.getMessage("FAIL_1003"));
-//		}
-//		String excelfileName = "CNPlus 엑셀양식_" + GagaDateUtil.getTodayDateTime() + ".xlsx";
-//		String excelFilenameWithPath = GagaFileUtil.getConcatenationPath(env.getProperty("download.path"), "excel", excelfileName);
-//		log.info("pos {}", pos.getOrdDtlNos());
-//		if (StringUtils.isNotBlank(pos.getOrdDtlNos())) {
-//			pos.setOrdDtlNoArr(pos.getOrdDtlNos().split(","));
-//		}
-//		// 대용량엑셀파일다운로드는 이런 식으로 ...
-//		posService.getOrderExcelList(pos, excelFilenameWithPath);
-//
-//		return GagaFileUtil.writeFile(request, excelFilenameWithPath);
-//	}
-
-	/**
-	 * 매장 출고처지정 수략율 통계화면
-	 *
-	 * @author card007
-	 * @since 2020. 09. 16
-	 */
-	/*
-	@GetMapping("/delivery/assign/statistics/form")
-	public ModelAndView storeDeliveryAssignStatisticsForm() {
-		ModelAndView mav = new ModelAndView();
-
-		// 공급업체
-		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList());
-
-		mav.setViewName("statistics/DeliveryAssignForm");
-
-		return mav;
-	}
-	*/
-
-	/**
-	 * 매장 출고처지정 수략율 통계 조회
-	 *
-	 * @param TsaDeliveryAssign - 출고처지정
-	 * @return Collection<TsaDeliveryAssign>
-	 * @author card007
-	 * @since 2020. 09. 16
-	 */
-	/*
-	@PostMapping("/delivery/assign/statistics/list")
-	@ResponseBody
-	public Collection<TsaDeliveryAssign> getStoreDeliveryAssignStatistics(@RequestBody TsaDeliveryAssign deliveryAssign) {
-		return statisticsService.getStoreDeliveryAssignStatistics(deliveryAssign);
-	}
-	*/
-	/**
-	 * 매장 출고처지정 상세 데이터 조회
-	 *
-	 * @param TsaDeliveryAssign - 출고처지정
-	 * @return Collection<TsaDeliveryAssign>
-	 * @author card007
-	 * @since 2020. 09. 16
-	 */
-	/*
-	@GetMapping("/delivery/assign/statistics/detail/{delvLocCd}")
-	@ResponseBody
-	public ModelAndView storeDeliveryAssignDetailForm(@PathVariable String delvLocCd, @RequestParam(value = "stDate", required = false) String stDate, @RequestParam(value = "edDate", required = false) String edDate, @RequestParam(value = "brandCd", required = false) String brandCd) {
-		ModelAndView mav = new ModelAndView();
 
-		TsaDeliveryAssign deliveryAssign = new TsaDeliveryAssign();
-		deliveryAssign.setDelvLocCd(delvLocCd);
-		deliveryAssign.setBrandCd(brandCd);
-		deliveryAssign.setStDate(stDate);
-		deliveryAssign.setEdDate(edDate);
 
-		Collection<TsaDeliveryAssign> dataList = statisticsService.getStoreDeliveryAssignDetailList(deliveryAssign);
 
-		mav.addObject("dataList", dataList);
 
-		// 출고거부사유
-		mav.addObject("noList", rendererService.getAvailCommonCodeList("G017"));
-
-		mav.setViewName("statistics/DeliveryAssignDetailPopupForm");
 
-		return mav;
-	}
-	*/
 
-	/**
-	 * 입점업체브랜드 목록
-	 *
-	 * @param supplyCompCd - 입점업체관리일련번호
-	 * @return
-	 * @author moon
-	 * @since 2019. 11. 13
-	 */
-//	@GetMapping("/delivery/assign/statistics/brand/list/{supplyCompCd}")
-//	@ResponseBody
-//	public Collection<CommonCode> getSupplyCompanyBrandList(@PathVariable String supplyCompCd) {
-//		return rendererService.getSupplyCompanyBrandList(supplyCompCd);
-//	}
 
-	/**
-	 * 출고처 목록
-	 *
-	 * @param deliveryLoc - 출고처 정보
-	 * @return
-	 * @author moon
-	 * @since 2020. 11. 13
-	 */
-//	@GetMapping("/delivery/assign/statistics/store/stock/link/list/{supplyCompCd}")
-//	@ResponseBody
-//	public Collection<CommonCode> getStoreStockLinkList(@PathVariable String supplyCompCd) {
-//		DeliveryLoc deliveryLoc = new DeliveryLoc();
-//		deliveryLoc.setSupplyCompCd(supplyCompCd);
-//		deliveryLoc.setDelvLocClsf("21");
-//		return rendererService.getDeliveryLocList(deliveryLoc);
-//	}
 }

src/main/webapp/WEB-INF/views/pos/PosMainForm.html

@@ -1,9 +1,6 @@
 <!DOCTYPE html>
 <html lang="ko"
-	  xmlns:th="http://www.thymeleaf.org">
-<head th:replace="common/fragments/header :: header"></head>
-<body>
-<th:block th:replace="common/fragments/variables :: variables"></th:block>
+xmlns:th="http://www.thymeleaf.org">
 
 <!--
  *******************************************************************************
@@ -920,37 +917,27 @@
 	
 
 	$(document).ready(function() {
-		
 		gagaAgGrid.createGrid('watingGrid',  gridWaitingOptions);
 		gagaAgGrid.createGrid('deliveryGrid',gridDeliveryOptions);
 		gagaAgGrid.createGrid('confirmGrid',gridConfirmOptions);
 		gagaAgGrid.createGrid('banDelvGrid', gridBanDelvOptions);
-		
-		
-		
-		
-		cfnCreateCalendar('#deliveryTerms', 'deliveryStDate', 'deliveryEdDate', true, '조회');
+
 		cfnCreateCalendar('#waitTerms',     'waitOrdStDate',  'waitOrdEdDate',  true, '조회');
+		cfnCreateCalendar('#deliveryTerms', 'deliveryStDate', 'deliveryEdDate', true, '조회');
+		
 		cfnCreateCalendar('#confirmTerms',  'confirmStDate',  'confirmEdDate', true, '조회');		
 		cfnCreateCalendar('#banDelvTerms',  'banDelvStDate',  'banDelvEdDate',  true, '조회');
 
-		
-		 setTimeout(fnSetDate, 100);
-		
-		
-		
-	});
-
-	var fnSetDate = function(){
-		cfnChangeCalendar('2d', $('#deliveryStDate'), $('#deliveryEdDate'));
 		cfnChangeCalendar('1d', $('#waitOrdStDate'), $('#waitOrdEdDate'));
-		cfnChangeCalendar('2d', $('#confirmStDate'), $('#confirmEdDate'));
+		cfnChangeCalendar('1d', $('#deliveryStDate'), $('#deliveryEdDate'));
+		cfnChangeCalendar('1d', $('#confirmStDate'), $('#confirmEdDate'));
 		cfnChangeCalendar('1m', $('#banDelvStDate'), $('#banDelvEdDate'));
 
 		$('#btnWaitSearch').trigger('click');
-	}
+
+	});
+
 
 	/*]]>*/
 </script>
-</body>
 </html>