Parcourir la source

08.18 직송매장수정

tsit05 il y a 4 ans
Parent
commit
96db39002a

+ 2 - 1
src/main/java/com/style24/persistence/domain/Pos.java

@@ -120,6 +120,7 @@ public class Pos extends TscBaseDomain {
 	private String ifstat;
 	private String ifyn;
 	private String ifdate;	
+	private String wmsShipCompCd; 
 	
 	private String cdRtoutshop; //CD_RTOUTSHOP
 	private String cdStyle; //CD_STYLE
@@ -144,7 +145,7 @@ public class Pos extends TscBaseDomain {
 	private Integer deliveryorderno;
 	private Integer deliveryorderitemno;
 	private Integer orderdtlno;
-	
+	private Integer invoicenoseq;
 	
 	private int assignQty;
 	private int saleQty;

+ 4 - 2
src/main/java/com/style24/persistence/mybatis/shop/TssPos.xml

@@ -477,7 +477,7 @@
 		/*TssPos.getWmsDeliveryList*/
 		SELECT 
 			  A.ORD_NO                            AS OrderNo
-			, 'SHOP'                               AS  DeliveryTypeCd
+			, B.DELV_LOC_CD                       AS  DeliveryTypeCd
 			, '정상'                               AS  IssueTypeCd
 			, '30'                                AS StatusCd -- 배송지시
 			, D.CUST_ID                           AS LoginId
@@ -511,7 +511,7 @@
 			, 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
+			, B.DELV_LOC_CD                       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   -- 세트상품여부 
@@ -521,6 +521,8 @@
 			, 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 
+			, (SELECT WMS_SHIP_COMP_CD FROM TB_SHIP_COMPANY WHERE SHIP_COMP_CD = B.SHIP_COMP_CD) AS WMS_SHIP_COMP_CD
+			, B.INVOICE_NO
 		  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 

+ 38 - 0
src/main/java/com/style24/persistence/mybatis/wms/TssWmsPos.xml

@@ -142,5 +142,43 @@
 		)		
 	</insert>		
 	
+	<!-- 출고요청 D     -->
+	<insert id="insertWmsTbIfDeliveryInvoice" parameterType="Pos" useGeneratedKeys="true" keyProperty="invoicenoseq" >
+		/*TsbWmsDelivery.insertWmsTbIfDeliveryInvoice*/
+		INSERT INTO istyle24_Wmsif.dbo.TB_IF_DeliveryInvoice
+		(
+			  orderNo
+			, orderDtlNo
+			, LogisticsNo
+			, InvoiceNo
+			, DateShip
+			, Qty
+			, AddInvoiceYn
+			, DateFirstCreated
+			, IfYn
+			, IfDate
+			, ProductNo
+			, SKUCode
+		)
+		VALUES 
+		(
+			  #{orderno}
+			, #{orderdtlno}
+			, #{wmsShipCompCd}
+			, #{invoiceNo}
+			, GETDATE()	
+			, 0
+			, 'N'
+			, GETDATE()	
+			, 'Y'
+			, GETDATE()	
+			, #{productno}
+			, #{skucode}
+		)
+
+	</insert>
+	
+	
+	
 	
 </mapper>

+ 8 - 0
src/main/java/com/style24/scm/biz/dao/TssWmsPosDao.java

@@ -33,5 +33,13 @@ public interface TssWmsPosDao {
 	 */
 	void insertWmsTbIfDeliveryOrderItem(Pos delivery);
 	
+	/**
+	 * 송장번호
+	 * @param 
+	 * @return Pos
+	 * @author moon
+	 * @since 2021. 08. 18
+	 */
+	void insertWmsTbIfDeliveryInvoice(Pos delivery);	
 
 }

+ 3 - 0
src/main/java/com/style24/scm/biz/service/TssWmsPosService.java

@@ -53,6 +53,9 @@ public class TssWmsPosService {
 			data.setDeliveryorderno(ordPk);
 			data.setIfyn("Y");
 			wmsPosDao.insertWmsTbIfDeliveryOrderItem(data);
+			
+			wmsPosDao.insertWmsTbIfDeliveryInvoice(data);
+			
 		}