diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastdesignHoleServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastdesignHoleServiceImpl.java index 437d70b81d7a666e84e14ca6bca32a25d3f04dff..732cf66f655221f07c38c14338a0dc1bc2b53b9c 100644 --- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastdesignHoleServiceImpl.java +++ b/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));