仓库出运推送srm调整

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

@@ -73,22 +73,22 @@ public class PurchaseDeliverDetailVo {
                                SyShippingOrder syShippingOrder,
                                SyShippingOrderItem syShippingOrderItem,
                                SyDeclarationElements syDeclarationElements){
-        id = syPackingListFabricItem.getId();
+        id = syShippingOrderItem.getId();
         size = syPackingListFabricItem.getSize();
         invCode = syPackingListFabricItem.getInventoryCode();
-        actualDeclaredQuantity = syPackingListFabricItem.getActualDeclaredQuantity();
+        actualDeclaredQuantity = syShippingOrderItem.getNumber();
         orderCode = syPackingListFabricItem.getPurOrSubOrder();
         purchaseOrderItemId = syPackingListFabricItem.getOmpoIdItem();
         purchaseOrderId = syPackingListFabricItem.getOmpoId();
         sysOrgCode = syPackingListFabricItem.getOmpoAccount();
         isTc = syPackingListFabricItem.getIsTc();
         invccode = syPackingListFabricItem.getInventoryCcode();
-        syPackingDetailGroupId = syPackingListFabricItem.getGroupId();
+//        syPackingDetailGroupId = syPackingListFabricItem.getGroupId();
         company = syShippingOrder.getUnitInOperation();
         containerNumber =syShippingOrderItem.getContainerNumber();
         declarationPrice = syShippingOrderItem.getDeclarationUnitPrice().toPlainString();
-        declarationMoney = (syShippingOrderItem.getDeclarationUnitPrice().multiply(actualDeclaredQuantity).setScale(2)).toPlainString();
-        quantity = syShippingOrderItem.getNumber();
+        declarationMoney = (syShippingOrderItem.getDeclarationUnitPrice().multiply(actualDeclaredQuantity).setScale(2, BigDecimal.ROUND_HALF_UP)).toPlainString();
+        quantity = syPackingListFabricItem.getActualDeclaredQuantity();
         syPackingDetailId = syPackingListFabricItem.getId();
         declarationUnit = syDeclarationElements.getDeclarationUnit();
         declarationName = syDeclarationElements.getDeclarationName();