托书申报要素排序，费用支出取当月汇率

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/mapper/xml/SyShippingOrderMapper.xml

@@ -266,7 +266,7 @@ where a.del_flag = 0 and a.sy_shipping_order_item_id = #{id}  group by a.group_i
         on a.elements_Id = b.id
         where a.del_flag = 0 and a.sy_shipping_order_item_id = #{id}
         group by a.elements_Id,a.style_number,a.smail_po,a.unit_price
-        order by a.style_number,a.smail_po desc
+        order by a.supplier,a.salesman,a.style_number,a.smail_po,a.unit_price
 
     </select>
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/service/impl/SyShippingOrderServiceImpl.java

@@ -638,7 +638,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
         //查询U8汇率
         Map<String, Object> rate = null;
         String nflat = "";
-        String lastTime = map1.get("rateDate").toString();
+        String lastTime = sf.format(new Date());
         if(oConvertUtils.isEmpty(lastTime)){
             SimpleDateFormat sf1 = new SimpleDateFormat("yyyy-M-dd");
             String dd = sf1.format(new Date());