ST24PRJ-678 [결함] 배송 출고 누락 문의

src/main/java/com/style24/core/biz/service/TscOrderService.java

@@ -3580,12 +3580,14 @@ public class TscOrderService {
 
 			if (OrderDetailStat.GOODS_PREPARE.value().equals(ordDtlStat) && "Y".equals(data.getSelfGoodsYn())) {
 				goodsPrepare = data;
+				goodsPrepare.setOrdNo(order.getOrdNo());
+				goodsPrepare.setDelvAddrSq(order.getDelvAddrSq());
 			}
 		}
 
 		// 상품준비중 WMS IF 상태값 체크 (10일떄 수정가능)
 		List<Integer> deliveryOrderNoList = new ArrayList<>();
-		if (rst > 0 && goodsPrepare.getOrdNo() > 0) {
+		if (rst > 0 && goodsPrepare != null && goodsPrepare.getOrdNo() > 0) {
 			// WMS 배송정보 조회 용 주문상세번호 조회
 			List<Integer> ordDtlNoList = new ArrayList<>();
 			for(Order tmp : orderDao.getOrderDtlNoForModifyAddr(goodsPrepare)) {
@@ -3603,7 +3605,7 @@ public class TscOrderService {
 		}
 
 		result.setInt("result", rst);
-		result.set("deliveryOrderNoArr", deliveryOrderNoList);
+		result.set("deliveryOrderNoArr", deliveryOrderNoList.stream().mapToInt(Integer::intValue).toArray());
 
 		return result;
 	}

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

@@ -6115,7 +6115,7 @@
 	
 	<!-- 배송지수정 주문상세 상태값 조회 -->
 	<select id="getOrderDetailStatInfo" parameterType="Order" resultType="Order">
-		/* TscOrder.getOrderInfo */
+		/* TscOrder.getOrderDetailStatInfo */
 		SELECT OD.ORD_DTL_STAT
 		     , G.SELF_GOODS_YN
 		     , OD.SHOT_DELV_YN