销售发货的，KG为计量单位的，取净重，其他取实际报关数量

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/entity/VO/PurchaseDeliverDetailVo.java

@@ -90,7 +90,12 @@ public class PurchaseDeliverDetailVo {
         containerNumber =syShippingOrderItem.getContainerNumber();
         declarationPrice = syShippingOrderItem.getDeclarationUnitPrice().toPlainString();
         declarationMoney = (syShippingOrderItem.getDeclarationUnitPrice().multiply(actualDeclaredQuantity).setScale(2, BigDecimal.ROUND_HALF_UP)).toPlainString();
-        quantity = syPackingListFabricItem.getActualDeclaredQuantity();
+        // 千克作为主计量单位的取净重
+        if ("KG".equals(syPackingListFabricItem.getMasterMetering())){
+            quantity = syPackingListFabricItem.getNetWeight();
+        }else {
+            quantity = syPackingListFabricItem.getActualDeclaredQuantity();
+        }
         syPackingDetailId = syPackingListFabricItem.getId();
         declarationUnit = syDeclarationElements.getDeclarationUnit();
         declarationName = syDeclarationElements.getDeclarationName();

jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/job/PushShippingDetailsJob.java

@@ -184,7 +184,7 @@ public class PushShippingDetailsJob implements Job {
             //推送托书到srm发货单字段
             //    成衣通过预装箱单子表id和srm预装箱单子表id关联
             //    面辅料装箱单如果来源是“u8拉取”的，推送srm发货单，生成接收单
-            //              富国来源不是“u8拉取”的，推送其他信息
+            //              如果来源不是“u8拉取”的，推送其他信息
             dxpDataPlanQueryWrapper = new QueryWrapper<>();
             dxpDataPlanQueryWrapper.eq("code", "senYu_Srm_Ts");
             dxpDataPlan = iDxpDataPlanService.getOne(dxpDataPlanQueryWrapper);