Merge remote-tracking branch 'origin/master'

so/src/public/nccloud/api/so/saleinvoice/operator/saveCommitAction.java

@@ -390,9 +390,13 @@ public class saveCommitAction extends AbstractNCCRestResource {
 
     private static Map<String, Object> getSaleorderVo(String csourcebillbidStr) throws BusinessException {
         IUAPQueryBS queryBS = NCLocator.getInstance().lookup(IUAPQueryBS.class);
-        String sql = " select s.vbillcode,s.csaleorderid,sb.csaleorderbid,sb.crowno,sb.blargessflag,sb.nexchangerate,s.corigcurrencyid from so_saleorder_b sb\n"
-                + "inner join so_saleorder s on sb.csaleorderid=s.csaleorderid\n"
-                + "where sb.csaleorderbid='" + csourcebillbidStr + "' ";
+        String sql = " select s.vbillcode,s.csaleorderid, s.corigcurrencyid," +
+                " sb.csaleorderbid,sb.crowno,sb.blargessflag,sb.nexchangerate," +
+                " bdc.code currencycode" +
+                " from so_saleorder_b sb" +
+                " inner join so_saleorder s on sb.csaleorderid=s.csaleorderid" +
+                " left join bd_currtype bdc on s.corigcurrencyid=bdc.pk_currtype" +
+                " where sb.csaleorderbid='" + csourcebillbidStr + "' ";
         Map<String, Object> value2 = (Map<String, Object>) queryBS.executeQuery(sql, new MapProcessor());
         return value2;
     }