diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesAuxiliary.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesAuxiliary.java
index fd489c7ddcb9e3ec9189ebf9e9ac22920c3b4c48..40c2104804840c3365c5a67406b444738a6507aa 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesAuxiliary.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesAuxiliary.java
@@ -108,7 +108,12 @@ public class TProcessesAuxiliary implements Serializable {
     /**
      * 司机
      */
-    @TableField("Driver")
-    private String Driver;
+//    @TableField("Driver")
+//    private String Driver;
 
+    /**
+     * 作业日期
+      */
+    @TableField("Zyrq")
+    private String Zyrq;
 }
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesBlastdesignHole.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesBlastdesignHole.java
index 487581c8768426d50a4699f84aeb1256143595b1..3d41bc18fd72376ddc5ab4f1a71cc630f3963fd1 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesBlastdesignHole.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesBlastdesignHole.java
@@ -132,6 +132,16 @@ public class TProcessesBlastdesignHole implements Serializable {
     @TableField("DrillingDate")
     private LocalDateTime DrillingDate;
 
+    /**
+     * 设计日期
+     */
+    @TableField("DesignDate")
+    private LocalDateTime DesignDate;
 
+    /**
+     * 日期标记,如:2020年11月
+     */
+    @TableField("Tag")
+    private String Tag;
 
 }
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesBlastdesignHoleMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesBlastdesignHoleMapper.xml
index da348482ae23d27645aa62c4a812e6712ac3b0fb..57052296d55a21fdd173a0deb55b1a433726c667 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesBlastdesignHoleMapper.xml
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesBlastdesignHoleMapper.xml
@@ -20,7 +20,8 @@
         a.y,
         a.z,
         a.StepHeight,
-        a.HoleBlastVolume
+        a.HoleBlastVolume,
+        a.Tag
 	</sql>
 
     <sql id="TProcessesBlastdesignVolumeColumns">
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TProcessesAuxiliaryQuery.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TProcessesAuxiliaryQuery.java
index ff112e1037d7cf19f85b10333116f8e57f56d264..ef5420668174769b068f19cf08589033746020a0 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TProcessesAuxiliaryQuery.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TProcessesAuxiliaryQuery.java
@@ -102,8 +102,12 @@ public class TProcessesAuxiliaryQuery {
     /**
      * 司机
      */
-    @ApiModelProperty("Driver")
-    private String Driver;
-
+//    @ApiModelProperty("Driver")
+//    private String Driver;
+    /**
+     * 作业日期
+     */
+    @ApiModelProperty("作业日期")
+    private String Zyrq;
 
 }
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TProcessesBlastdesignHoleQuery.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TProcessesBlastdesignHoleQuery.java
index 4149b07115046859c9616e2c5942f20d26b6aedd..c20b2c7d104ff80075a69f6914d036c1875bdadd 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TProcessesBlastdesignHoleQuery.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TProcessesBlastdesignHoleQuery.java
@@ -139,4 +139,10 @@ public class TProcessesBlastdesignHoleQuery  extends TProcessesBlastdesignVolume
      */
     @ApiModelProperty("NewBlastHoleID")
     private String NewBlastHoleID;
+
+    /**
+     * 日期标记,如:2020年11月
+     */
+    @ApiModelProperty("Tag")
+    private String Tag;
 }
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/vo/TProcessesAuxiliaryVo.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/vo/TProcessesAuxiliaryVo.java
index fdfc454a65faafd68e6fd6c03ec15b08aa66480b..346c1dfe7f90b0eb382e8f16a37b56e36bebae56 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/vo/TProcessesAuxiliaryVo.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/vo/TProcessesAuxiliaryVo.java
@@ -7,7 +7,7 @@ import lombok.Data;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author renchao
@@ -98,7 +98,13 @@ public class TProcessesAuxiliaryVo {
     /**
      * 司机
      */
-    @ApiModelProperty("Driver")
-    private String Driver;
+//    @ApiModelProperty("Driver")
+//    private String Driver;
+
+    /**
+     * 作业日期
+     */
+    @ApiModelProperty("作业日期")
+    private String Zyrq;
 
 }
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/vo/TProcessesBlastdesignHoleVo.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/vo/TProcessesBlastdesignHoleVo.java
index 63a98225512719ecff09150e6dd8af35446010ff..879565dcaf270a41c5783f87c1e0652648b7f9b3 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/vo/TProcessesBlastdesignHoleVo.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/vo/TProcessesBlastdesignHoleVo.java
@@ -138,4 +138,9 @@ public class TProcessesBlastdesignHoleVo {
     @ApiModelProperty("设计日期")
     private LocalDateTime DesignDate;
 
+    /**
+     * 日期标记,如:2020年11月
+     */
+    @ApiModelProperty("Tag")
+    private String Tag;
 }
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastServiceImpl.java
index 2e7eb387feae4bbb73038c8f90b1968238d7d2cf..568ffb79124de5eef38eb3508b13cd35acd97662 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastServiceImpl.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastServiceImpl.java
@@ -146,10 +146,6 @@ public class TProcessesBlastServiceImpl extends ServiceImpl<TProcessesBlastMappe
         log.info(JSON.toJSONString(query));
         //参数校验
         Rcode.NOT_PARAM.assertNotNull(query);
-        //uid自动生成 不能手动设置
-        if (query.getUid() != null) {
-            return R.failed("爆破设计中->uid自动生成 不能手动设置");
-        }
         //不能修改tag
         if (StringUtils.isNotBlank(query.getTag())) {
             return R.failed("爆破设计中->tag自动计算，不能添加");
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 7332893415428a6c697c6a539af50f9b230de88d..08ac4b8411642cf2ce15ee6d060f389a529a49d1 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
@@ -2,6 +2,7 @@ package cn.wise.sc.acquisition.business.service.impl;
 
 import cn.wise.sc.acquisition.business.constant.Rcode;
 import cn.wise.sc.acquisition.business.entity.TProcessesBlastdesignHole;
+import cn.wise.sc.acquisition.business.entity.TProcessesBlastdesignVolume;
 import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
 import cn.wise.sc.acquisition.business.mapper.TProcessesBlastdesignHoleMapper;
 import cn.wise.sc.acquisition.business.model.query.TProcessesBlastQuery;
@@ -27,7 +28,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 
-
 /**
  * <p>
  * 服务实现类
@@ -49,6 +49,9 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
     @Autowired
     private ITProcessesBlastService itProcessesBlastService;
 
+    @Autowired
+    private ITSysDictService itSysDictService;
+
     @Override
     public R getPage(TProcessesBlastdesignHoleQuery tProcessesBlastdesignHoleQuery, Query query) {
         log.info(JSON.toJSONString(tProcessesBlastdesignHoleQuery));
@@ -248,6 +251,10 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
         if (query.getUid() != null) {
             return R.failed("炮孔设计中->uid自动生成 不能手动设置");
         }
+        //tag为自动生成不能添加
+        if (StringUtils.isNotBlank(query.getTag())) {
+            return R.failed("炮孔设计中->tag为自动生成不能添加");
+        }
         //判断炮孔编号是否存在
         if (StringUtils.isNotBlank(query.getBlastHoleID())) {
             R r = getByBlastHoleID(query);
@@ -258,26 +265,38 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
         //查看设计爆区爆破量是否存在数据
         TProcessesBlastdesignVolumeQuery tProcessesBlastdesignVolumeQuery = new TProcessesBlastdesignHoleQuery();
         BeanUtils.copyProperties(query, tProcessesBlastdesignVolumeQuery);
-        R volume = itProcessesBlastdesignVolumeService.getByQuery(tProcessesBlastdesignVolumeQuery);
-        if (volume.getData() == null) {
+        R r = itProcessesBlastdesignVolumeService.getByQuery(tProcessesBlastdesignVolumeQuery);
+        if (r.getData() == null) {
             return R.failed("炮孔设计中->设计爆区爆破量表数据不存在，StopeName,StepName,BlastAreaName");
         }
 
         //条件封装
         TProcessesBlastdesignHole tProcessesBlastdesignHole = new TProcessesBlastdesignHole();
         BeanUtils.copyProperties(query, tProcessesBlastdesignHole);
+        //设置设计日期
+        TProcessesBlastdesignVolume volume = (TProcessesBlastdesignVolume) r.getData();
+        if (volume.getDesignDate() == null) {
+            log.error("炮孔设计中->设计爆区爆破量表数据中设计日期为空:{}", JSON.toJSONString(volume));
+            return R.failed("炮孔设计中->设计爆区爆破量表数据中设计日期为空:" + JSON.toJSONString(volume));
+        }
+        tProcessesBlastdesignHole.setDesignDate(volume.getDesignDate());
         //单孔爆破量(m3)=孔距*排距*台阶高度
         calculateHoleBlastVolume(tProcessesBlastdesignHole);
+        //设置tag
+        R tagDate = itSysDictService.getTagDate(null);
+        if (tagDate.getCode() != 0) {
+            return R.failed(tagDate.getMsg());
+        }
+        tProcessesBlastdesignHole.setTag((String) tagDate.getData());
         //增加
         log.info(JSON.toJSONString(tProcessesBlastdesignHole));
         int insert = baseMapper.insert(tProcessesBlastdesignHole);
         if (insert > 0) {
-            R r = getByBlastHoleID(query);
-            TProcessesBlastdesignHole hole = (TProcessesBlastdesignHole) r.getData();
-
+            R r0 = getByBlastHoleID(query);
+            TProcessesBlastdesignHole hole = (TProcessesBlastdesignHole) r0.getData();
             //增加一条穿孔工序
             TProcessesDrillingQuery tProcessesDrillingQuery = new TProcessesDrillingQuery();
-            tProcessesBlastdesignHole.setUid(hole.getUid());
+            tProcessesDrillingQuery.setUid(hole.getUid());
             //tProcessesDrillingQuery.setTag(DateUtil.timeToStr(LocalDateTime.now(), DateUtil.FORMAT_TO_SECOND));
             R r1 = itProcessesDrillingService.insertTProcessesDrilling(tProcessesDrillingQuery);
             if (r1.getCode() != 0) {
@@ -291,8 +310,8 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
             //tProcessesBlastQuery.setTag(DateUtil.timeToStr(LocalDateTime.now(), DateUtil.FORMAT_TO_SECOND));
             R r2 = itProcessesBlastService.insertTProcessesBlast(tProcessesBlastQuery);
             if (r2.getCode() != 0) {
-                log.error("炮孔设计中->增加一条爆破工序失败:" + JSON.toJSONString(tProcessesDrillingQuery));
-                return R.failed(r1.getMsg());
+                log.error("炮孔设计中->增加一条爆破工序失败:" + JSON.toJSONString(tProcessesBlastQuery));
+                return R.failed(r2.getMsg());
             }
             return R.ok("炮孔设计中->增加成功");
         } else {
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesDrillingServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesDrillingServiceImpl.java
index eb7c9bf86de3f613931cf22da19ed7ab6c0bc4a0..a99a09cecac76f18dad82ff1e33d4332a2336623 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesDrillingServiceImpl.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesDrillingServiceImpl.java
@@ -6,6 +6,7 @@ import cn.wise.sc.acquisition.business.entity.TProcessesDrilling;
 import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
 import cn.wise.sc.acquisition.business.mapper.TProcessesDrillingMapper;
 import cn.wise.sc.acquisition.business.model.query.*;
+import cn.wise.sc.acquisition.business.model.vo.TProcessesBlastdesignHoleVo;
 import cn.wise.sc.acquisition.business.model.vo.TProcessesDrillingVo;
 import cn.wise.sc.acquisition.business.model.vo.TProcessesProductVo;
 import cn.wise.sc.acquisition.business.service.*;
@@ -216,7 +217,7 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
             R r = itProcessesBlastdesignHoleService.getByUid(holeQuery);
             //不为空计算单孔爆破量
             if (r.getData() != null) {
-                TProcessesBlastdesignHole data = (TProcessesBlastdesignHole) r.getData();
+                TProcessesBlastdesignHoleVo data = (TProcessesBlastdesignHoleVo) r.getData();
                 Double volume = calculateHoleBlastVolume(temp.getHoleSpace(), temp.getRowSpace(), data.getStepHeight());
                 temp.setHoleBlastVolume(volume);
             } else {
diff --git a/acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TProcessesBlastdesignHoleMapper.xml b/acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TProcessesBlastdesignHoleMapper.xml
index da348482ae23d27645aa62c4a812e6712ac3b0fb..57052296d55a21fdd173a0deb55b1a433726c667 100644
--- a/acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TProcessesBlastdesignHoleMapper.xml
+++ b/acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TProcessesBlastdesignHoleMapper.xml
@@ -20,7 +20,8 @@
         a.y,
         a.z,
         a.StepHeight,
-        a.HoleBlastVolume
+        a.HoleBlastVolume,
+        a.Tag
 	</sql>
 
     <sql id="TProcessesBlastdesignVolumeColumns">