Merge remote-tracking branch 'origin/yitoa_EDI_REST' into yitoa_EDI_REST

src/main/java/com/uas/eis/service/Impl/GEServiceImpl.java

@@ -196,6 +196,10 @@ public class GEServiceImpl implements GEService {
                 "left join (select * from N_HUASL_QD.CUSTOMTABLE left join N_HUASL_QD.CUSTOMTABLEDETAIL on CD_CTID = CT_ID " +
                 "where CT_CALLER = 'GESELLERBRAND' and CT_STATUS = '已审核') on cd_varchar50_1 = pr_brand " +
                 "where DPOID = " + poid);
+        //更新RMB单价
+        sqls.add("update SALECONFIRMGRDETAIL set SCGD_PRICE2 = SCGD_PRICE where SCGD_SCGID = " + scgid);
+        sqls.add("update SALECONFIRMGRDETAIL set SCGD_PRICE = round(SCGD_PRICE2*1.13,6) " +
+                "where SCGD_SCGID in (select SCG_ID from SALECONFIRMGR where SCG_ID = "+scgid+" and nvl(scg_currency,' ') = 'RMB') and SCGD_SCGID = " + scgid);
         sqls.add("update SALECONFIRMGRDETAIL set SCGD_TOTAL = round(nvl(SCGD_QTY,0)*nvl(SCGD_PRICE,0),2) where SCGD_SCGID = " + scgid);
         baseDao.execute(sqls);
         getPrice(scgid);