Merge remote-tracking branch 'origin/bin2107' into order

src/main/java/com/style24/core/biz/dao/TscWmsDao.java

@@ -86,5 +86,21 @@ public interface TscWmsDao {
 	 */		
 	void updateWmsIfDeliveryOrderGiftCancel(WmsDelivery wmsDelivery);
 	
+	/**
+	 * 출고처지정 지연재고 삭제
+	 *
+	 * @param WmsDelivery 
+	 * @author moon
+	 * @since 2021. 04. 27
+	 */		
+	void deleteWmsTbIfDelifixQty(WmsDelivery wmsDelivery);
 	
+	/**
+	 * 출고처지정 지연재고 변경 
+	 *
+	 * @param WmsDelivery 
+	 * @author moon
+	 * @since 2021. 04. 27
+	 */		
+	void updateWmsTbIfDelifixQty(WmsDelivery wmsDelivery);
 }

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

@@ -162,6 +162,7 @@ public class TscWmsService {
 					uData.setOrdDtlNo(null);
 				}
 				wmsDao.updateWmsIfDeliveryOrderItemCancel(uData);
+				wmsDao.updateWmsTbIfDelifixQty(uData);
 			}
 		}
 		
@@ -172,9 +173,11 @@ public class TscWmsService {
 		
 		//4. WMS 남은 주문건수 0일경우  WMS (TB_IF_DELIVERYORDER)주문TB 취소 업데이트  (TB_IF_DELIVERYORDERITEM) 사은품 취소 업데이트 
 		if("Y".equals(cancelChk)) {
-			wmsDao.updateWmsIfDeliveryOrderItemCancel(sData);
+			wmsDao.updateWmsIfDeliveryOrderCancel(sData);
 			// 사은품 취소
 			wmsDao.updateWmsIfDeliveryOrderGiftCancel(sData);
+			
+			wmsDao.deleteWmsTbIfDelifixQty(sData);
 		}
 	}
 }

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

@@ -141,21 +141,24 @@
 				                     AND B.StatusCd != '60'
 				                     AND B.GiftYn    = 'Y' )
 	</update>   	
-   	
-	      
-</mapper>
-
-
-
-
-
-
-
-
-
-
-
-
-
 
+	<!-- 출고처지정 지연재고 삭제     -->
+	<delete id="deleteWmsTbIfDelifixQty" parameterType="WmsDelivery" >
+		/*TscWmsDelivery.deleteWmsTbIfDelifixQty*/
+		DELETE FROM iSTYLE24_WmsIf.dbo.TB_IF_DELIFIX_QTY 
+		WHERE OrderNo    = #{ordNo}
+	</delete>
+	
+	<!-- 출고처지정 지연재고 변경  -->
+	<update id="updateWmsTbIfDelifixQty" parameterType="WmsDelivery">
+		/* TscWmsDelivery.updateWmsTbIfDelifixQty */
+		UPDATE iSTYLE24_WmsIf.dbo.TB_IF_DELIFIX_QTY SET
+			Qty = Qty - #{itemQty}
+		WHERE OrderNo    = #{ordNo}
+		  AND OrderDtlNo = #{ordDtlNo}
+		  AND SKUCode    = #{optCd} 
+		  AND ProductNo  = #{productNo}
+	</update>
+	
+</mapper>