驾驶舱工序显示逻辑调整

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC007.java

@@ -317,10 +317,10 @@ public class ServiceHGSC007 extends ServiceEPBase {
 			if (queryRow.containsKey("depositDate")) {
 				queryRow.put("depositDate", DateUtils.formatShort(queryRow.get("depositDate")));
 			}
-			queryRow.put("processNames",Arrays.asList("切割下料","烧焊","车加工","铣加工","动平衡","装配"));
+			//queryRow.put("processNames",Arrays.asList("切割下料","烧焊","车加工","铣加工","动平衡","装配"));
 //			List<Map> result = DaoBase.getInstance().query("HGSC007.queryBySunWt", queryRow);
 			List<HashMap<String, Object>> result = (List<HashMap<String, Object>>)DaoBase.getInstance().query("HGSC007.queryBySunWt", queryRow);
-			List<String> processNamesList = Arrays.asList("切割下料","烧焊","车加工","铣加工","动平衡","装配");  //"组立", "油漆", "埋弧盖面", "抛丸除锈", "拼装", "焊接"
+			/*List<String> processNamesList = Arrays.asList("切割下料","烧焊","车加工","铣加工","动平衡","装配");  //"组立", "油漆", "埋弧盖面", "抛丸除锈", "拼装", "焊接"
 			List<Object> resultList = new ArrayList<>();
 			for (String processNames:processNamesList){
 				for(Map<String, Object> item :result){
@@ -328,9 +328,9 @@ public class ServiceHGSC007 extends ServiceEPBase {
 						resultList.add(item.get("totalWeight"));
 					}
 				}
-			}
+			}*/
 			EiBlock block = new EiBlock("result");
-			block.set("processNameList",resultList);
+			block.set("processNameList",result);
 			inInfo.addBlock(block);
 //			Object processNames = queryRow.get("processNames");
 //			for(Object  item:processNames){

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC007.xml

@@ -1287,7 +1287,7 @@
 			</isNotEmpty>
 			group by h2.process_code
 		) B on A.process_code = B.process_code
-		where 1=1 and DELETE_FLAG = '0'
+		where 1=1 and DELETE_FLAG = '0' and reveal = 1
 			<isNotEmpty prepend=" AND " property="accountCode">
 				A.account_code = #accountCode#
 			</isNotEmpty>
@@ -1298,7 +1298,7 @@
 				C.factory_name = #factoryName#
 			</isNotEmpty>
 		group by
-			A.process_name
+			a.sort, A.process_name
 	</select>
 	<!--日期到条件7天日产量-->
 	<select id="queryByDayWt" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">

src/main/java/com/baosight/hggp/hg/sj/domain/HGSJ001.java

@@ -47,6 +47,8 @@ public class HGSJ001 extends DaoEPBase {
 	public static final String FIELD_COMPUTE_TYPE = "computeType"; /* 计算类型*/
 	public static final String FIELD_COST_WEIGHT = "costWeight";
 	public static final String FIELD_OVERLAP_DAY = "overlapDay";    /* 前后工序重叠天数*/
+	public static final String FIELD_REVEAL = "reveal";  /*是否驾驶舱显示*/
+	public static final String FIELD_SORT = "sort";    /*排序*/
 
 	public static final String COL_ID = "ID";    		/* 主键id*/
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码 预留*/
@@ -102,6 +104,8 @@ public class HGSJ001 extends DaoEPBase {
 	private Integer computeType = 0;
 	private BigDecimal costWeight = new BigDecimal(0.000);
 	private Integer overlapDay = 0; /* 前后工序重叠天数*/
+	private Integer reveal = 0; /*是否驾驶舱显示*/
+	private Integer sort = 0; /*排序*/
 
 	/**
 	 * initialize the metadata.
@@ -219,6 +223,16 @@ public class HGSJ001 extends DaoEPBase {
 		eiColumn.setDescName("前后工序重叠天数");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_REVEAL);
+		eiColumn.setType("N");
+		eiColumn.setDescName("是否驾驶舱显示");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_SORT);
+		eiColumn.setType("N");
+		eiColumn.setDescName("排序");
+		eiMetadata.addMeta(eiColumn);
+
 	}
 
 	/**
@@ -581,7 +595,23 @@ public class HGSJ001 extends DaoEPBase {
 	public void setOverlapDay(Integer overlapDay) {
 		this.overlapDay = overlapDay;
 	}
-	
+
+	public Integer getReveal() {
+		return reveal;
+	}
+
+	public void setReveal(Integer reveal) {
+		this.reveal = reveal;
+	}
+
+	public Integer getSort() {
+		return sort;
+	}
+
+	public void setSort(Integer sort) {
+		this.sort = sort;
+	}
+
 	/**
 	 * get the value from Map.
 	 *
@@ -614,6 +644,8 @@ public class HGSJ001 extends DaoEPBase {
 		setComputeType(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_COMPUTE_TYPE)), computeType));
 		setCostWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_COST_WEIGHT)), costWeight));
 		setOverlapDay(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_OVERLAP_DAY)), overlapDay));
+		setReveal(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_REVEAL)), reveal));
+		setSort(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_SORT)), sort));
 	}
 
 	/**
@@ -647,6 +679,8 @@ public class HGSJ001 extends DaoEPBase {
 		map.put(FIELD_COMPUTE_TYPE, StringUtils.toString(computeType, eiMetadata.getMeta(FIELD_COMPUTE_TYPE)));
 		map.put(FIELD_COST_WEIGHT,StringUtils.toString(costWeight, eiMetadata.getMeta(FIELD_COST_WEIGHT)));
 		map.put(FIELD_OVERLAP_DAY,StringUtils.toString(overlapDay, eiMetadata.getMeta(FIELD_OVERLAP_DAY)));
+		map.put(FIELD_REVEAL,StringUtils.toString(reveal, eiMetadata.getMeta(FIELD_REVEAL)));
+		map.put(FIELD_SORT,StringUtils.toString(sort, eiMetadata.getMeta(FIELD_SORT)));
 
 		return map;
 	}

src/main/java/com/baosight/hggp/hg/sj/sql/HGSJ001.xml

@@ -26,7 +26,9 @@
         STATUS as "status", <!-- 状态0.停止1.启动 -->
         COMPUTE_TYPE as "computeType",
         COST_WEIGHT as "costWeight", <!-- 费用权重 -->
-        OVERLAP_DAY as "overlapDay" <!-- 前后工序重叠天数 -->
+        OVERLAP_DAY as "overlapDay", <!-- 前后工序重叠天数 -->
+        REVEAL as "reveal",
+        SORT as "sort"
 	</sql>
 
 	<sql id="condition">
@@ -107,6 +109,12 @@
 		<isNotEmpty prepend=" AND " property="computeType">
 			COMPUTE_TYPE = #computeType#
 		</isNotEmpty>
+        <isNotEmpty prepend=" AND " property="reveal">
+            REVEAL = #reveal#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="sort">
+            SORT = #sort#
+        </isNotEmpty>
 	</sql>
 
     <sql id="orderBy">
@@ -115,7 +123,7 @@
                 $orderBy$
             </isNotEmpty>
             <isEmpty property="orderBy">
-                CREATED_TIME DESC, ID ASC
+                SORT, CREATED_TIME DESC, ID ASC
             </isEmpty>
         </dynamic>
     </sql>
@@ -152,12 +160,12 @@
         PRINC,  <!-- 负责人 -->
         PRINC_NAME,
         STATUS,  <!-- 状态0.停止1.启动 -->
-        COMPUTE_TYPE, COST_WEIGHT, OVERLAP_DAY
+        COMPUTE_TYPE, COST_WEIGHT, OVERLAP_DAY, REVEAL, SORT
         ) VALUES (
         #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#,
         #deleteFlag#, #factoryCode#, #factoryName#, #processCode#, #processName#,
         #unit#, #standardJob#, #standardDays#, #standardNum#, #princ#, #princName#,
-        #status#, #computeType#, #costWeight#, #overlapDay#)
+        #status#, #computeType#, #costWeight#, #overlapDay#,#reveal#,#sort#)
     </insert>
 
     <delete id="delete">
@@ -195,7 +203,9 @@
         STATUS = #status#,  <!-- 状态0.停止1.启动 -->
         COMPUTE_TYPE = #computeType#,
         COST_WEIGHT = #costWeight#,
-        OVERLAP_DAY = #overlapDay#
+        OVERLAP_DAY = #overlapDay#,
+        REVEAL = #reveal#,
+        SORT = #sort#
         WHERE ID = #id#
     </update>
 

src/main/webapp/HG/BI/components/hipi/002/left-manage-cockpit.vue

@@ -23,15 +23,15 @@
         </div>
       </div>
       <div class="page-content-main" style="flex-wrap: wrap">
-        <div style="width: 45%;height: 30%;display: flex;flex-wrap: wrap;justify-content: space-between;" v-for="(item,index) in queryBySunWtDate"
+        <div style="width: 45%;height: 30%;display: flex;flex-wrap: wrap;justify-content: space-between;" v-for="(item,index) in queryBySunWtList"
              :key="index"
         >
           <div class="page-content-left" style="position: relative">
-            <div class="data-title-span temp"> {{ queryBySunWtList[index] || 0 }}</div>
+            <div class="data-title-span temp"> {{ item.totalWeight || 0 }}</div>
             <div style="width: 100%;display: flex;" class="temp">
               <img  :src="`${ctx}/common/img/produce-img.png`" class="produce-img " alt/>
             </div>
-            <div class="content-main-footer temp" data-process="组立">{{  queryBySunWtDate[index] }}/ 吨</div>
+            <div class="content-main-footer temp" data-process="组立">{{  item.processName }}/ 吨</div>
             <div style="width: 100%;display: flex;" class="temp">
             <img  :src="`${ctx}/common/img/produce-put.png`" v-if="index < 4" alt/>
             </div>

src/main/webapp/HG/SJ/HGSJ001.jsp

@@ -76,6 +76,11 @@
 			                  required="true" defaultValue="1">
 				<EF:EFCodeOption codeName="hpjx.hpjx.status"/>
 			</EF:EFComboColumn>
+			<EF:EFComboColumn ename="reveal" cname="驾驶舱显示" width="100" enable="true" readonly="false" align="center"
+							  required="false" defaultValue="0">
+				<EF:EFCodeOption codeName="hggp.common.yesNo"/>
+			</EF:EFComboColumn>
+			<EF:EFColumn ename="sort" cname="排序" width="80" enable="true" readonly="false" align="center"/>
 			<EF:EFColumn cname="创建人" ename="createdName" align="center" width="100" readonly="true" required="false"
 			             enable="false"/>
 			<EF:EFColumn cname="创建时间" ename="createdTime" parseFormats="['yyyyMMddHHmmss']" editType="datetime"