08.09

src/main/java/com/style24/persistence/domain/Pos.java

@@ -80,6 +80,47 @@ public class Pos extends TscBaseDomain {
 	private String delYn;
 	private String addInvoiceYn;
 	
+	private String deliverytypecd;
+	private String issuetypecd;	
+	private String statuscd;
+	private String loginid;	
+	private String customername;
+	private String dateordered;	
+	private String grade;
+	private String receiver;			// 받는자
+	private String receivertelnum;		// 받는자 전화번호
+	private String receivercellnum;		// 받는자 핸드폰 번호
+	private String deliverypostalcode;	// 우편 번호
+	private String deliveryaddr1;		// 기본 주소
+	private String deliveryaddr2;		// 상세 주소
+	private String logisticsno;	
+	private String logisticsname;
+	private String deliverymemo;			
+	private String productsummary;	
+	private String iscancel;
+	private String ischangeaddress;		
+	private String isreorder;
+	private String orderpath;
+	private String deliveryclasscd;
+	private String shippingtypecd;
+	private String isbeautydelivery;
+	private String deliveryaddrnew;		// 도로명 주소
+	private String productcode;
+	private String productname;
+	private String skucode;
+	private String producttypecd;	
+	private String skuvalue;
+	private String stockmgmttypecd;	
+	private String giftyn;
+	private String setproductcode;			// 세트상품코드
+	private String setproductyn;			// 세트상품여부
+	private String setproductname;			// 세트상품명
+	private String payGb;
+	private String orderguid;
+	private String ifstat;
+	private String ifyn;
+	private String ifdate;	
+	
 	private String cdRtoutshop; //CD_RTOUTSHOP
 	private String cdStyle; //CD_STYLE
 	private String cdColor; //CD_COLOR
@@ -97,11 +138,22 @@ public class Pos extends TscBaseDomain {
 	private Integer ordDtlNo;
 	private Integer delvArNo; 
 	private Integer ordDtlItemSq;
+	private Integer orderno;
+	private Integer providerno;	
+	private Integer productno;
+	private Integer deliveryorderno;
+	private Integer deliveryorderitemno;
+	private Integer orderdtlno;
+	
 	
 	private int assignQty;
 	private int saleQty;
+	private int unitprice;						// 단가(판매가)
+	private int cqty;							// 취소수량
+	private int qty;
+	private int setqty;
+	private int setitemqty;
 	
-
 	private String[] ordDtlNoArr;
 	
 	// 검색조건

src/main/java/com/style24/persistence/mybatis/shop/TssPos.xml

@@ -472,4 +472,67 @@
 		ORDER BY DA.DELV_AR_DT DESC
 	</select>			
 	
+	<!-- WMS 출고요청 대상 조회      -->	
+	<select id="getWmsDeliveryList" resultType="Pos">
+		/*TssPos.getWmsDeliveryList*/
+		SELECT 
+			  A.ORD_NO                            AS OrderNo
+			, 'SHOP'                               AS  DeliveryTypeCd
+			, '정상'                               AS  IssueTypeCd
+			, '30'                                AS StatusCd -- 배송지시
+			, D.CUST_ID                           AS LoginId
+			, A.ORD_NM                            AS CustomerName
+			, A.ORD_DT                            AS DateOrdered
+			, FN_GET_CODE_NM('G110',D.CUST_GRADE) AS  Grade 
+			, E.RECIP_NM                          AS Receiver
+			, E.RECIP_TELNO                       AS ReceiverTelNum
+			, E.RECIP_PHNNO                       AS ReceiverCellNum
+			, E.RECIP_ZIPCODE                     AS DeliveryPostalCode
+			, E.RECIP_BASE_ADDR                   AS DeliveryAddr1
+			, E.RECIP_DTL_ADDR                    AS DeliveryAddr2
+			, CASE WHEN B.SHOT_DELV_YN ='Y' THEN '14' ELSE '05' END                               AS LogisticsNo
+			, CASE WHEN B.SHOT_DELV_YN ='Y' THEN '디디로직스'  ELSE 'CJ 대한통운' END                  AS LogisticsName
+			, E.DELV_MEMO                         AS DeliveryMemo
+			, CASE WHEN (SELECT COUNT(*) -1 FROM TB_ORDER_DETAIL WHERE ORD_NO = A.ORD_NO) > 0 THEN CONCAT(F.GOODS_NM,' 외  ', (SELECT COUNT(*) -1 FROM TB_ORDER_DETAIL WHERE ORD_NO = A.ORD_NO) , '건') ELSE F.GOODS_NM END   AS ProductSummary
+			,  0                                  AS IsCancel
+			,  0                                  AS IsChangeAddress
+			,  0                                  AS IsReOrder
+			, CASE WHEN A.MALL_GB = 'G011_20' THEN B.EXTMALL_ID ELSE 'APISHOP_0054' END                  AS OrderPath -- 주문경로 (확인필요!)
+			, CASE WHEN B.SHOT_DELV_YN ='Y' THEN '20' ELSE '10' END                                 	 AS DeliveryClassCd 
+			, CASE WHEN B.ORD_EXCH_GB ='O'  THEN '10' ELSE '20' END                                 	 AS ShippingTypeCd
+			, B.GIFT_PACK_YN                      AS IsBeautyDelivery
+			, ''                                                                                         AS DeliveryAddrNew  -- 도로명 주소 (확인필요!)
+			, (SELECT PROVIDER_NO FROM TB_SUPPLY_COMPANY BB WHERE BB.SUPPLY_COMP_CD = B.SUPPLY_COMP_CD ) AS ProviderNo
+			, C.PRODUCT_NO                        AS ProductNo
+			, C.PRODUCT_CODE                      AS ProductCode
+			, (SELECT CC.GOODS_NM FROM TB_GOODS CC WHERE CC.GOODS_CD = C.ITEM_CD) AS ProductName    -- 상품명 
+			, CASE WHEN B.GOODS_TYPE = 'G056_S' THEN '세트' ELSE '일반' END 		  AS ProductTypeCd  -- 상품타입
+			, C.OPT_CD                            AS SKUCode       
+			, CONCAT(C.OPT_CD1,'/',C.OPT_CD2)     AS SKUValue
+			, B.CURR_PRICE + B.OPT_ADD_PRICE      AS UnitPrice
+			, (B.ORD_QTY -B.CNCL_RTN_QTY) * C.ITEM_QTY  AS Qty
+			, 'SHOP'                               AS StockMgmtTypeCd
+			, 'N'                                 AS GiftYn  -- 사은품여부 
+			, CASE WHEN B.GOODS_TYPE = 'G056_S' THEN B.GOODS_CD ELSE '' END  AS SetProductCode -- 세트상품코드 
+			, CASE WHEN B.GOODS_TYPE = 'G056_S' THEN 'Y' ELSE 'N' END        AS SetProductYn   -- 세트상품여부 
+			, CASE WHEN B.GOODS_TYPE = 'G056_S' THEN F.GOODS_NM ELSE '' END  AS SetproductName -- 세트상품명 
+			, B.ORD_DTL_NO                        AS OrderDtlNo
+			, 0                                   AS Cqty
+			, CASE WHEN B.GOODS_TYPE = 'G056_S' THEN (B.ORD_QTY -B.CNCL_RTN_QTY) ELSE 0 END  AS SetQty        -- 세트상품 수량
+			, CASE WHEN B.GOODS_TYPE = 'G056_S' THEN C.ITEM_QTY ELSE 0 END                   AS SetItemQty    -- 세트 구성수량
+			, (SELECT MAX(CASE WHEN PG_GB ='NAVER_ORDER' THEN 'NAVER' ELSE 'KCP' END)   FROM TB_PAYMENT WHERE ORD_NO= A.ORD_NO AND PAY_GB ='O'  ) AS PAY_GB 
+		  FROM TB_ORDER              A 
+		  JOIN TB_ORDER_DETAIL       B ON A.ORD_NO = B.ORD_NO 
+		  JOIN TB_ORDER_DETAIL_ITEM  C ON B.ORD_NO = C.ORD_NO AND B.ORD_DTL_NO = C.ORD_DTL_NO 
+		  LEFT JOIN TB_CUSTOMER      D ON A.CUST_NO = D.CUST_NO 
+		  JOIN TB_DELIVERY_ADDR      E ON B.DELV_ADDR_SQ = E.DELV_ADDR_SQ 
+		  JOIN TB_GOODS              F ON B.GOODS_CD = F.GOODS_CD 
+		  JOIN TB_DELIVERY_LOC       G ON B.DELV_LOC_CD = G.DELV_LOC_CD AND B.SUPPLY_COMP_CD = G.SUPPLY_COMP_CD
+		 WHERE A.ORD_NO        = #{ordNo} 
+		   AND B.ORD_DTL_STAT  = 'G013_50' -- 출고처지정
+		   AND G.DELV_LOC_CLSF = 'G024_21' -- 직송매장
+		  ORDER BY B.ORD_DTL_NO 
+		   
+	</select>		
+		
 </mapper>

src/main/java/com/style24/persistence/mybatis/wms/TssWmsPos.xml

@@ -0,0 +1,146 @@
+<?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.style24.scm.biz.dao.TssWmsPosDao">
+
+	<!-- 출고요청 M     -->
+	<insert id="insertWmsTbIfDeliveryOrder" parameterType="Pos" useGeneratedKeys="true" keyProperty="deliveryorderno">
+		/*TsbWmsDelivery.insertWmsTbIfDeliveryOrder*/
+		INSERT INTO iSTYLE24_WmsIf.dbo.TB_IF_DeliveryOrder
+		(
+			  OrderGUID				-- 주문서 고유번호
+			, OrderNo				-- 주문번호
+			, DeliveryTypeCd		-- 배송타입형태
+			, IssueTypeCd			-- 주문타입
+			, DeliveryUnitNo		-- 물류단위 번호
+			, DateIssued			-- 배송 데이터 수집일
+			, DateReceived
+			, DateSent
+			, StatusCd				-- 배송 상태
+			, LoginId				-- 로그인 아이디
+			, CustomerName			-- 주문자 명
+			, DateOrdered			-- 주문 일
+			, Grade					-- 회원 등급
+			, Receiver				-- 주문자
+			, ReceiverTelNum		-- 주문자 전화번호
+			, ReceiverCellNum		-- 주문자 핸드폰 번호
+			, DeliveryPostalCode	-- 우편번호
+			, DeliveryAddr1			-- 기본 주소
+			, DeliveryAddr2			-- 상세 주소
+			, LogisticsNo			-- 택배사 고유번호
+			, LogisticsName			-- 택배사 명
+			, DeliveryMemo			-- 배송 메모
+			, ProductSummary		-- 상품명
+			, IsCancel				-- 배송 취소 여부
+			, IsChangeAddress		-- 배송지 변경 여부
+			, IsReOrder				-- 재주문 여부
+			, OrderPath				-- 주문 경로
+			, DeliveryClassCd		-- 배송 형태 (당일)
+			, ShippingTypeCd		-- 출고 구분
+			, IsBeautyDelivery		-- 선물 포장 여부
+			, DeliveryAddrNew		-- 도로명 주소
+			, IfYn					-- I/F여부
+			, PayGb
+		)
+		VALUES
+		(
+			  #{orderguid}
+			, #{orderno}				
+			, #{deliverytypecd}		
+			, #{issuetypecd}			
+			, 0	
+			, GETDATE()				
+			, GETDATE()	
+			, GETDATE()	
+			, #{statuscd}				
+			, #{loginid}				
+			, #{customername}			
+			, #{dateordered}			
+			, #{grade}					
+			, #{receiver}				
+			, #{receivertelnum}		
+			, #{receivercellnum}		
+			, #{deliverypostalcode}	
+			, #{deliveryaddr1}			
+			, #{deliveryaddr2}			
+			, #{logisticsno}			
+			, #{logisticsname}			
+			, #{deliverymemo}			
+			, #{productsummary}				
+			, #{iscancel}				
+			, #{ischangeaddress}		
+			, #{isreorder}				
+			, #{orderpath}				
+			, #{deliveryclasscd}		
+			, #{shippingtypecd}				
+			, CASE WHEN #{isbeautydelivery} = 'N' THEN 0 ELSE 1 END 		    
+			, #{deliveryaddrnew}	
+			, 'Y'					
+			, #{payGb}
+		)
+	</insert>		
+	
+	<!-- 출고요청 D     -->
+	<insert id="insertWmsTbIfDeliveryOrderItem" parameterType="Pos" useGeneratedKeys="true" keyProperty="deliveryorderitemno" >
+		/*TsbWmsDelivery.insertWmsTbIfDeliveryOrderItem*/
+		INSERT INTO iSTYLE24_WmsIf.dbo.TB_IF_DeliveryOrderItem
+		(
+			  DeliveryOrderNo		-- 배송번호
+			, ProviderNo			-- 공급자 번호
+			, ProductNo				-- 상품 번호
+			, ProductCode			-- 상품 코드
+			, ProductName			-- 상품 명
+			, ProductTypeCd			-- 상품 타입
+			, SKUCode				-- 옵션 코드
+			, SKUValue				-- 옵션 값
+			, UnitPrice				-- 단가(판매가)
+			, Qty					-- 수량
+			, StatusCd				-- 배송상태
+			, DateReceived
+			, DateSent
+			, DateLastModified		-- 수정일
+			, IsCancel				-- 취소
+			, StockMgmtTypeCd		-- 재고관리 타입
+			, GiftYn				-- 사은품여부
+			, SetProductCode		-- 세트상품코드
+			, SetProductYn			-- 세트상품여부
+			, SetproductName		-- 세트상품명
+			, OrderDtlNo			-- 주문상세번호
+			, IfYn					-- I/F여부
+			, IfDate				-- I/F일자
+			, Cqty					-- 취소수량
+			, SetQty				-- 세트수량
+			, SetItemQty			-- 세트구성수량
+		)
+		VALUES 
+		(
+			  #{deliveryorderno}		-- 배송번호
+			, #{providerno}				-- 공급자 번호
+			, #{productno}				-- 상품 번호
+			, #{productcode}			-- 상품 코드
+			, #{productname}			-- 상품 명
+			, #{producttypecd}			-- 상품 타입
+			, #{skucode}				-- 옵션 코드
+			, #{skuvalue}				-- 옵션 값
+			, #{unitprice}				-- 단가(판매가)
+			, #{qty}					-- 수량
+			, #{statuscd}				-- 배송상태
+			, GETDATE()
+			, GETDATE()
+			, GETDATE()						-- 수정일
+			, #{iscancel}				-- 취소
+			, #{stockmgmttypecd}		-- 재고관리 타입
+			, #{giftyn}					-- 사은품여부
+			, #{setproductcode}			-- 세트상품코드
+			, #{setproductyn}			-- 세트상품여부
+			, #{setproductname}			-- 세트상품명
+			, #{orderdtlno}				-- 주문상세번호
+			, #{ifyn}					-- I/F여부
+			, #{ifdate}					-- I/F일자
+			, #{cqty}					-- 취소수량
+			, #{setqty}					-- 세트수량
+			, #{setitemqty}				-- 세트구성수량
+		)		
+	</insert>		
+	
+	
+</mapper>

src/main/java/com/style24/scm/biz/dao/TssPosDao.java

@@ -176,4 +176,15 @@ public interface TssPosDao {
 	 * @since 2021. 06. 21
 	 */
 	Collection<Pos> getDeliveryAssignList(Pos pos);	
+	
+	/**
+	 * WMS 출고 요청 대상 
+	 *
+	 * @param Pos
+	 * @return Collection<Pos>
+	 * @author moon
+	 * @since 2021. 08. 09
+	 */
+	Collection<Pos> getWmsDeliveryList(Pos pos);	
+
 }

src/main/java/com/style24/scm/biz/dao/TssWmsPosDao.java

@@ -0,0 +1,37 @@
+package com.style24.scm.biz.dao;
+
+import java.util.Collection;
+
+import com.style24.core.support.annotation.WmsDs;
+import com.style24.persistence.domain.Pos;
+
+/**
+ * wms Dao
+ *
+ * @author moon
+ * @since 2021. 08. 09
+ */
+@WmsDs
+public interface TssWmsPosDao {
+
+
+	/**
+	 * 출고요청 M
+	 * @param 
+	 * @return Pos
+	 * @author moon
+	 * @since 2021. 08. 09
+	 */
+	void insertWmsTbIfDeliveryOrder(Pos delivery);
+		
+	/**
+	 * 출고요청 D
+	 * @param 
+	 * @return Pos
+	 * @author moon
+	 * @since 2021. 08. 09
+	 */
+	void insertWmsTbIfDeliveryOrderItem(Pos delivery);
+	
+
+}

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

@@ -27,7 +27,7 @@ import com.style24.persistence.domain.Order;
 import com.style24.persistence.domain.Pos;
 import com.style24.scm.biz.dao.TssPosDao;
 import com.style24.scm.support.security.session.TssSession;
-
+import com.style24.scm.biz.service.TssWmsPosService;
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -55,6 +55,10 @@ public class TssPosService {
 	@Autowired
 	private HansaeErp hansaeErp;
 	
+	@Autowired
+	private TssWmsPosService wmsPosService;
+	
+	
 	/**
 	 * 매장로그인 정보 조회
 	 * @param  Pos
@@ -503,7 +507,7 @@ public class TssPosService {
 		}
 		
 		// API 호출 재고이동
-		//hansaeErp.erpStockRt(HansaeErp.ErpGb.HANSAE_DR.value(), rtList);
+		hansaeErp.erpStockRt(HansaeErp.ErpGb.HANSAE_DR.value(), rtList);
 		
 		// API 호출 매출정보 
 		//GagaMap resultMap = hansaeErp.uploadErpSales(HansaeErp.ErpGb.HANSAE_DR.value(), salesList);
@@ -539,6 +543,124 @@ public class TssPosService {
 		return result;
 	}
 	
+	/**
+	 * 매장POS -출고확정
+	 *
+	 * @param Pos 
+	 * @return GagaMap
+	 * @author moon
+	 * @since 2021. 06. 21
+	 */
+	@Transactional("shopTxnManager")
+	public GagaMap saveConfirmation2(Collection<Pos> posList, int cnt) {
+		GagaMap result = new GagaMap();
+		result.setString("resultMsg", "출고확정 되었습니다.");
+		Integer userNo = TssSession.getInfo().getUserNo();
+		Collection<Erp> rtList = new ArrayList();
+		Collection<Erp> salesList = new ArrayList();
+		
+		Date date = new Date();
+
+		SimpleDateFormat ifDt = new SimpleDateFormat("yyyymmddhhmmss");
+		String noIf =  ifDt.format(date);
+		
+		for(Pos pos : posList) {
+			Collection<Pos> list = posDao.getSendErpList(pos);
+			//log.info("list {}"+list);
+			for(Pos data : list) {
+				Erp erpData = new Erp();
+				erpData.setCD_RTOUTSHOP(data.getCdRtoutshop());
+				erpData.setCD_STYLE(data.getCdStyle());
+				erpData.setCD_COLOR(data.getCdColor());
+				erpData.setCD_SIZE(data.getCdSize());
+				erpData.setQT_RTOUT(data.getQtRtout());
+				rtList.add(erpData);
+				
+				erpData.setNO_IF(noIf+ GagaStringUtil.getLPadding(cnt+"", 4, "0"));
+				//erpData.setDT_SALE(data.getDtSale());
+				erpData.setDT_SALE("20210831");
+				erpData.setQT_SALE(data.getQtSale());
+				erpData.setAM_ACSALE(data.getAmAcsale());
+				erpData.setDS_REMARK("TEST");
+				salesList.add(erpData);
+				
+			}
+			
+		}
+
+		// API 호출 재고이동
+		String rtn = "";
+		//rtn = hansaeErp.erpStockRt(HansaeErp.ErpGb.HANSAE_DR.value(), rtList);
+		rtn = "S";
+		if("S".equals(rtn)) {
+			// API 호출 매출정보 
+			//GagaMap resultMap = hansaeErp.uploadErpSales(HansaeErp.ErpGb.HANSAE_DR.value(), salesList);
+			
+			//log.info("매출정보 호출결과 {}"+resultMap);
+			
+			for(Pos pos : posList) {
+				// 주문상세 업데이트
+				pos.setOrdDtlStat(OrderDetailStat.SHIPPING.value()); // 배송중 
+				pos.setInvoiceNo("");
+				pos.setDelvArGb("");
+				pos.setUpdNo(userNo);
+				posDao.updateOrderDetail(pos);
+
+				// 주문상세 이력 삽입
+				Order order = new Order();
+				order.setOrdDtlNo(pos.getOrdDtlNo()); 
+				order.setUpdNo(userNo);
+				order.setRegNo(userNo);
+				orderDao.createOrderDetailHst(order);
+				
+				Collection<Pos> list = posDao.getSendErpList(pos);
+				// 주문상세단품 HST 등록???
+				for(Pos data : list) {
+					Order ordItem = new Order();
+					ordItem.setUpdNo(userNo);
+					ordItem.setRegNo(userNo);
+					ordItem.setOrdDtlItemSq(data.getOrdDtlItemSq());
+					//orderChangeDao.createOrderDetailItemHst(ordItem);
+					
+					// 2021.06.25 POS 배송중 (정산구분값추가)
+					ordItem.setOrdDtlStat(TscConstants.OrdDtlItemStat.SALE_SHIPPING.value());
+					orderDao.createOrderDetailItemHst(ordItem);
+				}
+				 
+			}
+			
+			// WMS에  출고 DATA 넣기 (회수시 출고DATA 필요!)
+			Collection<Pos> ordNoList = new ArrayList<>();
+
+			for (Pos posParam : posList) {
+				String chk = "N";
+				for (Pos param : ordNoList) {
+					if (param.getOrdNo().equals(posParam.getOrdNo())) {
+						chk = "Y";
+					}
+				}
+				if (!"Y".equals(chk)) {
+					Pos ordNo = new Pos();
+					ordNo.setOrdNo(posParam.getOrdNo());
+					ordNoList.add(ordNo);
+				}
+			}
+			
+			for(Pos ordParam : ordNoList) {
+				// wms 출고 정보 조회(mall_DB) 
+				Collection<Pos> wmsDelvList = posDao.getWmsDeliveryList(ordParam);
+				 // wms 출고 정보 등록 (wms_DB)
+				wmsPosService.insertWmsDelivery(wmsDelvList);
+			}
+
+		} else {
+			result.setString("resultMsg", "hansaeErp API 호출 실패했습니다.");
+		}
+				
+		return result;
+	}
+	
+	
 	/**
 	 * 매장POS - 정산내역
 	 * 

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

@@ -0,0 +1,61 @@
+package com.style24.scm.biz.service;
+
+import java.util.Collection;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import com.style24.core.support.message.TscMessageByLocale;
+import com.style24.persistence.domain.Pos;
+import com.style24.scm.biz.dao.TssWmsPosDao;
+import java.util.UUID;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ *  wms Service
+ *
+ * @author moon
+ * @since 2021. 08. 09
+ */
+@Service
+@Slf4j
+public class TssWmsPosService {
+
+	@Autowired
+	private TscMessageByLocale message;
+
+	@Autowired
+	private TssWmsPosDao wmsPosDao;
+
+	/**
+	 * WMS_IF 출고요청 등록
+	 * @param Collection<Delivery>
+	 * @return 
+	 * @author moon
+	 * @since  2021. 04. 08
+	 */
+	@Transactional("wmsTxnManager")
+	public void insertWmsDelivery(Collection<Pos> list) {
+
+		// TB_IF_DeliveryOrder
+		String uuid = UUID.randomUUID().toString();
+		Pos dataM = list.iterator().next();	
+
+		dataM.setOrderguid(uuid);
+
+		
+		wmsPosDao.insertWmsTbIfDeliveryOrder(dataM);
+		Integer ordPk = dataM.getDeliveryorderno();
+
+		log.info("ordPk: "+ordPk);
+		for (Pos data : list) {
+			// TB_IF_DeliveryOrderItem
+			data.setDeliveryorderno(ordPk);
+			data.setIfyn("Y");
+			wmsPosDao.insertWmsTbIfDeliveryOrderItem(data);
+		}
+
+		
+	}
+
+}

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

@@ -371,7 +371,7 @@ public class TssPosController extends TssBaseController {
 	 */
 	@PostMapping("/confirm/save")
 	@ResponseBody
-	public Collection<GagaMap> saveConfirmation(@RequestBody Collection<Pos> posList) {
+	public GagaResponse saveConfirmation(@RequestBody Collection<Pos> posList) {
 		Integer userNo = TssSession.getInfo().getUserNo();
 		Collection<GagaMap> resultList = new ArrayList<>();
 		Collection<Pos> dtlNoList = new ArrayList<Pos>();
@@ -394,14 +394,16 @@ public class TssPosController extends TssBaseController {
 				data.setDelvFeeRate(posParam.getDelvFeeRate());
 				data.setInvoiceNo(posParam.getInvoiceNo());
 				data.setShipCompCd(posParam.getShipCompCd());
-				cnt = cnt+1;
-				GagaMap result = posService.saveConfirmation(data,cnt);
 
-				dtlNoList.add(posParam);
-				resultList.add(result);
+				//GagaMap result = posService.saveConfirmation(data,cnt);
+
+				dtlNoList.add(data);
 			}
 		}
-		return resultList;
+		
+		GagaMap result = posService.saveConfirmation2(dtlNoList,cnt);
+		String resultMsg   = result.getString("resultMsg");
+		return super.ok(resultMsg);
 	}
 	
 

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

@@ -915,7 +915,7 @@
 	var fnConfirmCallback = function() {
 		$('#tab2-1').trigger('click');
 		$('#btnConfirmSearch').trigger('click');
-		mcxDialog.alert('출고확정 되었습니다.');
+		// mcxDialog.alert('출고확정 되었습니다.');
 	};