x

src/main/java/com/egolm/oms/service/impl/OrderServiceImpl.java

@@ -336,13 +336,13 @@ public class OrderServiceImpl implements OrderService {
 				"       GoodsID = b.nGoodsID, " + 
 				"       GoodsDesc = ag.sGoodsDesc, " + 
 				"       AgentContractNO = ag.sAgentContractNO, " + 
-				"       RealSalePrice = ag.nRealSalePrice, " +
+				"       RealSalePrice = isnull(ap.nRealSalePrice, ag.nRealSalePrice), " +
 				"       AgentID = ag.nAgentID, " +
 				"       Barcode = ag.sMainBarcode, " +
-				"       WarehouseNO = ag.nRealSalePrice, " +
 				"       MeetQty = b.nMeetQty, " + 
 				"       Price = b.nPrice " + 
 				" FROM tPromo a, tPromoRuleGoods b, tPromoCustBWList c, tAgent at, tAgentContractGoods ag " + 
+				" LEFT JOIN tAgentCustTypePrice ap ON ap.sCustTypeID = '" + sCustTypeID + "' and ap.sAgentContractNO = ag.sAgentContractNO and ap.nGoodsID = ag.nGoodsID " + 
 				" WHERE " + 
 				"  a.sPromoPaperNO = c.sPromoPaperNO  " + 
 				"  AND a.sPromoPaperNO = b.sPromoPaperNO  " +