주문목록, 미발주주문목록 개발중

style24.admin/src/main/java/com/style24/admin/biz/web/TsaOrderController.java

@@ -71,7 +71,7 @@ public class TsaOrderController extends TsaBaseController {
 		mav.addObject("siteCdList"		, rendererService.getAvailCommonCodeList("G012"));		// 사이트구분
 		mav.addObject("mallGbList"		, rendererService.getAvailCommonCodeList("G011"));		// 몰구분		
 		mav.addObject("supplyCompList"	, rendererService.getSupplyCompanyList());				// 공급업제목록
-		mav.addObject("ordStatList"		, rendererService.getAvailCommonCodeList("G012"));		// 주문상태코드
+		//mav.addObject("ordStatList"		, rendererService.getAvailCommonCodeList("G012"));		// 주문상태코드
 		mav.addObject("ordDtlStatList"	, rendererService.getAvailCommonCodeList("G013"));		// 주문상세상태코드
 		
 		mav.addObject("chgStatList"		, rendererService.getAvailCommonCodeList("G685"));		// 주문변경요청상태코드
@@ -89,7 +89,7 @@ public class TsaOrderController extends TsaBaseController {
 	 * 주문 목록
 	 *
 	 * @param order - 주문정보
-	 * @return Collection<TsaOrder>
+	 * @return Collection<Order>
 	 * @author jsh77b
 	 * @since 2020. 11. 16
 	 */
@@ -104,7 +104,7 @@ public class TsaOrderController extends TsaBaseController {
 	 * 주문 목록
 	 *
 	 * @param order - 주문정보
-	 * @return Collection<TsaOrder>
+	 * @return Collection<Order>
 	 * @author jsh77b
 	 * @since 2020. 11. 16
 	 */
@@ -142,7 +142,7 @@ public class TsaOrderController extends TsaBaseController {
 	 * 주문 목록 합산
 	 *
 	 * @param order - 주문정보
-	 * @return Collection<TsaOrder>
+	 * @return Collection<Order>
 	 * @author jsh77b
 	 * @since 2020. 11. 16
 	 */
@@ -213,7 +213,7 @@ public class TsaOrderController extends TsaBaseController {
 	 * 입점업체미발주 주문목록
 	 *
 	 * @param order - 주문정보
-	 * @return Collection<TsaOrder>
+	 * @return Collection<Order>
 	 * @author jsh77b
 	 * @since 2020. 11. 16
 	 */
@@ -307,7 +307,23 @@ public class TsaOrderController extends TsaBaseController {
 		GagaFileUtil.deleteFile(GagaFileUtil.getConcatenationPath(targetPath, order.getExcelFileNm()));
 
 		return map;
-
+	}
+	
+	/**
+	 * 입점업체미발주목록 - 송장번호 입력(출고완료)
+	 *
+	 * @param orderList - 송방번호 입력된 주문리스트
+	 * @return GagaMap
+	 * @author jsh77b
+	 * @since 2020. 12. 01
+	 */
+	@PostMapping(value = "/seller/unorder/invoice/save")
+	@ResponseBody
+	public GagaMap saveUnorderInvoice(@RequestBody Collection<Order> orderList) {
+		String result = orderService.saveUnorderInvoice(orderList);
+		GagaMap map = new GagaMap();
+		map.set("msg", result);
+		return map;
 	}
 	
 }

style24.admin/src/main/java/com/style24/persistence/mybatis/shop/TsaOrder.xml

@@ -59,6 +59,7 @@
 		AND    P.PAY_GB = 'O'
 		INNER  JOIN TB_DELIVERY_ADDR DA
 		ON     OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ
+		WHERE  1=1
 		<if test='siteCd != null and siteCd != ""'>
 		AND    O.SITE_CD = #{siteCd}
 		</if>
@@ -74,12 +75,6 @@
         		#{item}
             </foreach>
         </if>
-        <if test="multiOrdStat != null and multiOrdStat != ''">
-        AND    OD.ORD_DTL_STAT IN
-			<foreach collection="multiOrdStat" item="item" index="index"  open="(" close=")" separator=",">
-        		#{item}
-            </foreach>
-        </if>
         <if test="multiOrdDtlStat != null and multiOrdDtlStat != ''">
         AND    OD.ORD_DTL_STAT IN
 			<foreach collection="multiOrdDtlStat" item="item" index="index"  open="(" close=")" separator=",">
@@ -182,6 +177,7 @@
 			AND    P.PAY_GB = 'O'
 			INNER  JOIN TB_DELIVERY_ADDR DA
 			ON     OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ
+			WHERE  1=1
 			<if test='siteCd != null and siteCd != ""'>
 			AND    O.SITE_CD = #{siteCd}
 			</if>
@@ -197,12 +193,6 @@
 	        		#{item}
 	            </foreach>
 	        </if>
-	        <if test="multiOrdStat != null and multiOrdStat != ''">
-	        AND    OD.ORD_DTL_STAT IN
-				<foreach collection="multiOrdStat" item="item" index="index"  open="(" close=")" separator=",">
-	        		#{item}
-	            </foreach>
-	        </if>
 	        <if test="multiOrdDtlStat != null and multiOrdDtlStat != ''">
 	        AND    OD.ORD_DTL_STAT IN
 				<foreach collection="multiOrdDtlStat" item="item" index="index"  open="(" close=")" separator=",">
@@ -533,7 +523,7 @@
 		ON     OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ 
 		INNER  JOIN TB_DELIVERY_FEE DF
 		ON     DF.SUPPLY_COMP_CD = OD.SUPPLY_COMP_CD
-		WHERE  OD.SUPPLY_COMP_CD = 'S0001'
+		WHERE  OD.SUPPLY_COMP_CD = 'S0003'
 		<if test="multiBrand != null and multiBrand != ''">
         AND    G.BRAND_CD IN
 			<foreach collection="multiBrand" item="item" index="index"  open="(" close=")" separator=",">
@@ -802,7 +792,7 @@
 		INNER  JOIN TB_ENTRY_UPLOAD_EXCEL X
 		ON     OD.ORD_NO = X.ORD_NO
 		AND    OD.ORD_DTL_NO = X.ORD_DTL_NO
-		WHERE  OD.SUPPLY_COMP_CD = 'S0001'
+		WHERE  OD.SUPPLY_COMP_CD = 'S0003'
 	</select>
 	
 	<!-- 주문상세 목록 -->

style24.admin/src/main/webapp/WEB-INF/views/order/OrderListForm.html

@@ -82,6 +82,7 @@
 						</td>
 					</tr>
 					<tr>
+						<!-- 
 						<th>주문상태</th>
 						<td>
 							<div class="multiCheckBox" style="width:200px">
@@ -95,8 +96,9 @@
 								</ul>
 							</div>
 						</td>
+						 -->
 						<th>주문상세상태</th>
-						<td colspan="3">
+						<td colspan="5">
 							<div class="multiCheckBox" style="width:270px">
 								<button type="button" class="sltBtn" style="overflow-x: hidden; padding-right:5px;">[전체]</button>
 								<ul style="display: none; box-shadow: 3px 3px 3px; overflow-y: scroll; height: 112px;">
@@ -253,7 +255,6 @@
 var sessRoleCd 		= [[${sessionInfo.roleCd}]];
 var siteCdList 		= gagajf.convertToArray([[${siteCdList}]]);
 var mallGbList 		= gagajf.convertToArray([[${mallGbList}]]);
-var ordStatList 	= gagajf.convertToArray([[${ordStatList}]]);
 var ordDtlStatList 	= gagajf.convertToArray([[${ordDtlStatList}]]);
 var payMeansList 	= gagajf.convertToArray([[${payMeansList}]]);
 //var vendorList 		= gagajf.convertToArray([[${vendorList}]]);