订单删除恢复炉号数量

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/OrderServiceImpl.java

@@ -280,8 +280,9 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
         List<MMeterialReceiveLog>meterialReceiveLogList = meterialReceiveLogService.list(Wraps.<MMeterialReceiveLog>lbQ().in(MMeterialReceiveLog::getId,idList));
 
         for(MMeterialReceiveLog meterialReceiveLog:meterialReceiveLogList){
-            int bomNum = orderProductMap.get(meterialReceiveLog.getId());
-            meterialReceiveLog.setUsedNum(meterialReceiveLog.getUsedNum()-bomNum);
+            int bomNum = orderProductMap.get(meterialReceiveLog.getId())==null?0:orderProductMap.get(meterialReceiveLog.getId());
+            int usedNum = meterialReceiveLog.getUsedNum() == null?0:meterialReceiveLog.getUsedNum();
+            meterialReceiveLog.setUsedNum(usedNum-bomNum);
         }
         meterialReceiveLogService.saveOrUpdateBatch(meterialReceiveLogList);
 
@@ -792,7 +793,8 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
 
         for(MMeterialReceiveLog meterialReceiveLog:meterialReceiveLogList){
             int bomNum = orderProductMap.get(meterialReceiveLog.getId())==null?0:orderProductMap.get(meterialReceiveLog.getId());
-            meterialReceiveLog.setUsedNum(meterialReceiveLog.getUsedNum()-bomNum);
+            int usedNum = meterialReceiveLog.getUsedNum() == null?0:meterialReceiveLog.getUsedNum();
+            meterialReceiveLog.setUsedNum(usedNum-bomNum);
         }
         meterialReceiveLogService.saveOrUpdateBatch(meterialReceiveLogList);