修复问题

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

@@ -109,8 +109,8 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
 
         }
         //判断是否添加了穿孔日期，如果已添加那么久不能修改，未添加则可以修改
-        if (query.getDrillingDate() != null) {
-            return R.failed("炮孔设计中->穿孔日期已存在不能修改: DrillingDate:" + query.getDrillingDate());
+        if (temp.getDrillingDate() != null) {
+            return R.failed("炮孔设计中->穿孔日期已存在不能修改: DrillingDate:" + temp.getDrillingDate());
         }
         //判断是否需要修改关联的 设计爆区爆破量
         if (StringUtils.isNotBlank(query.getStepName())
@@ -153,7 +153,7 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
             calculateHoleBlastVolume(temp);
         }
         //如果修改了台阶高度，需要通知穿孔工序重新计算设计区爆破量
-        if (query.getStepHeight() != null) {
+        if (query.getStepHeight().equals(temp.getStepHeight())) {
             TProcessesDrillingQuery tProcessesDrillingQuery = new TProcessesDrillingQuery();
             tProcessesDrillingQuery.setUid(temp.getUid());
             tProcessesDrillingQuery.setStepHeight(query.getStepHeight());
@@ -311,6 +311,9 @@ 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));