1.修改询价管理供应商条件

2.调整驾驶舱工序产量小数为4

src/main/java/com/baosight/hggp/hg/cg/service/ServiceHGCG005.java

@@ -35,7 +35,7 @@ public class ServiceHGCG005 extends ServiceEPBase {
 
         try {
             CommonMethod.initBlock(inInfo, Arrays.asList(
-                    DdynamicEnum.SUPPLIER_RECORD_BLOCK_ID,
+                    DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID,
                     DdynamicEnum.USER_BLOCK_ID), null, false);
             inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCG005().eiMetadata);
         } catch (Exception e) {

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

@@ -1078,7 +1078,7 @@
 			h2.factory_name as "factoryName",
 			h2.process_code as "processCode",
 			h2.process_name as "processName",
-		ROUND(ifnull(SUM(h.INV_WEIGHT),0)/1000, 2) "totalWeight"
+		ROUND(ifnull(SUM(h.INV_WEIGHT),0)/1000, 4) "totalWeight"
 		from ${hggpSchema}.hgkc003 h inner join ${hggpSchema}.hgzl002 h2 on h.QUALITY_ID = h2.id
 		where 1 = 1 and h.DELETE_FLAG = '0' and h.SUBMIT_STATUS = '1'
 		<include refid="appCondition"/>
@@ -1098,7 +1098,7 @@
 			h2.factory_name as "factoryName",
 			h2.process_code as "processCode",
 			h2.process_name as "processName",
-			ROUND(ifnull(SUM(h.INV_WEIGHT),0)/1000, 2) "totalWeight"
+			ROUND(ifnull(SUM(h.INV_WEIGHT),0)/1000, 4) "totalWeight"
 		from ${hggpSchema}.hgkc003 h inner join ${hggpSchema}.hgzl002 h2 on h.QUALITY_ID = h2.id
 		where 1 = 1 and h.DELETE_FLAG = '0' and h.SUBMIT_STATUS = '1'
 		<include refid="appCondition"/>
@@ -1238,7 +1238,7 @@
 		select
 			A.process_code as "processCode",
 			A.process_name as "processName",
-			ROUND(ifnull(SUM(B.INV_WEIGHT),0)/1000, 2) "totalWeight"
+			ROUND(ifnull(SUM(B.INV_WEIGHT),0)/1000, 4) "totalWeight"
 		from ${hggpSchema}.HGGY001 A
 		left join (
 			select
@@ -1276,7 +1276,7 @@
 			A.SORT as "sort",
 			A.process_code as "processCode",
 			A.process_name as "processName",
-			ROUND(ifnull(SUM(B.INV_WEIGHT),0)/1000, 2) "totalWeight"
+			ROUND(ifnull(SUM(B.INV_WEIGHT),0)/1000, 4) "totalWeight"
 		from ${hggpSchema}.HGGY001 A
 		left join (
 			select

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

@@ -45,7 +45,7 @@
       <EF:EFColumn ename="inquiryDate" cname="询价日期" align="center" width="150" readonly="true" editType="date"
                    dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
       <EF:EFColumn ename="inquiryNumber" cname="询价单号" enable="false" width="130" align="center" />
-      <EF:EFComboColumn ename="supplierName" cname="供应商名称" blockName="supplier_record_block_id"
+      <EF:EFComboColumn ename="supplierName" cname="供应商名称" blockName="customer_record_block_id"
                         columnTemplate="#=textField#" itemTemplate="#=textField#"
                         textField="textField" valueField="valueField"
                         maxLength="16" readonly="false" width="160" required="true"