|
@@ -736,9 +736,6 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
|
|
|
Double money = Double.parseDouble(li.get("grossWeight").toString()) / Double.parseDouble(map1.get("totalGrossWeight").toString());
|
|
|
Double imoney = money * Double.parseDouble(rmb.get("amount").toString());
|
|
|
|
|
|
- sumImoney = sumImoney.add(new BigDecimal(df.format(imoney)));
|
|
|
-
|
|
|
-
|
|
|
maps.put("iMoney", df.format(imoney));
|
|
|
maps.put("INatMoney", df.format(imoney));
|
|
|
maps.put("cExpCode", rmb.get("itemColumn"));//项目编码
|
|
@@ -746,6 +743,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
|
|
|
maps.put("irowno", "1");//行号
|
|
|
maps.put("cbSysBarCode", "||SA09|"+cCode+"|"+ii);
|
|
|
if(imoney >= 1){
|
|
|
+ sumImoney = sumImoney.add(new BigDecimal(df.format(imoney)));
|
|
|
listmap.add(map);
|
|
|
listmaps.add(maps);
|
|
|
}
|
|
@@ -796,8 +794,6 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
|
|
|
Double money = Double.parseDouble(li.get("grossWeight").toString()) / Double.parseDouble(map1.get("totalGrossWeight").toString());
|
|
|
Double imoney = money * Double.parseDouble(usd.get("amount").toString());
|
|
|
|
|
|
- sumImoney = sumImoney.add(new BigDecimal(df.format(imoney)));
|
|
|
-
|
|
|
maps.put("cbSysBarCode", "||SA09|"+cCode+"|"+ii);
|
|
|
maps.put("INatMoney", df.format(imoney*Double.parseDouble(nflat)));
|
|
|
maps.put("iMoney", df.format(imoney));
|
|
@@ -805,6 +801,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
|
|
|
maps.put("ID", id);
|
|
|
maps.put("irowno", "1");//行号
|
|
|
if(imoney >= 1){
|
|
|
+ sumImoney = sumImoney.add(new BigDecimal(df.format(imoney)));
|
|
|
listmap.add(map);
|
|
|
listmaps.add(maps);
|
|
|
}
|