Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

2024-02-19 14:38:06 +08:00
parent 7d8a560571 17c1843fea
commit 1b215a0b93
153 changed files with 5740 additions and 1679 deletions
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
@@ -5363,7 +5363,6 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {

                // 计算合计重量
                all_qty = NumberUtil.add(String.valueOf(all_qty), json.getString("qty")).doubleValue();
-                all_real = NumberUtil.add(String.valueOf(all_real), jsonSub.getString("box_weight")).doubleValue();

            }
            // 订单号