Merge remote-tracking branch 'origin/v11.0_add_tare_gross_weight_20240124' into test

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -112,6 +112,10 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
                 .set(OrderChild::getPoundStatus, item.getPoundStatus())
                 .set(OrderChild::getLoadNet, item.getLoadNet())
                 .set(OrderChild::getUnloadNet, item.getUnloadNet())
+                .set(OrderChild::getLoadRough, item.getLoadRough())
+                .set(OrderChild::getLoadTare, item.getLoadTare())
+                .set(OrderChild::getUnloadRough, item.getUnloadRough())
+                .set(OrderChild::getUnloadTare, item.getUnloadTare())
                 .set(OrderChild::getWeight, item.getWeight())
                 .set(OrderChild::getFreight, item.getFreight())
         );

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildPoundAuditServiceImpl.java

@@ -114,10 +114,10 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
         }else{
             poundAuditDetail.setLoadNet(loadNet);
             poundAuditDetail.setUnloadNet(unLoadNet);
-            poundAuditDetail.setLoadRough(poundAuditDetail.getLoadRough());
-            poundAuditDetail.setLoadTare(poundAuditDetail.getLoadTare());
-            poundAuditDetail.setUnloadRough(poundAuditDetail.getUnloadRough());
-            poundAuditDetail.setUnloadTare(poundAuditDetail.getUnloadTare());
+            poundAuditDetail.setLoadRough(param.getLoadRough());
+            poundAuditDetail.setLoadTare(param.getLoadTare());
+            poundAuditDetail.setUnloadRough(param.getUnloadRough());
+            poundAuditDetail.setUnloadTare(param.getUnloadTare());
             orderChild.setLoadNet(loadNet);
             orderChild.setUnloadNet(unLoadNet);
         }