修复爆破设计，辅助设计问题

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

@@ -40,7 +40,7 @@
     </sql>
 
     <sql id="TProcessesBlastDesignHoleJoins">
-        left join T_Processes_BlastDesign_Hole b on c.Uid = b.BlastHoleID
+        left join T_Processes_BlastDesign_Hole b on c.Uid = b.Uid
     </sql>
 
     <!-- 获取所有getPage列表 -->

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

 package cn.wise.sc.acquisition.business.model.query;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -11,7 +10,7 @@ import java.time.LocalDateTime;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author renchao
@@ -21,10 +20,6 @@ import java.time.LocalDateTime;
 @ApiModel("辅助工序")
 public class TProcessesAuxiliaryQuery {
 
-    /**
-     * 搜索字段
-     */
-    private String search;
     /**
      * ID号
      */
@@ -42,6 +37,12 @@ public class TProcessesAuxiliaryQuery {
      */
     @ApiModelProperty("EquipmentName")
     private String EquipmentName;
+    /**
+     * 加油日期
+     */
+    @ApiModelProperty("ConsumeDate")
+    @DateTimeFormat(pattern = "yyyy-mm-hh")
+    private LocalDateTime ConsumeDate;
     /**
      * 品名：柴油或汽油
      */
@@ -53,52 +54,34 @@ public class TProcessesAuxiliaryQuery {
     @ApiModelProperty("Amount")
     private Float Amount;
     /**
-     * 项目经理
-     */
-    @ApiModelProperty("Manager")
-    private String Manager;
-
-    /**
-     * 主管项目领导
-     */
-    @ApiModelProperty("Supervisor")
-    private String Supervisor;
-
-    /**
-     * 生产技术部
-     */
-    @ApiModelProperty("TechDepart")
-    private String TechDepart;
-
-    /**
-     * 制表人
+     * 金额
      */
-    @ApiModelProperty("Tabulator")
-    private String Tabulator;
+    @ApiModelProperty("Total")
+    private Float Total;
 
     /**
-     * 当月累计油量
+     * 本次加油产量
      */
-    @ApiModelProperty("Ljyl")
-    private Float Ljyl;
+    @ApiModelProperty("Cl")
+    private Float Cl;
 
     /**
-     * 总价(元)
+     * 材料领用人
      */
-    @ApiModelProperty("Zj")
-    private Float Zj;
+    @ApiModelProperty("Cllyr")
+    private String Cllyr;
 
     /**
-     * 当月累计产量
+     * 单耗=当月累计油量/当月产量
      */
-    @ApiModelProperty("Dyljcl")
-    private Float Dyljcl;
+    @ApiModelProperty("Dh")
+    private Float Dh;
 
     /**
-     * 单耗=当月累计油量/当月产量
+     * 是否从出库单传过来的，若是，则计算成本的时候，不在把它包含在内
      */
-    @ApiModelProperty("Dh")
-    private Double Dh;
+    @ApiModelProperty("Flag;")
+    private Boolean Flag;
 
     /**
      * 备注
@@ -106,19 +89,12 @@ public class TProcessesAuxiliaryQuery {
     @ApiModelProperty("Bz")
     private String Bz;
 
-    @ApiModelProperty("ConsumeDate")
-    @DateTimeFormat(pattern = "yyyy-mm-hh")
-    private LocalDateTime ConsumeDate;
+
     /**
      * 日期标记,如:2021年01月
      */
     @ApiModelProperty("Tag")
     private String Tag;
-    /**
-     * 是否从出库单传过来的，若是，则计算成本的时候，不在把它包含在内
-     */
-    @ApiModelProperty("Flag;")
-    private Boolean Flag;
 
 
 }

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

@@ -90,9 +90,9 @@ public class TProcessesAuxiliaryServiceImpl extends ServiceImpl<TProcessesAuxili
             return R.failed("辅助工序中->tag为自动生成字段，不能修改");
         }
         //当月累计油量不为空时，需要判断。当月累计油量不为0时，当月累计产量不能为0 因为dh 由当月累计油量/当月累计产量 计算而来，分母不能为0
-        if ((query.getLjyl() != null && query.getLjyl() != 0)
-                && query.getDyljcl() != null
-                && query.getDyljcl() == 0) {
+        if ((query.getAmount() != null && query.getAmount() != 0)
+                && query.getCl() != null
+                && query.getCl() == 0) {
             return R.failed("辅助工序中->当要同时修改当月累计油量和当月累计油量时, 当月累计油量Ljyl 不为0时，当月累计产量Dyljcl不能为0,因为dh 由当月累计油量/当月累计产量 计算而来，分母不能为0");
         }
         //条件封装
@@ -120,9 +120,8 @@ public class TProcessesAuxiliaryServiceImpl extends ServiceImpl<TProcessesAuxili
         log.info(JSON.toJSONString(query));
         //参数校验
         Rcode.NOT_PARAM.assertNotNull(query);
-        Rcode.NOT_PARAM.assertNotNull(query.getLjyl());
-        Rcode.NOT_PARAM.assertNotNull(query.getZj());
-        Rcode.NOT_PARAM.assertNotNull(query.getDyljcl());
+        Rcode.NOT_PARAM.assertNotNull(query.getAmount());
+        Rcode.NOT_PARAM.assertNotNull(query.getCl());
         //uid自动生成 不能手动设置
         if (query.getUid() != null) {
             return R.failed("辅助工序中->uid自动生成 不能手动设置");
@@ -136,7 +135,7 @@ public class TProcessesAuxiliaryServiceImpl extends ServiceImpl<TProcessesAuxili
             return R.failed("辅助工序中->dh为自动计算字段，不能添加");
         }
         //当月累计油量不为0时，当月累计产量不能为0
-        if (query.getLjyl() != 0 && query.getDyljcl() == 0) {
+        if (query.getAmount() != 0 && query.getCl() == 0) {
             return R.failed("辅助工序中->当月累计油量Ljyl 不为0时，当月累计产量Dyljcl不能为0,分母不能为0");
         }
         query.setFlag(false);
@@ -150,11 +149,11 @@ public class TProcessesAuxiliaryServiceImpl extends ServiceImpl<TProcessesAuxili
         }
         tProcessesAuxiliary.setTag(r1.getData());
         //设置单耗
-        if (query.getLjyl() == 0) {
+        if (query.getAmount() == 0) {
             tProcessesAuxiliary.setDh(0f);
         } else {
             //强转失去精度，借助字符串
-            float dh = query.getLjyl() / query.getDyljcl();
+            float dh = query.getAmount() / query.getCl();
             tProcessesAuxiliary.setDh(Float.valueOf(String.valueOf(dh)));
         }
         //增加

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

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -263,11 +264,11 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
         }
         //判断爆区是否存在
         QueryWrapper<TProcessesBlastdesignHole> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(ProjectEnum.TProcessesBlastdesignHole.STEP_NAME.getLabel(), query.getStepName());
-        queryWrapper.eq(ProjectEnum.TProcessesBlastdesignHole.STOPE_NAME.getLabel(), query.getStopeName());
-        queryWrapper.eq(ProjectEnum.TProcessesBlastdesignHole.Blast_Area_Name.getLabel(), query.getBlastAreaName());
-        List<TProcessesBlastdesignHole> holeVoList = processesBlastdesignHoleMapper.selectList(queryWrapper);
-        if (holeVoList == null || holeVoList.size()==0) {
+        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());
+        List<TProcessesBlastdesignHoleVo> holeVo = baseMapper.getByQuery(queryWrapper);
+        if (CollectionUtils.isNotEmpty(holeVo)) {
             return R.failed("炮孔设计中->泡孔设计中爆区已存在，StopeName,StepName,BlastAreaName");
         }
         //条件封装
@@ -340,7 +341,12 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
         uid.append(ProjectEnum.TableAlias.A.getLabel()).append(ProjectEnum.TProcessesBlastdesignHole.UID.getLabel());
         queryWrapper.eq(uid.toString(), query.getUid());
         //查询并且返回
-        return R.ok(baseMapper.getByQuery(queryWrapper));
+        List<TProcessesBlastdesignHoleVo> data = baseMapper.getByQuery(queryWrapper);
+        if (null != data && data.size() != 1) {
+            log.error("炮孔设计中->根据uid获取数据出现多条数据:{}", JSON.toJSONString(data));
+            return R.failed("炮孔设计中->根据uid获取数据出现多条数据");
+        }
+        return R.ok(data.get(0));
     }