diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/po/ContractManagePO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/po/ContractManagePO.java
index e9b2ac85c..81e148952 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/po/ContractManagePO.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/po/ContractManagePO.java
@@ -166,7 +166,7 @@ public class ContractManagePO extends BaseVOEntity{
     private Integer automaticFlag;
 
     @ApiModelProperty("出账日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "d", timezone = "GMT+8")
     private Date paymentDate;
 
     @ApiModelProperty(name = "主体类型(1-货主，2-客户，3-承运商)")
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java
index 7979f059b..77780d9ae 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java
@@ -981,7 +981,7 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
         LoginUser loginUser = SecurityUtils.getLoginUser();
         List<OutMaterialDetail> outMaterialDetailDbList = outMaterialDetailMapper.selectList(new QueryWrapper<OutMaterialDetail>().lambda()
                 .eq(OutMaterialDetail::getOutOrderNumber, stockOutOrderDO.getOutOrderNumber())
-                .eq(OutMaterialDetail::getLevel, 1)
+                        //.eq(OutMaterialDetail::getLevel, 1)
                 .eq(OutMaterialDetail::getDelFlag, 1));
         Map<Long, OutMaterialDetail> materialDetailMap = outMaterialDetailDbList.stream().collect(Collectors.toMap(OutMaterialDetail::getMaterialDetailId, Function.identity()));
         //批量新增或修改物料信息
@@ -997,7 +997,9 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
             outMaterialDetail.setMaterialDetailId(outMaterialDetailDO.getMaterialDetailId());
             if (1 == type){
                 //复核
-                outMaterialDetail.setCheckQuantity(outMaterialDetailDb.getCheckQuantity().add(outMaterialDetailDO.getActualQuantity()));
+                BigDecimal checkQuantity1 = outMaterialDetailDb.getCheckQuantity() != null ? outMaterialDetailDb.getCheckQuantity() : BigDecimal.ZERO;
+                BigDecimal actualQuantity = outMaterialDetailDO.getActualQuantity() != null ? outMaterialDetailDO.getActualQuantity() : BigDecimal.ZERO;
+                outMaterialDetail.setCheckQuantity(checkQuantity1.add(actualQuantity));
             }else {
                 //取消复核
                 outMaterialDetail.setCheckQuantity(outMaterialDetailDb.getCheckQuantity().subtract(outMaterialDetailDO.getActualQuantity()));
@@ -1011,7 +1013,8 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
             outMaterialDetail.setCheckNetWeight(outMaterialDetailDO.getCheckNetWeight());
 
             outMaterialDetailList.add(outMaterialDetail);
-            checkQuantity = checkQuantity.add(outMaterialDetailDO.getActualQuantity());
+            BigDecimal actualQuantity = outMaterialDetailDO.getActualQuantity() != null ? outMaterialDetailDO.getActualQuantity() : BigDecimal.ZERO;
+            checkQuantity = checkQuantity.add(actualQuantity);
         }
         //保存物料明细信息
         saveOrUpdateBatch(outMaterialDetailList);
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java
index f8e400583..780931ffb 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java
@@ -751,6 +751,26 @@ public class StockOutOrderDomainService {
                 outMaterialDetailPO.setCheckGrossWeight(pickingMaterialDetailPO.getTotalGrossWeight());
                 outMaterialDetailPO.setWaitCheckQuantity(outMaterialDetailPO.getPickingQuantity());
             }
+            List<OutMaterialDetailPO> children = outMaterialDetailPO.getChildren();
+            if (!CollectionUtils.isEmpty(children)) {
+                for (OutMaterialDetailPO outMaterialDetailPOChild : children) {
+                    outMaterialDetailPOChild.setMaterialCode(outMaterialDetailPOChild.getMaterialNo());
+                    outMaterialDetailPOChild.setMaterialName(outMaterialDetailPOChild.getCommodityName());
+                    Long uniqueIdChild = outMaterialDetailPOChild.getUniqueId();
+                    PickingMaterialDetailPO pickingMaterialDetailPO1 = pickingMaterialDetailService.queryTotalsByOutNumberAndBaseId(uniqueIdChild);
+                    if (ObjectUtils.isNotEmpty(pickingMaterialDetailPO1)) {
+                        outMaterialDetailPOChild.setTotalArea(pickingMaterialDetailPO1.getTotalArea());
+                        outMaterialDetailPOChild.setTotalVolume(pickingMaterialDetailPO1.getTotalVolume());
+                        outMaterialDetailPOChild.setTotalNetWeight(pickingMaterialDetailPO1.getTotalNetWeight());
+                        outMaterialDetailPOChild.setTotalGrossWeight(pickingMaterialDetailPO1.getTotalGrossWeight());
+                        outMaterialDetailPOChild.setCheckArea(pickingMaterialDetailPO1.getTotalArea());
+                        outMaterialDetailPOChild.setCheckVolume(pickingMaterialDetailPO1.getTotalVolume());
+                        outMaterialDetailPOChild.setCheckNetWeight(pickingMaterialDetailPO1.getTotalNetWeight());
+                        outMaterialDetailPOChild.setCheckGrossWeight(pickingMaterialDetailPO1.getTotalGrossWeight());
+                        outMaterialDetailPOChild.setWaitCheckQuantity(outMaterialDetailPOChild.getPickingQuantity());
+                    }
+                }
+            }
         }
         stockOutOrderPO.setMaterialDetailList(outMaterialDetailPOList);
         BigDecimal weightLimit = BigDecimal.ZERO;