生产工序业务修改

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

@@ -105,5 +105,10 @@ public class TProcessesAuxiliary implements Serializable {
     @TableField("Tag")
     private String Tag;
 
+    /**
+     * 司机
+     */
+    @TableField("Driver")
+    private String Driver;
 
 }

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

@@ -132,11 +132,6 @@ public class TProcessesBlastdesignHole implements Serializable {
     @TableField("DrillingDate")
     private LocalDateTime DrillingDate;
 
-    /**
-     * 爆破日期
-     */
-    @TableField("BlastDate")
-    private LocalDateTime BlastDate;
 
 
 }

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

@@ -755,17 +755,18 @@ public class ProjectEnum {
     public enum TProcessesAuxiliary {
         UID(1, "Uid","id"),
         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月");
+        EQUIPMENT_NAME(3, "EquipmentName","设备名称"),
+        MANAGER(4, "Manager","项目经理"),
+        SUPERVISOR(5, "Supervisor","主管项目领导"),
+        TECH_DEPART(6, "TechDepart","生产技术部"),
+        TABULATOR(7, "Tabulator","制表人"),
+        LJYL(8, "Ljyl","当月累计油量"),
+        ZJ(9, "Zj","总价(元)"),
+        DYLJCL(10, "Dyljcl","当月累计产量"),
+        DH(11, "Dh","单耗=当月累计油量/当月产量"),
+        BZ(12, "Bz","备注"),
+        DRIVER(13, "Driver","司机"),
+        TAG(14, "Tag","日期标记,如:2021年01月");
 
 
         // 成员变量

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

@@ -38,8 +38,8 @@
 
     <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
+        left join T_Processes_Blast c on a.BlastHoleID = c.HoleID
+        left join T_Processes_Drilling d on a.BlastHoleID = d.HoleID
     </sql>
 
     <!-- 获取所有getPage列表 -->

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

@@ -99,5 +99,11 @@ public class TProcessesAuxiliaryQuery {
     @ApiModelProperty("Tag")
     private String Tag;
 
+    /**
+     * 司机
+     */
+    @ApiModelProperty("Driver")
+    private String Driver;
+
 
 }

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

@@ -95,5 +95,10 @@ public class TProcessesAuxiliaryVo {
     @ApiModelProperty("Tag")
     private String Tag;
 
+    /**
+     * 司机
+     */
+    @ApiModelProperty("Driver")
+    private String Driver;
 
 }

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

@@ -124,11 +124,7 @@ public class TProcessesBlastdesignHoleVo {
     @ApiModelProperty("穿孔日期")
     private LocalDateTime DrillingDate;
 
-    /**
-     * 爆破日期
-     */
-    @ApiModelProperty("爆破日期")
-    private LocalDateTime BlastDate;
+
 
 
     //以下为增加字段
@@ -144,4 +140,9 @@ public class TProcessesBlastdesignHoleVo {
     @ApiModelProperty("设计日期")
     private LocalDateTime DesignDate;
 
+    /**
+     * 爆破日期
+     */
+    @ApiModelProperty("爆破日期")
+    private LocalDateTime BlastDate;
 }

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

@@ -44,6 +44,7 @@ public class TProcessesAuxiliaryServiceImpl extends ServiceImpl<TProcessesAuxili
                 ProjectEnum.TProcessesAuxiliary.ZJ.getLabel(),
                 ProjectEnum.TProcessesAuxiliary.TAG.getLabel(),
                 ProjectEnum.TProcessesAuxiliary.DYLJCL.getLabel(),
+                ProjectEnum.TProcessesAuxiliary.DRIVER.getLabel(),
                 ProjectEnum.TProcessesAuxiliary.DH.getLabel()
         );
         queryWrapper.eq(StringUtils.isNotBlank(tProcessesAuxiliaryQuery.getEquipmentID()),

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

@@ -38,8 +38,8 @@
 
     <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
+        left join T_Processes_Blast c on a.BlastHoleID = c.HoleID
+        left join T_Processes_Drilling d on a.BlastHoleID = d.HoleID
     </sql>
 
     <!-- 获取所有getPage列表 -->