修复问题

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastdesignHoleServiceImpl.java

@@ -311,9 +311,6 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
             LoginUser loginUser = (LoginUser) str.getData();
             String name = loginUser.getName();
             tProcessesDrillingQuery.setTabulator(name);
-            tProcessesDrillingQuery.setStepHeight(query.getStepHeight());
-            tProcessesDrillingQuery.setRowSpace(query.getRowSpace());
-            tProcessesDrillingQuery.setHoleSpace(query.getHoleSpace());
             R r1 = itProcessesDrillingService.insertTProcessesDrilling(tProcessesDrillingQuery);
             if (r1.getCode() != 0) {
                 log.error("炮孔设计中->增加一条穿孔工序失败:" + JSON.toJSONString(tProcessesDrillingQuery));
@@ -373,6 +370,11 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
      * 计算并设值 单孔爆破量(m3)=孔距*排距*台阶高度
      */
     private void calculateHoleBlastVolume(TProcessesBlastdesignHole tProcessesBlastdesignHole) {
+        if (null == tProcessesBlastdesignHole.getHoleSpace()
+                || null == tProcessesBlastdesignHole.getRowSpace()
+                || null == tProcessesBlastdesignHole.getStepHeight()) {
+            tProcessesBlastdesignHole.setHoleBlastVolume(null);
+        }
         tProcessesBlastdesignHole.setHoleBlastVolume(tProcessesBlastdesignHole.getHoleSpace()
                 * tProcessesBlastdesignHole.getRowSpace()
                 * tProcessesBlastdesignHole.getStepHeight());

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesDrillingServiceImpl.java

@@ -323,6 +323,9 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
      * 计算并设值 单孔爆破量(m3)=孔距*排距*台阶高度
      */
     private Double calculateHoleBlastVolume(Double HoleSpace, Double RowSpace, Double StepHeight) {
+        if (null == HoleSpace || RowSpace == null || StepHeight == null) {
+            return null;
+        }
         return HoleSpace * RowSpace * StepHeight;
     }