07.13

src/main/java/com/style24/batch/biz/service/TsbDeliveryService.java

@@ -693,10 +693,11 @@ public class TsbDeliveryService {
 			dtlNo.setChgGb(data.getChgGb());
 			dtlNo.setChgStat(data.getChgStat());
 			dtlNo.setOrdChgSq(data.getOrdChgSq());
+			dtlNo.setOrdDtlNo(dtlNo.getOrdDtlNo());	
 			dtlNo.setOrderdtlno(dtlNo.getOrdDtlNo());
 			
 			// TB_ORDER_CHANGE_DETAIL
-			deliveryDao.updateTbOrderChangeDetail(data);  //  주문상세번호 단위 
+			deliveryDao.updateTbOrderChangeDetail(dtlNo);  //  주문상세번호 단위 
 
 			// 주문상세변경 이력 
 			OrderChange ordChg = new OrderChange();
@@ -1000,8 +1001,6 @@ public class TsbDeliveryService {
 			item.setRtnLocCd("DL001");
 			// TB_WITHDRAW_DETAIL 입력
 			deliveryDao.insertTbWithdrawDetail(item);	// 주문변경번호  ITEM단위 
-			
-			data.setCustNo(ordInfo.getCustNo());
 		}
 
 	}	
@@ -1277,7 +1276,7 @@ public class TsbDeliveryService {
 	 */
 	public void getShopRealStockSetChk(Collection<Delivery> itemList, Integer ordDtlNo) {
 		for (Delivery item : itemList) {
-			Collection<Erp> shopStockList = hansaeErp.getErpRealStockList(HansaeErp.ErpGb.HANSAE_DR.value(), item.getGoodsCd(), item.getOptCd1(), item.getOptCd2());
+			Collection<Erp> shopStockList = hansaeErp.getErpRealStockList(HansaeErp.ErpGb.HANSAE_DR.value(), item.getItemCd(), item.getOptCd1(), item.getOptCd2());
 
 			if (shopStockList != null) {
 				for (Erp shop : shopStockList) {

src/main/java/com/style24/batch/biz/service/TsbWmsDeliveryService.java

@@ -348,6 +348,7 @@ public class TsbWmsDeliveryService {
 		
 		wmsDeliveryDao.insertWmsTbIfDeliveryOrder(dataM);
 		Integer ordPk = dataM.getDeliveryorderno();
+		String exchGb = dataM.getShippingtypecd(); // 10:일반, 20:  교환
 		log.info("ordPk: "+ordPk);
 		for (Delivery data : list) {
 			// TB_IF_DeliveryOrderItem
@@ -355,12 +356,12 @@ public class TsbWmsDeliveryService {
 			data.setIfyn("N");
 			wmsDeliveryDao.insertWmsTbIfDeliveryOrderItem(data);
 		}
-		for(Delivery gift : giftList) {
-			gift.setDeliveryorderno(ordPk);
-			gift.setIfyn("N");
-			wmsDeliveryDao.insertWmsTbIfDeliveryOrderItem(gift);
-			
-			
+		if("10".equals(exchGb)) {
+			for(Delivery gift : giftList) {
+				gift.setDeliveryorderno(ordPk);
+				gift.setIfyn("N");
+				wmsDeliveryDao.insertWmsTbIfDeliveryOrderItem(gift);
+			}
 		}
 		
 	}

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

@@ -330,7 +330,7 @@
 		   AND C.PRODUCT_CODE = #{productcode}
 		   AND E.ORD_CHG_SQ   = #{ordChgSq} 
 		   AND D.DEL_YN       = 'N'
-		   AND D.CHG_STAT IN ('G685_30','G685_31') -- 회수요청 상품검수중
+		   AND D.CHG_STAT IN ('G685_30','G685_31','G685_33','G685_40') -- 회수요청 상품검수중
 	</select>
 
 	<!-- 주문정보 조회 -->	
@@ -360,7 +360,7 @@
 		   AND B.ORD_DTL_NO   = #{ordDtlNo}
 		   AND E.ORD_CHG_SQ   = #{ordChgSq} 
 		   AND D.DEL_YN       = 'N'
-		   AND D.CHG_STAT IN ('G685_30','G685_31') -- 회수요청 상품검수중
+		   AND D.CHG_STAT IN ('G685_30','G685_31','G685_33','G685_40') -- 회수요청 상품검수중
 	</select>
 	
 	<!-- 회수결과 등록  -->