显示样式调整

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){

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

@@ -119,7 +119,7 @@ module.exports = {
       sumWtdataList:['dayWeight','monthWeight','yearWeight'],
       getByProcessSumWtList:[],
       queryBySunWtList:[],
-      queryBySunWtDate:['组立','油漆','埋弧盖面','抛丸除锈','拼装','焊接'],
+      queryBySunWtDate:['切割下料','烧焊','车加工','铣加工','动平衡','装配'], //'组立','油漆','埋弧盖面','抛丸除锈','拼装','焊接'
     };
   },
   watch:{

src/main/webapp/HG/CG/HGCG001.jsp

@@ -54,10 +54,10 @@
 			<EF:EFComboColumn ename="status" cname="状态" enable="false" width="80" align="center">
 				<EF:EFCodeOption codeName="hggp.hgcg.planStatus"/>
 			</EF:EFComboColumn>
-			<EF:EFColumn ename="purQty" cname="采购数量" enable="false" width="120" align="right" format="{0:N3}" defaultValue="0"/>
-			<EF:EFColumn ename="purWeight" cname="采购重量" enable="false" width="120" align="right" format="{0:N3}" defaultValue="0"/>
-			<EF:EFColumn ename="planQty" cname="计划数量" enable="false" width="120" align="right" format="{0:N3}" defaultValue="0"/>
-			<EF:EFColumn ename="planWeight" cname="计划重量" enable="false" width="120" align="right" format="{0:N3}" defaultValue="0"/>
+			<EF:EFColumn ename="purQty" cname="采购计划数量" enable="false" width="120" align="right" format="{0:N3}" defaultValue="0"/>
+			<EF:EFColumn ename="purWeight" cname="采购计划重量" enable="false" width="120" align="right" format="{0:N3}" defaultValue="0"/>
+			<EF:EFColumn ename="planQty" cname="材料计划数量" enable="false" width="120" align="right" format="{0:N3}" defaultValue="0"/>
+			<EF:EFColumn ename="planWeight" cname="材料计划重量" enable="false" width="120" align="right" format="{0:N3}" defaultValue="0"/>
 			<EF:EFColumn ename="createdName" cname="创建人" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="createdTime" cname="创建时间" enable="false" width="140" align="center"
 			             editType="datetime" parseFormats="['yyyyMMddHHmmss']"/>

src/main/webapp/HG/CG/HGCG001A.jsp

@@ -44,10 +44,10 @@
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="inventTypeDetail" cname="存货类型大类" hidden="true"/>
 			<EF:EFColumn ename="spec" cname="规格" width="120" align="center" required="true"/>
-			<EF:EFColumn ename="purQty" cname="采购数量" width="120" align="right" format="{0:N3}" required="true"/>
-			<EF:EFColumn ename="purWeight" cname="采购重量" width="120" align="right" format="{0:N3}" required="true"/>
-			<EF:EFColumn ename="planQty" cname="计划数量" enable="false" width="120" align="right" format="{0:N3}"/>
-			<EF:EFColumn ename="planWeight" cname="计划重量" enable="false" width="120" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="purQty" cname="采购计划数量" width="120" align="right" format="{0:N3}" required="true"/>
+			<EF:EFColumn ename="purWeight" cname="采购计划重量" width="120" align="right" format="{0:N3}" required="true"/>
+			<EF:EFColumn ename="planQty" cname="材料计划数量" enable="false" width="120" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="planWeight" cname="材料计划重量" enable="false" width="120" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="material" cname="材质" width="80" align="center" required="true"/>
 			<EF:EFColumn ename="unit" cname="单位" enable="false" width="80" align="center"/>
 			<EF:EFColumn ename="length" cname="长(MM)" width="80" align="right" format="{0:N3}" required="true"/>