Merge remote-tracking branch 'origin/master'

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

@@ -64,6 +64,19 @@ public class TProcessesDrillingController {
     }
 
 
+    /**
+     * 修改所有爆破日期
+     *
+     * @param tProcessesDrillingQuery
+     * @return
+     */
+    @ApiOperation(value = "修改所有爆破日期")
+    @RequestMapping(value = "/updateAllBlastDate", method = RequestMethod.POST)
+    public R updateAllBlastDate(@RequestBody TProcessesDrillingQuery tProcessesDrillingQuery) {
+        return itProcessesDrillingService.updateAllBlastDate(tProcessesDrillingQuery);
+    }
+
+
     /**
      * 根据uid获取详细信息
      *

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;
 }

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;
 
 }

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

@@ -104,4 +104,10 @@ public class TSampleList implements Serializable {
      */
     @TableField("RecordCode")
     private byte[] RecordCode;
+
+    /**
+     * 化验室是否已接收，0未接收，1已接收
+     */
+    @TableField("Flag")
+    private byte[] Flag;
 }

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

@@ -759,7 +759,8 @@ public class ProjectEnum {
         DESIGN_HOLE_SPACE(8, "DesignHoleSpace","设计孔距（m）"),
         STEP_HEIGHT(9, "StepHeight","台阶高度"),
         HOLE_BLAST_VOLUME(10, "HoleBlastVolume","单孔爆破量"),
-        HOLE_ID(10, "HoleID","炮孔编号");
+        BLAST_DATE(11, "BlastDate","爆破日期"),
+        HOLE_ID(12, "HoleID","炮孔编号");
 
         // 成员变量
         private int value;

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">

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;
 
 }

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;
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/vo/TProcessesAuxiliaryVo.java

@@ -98,7 +98,13 @@ public class TProcessesAuxiliaryVo {
     /**
      * 司机
      */
-    @ApiModelProperty("Driver")
-    private String Driver;
+//    @ApiModelProperty("Driver")
+//    private String Driver;
+
+    /**
+     * 作业日期
+     */
+    @ApiModelProperty("作业日期")
+    private String Zyrq;
 
 }

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;
 }

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

@@ -24,6 +24,7 @@ public interface ITProcessesDrillingService extends IService<TProcessesDrilling>
 
     R updateHoleBlastVolume(TProcessesDrillingQuery query);
 
+    R updateAllBlastDate(TProcessesDrillingQuery query);
 
     R getByUid(TProcessesDrillingQuery query);
 

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

@@ -123,9 +123,16 @@ public class TMineWorkemployeesServiceImpl extends ServiceImpl<TMineWorkemployee
         //参数校验
         Rcode.NOT_PARAM.assertNotNull(query);
         Rcode.NOT_PARAM.assertNotNull(query.getUid());
+        //判断日期是否存在
         if (query.getGzsj() != null) {
             R r1 = getByQuery(query);
-            if (r1.getData() != null) return R.failed("员工上班统计中->上班日期已存在，不能修改");
+            //如果日期存在，需要排除是否是当前数据
+            if (r1.getData() != null) {
+                TMineWorkemployees tMineWorkemployees = (TMineWorkemployees) r1.getData();
+                if (!query.getUid().equals(tMineWorkemployees.getUid())){
+                    return R.failed("员工上班统计中->上班日期已存在，不能修改");
+                }
+            }
         }
         //tag不能添加
         if (StringUtils.isNotBlank(query.getTag())) {

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自动计算，不能添加");

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 {

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.*;
@@ -108,7 +109,7 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
         //参数校验
         Rcode.NOT_PARAM.assertNotNull(query);
         //tag不能添加
-        if (StringUtils.isNotBlank(query.getTag())){
+        if (StringUtils.isNotBlank(query.getTag())) {
             return R.failed("穿孔工序中->tag标注日期自动生成，不能添加");
         }
         //条件封装
@@ -125,7 +126,7 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
         if (insert > 0) {
             return R.ok("穿孔工序中->增加成功");
         } else {
-            log.error("穿孔工序中->增加失败,{}",JSON.toJSONString(tProcessesDrilling));
+            log.error("穿孔工序中->增加失败,{}", JSON.toJSONString(tProcessesDrilling));
             return R.failed("穿孔工序中->增加失败");
         }
     }
@@ -147,7 +148,7 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
             return R.failed("穿孔工序中->不能修改炮孔编号");
         }
         //不能修改tag
-        if (StringUtils.isNotBlank(query.getTag())){
+        if (StringUtils.isNotBlank(query.getTag())) {
             return R.failed("穿孔工序中->tag标注日期自动生成，不能修改");
         }
         //条件封装
@@ -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 {
@@ -231,7 +232,7 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
         if (update > 0) {
             return R.ok("穿孔工序中->修改成功");
         } else {
-            log.error("穿孔工序中->修改失败:{}",JSON.toJSONString(temp));
+            log.error("穿孔工序中->修改失败:{}", JSON.toJSONString(temp));
             return R.failed("穿孔工序中->修改失败");
         }
     }
@@ -258,7 +259,7 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
         if (update > 0) {
             return R.ok("穿孔工序中->修改成功");
         } else {
-            log.error("穿孔工序中->修改失败:{}",JSON.toJSONString(temp));
+            log.error("穿孔工序中->修改失败:{}", JSON.toJSONString(temp));
             return R.failed("穿孔工序中->修改失败");
         }
     }
@@ -279,6 +280,26 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
     }
 
 
+    @Override
+    public R updateAllBlastDate(TProcessesDrillingQuery query) {
+        log.info(JSON.toJSONString(query));
+        //参数校验
+        Rcode.NOT_PARAM.assertNotNull(query);
+        Rcode.NOT_PARAM.assertNotNull(query.getBlastDate());
+        //封装条件
+        QueryWrapper<TProcessesDrilling> queryWrapper = new QueryWrapper<>();
+        //封装实体
+        TProcessesDrilling tProcessesDrilling = new TProcessesDrilling();
+        tProcessesDrilling.setBlastDate(query.getBlastDate());
+        int update = baseMapper.update(tProcessesDrilling, queryWrapper);
+        if (update > 0) {
+            return R.ok("穿孔工序中->修改爆破日期成功");
+        } else {
+            log.error("穿孔工序中->修改爆破日期失败:{}", JSON.toJSONString(tProcessesDrilling));
+            return R.failed("穿孔工序中->修改爆破日期失败");
+        }
+    }
+
     /**
      * 计算并设值 单孔爆破量(m3)=孔距*排距*台阶高度
      */

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">