同步数据时计算有补货订单的主单下补货订单的实收和差异数量

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/HanaOrderComponent.java

@@ -1185,7 +1185,7 @@ public class HanaOrderComponent {
         /**
          *电子单签收数据处理有补货订单的数据，将补货订单的数据实收数量和差异数量放到主单里；方便要货时进行简单计算和判断处理
          */
-
+        metaHanaDeliverSignService.handleDeliverSignAbnormal();
     }
 
 //订单

suishenbang-system/src/main/java/com/dgtly/system/service/impl/MetaHanaDeliverSignServiceImpl.java

@@ -100,11 +100,13 @@ public class MetaHanaDeliverSignServiceImpl implements IMetaHanaDeliverSignServi
             deliverSignList.forEach(deliverSign->{
                 //查询补货订单的实收数量和差异数量
                 MetaHanaDeliverSign abnormalSign = metaHanaDeliverSignMapper.selectAbnormalSignByabnormalOrderAndItem(deliverSign.getAbnormalOrder(),deliverSign.getAbnormalOrderItem());
-                //差异数量
-                deliverSign.setAbnormalDifferenceQty(abnormalSign.getDifferenceQty());
-                //实收数量
-                deliverSign.setAbnormalActualQty(abnormalSign.getActualQty());
-
+                if(abnormalSign !=null){
+                    //差异数量
+                    deliverSign.setAbnormalDifferenceQty(abnormalSign.getDifferenceQty());
+                    //实收数量
+                    deliverSign.setAbnormalActualQty(abnormalSign.getActualQty());
+                    metaHanaDeliverSignMapper.updateMetaHanaDeliverSign(deliverSign);
+                }
             });
         }
     }