修复问题

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesCrusherController.java

@@ -59,18 +59,6 @@ public class TProcessesCrusherController {
         return itProcessesCrusherService.updateByUid(tProcessesCrusherQuery);
     }
 
-    /**
-     * 增加辅助工序
-     *
-     * @param tProcessesCrusherQuery
-     * @return
-     */
-    @ApiOperation(value = "增加破碎工序")
-    @RequestMapping(value = "/insertTProcessesCrusher", method = RequestMethod.POST)
-    public R insertTProcessesCrusher(@RequestBody TProcessesCrusherQuery tProcessesCrusherQuery) {
-        return itProcessesCrusherService.insertTProcessesCrusher(tProcessesCrusherQuery);
-    }
-
 
     /**
      * 根据uid获取破碎工序

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesCrusher.java

@@ -33,10 +33,10 @@ public class TProcessesCrusher implements Serializable {
     private String Uid;
 
     /**
-     * 破碎站编号
+     * 破碎站名称
      */
-    @TableField("CrusherStationID")
-    private String CrusherStationID;
+    @TableField("CrusherStationName")
+    private String CrusherStationName;
 
     /**
      * 破碎日期

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesBlastdesignHoleMapper.xml

@@ -58,7 +58,7 @@
     </select>
 
 
-    <!-- 获取所有getPage列表 -->
+    <!-- 获取所有getByQuery列表 -->
     <select id="getByQuery" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesBlastdesignHoleVo">
         SELECT
         <include refid="TProcessesBlastdesignVolumeColumns"/>

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesCrusherMapper.xml

@@ -6,7 +6,7 @@
     <!-- 表和实体字段对照关系, 类似RestultMap -->
     <sql id="TProcessesCrusherColumns">
         a.Uid,
-        a.CrusherStationID,
+        a.CrusherStationName,
         a.CrushDate,
         a.Manager,
         a.Supervisor,

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TProcessesCrusherQuery.java

@@ -32,10 +32,10 @@ public class TProcessesCrusherQuery {
     private String Uid;
 
     /**
-     * 破碎站编号
+     * 破碎站名称
      */
-    @ApiModelProperty("CrusherStationID")
-    private String CrusherStationID;
+    @ApiModelProperty("CrusherStationName")
+    private String CrusherStationName;
 
     /**
      * 破碎日期

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

@@ -146,6 +146,7 @@ public class TProcessesBlastServiceImpl extends ServiceImpl<TProcessesBlastMappe
         log.info(JSON.toJSONString(query));
         //参数校验
         Rcode.NOT_PARAM.assertNotNull(query);
+        //判断是否已经添加过该爆破工序todo
         //不能修改tag
         if (StringUtils.isNotBlank(query.getTag())) {
             return R.failed("爆破设计中->tag自动计算，不能添加");

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

@@ -100,24 +100,7 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
             if (r.getData() != null) {
                 return R.failed("炮孔设计中->炮孔编号已存在: BlastHoleID:" + query.getBlastHoleID());
             }
-//            //修改穿孔工序炮孔编号
-//            TProcessesDrillingQuery tProcessesDrillingQuery = new TProcessesDrillingQuery();
-//            tProcessesDrillingQuery.setUid(temp.getUid());
-//            tProcessesDrillingQuery.setNewHoleID(query.getBlastHoleID());
-//            R r1 = itProcessesDrillingService.updateByUid(tProcessesDrillingQuery);
-//            if (r1.getCode() != 0) {
-//                log.error("炮孔设计中->修改穿孔工序炮孔编号失败：{}", JSON.toJSONString(tProcessesDrillingQuery));
-//                return R.failed(r1.getMsg());
-//            }
-//            //修改爆破设计炮孔编号
-//            TProcessesBlastQuery tProcessesBlastQuery = new TProcessesBlastQuery();
-//            tProcessesBlastQuery.setUid(temp.getUid());
-//            tProcessesBlastQuery.setNewHoleID(query.getBlastHoleID());
-//            R r2 = itProcessesBlastService.updateByUid(tProcessesBlastQuery);
-//            if (r2.getCode() != 0) {
-//                log.error("炮孔设计中->修改爆破设计炮孔编号失败：{}", JSON.toJSONString(tProcessesBlastQuery));
-//                return R.failed(r2.getMsg());
-//            }
+
         }
         //判断是否需要修改关联的 设计爆区爆破量
         if (StringUtils.isNotBlank(query.getStepName())
@@ -273,7 +256,15 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
         if (r.getData() == null) {
             return R.failed("炮孔设计中->设计爆区爆破量表数据不存在，StopeName,StepName,BlastAreaName");
         }
-
+        //判断爆区是否存在
+        QueryWrapper<TProcessesBlastdesignHole> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(new StringBuilder(ProjectEnum.TableAlias.A.getLabel()).append(ProjectEnum.TProcessesBlastdesignHole.STEP_NAME.getLabel()).toString(), query.getStepName());
+        queryWrapper.eq(new StringBuilder(ProjectEnum.TableAlias.A.getLabel()).append(ProjectEnum.TProcessesBlastdesignHole.STOPE_NAME.getLabel()).toString(), query.getStopeName());
+        queryWrapper.eq(new StringBuilder(ProjectEnum.TableAlias.A.getLabel()).append(ProjectEnum.TProcessesBlastdesignHole.Blast_Area_Name.getLabel()).toString(), query.getBlastAreaName());
+        TProcessesBlastdesignHoleVo holeVo = baseMapper.getByQuery(queryWrapper);
+        if (holeVo != null) {
+            return R.failed("炮孔设计中->泡孔设计中爆区已存在，StopeName,StepName,BlastAreaName");
+        }
         //条件封装
         TProcessesBlastdesignHole tProcessesBlastdesignHole = new TProcessesBlastdesignHole();
         BeanUtils.copyProperties(query, tProcessesBlastdesignHole);
@@ -304,14 +295,13 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
             tProcessesDrillingQuery.setUid(hole.getUid());
             //设置当前登录人（穿孔的制表人）
             cn.wise.im.common.http.R str = itSysUserService.getLoginUser();
-            if (str.getCode()!=0) {
-                log.error("炮孔设计中->获取当前登录人错误:{}",JSON.toJSONString(str));
+            if (str.getCode() != 0) {
+                log.error("炮孔设计中->获取当前登录人错误:{}", JSON.toJSONString(str));
                 return R.failed(str.getMessage());
             }
-            LoginUser loginUser = (LoginUser)str.getData();
+            LoginUser loginUser = (LoginUser) str.getData();
             String name = loginUser.getName();
             tProcessesDrillingQuery.setTabulator(name);
-            //tProcessesDrillingQuery.setTag(DateUtil.timeToStr(LocalDateTime.now(), DateUtil.FORMAT_TO_SECOND));
             R r1 = itProcessesDrillingService.insertTProcessesDrilling(tProcessesDrillingQuery);
             if (r1.getCode() != 0) {
                 log.error("炮孔设计中->增加一条穿孔工序失败:" + JSON.toJSONString(tProcessesDrillingQuery));
@@ -321,7 +311,6 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
             //增加一条爆破工序
             TProcessesBlastQuery tProcessesBlastQuery = new TProcessesBlastQuery();
             tProcessesBlastQuery.setUid(hole.getUid());
-            //tProcessesBlastQuery.setTag(DateUtil.timeToStr(LocalDateTime.now(), DateUtil.FORMAT_TO_SECOND));
             R r2 = itProcessesBlastService.insertTProcessesBlast(tProcessesBlastQuery);
             if (r2.getCode() != 0) {
                 log.error("炮孔设计中->增加一条爆破工序失败:" + JSON.toJSONString(tProcessesBlastQuery));