生产工序业务修改

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

@@ -77,6 +77,16 @@ public class TMaterialOutController {
         return materialOutService.getConsumePage(tMaterialOutQuery, pageQuery);
     }
 
+    /**
+     * 获取工序字典
+     * @return
+     */
+    @ApiOperation(value = "获取工序字典")
+    @GetMapping("/getProcessesType")
+    public R getProcessesType() {
+        return materialOutService.getProcessesType( );
+    }
+
 
 }
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/enumation/ProjectEnum.java

@@ -10,6 +10,65 @@ public class ProjectEnum {
 
 
 
+    /**
+     * 很多项目都会共用的字段
+     */
+    public enum ProcessesType {
+
+        T_PROCESSES_DRILLING(1, "穿孔工序","材料消耗日期"),
+        T_PROCESSES_BLAST(2, "爆破工序","工序名称"),
+        T_PROCESSES_DIGGING(3, "装车工序","工序名称"),
+        T_PROCESSES_TRUCK(4, "运输工序","工序名称"),
+        T_PROCESSES_CRUSHER(5, "破碎工序","工序名称"),
+        T_PROCESSES_AUXILIARY(6, "辅助工序","工序名称");
+
+
+        // 成员变量
+        private int value;
+        private String label;
+        private String explain;
+
+        // 构造方法
+        ProcessesType(int value, String label, String explain) {
+            this.value = value;
+            this.label = label;
+            this.explain = explain;
+        }
+
+        /**
+         * 根据value,获取label
+         */
+        public static String getLabel(int value) {
+            for (ProcessesType c : ProcessesType.values()) {
+                if (c.value == value) {
+                    return c.label;
+                }
+            }
+            return ProcessesType.T_PROCESSES_DRILLING.label;
+        }
+
+        /**
+         * 根据label,获取value
+         */
+        public static int getValue(String label) {
+            for (ProcessesType c : ProcessesType.values()) {
+                if (StringUtils.equalsIgnoreCase(label, c.label)) {
+                    return c.value;
+                }
+            }
+            return ProcessesType.T_PROCESSES_DRILLING.value;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getLabel() {
+            return label;
+        }
+    }
+
+
     /**
      * 很多项目都会共用的字段
      */
@@ -684,9 +743,19 @@ public class ProjectEnum {
      * 辅助工序字典
      * */
     public enum TProcessesAuxiliary {
-
         UID(1, "Uid","id"),
-        EQUIPMENT_ID(2, "EquipmentID","设备编号");
+        EQUIPMENT_ID(2, "EquipmentID","设备编号"),
+        EQUIPMENT_NAME(2, "EquipmentName","设备名称"),
+        MANAGER(2, "Manager","项目经理"),
+        SUPERVISOR(2, "Supervisor","主管项目领导"),
+        TECH_DEPART(2, "TechDepart","生产技术部"),
+        TABULATOR(2, "Tabulator","制表人"),
+        LJYL(2, "Ljyl","当月累计油量"),
+        ZJ(2, "Zj","总价(元)"),
+        DYLJCL(2, "Dyljcl","当月累计产量"),
+        DH(2, "Dh","单耗=当月累计油量/当月产量"),
+        BZ(2, "Bz","备注"),
+        TAG(2, "Tag","日期标记,如:2021年01月");
 
 
         // 成员变量

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

@@ -40,9 +40,11 @@
     <!-- 获取所有getPage列表 -->
     <select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesBlastVo">
         SELECT
-        <include refid="TProcessesDiggingHoleColumns"/>
-        <include refid="TProcessesDrillingColumns"/>
-        <include refid="TProcessesBlastColumns"/>
+        a.Uid,
+        a.HoleID,
+        b.HoleBlastVolume,
+        b.depth AS DesignDepth,
+        c.Depth
         FROM T_Processes_Blast a
         <include refid="TProcessesBlastdesignHoleJoins"/>
         <where>

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

@@ -20,9 +20,7 @@
         a.y,
         a.z,
         a.StepHeight,
-        a.HoleBlastVolume,
-        a.DrillingDate,
-        a.BlastDate
+        a.HoleBlastVolume
 	</sql>
 
     <sql id="TProcessesBlastdesignVolumeColumns">
@@ -30,16 +28,38 @@
         b.DesignDate,
 	</sql>
 
+    <sql id="TProcessesBlastColumns">
+        c.BlastDate,
+	</sql>
+
+    <sql id="TProcessesDrillingColumns">
+        d.DrillingDate,
+	</sql>
 
     <sql id="TProcessesBlastdesignHoleJoins">
         left join T_Processes_BlastDesign_Volume b on a.StopeName=b.StopeName and a.StepName=b.StepName and a.BlastAreaName=b.BlastAreaName
+        left join T_Processes_Blast c on a.HoleID = c.HoleID
+        left join T_Processes_Drilling d on a.HoleID = d.HoleID
     </sql>
 
     <!-- 获取所有getPage列表 -->
     <select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesBlastdesignHoleVo">
         SELECT
-        <include refid="TProcessesBlastdesignVolumeColumns"/>
-        <include refid="TProcessesBlastdesignHoleColumns"/>
+        a.Uid,
+        a.BlastHoleID,
+        a.Depth,
+        a.RowSpace,
+        a.HoleSpace,
+        a.Azimuth,
+        a.Inclination,
+        a.Aperture,
+        a.x,
+        a.y,
+        a.z,
+        a.StepHeight,
+        b.BlastVolume,
+        c.BlastDate,
+        d.DrillingDate
         FROM T_Processes_BlastDesign_Hole a
         <include refid="TProcessesBlastdesignHoleJoins"/>
         <where>
@@ -52,6 +72,7 @@
     <select id="getByQuery" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesBlastdesignHoleVo">
         SELECT
         <include refid="TProcessesBlastdesignVolumeColumns"/>
+        <include refid="TProcessesBlastColumns"/>
         <include refid="TProcessesBlastdesignHoleColumns"/>
         FROM T_Processes_BlastDesign_Hole a
         <include refid="TProcessesBlastdesignHoleJoins"/>

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

@@ -42,6 +42,14 @@
     <!-- 获取所有getPage列表 -->
     <select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesCrusherVo">
         SELECT
+        a.Uid,
+        a.EquipmentID,
+        a.WorkType,
+        a.WorkTime,
+        --        a.Wcdw, /*吨位  查吨位表中的吨位*/
+        a.Price,
+        a.TotalMoney,
+        b.Wcdw
         <include refid="TWeightColumns"/>
         <include refid="TProcessesCrusherColumns"/>
         FROM T_Processes_Crusher a

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

@@ -20,7 +20,7 @@
         a.StartTime,
         a.EndTime,
         a.WorkTime,
-
+        a.HoleBlastVolume,
         a.Depth,
         a.RowSpace,
         a.HoleSpace,
@@ -44,7 +44,7 @@
         b.Azimuth AS DesignAzimuth,
         b.Inclination AS DesignInclination,
         b.Aperture AS DesignAperture,
-        b.HoleBlastVolume,
+        b.StepHeight,
 	</sql>
 
 
@@ -66,10 +66,16 @@
     <!-- 获取所有getPage列表 -->
     <select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesDrillingVo">
         SELECT
-        <include refid="TProcessesDiggingHoleColumns"/>
-        <include refid="TProcessesBlastColumns"/>
-        <include refid="TProcessesBlastdesignVolumeColumns"/>
-        <include refid="TProcessesDrillingColumns"/>
+        a.Uid,
+        a.HoleID,
+        a.Depth,
+        a.RowSpace,
+        a.HoleSpace,
+        a.HoleBlastVolume,
+        b.Depth AS DesignDepth,
+        b.RowSpace AS DesignRowSpace,
+        b.HoleSpace AS  DesignHoleSpace,
+        b.StepHeight
         FROM T_Processes_Drilling a
         <include refid="TProcessesDrillingJoins"/>
         <where>

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

@@ -23,6 +23,8 @@ public interface ITMaterialOutService extends IService<TMaterialOut> {
 
 	R update(TMaterialOutQuery query);
 
+	R getProcessesType();
+
 	R<TMaterialOut> getDetail(String Uid);
 
 	R<IPage<TMaterialOut>> getConsumePage(TMaterialOutQuery tMaterialOutQuery,PageQuery pageQuery);

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

@@ -22,6 +22,8 @@ public interface ITProcessesDrillingService extends IService<TProcessesDrilling>
 
     R updateByUid(TProcessesDrillingQuery query);
 
+    R updateHoleBlastVolume(TProcessesDrillingQuery query);
+
     R updateByHoleId(TProcessesDrillingQuery query);
 
     R getByUid(TProcessesDrillingQuery query);

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

@@ -21,6 +21,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * <p>
@@ -132,4 +134,22 @@ public class TMaterialOutServiceImpl extends ServiceImpl<TMaterialOutMapper, TMa
         return R.ok(tMaterialOutPage);
     }
 
+
+    /**
+     * 获取工序名称字典
+     *
+     * @return
+     */
+    @Override
+    public R getProcessesType() {
+        List<String> processes = Arrays.asList(
+                ProjectEnum.ProcessesType.T_PROCESSES_DRILLING.getLabel(),
+                ProjectEnum.ProcessesType.T_PROCESSES_BLAST.getLabel(),
+                ProjectEnum.ProcessesType.T_PROCESSES_DIGGING.getLabel(),
+                ProjectEnum.ProcessesType.T_PROCESSES_TRUCK.getLabel(),
+                ProjectEnum.ProcessesType.T_PROCESSES_CRUSHER.getLabel(),
+                ProjectEnum.ProcessesType.T_PROCESSES_AUXILIARY.getLabel()
+        );
+        return R.ok(processes);
+    }
 }

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

@@ -37,8 +37,17 @@ public class TProcessesAuxiliaryServiceImpl extends ServiceImpl<TProcessesAuxili
         Page<TProcessesAuxiliary> page = new Page<>(query.getPageNum(), query.getPageSize());
         //条件封装
         QueryWrapper<TProcessesAuxiliary> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select(
+                ProjectEnum.TProcessesAuxiliary.EQUIPMENT_ID.getLabel(),
+                ProjectEnum.TProcessesAuxiliary.EQUIPMENT_NAME.getLabel(),
+                ProjectEnum.TProcessesAuxiliary.LJYL.getLabel(),
+                ProjectEnum.TProcessesAuxiliary.ZJ.getLabel(),
+                ProjectEnum.TProcessesAuxiliary.TAG.getLabel(),
+                ProjectEnum.TProcessesAuxiliary.DYLJCL.getLabel(),
+                ProjectEnum.TProcessesAuxiliary.DH.getLabel()
+        );
         queryWrapper.eq(StringUtils.isNotBlank(tProcessesAuxiliaryQuery.getEquipmentID()),
-                ProjectEnum.TProcessesAuxiliary.EQUIPMENT_ID.getLabel(),tProcessesAuxiliaryQuery.getEquipmentID());
+                ProjectEnum.TProcessesAuxiliary.EQUIPMENT_ID.getLabel(), tProcessesAuxiliaryQuery.getEquipmentID());
         //查询
         Page<TProcessesAuxiliary> tSampleListPage = baseMapper.selectPage(page, queryWrapper);
         return R.ok(tSampleListPage);

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

@@ -58,20 +58,6 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
         Page<TProcessesBlastdesignHole> page = new Page<>(query.getPageNum(), query.getPageSize());
         //条件封装
         QueryWrapper<TProcessesBlastdesignHole> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select(
-                ProjectEnum.TProcessesBlastdesignHole.DEPTH.getLabel(),
-                ProjectEnum.TProcessesBlastdesignHole.DRILLING_DATE.getLabel(),
-                ProjectEnum.TProcessesBlastdesignHole.BLAST_DATE.getLabel(),
-                ProjectEnum.TProcessesBlastdesignHole.HOLE_SPACE.getLabel(),
-                ProjectEnum.TProcessesBlastdesignHole.ROW_SPACE.getLabel(),
-                ProjectEnum.TProcessesBlastdesignHole.STEP_HEIGHT.getLabel(),
-                ProjectEnum.TProcessesBlastdesignHole.AZIMUTH.getLabel(),
-                ProjectEnum.TProcessesBlastdesignHole.INCLINATION.getLabel(),
-                ProjectEnum.TProcessesBlastdesignHole.APERTURE.getLabel(),
-                ProjectEnum.TProcessesBlastdesignHole.X.getLabel(),
-                ProjectEnum.TProcessesBlastdesignHole.Y.getLabel(),
-                ProjectEnum.TProcessesBlastdesignHole.Z.getLabel()
-        );
         //如果设计时间不为空 因为涉及到表连接，需要创建字段别名
         if (tProcessesBlastdesignHoleQuery.getDesignDate() != null) {
             StringBuilder stringBuilder = new StringBuilder();
@@ -149,6 +135,13 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
             //计算单孔爆破量
             calculateHoleBlastVolume(temp);
         }
+        //如果修改了台阶高度，需要通知爆破设计重新计算设计区爆破量
+        if (query.getStepHeight()!=null){
+            TProcessesDrillingQuery tProcessesDrillingQuery = new TProcessesDrillingQuery();
+            tProcessesDrillingQuery.setHoleID(temp.getBlastHoleID());
+            tProcessesDrillingQuery.setStepHeight(query.getStepHeight());
+            itProcessesDrillingService.updateHoleBlastVolume(tProcessesDrillingQuery);
+        }
         QueryWrapper<TProcessesBlastdesignHole> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(ProjectEnum.TProcessesBlastdesignHole.UID.getLabel(), query.getUid());
         //修改

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

@@ -61,16 +61,6 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
         Page<TProcessesDrilling> page = new Page<>(query.getPageNum(), query.getPageSize());
         //条件封装
         QueryWrapper<TProcessesDrilling> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select(
-                ProjectEnum.TProcessesDrilling.DEPTH.getLabel(),
-                ProjectEnum.TProcessesDrilling.ROW_SPACE.getLabel(),
-                ProjectEnum.TProcessesDrilling.HOLE_SPACE.getLabel(),
-                ProjectEnum.TProcessesDrilling.STEP_HEIGHT.getLabel(),
-                ProjectEnum.TProcessesDrilling.HOLE_BLAST_VOLUME.getLabel(),
-                ProjectEnum.TProcessesDrilling.DESIGN_DEPTH.getLabel(),
-                ProjectEnum.TProcessesDrilling.DESIGN_ROW_SPACE.getLabel(),
-                ProjectEnum.TProcessesDrilling.DESIGN_HOLE_SPACE.getLabel()
-        );
         //如果设计时间不为空 因为涉及到表连接，需要创建字段别名
         if (tProcessesDrillingQuery.getDrillingDate() != null) {
             //前端传来的时间可能为2021-04-05 17:37:33.000, 需要查询 2021-04-05 00:00:00 到 2021-04-05 23:59:59 的数据 故作处理
@@ -233,6 +223,7 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
                 log.info("计算单孔爆破量时，获取炮孔设计为空，炮孔编号：{}", temp.getHoleID());
             }
         }
+
         QueryWrapper<TProcessesDrilling> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotBlank(query.getUid()), ProjectEnum.TProcessesDrilling.UID.getLabel(), query.getUid());
         //修改
@@ -266,6 +257,32 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
         return updateByUid(query);
     }
 
+    @Override
+    public R updateHoleBlastVolume(TProcessesDrillingQuery query) {
+        log.info(JSON.toJSONString(query));
+        //参数校验
+        Rcode.NOT_PARAM.assertNotNull(query);
+        Rcode.NOT_PARAM.assertNotNull(query.getHoleID());
+        Rcode.NOT_PARAM.assertNotNull(query.getStepHeight());
+        //判断数据是否存在
+        QueryWrapper<TProcessesDrilling> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(ProjectEnum.TProcessesBlast.HOLE_ID.getLabel(), query.getHoleID());
+        TProcessesDrilling temp = baseMapper.selectOne(queryWrapper);
+        if (temp == null) {
+            return R.failed("数据不存在：HOLE_ID: " + query.getHoleID());
+        }
+        //计算设计区爆破量
+        Double volume = calculateHoleBlastVolume(temp.getHoleSpace(), temp.getRowSpace(), query.getStepHeight());
+        temp.setHoleBlastVolume(volume);
+        int update = baseMapper.updateById(temp);
+        if (update > 0) {
+            return R.ok("修改成功");
+        } else {
+            log.info(JSON.toJSONString(temp));
+            return R.failed("修改失败");
+        }
+    }
+
     @Override
     public R getByUid(TProcessesDrillingQuery query) {
         log.info(JSON.toJSONString(query));

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

@@ -44,6 +44,7 @@ public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSamp
         Page<TSampleList> page = new Page<>(query.getPageNum(), query.getPageSize());
         //条件封装 因为图片字节太长，排除QR_CODE,RECORD_CODE
         QueryWrapper<TSampleList> queryWrapper = new QueryWrapper<>();
+
         queryWrapper
                 .select(TSampleList.class, info ->
                         !info.getColumn().equals(ProjectEnum.ImageType.QR_CODE.getLabel())
@@ -172,14 +173,12 @@ public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSamp
         if (temp == null) {
             return R.failed("数据不存在，样号：" + query.getYh());
         }
-        Rcode.NOT_PARAM.assertNotNull(query.getImageType());
         Rcode.NOT_PARAM.assertNotNull(file);
-
         //封装
         TSampleList tSampleList = new TSampleList();
         BeanUtils.copyProperties(query, tSampleList);
         //转化图片
-        ImageUtil.setImage(query.getImageType(), tSampleList, file);
+        ImageUtil.setImage(ProjectEnum.ImageType.RECORD_CODE.getValue(), tSampleList, file);
         //保存
         int update = baseMapper.updateById(tSampleList);
         if (update > 0) {

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TProcessesBlastMapper.xml

@@ -40,9 +40,11 @@
     <!-- 获取所有getPage列表 -->
     <select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesBlastVo">
         SELECT
-        <include refid="TProcessesDiggingHoleColumns"/>
-        <include refid="TProcessesDrillingColumns"/>
-        <include refid="TProcessesBlastColumns"/>
+        a.Uid,
+        a.HoleID,
+        b.HoleBlastVolume,
+        b.depth AS DesignDepth,
+        c.Depth
         FROM T_Processes_Blast a
         <include refid="TProcessesBlastdesignHoleJoins"/>
         <where>

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TProcessesBlastdesignHoleMapper.xml

@@ -20,9 +20,7 @@
         a.y,
         a.z,
         a.StepHeight,
-        a.HoleBlastVolume,
-        a.DrillingDate,
-        a.BlastDate
+        a.HoleBlastVolume
 	</sql>
 
     <sql id="TProcessesBlastdesignVolumeColumns">
@@ -30,16 +28,38 @@
         b.DesignDate,
 	</sql>
 
+    <sql id="TProcessesBlastColumns">
+        c.BlastDate,
+	</sql>
+
+    <sql id="TProcessesDrillingColumns">
+        d.DrillingDate,
+	</sql>
 
     <sql id="TProcessesBlastdesignHoleJoins">
         left join T_Processes_BlastDesign_Volume b on a.StopeName=b.StopeName and a.StepName=b.StepName and a.BlastAreaName=b.BlastAreaName
+        left join T_Processes_Blast c on a.HoleID = c.HoleID
+        left join T_Processes_Drilling d on a.HoleID = d.HoleID
     </sql>
 
     <!-- 获取所有getPage列表 -->
     <select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesBlastdesignHoleVo">
         SELECT
-        <include refid="TProcessesBlastdesignVolumeColumns"/>
-        <include refid="TProcessesBlastdesignHoleColumns"/>
+        a.Uid,
+        a.BlastHoleID,
+        a.Depth,
+        a.RowSpace,
+        a.HoleSpace,
+        a.Azimuth,
+        a.Inclination,
+        a.Aperture,
+        a.x,
+        a.y,
+        a.z,
+        a.StepHeight,
+        b.BlastVolume,
+        c.BlastDate,
+        d.DrillingDate
         FROM T_Processes_BlastDesign_Hole a
         <include refid="TProcessesBlastdesignHoleJoins"/>
         <where>
@@ -52,6 +72,7 @@
     <select id="getByQuery" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesBlastdesignHoleVo">
         SELECT
         <include refid="TProcessesBlastdesignVolumeColumns"/>
+        <include refid="TProcessesBlastColumns"/>
         <include refid="TProcessesBlastdesignHoleColumns"/>
         FROM T_Processes_BlastDesign_Hole a
         <include refid="TProcessesBlastdesignHoleJoins"/>

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TProcessesCrusherMapper.xml

@@ -42,6 +42,14 @@
     <!-- 获取所有getPage列表 -->
     <select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesCrusherVo">
         SELECT
+        a.Uid,
+        a.EquipmentID,
+        a.WorkType,
+        a.WorkTime,
+        --        a.Wcdw, /*吨位  查吨位表中的吨位*/
+        a.Price,
+        a.TotalMoney,
+        b.Wcdw
         <include refid="TWeightColumns"/>
         <include refid="TProcessesCrusherColumns"/>
         FROM T_Processes_Crusher a

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TProcessesDrillingMapper.xml

@@ -20,7 +20,7 @@
         a.StartTime,
         a.EndTime,
         a.WorkTime,
-
+        a.HoleBlastVolume,
         a.Depth,
         a.RowSpace,
         a.HoleSpace,
@@ -44,7 +44,7 @@
         b.Azimuth AS DesignAzimuth,
         b.Inclination AS DesignInclination,
         b.Aperture AS DesignAperture,
-        b.HoleBlastVolume,
+        b.StepHeight,
 	</sql>
 
 
@@ -66,10 +66,16 @@
     <!-- 获取所有getPage列表 -->
     <select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesDrillingVo">
         SELECT
-        <include refid="TProcessesDiggingHoleColumns"/>
-        <include refid="TProcessesBlastColumns"/>
-        <include refid="TProcessesBlastdesignVolumeColumns"/>
-        <include refid="TProcessesDrillingColumns"/>
+        a.Uid,
+        a.HoleID,
+        a.Depth,
+        a.RowSpace,
+        a.HoleSpace,
+        a.HoleBlastVolume,
+        b.Depth AS DesignDepth,
+        b.RowSpace AS DesignRowSpace,
+        b.HoleSpace AS  DesignHoleSpace,
+        b.StepHeight
         FROM T_Processes_Drilling a
         <include refid="TProcessesDrillingJoins"/>
         <where>