托书推送调整

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

@@ -210,8 +210,8 @@ group by c.group_id) t group by t.elementsId,t.styleNumber,t.smailPo,t.unitPrice
     <!--    新增费用支出单子表-->
     <insert id="saveSalePayVouchs">
 
-     insert into SalePayVouchs(cSPVCode,iMoney,cExpCode,ID,irowno)
-   value (#{map.cSPVCode},#{map.iMoney},#{map.cExpCode},#{map.ID},#{map.irowno})
+     insert into SalePayVouchs(cSPVCode,iMoney,cExpCode,ID,irowno,INatMoney)
+   value (#{map.cSPVCode},#{map.iMoney},#{map.cExpCode},#{map.ID},#{map.irowno},#{INatMoney})
 
     </insert>
 

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

@@ -783,7 +783,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                     sumImoney = sumImoney.add(imoney);
 
                     maps.put("cbSysBarCode", "||SA09|"+cCode+"|"+ii);
-                    maps.put("INatMoney", imoney);
+                    maps.put("INatMoney", imoney.multiply(new BigDecimal(nflat)));
                     maps.put("iMoney", imoney);
                     maps.put("cExpCode",usd.get("itemColumn"));//项目编码
                     maps.put("ID", id);
@@ -798,7 +798,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
         //判断算出来的金额是否跟运费合计金额相等
             if(sumMoney - sumImoney.doubleValue() ==0){
             }else{
-                BigDecimal mo = new BigDecimal(sumMoney).subtract(sumImoney).setScale(2,BigDecimal.ROUND_DOWN);
+                BigDecimal mo = new BigDecimal(sumMoney).subtract(sumImoney).setScale(2,BigDecimal.ROUND_HALF_UP);
                 listmaps.get(listmaps.size()-1).put("iMoney",(new BigDecimal(listmaps.get(listmaps.size()-1).get("iMoney").toString()).add(mo)));
             }