From 651e3950cddeb0481850837000609a0e3bf1980c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=AB=B9=E5=A4=A9=E5=8D=AB?= <15010051933@139.com>
Date: Mon, 7 Jun 2021 17:56:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BE=85=E5=8A=A9=E5=B7=A5=E5=BA=8F=20?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/enumation/ProjectEnum.java       | 22 +++++++++----------
 .../impl/TProcessesAuxiliaryServiceImpl.java  | 14 +++++++-----
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/enumation/ProjectEnum.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/enumation/ProjectEnum.java
index 56f1605..c14497a 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/enumation/ProjectEnum.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/enumation/ProjectEnum.java
@@ -834,18 +834,16 @@ public class ProjectEnum {
         UID(1, "Uid","id"),
         EQUIPMENT_ID(2, "EquipmentID","设备编号"),
         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月");
-
+        CONSUMEDATE(4, "ConsumeDate","设备名称"),
+        NAME(5, "Name","设备名称"),
+        AMOUNT(6, "Amount","设备名称"),
+        TOTAL(7, "Total","设备名称"),
+        CL(8, "Cl","本次加油产量"),
+        DH(9, "Dh","单耗=当月累计油量/当月产量(Amount/cl)"),
+        CLLYR(10, "Cllyr","材料领用人"),
+        FLAG(11, "Flag","是否从出库单传过来的，若是，则计算成本的时候，不在把它包含在内"),
+        TAG(12, "Tag","日期标记,如:2021年01月"),
+        BZ(13, "Bz","备注");
 
         // 成员变量
         private int value;
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesAuxiliaryServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesAuxiliaryServiceImpl.java
index a9da6d4..6d05d0f 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesAuxiliaryServiceImpl.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesAuxiliaryServiceImpl.java
@@ -53,12 +53,16 @@ public class TProcessesAuxiliaryServiceImpl extends ServiceImpl<TProcessesAuxili
                 ProjectEnum.TProcessesAuxiliary.UID.getLabel(),
                 ProjectEnum.TProcessesAuxiliary.EQUIPMENT_ID.getLabel(),
                 ProjectEnum.TProcessesAuxiliary.EQUIPMENT_NAME.getLabel(),
-                ProjectEnum.TProcessesAuxiliary.LJYL.getLabel(),
-                ProjectEnum.TProcessesAuxiliary.ZJ.getLabel(),
+                ProjectEnum.TProcessesAuxiliary.CONSUMEDATE.getLabel(),
+                ProjectEnum.TProcessesAuxiliary.NAME.getLabel(),
+                ProjectEnum.TProcessesAuxiliary.AMOUNT.getLabel(),
+                ProjectEnum.TProcessesAuxiliary.TOTAL.getLabel(),
+                ProjectEnum.TProcessesAuxiliary.CL.getLabel(),
+                ProjectEnum.TProcessesAuxiliary.DH.getLabel(),
+                ProjectEnum.TProcessesAuxiliary.CLLYR.getLabel(),
+                ProjectEnum.TProcessesAuxiliary.FLAG.getLabel(),
                 ProjectEnum.TProcessesAuxiliary.TAG.getLabel(),
-                ProjectEnum.TProcessesAuxiliary.DYLJCL.getLabel(),
-                ProjectEnum.TProcessesAuxiliary.DRIVER.getLabel(),
-                ProjectEnum.TProcessesAuxiliary.DH.getLabel()
+                ProjectEnum.TProcessesAuxiliary.BZ.getLabel()
         );
         queryWrapper.eq(StringUtils.isNotBlank(tProcessesAuxiliaryQuery.getEquipmentID()),
                 ProjectEnum.TProcessesAuxiliary.EQUIPMENT_ID.getLabel(), tProcessesAuxiliaryQuery.getEquipmentID());
-- 
2.18.1