Merge branch 'dev' of https://gitlab.baocloud.cn/bggf/smart/hp-smart into dev

src/main/java/com/baosight/hpjx/hp/mt/service/ServiceHPMT001.java

@@ -8,10 +8,7 @@ import com.baosight.hpjx.core.security.UserSessionUtils;
 import com.baosight.hpjx.hp.constant.HPConstant;
 import com.baosight.hpjx.hp.constant.HPSqlConstant;
 import com.baosight.hpjx.hp.zl.domain.HPZL001;
-import com.baosight.hpjx.util.AssertUtils;
-import com.baosight.hpjx.util.EiInfoUtils;
-import com.baosight.hpjx.util.LogUtils;
-import com.baosight.hpjx.util.StringUtil;
+import com.baosight.hpjx.util.*;
 import com.baosight.iplat4j.core.ei.EiBlock;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
@@ -20,10 +17,10 @@ import com.baosight.iplat4j.core.web.threadlocal.UserSession;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
 import org.apache.commons.collections.MapUtils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * 鸿鹏机械APP移动端接口调用处
@@ -56,26 +53,96 @@ public class ServiceHPMT001 extends ServiceBase {
         Map sqlMap = new HashMap();
         sqlMap.put("queryMonth", queryMonth);
         sqlMap.put("companyCode", companyCode);
-        List<Map> row1 = this.dao.query("HPMT001.pmOverview1", sqlMap);
-        List<Map> row2 = this.dao.query("HPMT001.pmOverview2", sqlMap);
+        List<Map> row1 = this.dao.query("HPMT001.pmOverview1", sqlMap);//目标
+        List<Map> row2 = this.dao.query("HPMT001.pmOverview2", sqlMap);//实际
         List<Map> rows = new ArrayList<>();
         Map resultMap = new HashMap();
-        if (BeanUtil.isEmpty(row1.get(0))) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMM");
+        try {
+            Date parse = sdf.parse(queryMonth);
+            Calendar instance = Calendar.getInstance();
+            instance.setTime(parse);
+            instance.add(Calendar.MONTH,-1);
+            String newnewDate = sdf.format(instance.getTime());//上月
+            Map sqlMap2 = new HashMap();
+            sqlMap2.put("queryMonth", newnewDate);
+            sqlMap2.put("companyCode", companyCode);
+            List<Map> row3 = this.dao.query("HPMT001.pmOverview1", sqlMap2);//上月目标
+            List<Map> row4 = this.dao.query("HPMT001.pmOverview2", sqlMap2);//上月实际
+
+            Calendar instance2 = Calendar.getInstance();
+            instance2.setTime(parse);
+            instance2.add(Calendar.YEAR,-1);
+            String newnewDate2 = sdf.format(instance2.getTime());//同年
+            Map sqlMap3 = new HashMap();
+            sqlMap3.put("queryMonth", newnewDate2);
+            sqlMap3.put("companyCode", companyCode);
+            List<Map> row5 = this.dao.query("HPMT001.pmOverview1", sqlMap3);//去年目标
+            List<Map> row6 = this.dao.query("HPMT001.pmOverview2", sqlMap3);//去年实际
+        //目标本月row1-targetWt    实际本月row2-actualWt
+        if (row1.get(0).get("targetWt")==null) {
             resultMap.put("targetWt", 0);
         } else {
             resultMap.put("targetWt", row1.get(0).get("targetWt"));
         }
-        if (BeanUtil.isEmpty(row2.get(0))) {
+        if (row2.get(0).get("actualWt")==null) {
             resultMap.put("actualWt", 0);
         } else {
             resultMap.put("actualWt", row2.get(0).get("actualWt"));
         }
+        //环比  目标上月row3-targetWt  实际上月row4-actualWt
+         if (row3.get(0).get("targetWt")==null) {
+                resultMap.put("targetWt_s", 0);//目标环比值
+                    resultMap.put("target_s_qoq", 0);//目标环比
+         } else {
+                resultMap.put("targetWt_s", row3.get(0).get("targetWt"));
+             BigDecimal targetWt = (BigDecimal) row1.get(0).get("targetWt");
+             BigDecimal targetWt2 = (BigDecimal) row3.get(0).get("targetWt");
+             resultMap.put("target_s_qoq", targetWt.subtract(targetWt2).divide(targetWt2,BigDecimal.ROUND_UP).
+                     multiply(new BigDecimal(100)).doubleValue());
+         }
+            if (row4.get(0).get("actualWt")==null) {
+                resultMap.put("actualWt_s", 0);//实际环比值
+                resultMap.put("actualWt_s_qoq", 0);//实际环比
+            } else {
+                resultMap.put("actualWt_s", row4.get(0).get("actualWt"));
+                BigDecimal actualWt = (BigDecimal) row2.get(0).get("actualWt");
+                BigDecimal actualWt2 = (BigDecimal) row4.get(0).get("actualWt");
+                resultMap.put("actualWt_s_qoq",actualWt.subtract(actualWt2).divide(actualWt2,BigDecimal.ROUND_UP).
+                        multiply(new BigDecimal(100)).doubleValue());
+            }
+         //同比  目标同期row5-targetWt   实际同期row6-actualWt
+            if (row5.get(0).get("targetWt")==null) {
+                resultMap.put("targetWt_h", 0);//目标同期值
+                resultMap.put("target_h_qoq", 0);//目标同期
+            } else {
+                resultMap.put("targetWt_h", row5.get(0).get("targetWt"));
+                BigDecimal targetWt = (BigDecimal) row1.get(0).get("targetWt");
+                BigDecimal targetWt2 = (BigDecimal) row5.get(0).get("targetWt");
+                resultMap.put("target_h_qoq", targetWt.subtract(targetWt2).divide(targetWt2,BigDecimal.ROUND_UP).
+                        multiply(new BigDecimal(100)).doubleValue());
+            }
+            if (row6.get(0).get("actualWt")==null) {
+                resultMap.put("actualWt_h", 0);//实际同比值
+                resultMap.put("actualWt_h_yoy", 0);//实际同比
+            } else {
+                resultMap.put("actualWt_h", row6.get(0).get("actualWt"));
+                BigDecimal actualWt = (BigDecimal) row2.get(0).get("actualWt");
+                BigDecimal actualWt2 = (BigDecimal) row6.get(0).get("actualWt");
+                resultMap.put("actualWt_h_yoy", actualWt.subtract(actualWt2).divide(actualWt2,BigDecimal.ROUND_UP).
+                        multiply(new BigDecimal(100)).doubleValue());
+            }
         rows.add(resultMap);
         EiInfo outInfo = new EiInfo();
         EiBlock eiBlock = new EiBlock(EiConstant.resultBlock);
         eiBlock.setRows(rows);
         outInfo.setBlock(eiBlock);
         return outInfo;
+        } catch (ParseException e) {
+            e.printStackTrace();
+            return inInfo;
+        }
+
     }
 
     /**

src/main/java/com/baosight/hpjx/hp/mt/service/ServiceHPMT002.java

@@ -179,8 +179,8 @@ public class ServiceHPMT002 extends ServiceBase {
             }
             Map Map = new HashMap();
             Map.put("checkId", id);
-            Map.put("docType", "XJ_WC");
-            List<HPZL001A> docIdlist = this.dao.query("HPZL001A.query", Map);
+            Map.put("docType",CommonConstant.YesNo.NO_0);
+            List<HPZL001A> docIdlist = this.dao.query("HPZL001A.queryDev", Map);
             List<String> imgList = new ArrayList<>();
             for (int i = 0; i < docIdlist.size(); i++) {
                 Map dirId = new HashMap();
@@ -193,6 +193,23 @@ public class ServiceHPMT002 extends ServiceBase {
                 String imgBase64 = UploadUtils.imageToBase64(bf);
                 imgList.add(imgBase64);
             }
+            //处理的文件
+            Map Map2 = new HashMap();
+            Map2.put("checkId", id);
+            Map2.put("docType",CommonConstant.YesNo.NO_0);
+            List<HPZL001A> docIdlist2 = this.dao.query("HPZL001A.queryDev", Map);
+            List<String> imgList2 = new ArrayList<>();
+            for (int i = 0; i < docIdlist2.size(); i++) {
+                Map dirId = new HashMap();
+                HPZL001A hpzl001A = docIdlist.get(i);
+                String docId = hpzl001A.getDocId();
+                dirId.put("docId", docId);
+                List<Map> query = this.dao.query("HPMT002.queryFile", dirId);
+                File file = new File(UploadUtils.ROOT_PATH + "/A/" + query.get(0).get("CHG_NAME"));
+                BufferedImage bf = ImageIO.read(file);
+                String imgBase64 = UploadUtils.imageToBase64(bf);
+                imgList2.add(imgBase64);
+            }
             Map sqlMap = new HashMap();
             sqlMap.put("companyCode", companyCode);
             sqlMap.put("id", id);
@@ -201,6 +218,7 @@ public class ServiceHPMT002 extends ServiceBase {
             eiBlock.setRows(rows);
             outInfo.setBlock(eiBlock);
             outInfo.set("img",imgList);
+            outInfo.set("img2",imgList2);
         } catch (Exception e){
             outInfo.setMsg("账号异常");
         }

src/main/java/com/baosight/hpjx/hp/mt/sql/HPMT002.xml

@@ -93,7 +93,7 @@
                 SUB_INVENT_CODE as "subInventCode",  <!-- 零件编码 -->
                 SUB_INVENT_NAME as "subInventName",  <!-- 零件名称 -->
                 FACTORY_CODE as "factoryCode",  <!-- 厂区编码 -->
-                FACTORY_NAME as "factoryName",  <!-- 厂区名称 -->
+                FACTORY_NAME as "factoryName",  <!-- 工厂 -->
                 ORG_NO as "orgNo",  <!-- 生产组编码 -->
                 ORG_NAME as "orgName",  <!-- 生产组名称 -->
                 POOR_TYPE as "poorType",  <!-- 不良品类 -->
@@ -137,7 +137,7 @@
                 SUB_INVENT_CODE as "subInventCode",  <!-- 零件编码 -->
                 SUB_INVENT_NAME as "subInventName",  <!-- 零件名称 -->
                 FACTORY_CODE as "factoryCode",  <!-- 厂区编码 -->
-                FACTORY_NAME as "factoryName",  <!-- 厂区名称 -->
+                FACTORY_NAME as "factoryName",  <!-- 工厂 -->
                 ORG_NO as "orgNo",  <!-- 生产组编码 -->
                 ORG_NAME as "orgName",  <!-- 生产组名称 -->
                 POOR_TYPE as "poorType",  <!-- 不良品类 -->
@@ -173,7 +173,7 @@
                 SUB_INVENT_CODE,  <!-- 零件编码 -->
                 SUB_INVENT_NAME,  <!-- 零件名称 -->
                 FACTORY_CODE as "factoryCode",  <!-- 厂区编码 -->
-                FACTORY_NAME as "factoryName",  <!-- 厂区名称 -->
+                FACTORY_NAME as "factoryName",  <!-- 工厂 -->
                 ORG_NO,  <!-- 生产组编码 -->
                 ORG_NAME,  <!-- 生产组名称 -->
                 POOR_TYPE,  <!-- 不良品类 -->

src/main/java/com/baosight/hpjx/hp/pz/domain/HPPZ011.java

@@ -30,7 +30,7 @@ public class HPPZ011 extends DaoEPBase {
 	public static final String FIELD_UPDATED_NAME = "updatedName";            /* 更新人名称*/
 	public static final String FIELD_UPDATED_TIME = "updatedTime";            /* 更新时间*/
 	public static final String FIELD_FACTORY_CODE = "factoryCode";            /* 厂区编码*/
-	public static final String FIELD_FACTORY_NAME = "factoryName";            /* 厂区名称*/
+	public static final String FIELD_FACTORY_NAME = "factoryName";            /* 工厂*/
 	public static final String FIELD_GROUP_CODE = "groupCode";            /* 生产组编码*/
 	public static final String FIELD_GROUP_NAME = "groupName";            /* 生产组名称*/
 	public static final String FIELD_GROUP_TYPE = "groupType";            /* 组类型*/
@@ -46,7 +46,7 @@ public class HPPZ011 extends DaoEPBase {
 	public static final String COL_UPDATED_NAME = "UPDATED_NAME";            /* 更新人名称*/
 	public static final String COL_UPDATED_TIME = "UPDATED_TIME";            /* 更新时间*/
 	public static final String COL_FACTORY_CODE = "FACTORY_CODE";            /* 厂区编码*/
-	public static final String COL_FACTORY_NAME = "FACTORY_NAME";            /* 厂区名称*/
+	public static final String COL_FACTORY_NAME = "FACTORY_NAME";            /* 工厂*/
 	public static final String COL_GROUP_CODE = "GROUP_CODE";            /* 生产组编码*/
 	public static final String COL_GROUP_NAME = "GROUP_NAME";            /* 生产组名称*/
 	public static final String COL_GROUP_TYPE = "GROUP_TYPE";            /* 组类型*/
@@ -70,7 +70,7 @@ public class HPPZ011 extends DaoEPBase {
 	private String updatedName = " ";        /* 更新人名称*/
 	private String updatedTime = " ";        /* 更新时间*/
 	private String factoryCode = " ";        /* 厂区编码*/
-	private String factoryName = " ";        /* 厂区名称*/
+	private String factoryName = " ";        /* 工厂*/
 	private String groupCode = " ";        /* 生产组编码*/
 	private String groupName = " ";        /* 生产组名称*/
 	private String groupType = " ";        /* 组类型*/
@@ -131,7 +131,7 @@ public class HPPZ011 extends DaoEPBase {
 		eiMetadata.addMeta(eiColumn);
 		
 		eiColumn = new EiColumn(FIELD_FACTORY_NAME);
-		eiColumn.setDescName("厂区名称");
+		eiColumn.setDescName("工厂");
 		eiMetadata.addMeta(eiColumn);
 		
 		eiColumn = new EiColumn(FIELD_GROUP_CODE);

src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ011.java

@@ -121,7 +121,7 @@ public class ServiceHPPZ011 extends ServiceBase {
 		for (int i = 0; i < resultRows.size(); i++) {
 			HPPZ011 fPz011 = new HPPZ011();
 			fPz011.fromMap(resultRows.get(i));
-			AssertUtils.isEmpty(fPz011.getFactoryName(), "厂区名称不能为空");
+			AssertUtils.isEmpty(fPz011.getFactoryName(), "工厂不能为空");
 			AssertUtils.isEmpty(fPz011.getGroupCode(), "生产组名不能为空");
 		}
 	}

src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ013.java

@@ -140,7 +140,7 @@ public class ServiceHPPZ013 extends ServiceBase {
 	 * @param fPz01301
 	 */
 	private void setBaseInfo(HPPZ01301 fPz01301) {
-		// 厂区名称
+		// 工厂
 		fPz01301.setFactoryName(HPXSTools.XsOrg.get(fPz01301.getFactoryCode()).getOrgCname());
 		// 组名称
 		fPz01301.setGroupName(HPXSTools.XsOrg.get(fPz01301.getGroupCode()).getOrgCname());

src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ014.java

@@ -136,7 +136,7 @@ public class ServiceHPPZ014 extends ServiceBase {
 	 * @param fPz014
 	 */
 	private void setBaseInfo(HPPZ014 fPz014) {
-		// 厂区名称
+		// 工厂
 		fPz014.setFactoryName(HPXSTools.XsOrg.get(fPz014.getFactoryCode()).getOrgCname());
 		// 组名称
 		fPz014.setGroupName(HPXSTools.XsOrg.get(fPz014.getGroupCode()).getOrgCname());

src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ011.xml

@@ -13,7 +13,7 @@
         A.UPDATED_NAME as "updatedName",  <!-- 更新人名称 -->
         A.UPDATED_TIME as "updatedTime", <!-- 更新时间 -->
         A.FACTORY_CODE as "factoryCode",  <!-- 厂区编码 -->
-        A.FACTORY_NAME as "factoryName",  <!-- 厂区名称 -->
+        A.FACTORY_NAME as "factoryName",  <!-- 工厂 -->
         A.GROUP_CODE as "groupCode",  <!-- 生产组编码 -->
         A.GROUP_TYPE as "groupType",  <!-- 组类型 -->
         B.ORG_CNAME as "groupName"  <!-- 生产组名称 -->
@@ -30,7 +30,7 @@
         A.UPDATED_NAME as "updatedName",  <!-- 更新人名称 -->
         A.UPDATED_TIME as "updatedTime", <!-- 更新时间 -->
         A.FACTORY_CODE as "factoryCode",  <!-- 厂区编码 -->
-        A.FACTORY_NAME as "factoryName",  <!-- 厂区名称 -->
+        A.FACTORY_NAME as "factoryName",  <!-- 工厂 -->
         A.GROUP_CODE as "groupCode",  <!-- 生产组编码 -->
         A.GROUP_TYPE as "groupType",  <!-- 组类型 -->
         A.GROUP_NAME as "groupName"  <!-- 生产组名称 -->
@@ -144,7 +144,7 @@
             COMPANY_CODE,  <!-- 企业编码 预留 -->
             DEP_CODE,  <!-- 部门编码 预留 -->
             FACTORY_CODE,  <!-- 厂区编码 -->
-            FACTORY_NAME,  <!-- 厂区名称 -->
+            FACTORY_NAME,  <!-- 工厂 -->
             GROUP_CODE,  <!-- 生产组编码 -->
             GROUP_NAME,  <!-- 生产组名称 -->
             GROUP_TYPE,  <!-- 组类型 -->
@@ -167,7 +167,7 @@
         UPDATE ${hpjxSchema}.T_HPPZ011
         SET
             FACTORY_CODE = #factoryCode#,   <!-- 厂区编码 -->
-            FACTORY_NAME = #factoryName#,   <!-- 厂区名称 -->
+            FACTORY_NAME = #factoryName#,   <!-- 工厂 -->
             GROUP_CODE = #groupCode#,   <!-- 组编码 -->
             GROUP_NAME = #groupName#,   <!-- 组名称 -->
             GROUP_TYPE = #groupType#,   <!-- 组类型 -->
@@ -181,7 +181,7 @@
     <select id="queryComboBox" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
         SELECT DISTINCT
         FACTORY_CODE as "factoryCode",  <!-- 厂区编码 -->
-        FACTORY_NAME as "factoryName"  <!-- 厂区名称 -->
+        FACTORY_NAME as "factoryName"  <!-- 工厂 -->
         FROM ${hpjxSchema}.T_HPPZ011
         WHERE DELETE_FLAG = 0
         <isNotEmpty prepend=" AND " property="companyCode">
@@ -213,7 +213,7 @@
     <select id="queryComboBoxAll" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
         SELECT DISTINCT
         A.FACTORY_CODE as "factoryCode",  <!-- 厂区编码 -->
-        A.FACTORY_NAME as "factoryName",  <!-- 厂区名称 -->
+        A.FACTORY_NAME as "factoryName",  <!-- 工厂 -->
         A.GROUP_CODE as "groupCode",  <!-- 组编码 -->
         B.ORG_CNAME as "groupName"  <!-- 组名称 -->
         FROM ${hpjxSchema}.T_HPPZ011 A, ${platSchema}.TXSOG01 B

src/main/java/com/baosight/hpjx/hp/pz/tools/HPPZTools.java

@@ -71,7 +71,7 @@ public class HPPZTools {
 		 * @return
 		 */
 		public static HPPZ011 getByName(String factoryName) {
-			AssertUtils.isEmpty(factoryName, "厂区名称不能为空");
+			AssertUtils.isEmpty(factoryName, "工厂不能为空");
 			Map queryMap = new HashMap();
 			queryMap.put("factoryName", factoryName);
 			List<HPPZ011> dbPz011s = DaoBase.getInstance().query(HPSqlConstant.HPPZ011.GET, queryMap);
@@ -79,7 +79,7 @@ public class HPPZTools {
 		}
 		
 		/**
-		 * 查询厂区名称
+		 * 查询工厂
 		 *
 		 * @param factoryCode
 		 * @return

src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC005.java

@@ -51,7 +51,7 @@ public class HPSC005 extends DaoEPBase {
 	public static final String FIELD_UNASSIGNED_NUM = "unassignedNum";    		/* 待派工数量*/
 	public static final String FIELD_STATUS = "status";    		/* 状态:0.计划中,1.不分派工,2.全部派工*/
 	public static final String FIELD_FACTORY_CODE = "factoryCode";    		/* 厂区编码*/
-	public static final String FIELD_FACTORY_NAME = "factoryName";    		/* 厂区名称*/
+	public static final String FIELD_FACTORY_NAME = "factoryName";    		/* 工厂*/
 	public static final String FIELD_ORG_NO = "orgNo";    		/* 生产组编码*/
 	public static final String FIELD_ORG_NAME = "orgName";    		/* 生产组名称*/
 	public static final String FIELD_DOCUMENT_TYPE = "documentType";    		/* 单据类型 0-非子母单；1-子母单*/
@@ -100,7 +100,7 @@ public class HPSC005 extends DaoEPBase {
 	public static final String COL_UNASSIGNED_NUM = "UNASSIGNED_NUM";    		/* 待派工数量*/
 	public static final String COL_STATUS = "STATUS";    		/* 状态:0.计划中,1.不分派工,2.全部派工*/
 	public static final String COL_FACTORY_CODE = "FACTORY_CODE";    		/* 厂区编码*/
-	public static final String COL_FACTORY_NAME = "FACTORY_NAME";    		/* 厂区名称*/
+	public static final String COL_FACTORY_NAME = "FACTORY_NAME";    		/* 工厂*/
 	public static final String COL_ORG_NO = "ORG_NO";    		/* 生产组编码*/
 	public static final String COL_ORG_NAME = "ORG_NAME";    		/* 生产组名称*/
 	public static final String COL_DOCUMENT_TYPE = "DOCUMENT_TYPE";    		/* 单据类型 0-非子母单；1-子母单*/
@@ -153,7 +153,7 @@ public class HPSC005 extends DaoEPBase {
 	private BigDecimal unassignedNum = new BigDecimal("0");		/* 待派工数量*/
 	private Integer status;		/* 状态:0.计划中,1.不分派工,2.全部派工*/
 	private String factoryCode = " ";		/* 厂区编码*/
-	private String factoryName = " ";		/* 厂区名称*/
+	private String factoryName = " ";		/* 工厂*/
 	private String orgNo = " ";		/* 生产组编码*/
 	private String orgName = " ";		/* 生产组名称*/
 	private Integer documentType;	/* 单据类型 0-非子母单；1-子母单*/
@@ -326,7 +326,7 @@ public class HPSC005 extends DaoEPBase {
 		eiMetadata.addMeta(eiColumn);
 
 		eiColumn = new EiColumn(FIELD_FACTORY_NAME);
-		eiColumn.setDescName("厂区名称");
+		eiColumn.setDescName("工厂");
 		eiMetadata.addMeta(eiColumn);
 
 		eiColumn = new EiColumn(FIELD_ORG_NO);
@@ -858,7 +858,7 @@ public class HPSC005 extends DaoEPBase {
 		this.factoryCode = factoryCode;
 	}
 	/**
-	 * get the factoryName - 厂区名称.
+	 * get the factoryName - 工厂.
 	 * @return the factoryName
 	 */
 	public String getFactoryName() {
@@ -866,9 +866,9 @@ public class HPSC005 extends DaoEPBase {
 	}
 
 	/**
-	 * set the factoryName - 厂区名称.
+	 * set the factoryName - 工厂.
 	 *
-	 * @param factoryName - 厂区名称
+	 * @param factoryName - 工厂
 	 */
 	public void setFactoryName(String factoryName) {
 		this.factoryName = factoryName;

src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC005A.java

@@ -33,7 +33,7 @@ public class HPSC005A extends DaoEPBase {
 	public static final String FIELD_ORG_NO = "orgNo";    		/* 生产组编码*/
 	public static final String FIELD_ORG_NAME = "orgName";    		/* 生产组名称*/
 	public static final String FIELD_FACTORY_CODE = "factoryCode";    		/* 厂区编码*/
-	public static final String FIELD_FACTORY_NAME = "factoryName";    		/* 厂区名称*/
+	public static final String FIELD_FACTORY_NAME = "factoryName";    		/* 工厂*/
 	public static final String FIELD_CREATED_BY = "createdBy";    		/* 创建人*/
 	public static final String FIELD_CREATED_NAME = "createdName";    		/* 创建人名称*/
 	public static final String FIELD_CREATED_TIME = "createdTime";    		/* 创建时间*/
@@ -52,7 +52,7 @@ public class HPSC005A extends DaoEPBase {
 	public static final String COL_ORG_NO = "ORG_NO";    		/* 生产组编码*/
 	public static final String COL_ORG_NAME = "ORG_NAME";    		/* 生产组名称*/
 	public static final String COL_FACTORY_CODE = "FACTORY_CODE";    		/* 厂区编码*/
-	public static final String COL_FACTORY_NAME = "FACTORY_NAME";    		/* 厂区名称*/
+	public static final String COL_FACTORY_NAME = "FACTORY_NAME";    		/* 工厂*/
 	public static final String COL_CREATED_BY = "CREATED_BY";    		/* 创建人*/
 	public static final String COL_CREATED_NAME = "CREATED_NAME";    		/* 创建人名称*/
 	public static final String COL_CREATED_TIME = "CREATED_TIME";    		/* 创建时间*/
@@ -77,7 +77,7 @@ public class HPSC005A extends DaoEPBase {
 	private String orgNo = " ";		/* 生产组编码*/
 	private String orgName = " ";		/* 生产组名称*/
 	private String factoryCode = " ";		/* 厂区编码*/
-	private String factoryName = " ";		/* 厂区名称*/
+	private String factoryName = " ";		/* 工厂*/
 	private String createdBy = " ";		/* 创建人*/
 	private String createdName = " ";		/* 创建人名称*/
 	private String createdTime = " ";		/* 创建时间*/
@@ -146,7 +146,7 @@ public class HPSC005A extends DaoEPBase {
 		eiMetadata.addMeta(eiColumn);
 		
 		eiColumn = new EiColumn(FIELD_FACTORY_NAME);
-		eiColumn.setDescName("厂区名称");
+		eiColumn.setDescName("工厂");
 		eiMetadata.addMeta(eiColumn);
 		
 		eiColumn = new EiColumn(FIELD_CREATED_BY);
@@ -360,7 +360,7 @@ public class HPSC005A extends DaoEPBase {
 		this.factoryCode = factoryCode;
 	}
 	/**
-	 * get the factoryName - 厂区名称.
+	 * get the factoryName - 工厂.
 	 * @return the factoryName
 	 */
 	public String getFactoryName() {
@@ -368,9 +368,9 @@ public class HPSC005A extends DaoEPBase {
 	}
 	
 	/**
-	 * set the factoryName - 厂区名称.
+	 * set the factoryName - 工厂.
 	 *
-	 * @param factoryName - 厂区名称
+	 * @param factoryName - 工厂
 	 */
 	public void setFactoryName(String factoryName) {
 		this.factoryName = factoryName;

src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC005C.java

@@ -51,7 +51,7 @@ public class HPSC005C extends DaoEPBase {
 	public static final String FIELD_UNASSIGNED_NUM = "unassignedNum";    		/* 待派工数量*/
 	public static final String FIELD_STATUS = "status";    		/* 状态:0.计划中,1.不分派工,2.全部派工*/
 	public static final String FIELD_FACTORY_CODE = "factoryCode";    		/* 厂区编码*/
-	public static final String FIELD_FACTORY_NAME = "factoryName";    		/* 厂区名称*/
+	public static final String FIELD_FACTORY_NAME = "factoryName";    		/* 工厂*/
 	public static final String FIELD_ORG_NO = "orgNo";    		/* 生产组编码*/
 	public static final String FIELD_ORG_NAME = "orgName";    		/* 生产组名称*/
 	public static final String FIELD_DOCUMENT_TYPE = "documentType";    		/* 单据类型 0-非子母单；1-子母单*/
@@ -102,7 +102,7 @@ public class HPSC005C extends DaoEPBase {
 	public static final String COL_UNASSIGNED_NUM = "UNASSIGNED_NUM";    		/* 待派工数量*/
 	public static final String COL_STATUS = "STATUS";    		/* 状态:0.计划中,1.不分派工,2.全部派工*/
 	public static final String COL_FACTORY_CODE = "FACTORY_CODE";    		/* 厂区编码*/
-	public static final String COL_FACTORY_NAME = "FACTORY_NAME";    		/* 厂区名称*/
+	public static final String COL_FACTORY_NAME = "FACTORY_NAME";    		/* 工厂*/
 	public static final String COL_ORG_NO = "ORG_NO";    		/* 生产组编码*/
 	public static final String COL_ORG_NAME = "ORG_NAME";    		/* 生产组名称*/
 	public static final String COL_DOCUMENT_TYPE = "DOCUMENT_TYPE";    		/* 单据类型 0-非子母单；1-子母单*/
@@ -155,7 +155,7 @@ public class HPSC005C extends DaoEPBase {
 	private BigDecimal unassignedNum = new BigDecimal("0");		/* 待派工数量*/
 	private Integer status;		/* 状态:0.计划中,1.不分派工,2.全部派工*/
 	private String factoryCode = " ";		/* 厂区编码*/
-	private String factoryName = " ";		/* 厂区名称*/
+	private String factoryName = " ";		/* 工厂*/
 	private String orgNo = " ";		/* 生产组编码*/
 	private String orgName = " ";		/* 生产组名称*/
 	private Boolean documentType;	/* 单据类型 0-非子母单；1-子母单*/
@@ -331,7 +331,7 @@ public class HPSC005C extends DaoEPBase {
 		eiMetadata.addMeta(eiColumn);
 
 		eiColumn = new EiColumn(FIELD_FACTORY_NAME);
-		eiColumn.setDescName("厂区名称");
+		eiColumn.setDescName("工厂");
 		eiMetadata.addMeta(eiColumn);
 
 		eiColumn = new EiColumn(FIELD_ORG_NO);
@@ -884,7 +884,7 @@ public class HPSC005C extends DaoEPBase {
 		this.factoryCode = factoryCode;
 	}
 	/**
-	 * get the factoryName - 厂区名称.
+	 * get the factoryName - 工厂.
 	 * @return the factoryName
 	 */
 	public String getFactoryName() {
@@ -892,9 +892,9 @@ public class HPSC005C extends DaoEPBase {
 	}
 	
 	/**
-	 * set the factoryName - 厂区名称.
+	 * set the factoryName - 工厂.
 	 *
-	 * @param factoryName - 厂区名称
+	 * @param factoryName - 工厂
 	 */
 	public void setFactoryName(String factoryName) {
 		this.factoryName = factoryName;

src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC006.java

@@ -45,7 +45,7 @@ public class HPSC006 extends DaoEPBase {
     public static final String FIELD_ORG_NO = "orgNo";    		/* 生产组编码*/
     public static final String FIELD_ORG_NAME = "orgName";    		/* 生产组名称*/
     public static final String FIELD_FACTORY_CODE = "factoryCode";    		/* 厂区编码*/
-    public static final String FIELD_FACTORY_NAME = "factoryName";    		/* 厂区名称*/
+    public static final String FIELD_FACTORY_NAME = "factoryName";    		/* 工厂*/
     public static final String FIELD_CREATED_BY = "createdBy";    		/* 创建人*/
     public static final String FIELD_CREATED_TIME = "createdTime";    		/* 创建时间*/
     public static final String FIELD_UPDATED_BY = "updatedBy";    		/* 更新人*/
@@ -87,7 +87,7 @@ public class HPSC006 extends DaoEPBase {
     public static final String COL_ORG_NO = "ORG_NO";    		/* 生产组编码*/
     public static final String COL_ORG_NAME = "ORG_NAME";    		/* 生产组名称*/
     public static final String COL_FACTORY_CODE = "FACTORY_CODE";    		/* 厂区编码*/
-    public static final String COL_FACTORY_NAME = "FACTORY_NAME";    		/* 厂区名称*/
+    public static final String COL_FACTORY_NAME = "FACTORY_NAME";    		/* 工厂*/
     public static final String COL_CREATED_BY = "CREATED_BY";    		/* 创建人*/
     public static final String COL_CREATED_TIME = "CREATED_TIME";    		/* 创建时间*/
     public static final String COL_UPDATED_BY = "UPDATED_BY";    		/* 更新人*/
@@ -133,7 +133,7 @@ public class HPSC006 extends DaoEPBase {
     private String orgNo = " ";		/* 生产组编码*/
     private String orgName = " ";		/* 生产组名称*/
     private String factoryCode = " ";		/* 厂区编码*/
-    private String factoryName = " ";		/* 厂区名称*/
+    private String factoryName = " ";		/* 工厂*/
     private String createdBy = " ";		/* 创建人*/
     private String createdTime = " ";		/* 创建时间*/
     private String updatedBy = " ";		/* 更新人*/
@@ -273,7 +273,7 @@ public class HPSC006 extends DaoEPBase {
         eiMetadata.addMeta(eiColumn);
 
         eiColumn = new EiColumn(FIELD_FACTORY_NAME);
-        eiColumn.setDescName("厂区名称");
+        eiColumn.setDescName("工厂");
         eiMetadata.addMeta(eiColumn);
 
         eiColumn = new EiColumn(FIELD_CREATED_BY);
@@ -705,7 +705,7 @@ public class HPSC006 extends DaoEPBase {
         this.factoryCode = factoryCode;
     }
     /**
-     * get the factoryName - 厂区名称.
+     * get the factoryName - 工厂.
      * @return the factoryName
      */
     public String getFactoryName() {
@@ -713,9 +713,9 @@ public class HPSC006 extends DaoEPBase {
     }
 
     /**
-     * set the factoryName - 厂区名称.
+     * set the factoryName - 工厂.
      *
-     * @param factoryName - 厂区名称
+     * @param factoryName - 工厂
      */
     public void setFactoryName(String factoryName) {
         this.factoryName = factoryName;

src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC098.java

@@ -11,7 +11,7 @@ import java.util.Map;
 public class HPSC098 extends DaoEPBase {
 
     private String factoryCode = " ";		/* 厂区编码*/
-    private String factoryName = " ";		/* 厂区名称*/
+    private String factoryName = " ";		/* 工厂*/
     private String groupCode = " ";		/* 组织编码*/
     private String groupName = " ";		/* 组织名称 */
     /**
@@ -24,7 +24,7 @@ public class HPSC098 extends DaoEPBase {
         eiMetadata.addMeta(eiColumn);
 
         eiColumn = new EiColumn("factoryName");
-        eiColumn.setDescName("厂区名称");
+        eiColumn.setDescName("工厂");
         eiMetadata.addMeta(eiColumn);
 
         eiColumn = new EiColumn("groupCode");

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC002.java

@@ -659,7 +659,7 @@ public class ServiceHPSC002 extends ServiceBase {
                 DaoUtils.update("HPSC002.check",map2);
 
                 //处理项目管理中物料状态
-                HPSCTools.updateProjStatus(hppz002.getProjCode());
+                HPSCTools.updateProjStatus(THPSC002.getProjCode());
 
             }
         } catch (PlatException e) {

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC005A.java

@@ -269,7 +269,7 @@ public class ServiceHPSC005A extends ServiceBase {
 	 * @param fSc005a
 	 */
 	private void setBaseInfo(HPSC005A fSc005a) {
-		// 厂区名称
+		// 工厂
 		fSc005a.setFactoryName(HPXSTools.XsOrg.get(fSc005a.getFactoryCode()).getOrgCname());
 		// 生产组名称
 		fSc005a.setOrgName(HPXSTools.XsOrg.get(fSc005a.getOrgNo()).getOrgCname());

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC005.xml

@@ -32,7 +32,7 @@
         UNASSIGNED_NUM as "unassignedNum",  <!-- 待派工数量 -->
         STATUS as "status",  <!-- 状态:0.计划中,1.不分派工,2.全部派工 -->
         FACTORY_CODE as "factoryCode",  <!-- 厂区编码 -->
-        FACTORY_NAME as "factoryName",  <!-- 厂区名称 -->
+        FACTORY_NAME as "factoryName",  <!-- 工厂 -->
         ORG_NO as "orgNo",  <!-- 生产组编码 -->
         ORG_NAME as "orgName",  <!-- 生产组名称 -->
         DOCUMENT_TYPE as "documentType",  <!-- 单据类型 0-非子母单；1-子母单 -->
@@ -187,7 +187,7 @@
             UNASSIGNED_NUM,  <!-- 待派工数量 -->
             STATUS,  <!-- 状态:0.计划中,1.不分派工,2.全部派工 -->
             FACTORY_CODE,  <!-- 厂区编码 -->
-            FACTORY_NAME,  <!-- 厂区名称 -->
+            FACTORY_NAME,  <!-- 工厂 -->
             ORG_NO,  <!-- 生产组编码 -->
             ORG_NAME,  <!-- 生产组名称 -->
             DOCUMENT_TYPE,  <!-- 单据类型 0-非子母单；1-子母单 -->
@@ -249,7 +249,7 @@
             UNASSIGNED_NUM = #unassignedNum#,   <!-- 待派工数量 -->
             STATUS = #status#,   <!-- 状态:0.计划中,1.不分派工,2.全部派工 -->
             FACTORY_CODE = #factoryCode#,   <!-- 厂区编码 -->
-            FACTORY_NAME = #factoryName#,   <!-- 厂区名称 -->
+            FACTORY_NAME = #factoryName#,   <!-- 工厂 -->
             ORG_NO = #orgNo#,   <!-- 生产组编码 -->
             ORG_NAME = #orgName#,   <!-- 生产组名称 -->
             DOCUMENT_TYPE = #documentType#,   <!-- 单据类型 0-非子母单；1-子母单 -->
@@ -274,7 +274,7 @@
         STATUS = #status#,   <!-- 状态   0-未派工，1-已派工 -->
         ORG_NO = #orgNo#,   <!-- 生产组编码 -->
         FACTORY_CODE = #factoryCode#,   <!-- 厂区编码 -->
-        FACTORY_NAME = #factoryName#,   <!-- 厂区名称 -->
+        FACTORY_NAME = #factoryName#,   <!-- 工厂 -->
         <include refid="updateRevise"/>
         WHERE ID = #id#
 	</update>

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC005A.xml

@@ -14,7 +14,7 @@
         ORG_NO as "orgNo",  <!-- 生产组编码 -->
         ORG_NAME as "orgName",  <!-- 生产组名称 -->
         FACTORY_CODE as "factoryCode",  <!-- 厂区编码 -->
-        FACTORY_NAME as "factoryName",  <!-- 厂区名称 -->
+        FACTORY_NAME as "factoryName",  <!-- 工厂 -->
         CREATED_BY as "createdBy",  <!-- 创建人 -->
         CREATED_NAME as "createdName",  <!-- 创建人名称 -->
         CREATED_TIME as "createdTime",  <!-- 创建时间 -->
@@ -123,7 +123,7 @@
             ORG_NO,  <!-- 生产组编码 -->
             ORG_NAME,  <!-- 生产组名称 -->
             FACTORY_CODE,  <!-- 厂区编码 -->
-            FACTORY_NAME,  <!-- 厂区名称 -->
+            FACTORY_NAME,  <!-- 工厂 -->
             CREATED_BY,  <!-- 创建人 -->
             CREATED_NAME,  <!-- 创建人名称 -->
             CREATED_TIME  <!-- 创建时间 -->

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC005B.xml

@@ -32,7 +32,7 @@
         B.COMPLETE_NUM as "completeNum",  <!-- 完成数量 -->
         (B.NUM - B.COMPLETE_NUM) as "unCompleteNum",  <!-- 剩余数量 -->
         B.FACTORY_CODE as "factoryCode",  <!-- 厂区编码 -->
-        B.FACTORY_NAME as "factoryName",  <!-- 厂区名称 -->
+        B.FACTORY_NAME as "factoryName",  <!-- 工厂 -->
         B.ORG_NO as "orgNo",
         B.ORG_NAME as "orgName",
         C.PROD_TASK_NO as "zlprodTaskNo"

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC005C.xml

@@ -42,7 +42,7 @@
 		PART_WIDTH as "partWidth",  <!-- 宽 -->
 		PART_THICK as "partThick",  <!-- 厚 -->
 		FACTORY_CODE as "factoryCode",  <!-- 厂区编码 -->
-		FACTORY_NAME as "factoryName",  <!-- 厂区名称 -->
+		FACTORY_NAME as "factoryName",  <!-- 工厂 -->
 		ASSIGNED_NUM as "assignedNum",  <!-- 已派工数量 -->
 		UNASSIGNED_NUM as "unassignedNum",  <!-- 待派工数量 -->
 		DOCUMENT_TYPE as "documentType"  <!-- 单据类型 0-非子母单；1-子母单 -->
@@ -88,7 +88,7 @@
 		A.PART_WIDTH as "partWidth",  <!-- 宽 -->
 		A.PART_THICK as "partThick",  <!-- 厚 -->
 		A.FACTORY_CODE as "factoryCode",  <!-- 厂区编码 -->
-		A.FACTORY_NAME as "factoryName",  <!-- 厂区名称 -->
+		A.FACTORY_NAME as "factoryName",  <!-- 工厂 -->
 		A.ASSIGNED_NUM as "assignedNum",  <!-- 已派工数量 -->
 		A.UNASSIGNED_NUM as "unassignedNum",  <!-- 待派工数量 -->
 		A.DOCUMENT_TYPE as "documentType",  <!-- 单据类型 0-非子母单；1-子母单 -->

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC006.xml

@@ -62,7 +62,7 @@
 		ORG_NO	as "orgNo",  <!-- 生产组编码 -->
 		ORG_NAME	as "orgName",  <!-- 生产组名称 -->
 		FACTORY_CODE	as "factoryCode",  <!-- 厂区编码 -->
-		FACTORY_NAME	as "factoryName",  <!-- 厂区名称 -->
+		FACTORY_NAME	as "factoryName",  <!-- 工厂 -->
 		CREATED_BY	as "createdBy",  <!-- 创建人 -->
 		CREATED_TIME	as "createdTime",  <!-- 创建时间 -->
 		UPDATED_BY	as "updatedBy",  <!-- 更新人 -->
@@ -231,7 +231,7 @@
 		ORG_NO,  <!-- 生产组编码 -->
 		ORG_NAME,  <!-- 生产组名称 -->
 		FACTORY_CODE,  <!-- 厂区编码 -->
-		FACTORY_NAME,  <!-- 厂区名称 -->
+		FACTORY_NAME,  <!-- 工厂 -->
 		CREATED_BY,  <!-- 创建人 -->
 		CREATED_TIME,  <!-- 创建时间 -->
 		UPDATED_BY,  <!-- 更新人 -->
@@ -279,7 +279,7 @@
 		ORG_NO	= #orgNo#,   <!-- 生产组编码 -->
 		ORG_NAME	= #orgName#,   <!-- 生产组名称 -->
 		FACTORY_CODE	= #factoryCode#,   <!-- 厂区编码 -->
-		FACTORY_NAME	= #factoryName#,   <!-- 厂区名称 -->
+		FACTORY_NAME	= #factoryName#,   <!-- 工厂 -->
 		CREATED_BY	= #createdBy#,   <!-- 创建人 -->
 		CREATED_TIME	= #createdTime#,   <!-- 创建时间 -->
 		UPDATED_BY	= #updatedBy#,   <!-- 更新人 -->
@@ -299,7 +299,7 @@
 		ORG_NO	= #orgNo#,   <!-- 生产组编码 -->
 		ORG_NAME	= #orgName#,
 		FACTORY_CODE = #factoryCode#,   <!-- 厂区编码 -->
-		FACTORY_NAME = #factoryName#,   <!-- 厂区名称 -->
+		FACTORY_NAME = #factoryName#,   <!-- 工厂 -->
 		UPDATED_BY	= #updatedBy#,   <!-- 更新人 -->
 		UPDATED_TIME	= #updatedTime#   <!-- 更新时间 -->
 		WHERE

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC006A.xml

@@ -62,7 +62,7 @@
 		ORG_NO	as "orgNo",  <!-- 生产组编码 -->
 		ORG_NAME	as "orgName",  <!-- 生产组名称 -->
 		FACTORY_CODE	as "factoryCode",  <!-- 厂区编码 -->
-		FACTORY_NAME	as "factoryName",  <!-- 厂区名称 -->
+		FACTORY_NAME	as "factoryName",  <!-- 工厂 -->
 		CREATED_BY	as "createdBy",  <!-- 创建人 -->
 		CREATED_TIME	as "createdTime",  <!-- 创建时间 -->
 		UPDATED_BY	as "updatedBy",  <!-- 更新人 -->
@@ -102,7 +102,7 @@
 		A.ORG_NO	as "orgNo",  <!-- 生产组编码 -->
 		A.ORG_NAME	as "orgName",  <!-- 生产组名称 -->
 		A.FACTORY_CODE	as "factoryCode",  <!-- 厂区编码 -->
-		A.FACTORY_NAME	as "factoryName",  <!-- 厂区名称 -->
+		A.FACTORY_NAME	as "factoryName",  <!-- 工厂 -->
 		A.CREATED_BY	as "createdBy",  <!-- 创建人 -->
 		A.CREATED_TIME	as "createdTime",  <!-- 创建时间 -->
 		A.UPDATED_BY	as "updatedBy",  <!-- 更新人 -->
@@ -270,7 +270,7 @@
 		ORG_NO,  <!-- 生产组编码 -->
 		ORG_NAME,  <!-- 生产组名称 -->
 		FACTORY_CODE,  <!-- 厂区编码 -->
-		FACTORY_NAME,  <!-- 厂区名称 -->
+		FACTORY_NAME,  <!-- 工厂 -->
 		CREATED_BY,  <!-- 创建人 -->
 		CREATED_TIME,  <!-- 创建时间 -->
 		UPDATED_BY,  <!-- 更新人 -->
@@ -318,7 +318,7 @@
 		ORG_NO	= #orgNo#,   <!-- 生产组编码 -->
 		ORG_NAME	= #orgName#,   <!-- 生产组名称 -->
 		FACTORY_CODE	= #factoryCode#,   <!-- 厂区编码 -->
-		FACTORY_NAME	= #factoryName#,   <!-- 厂区名称 -->
+		FACTORY_NAME	= #factoryName#,   <!-- 工厂 -->
 		CREATED_BY	= #createdBy#,   <!-- 创建人 -->
 		CREATED_TIME	= #createdTime#,   <!-- 创建时间 -->
 		UPDATED_BY	= #updatedBy#,   <!-- 更新人 -->
@@ -338,7 +338,7 @@
 		ORG_NO	= #orgNo#,   <!-- 生产组编码 -->
 		ORG_NAME	= #orgName#,
 		FACTORY_CODE = #factoryCode#,   <!-- 厂区编码 -->
-		FACTORY_NAME = #factoryName#,   <!-- 厂区名称 -->
+		FACTORY_NAME = #factoryName#,   <!-- 工厂 -->
 		UPDATED_BY	= #updatedBy#,   <!-- 更新人 -->
 		UPDATED_TIME	= #updatedTime#   <!-- 更新时间 -->
 		WHERE

src/main/java/com/baosight/hpjx/hp/zl/domain/HPZL001.java

@@ -49,7 +49,7 @@ public class HPZL001 extends DaoEPBase {
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 更新时间*/
 	public static final String FIELD_DELETE_FLAG = "deleteFlag";    		/* 是否删除*/
 	public static final String FIELD_FACTORY_CODE = "factoryCode";    		/* 厂区编码*/
-	public static final String FIELD_FACTORY_NAME = "factoryName";    		/* 厂区名称*/
+	public static final String FIELD_FACTORY_NAME = "factoryName";    		/* 工厂*/
 
 	public static final String COL_ID = "ID";
 	public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码 预留*/
@@ -79,7 +79,7 @@ public class HPZL001 extends DaoEPBase {
 	public static final String COL_UPDATED_TIME = "UPDATED_TIME";    		/* 更新时间*/
 	public static final String COL_DELETE_FLAG = "DELETE_FLAG";    		/* 是否删除*/
 	public static final String COL_FACTORY_CODE = "FACTORY_CODE";    		/* 厂区编码*/
-	public static final String COL_FACTORY_NAME = "FACTORY_NAME";    		/* 厂区名称*/
+	public static final String COL_FACTORY_NAME = "FACTORY_NAME";    		/* 工厂*/
 	
 	public static final String QUERY = "HPZL001.query";
 	public static final String COUNT = "HPZL001.count";
@@ -115,7 +115,7 @@ public class HPZL001 extends DaoEPBase {
 	private String updatedTime = " ";		/* 更新时间*/
 	private Integer deleteFlag;	/* 是否删除*/
 	private String factoryCode = " ";		/* 厂区编码*/
-	private String factoryName = " ";		/* 厂区名称*/
+	private String factoryName = " ";		/* 工厂*/
 	
 	/**
 	 * initialize the metadata.
@@ -237,7 +237,7 @@ public class HPZL001 extends DaoEPBase {
 		eiMetadata.addMeta(eiColumn);
 
 		eiColumn = new EiColumn(FIELD_FACTORY_NAME);
-		eiColumn.setDescName("厂区名称");
+		eiColumn.setDescName("工厂");
 		eiMetadata.addMeta(eiColumn);
 		
 		
@@ -699,7 +699,7 @@ public class HPZL001 extends DaoEPBase {
 		this.factoryCode = factoryCode;
 	}
 	/**
-	 * get the factoryName - 厂区名称.
+	 * get the factoryName - 工厂.
 	 * @return the factoryName
 	 */
 	public String getFactoryName() {
@@ -707,9 +707,9 @@ public class HPZL001 extends DaoEPBase {
 	}
 
 	/**
-	 * set the factoryName - 厂区名称.
+	 * set the factoryName - 工厂.
 	 *
-	 * @param factoryName - 厂区名称
+	 * @param factoryName - 工厂
 	 */
 	public void setFactoryName(String factoryName) {
 		this.factoryName = factoryName;

src/main/java/com/baosight/hpjx/hp/zl/sql/HPZL001.xml

@@ -13,7 +13,7 @@
         PROJ_CODE as "projCode",  <!-- 项目号 -->
         PROJ_NAME as "projName",  <!-- 项目名称 -->
         FACTORY_CODE as "factoryCode",  <!-- 厂区编码 -->
-        FACTORY_NAME as "factoryName",  <!-- 厂区名称 -->
+        FACTORY_NAME as "factoryName",  <!-- 工厂 -->
         INVENT_CODE as "inventCode",  <!-- 部件编码 -->
         INVENT_NAME as "inventName",  <!-- 部件名称 -->
         SUB_INVENT_CODE as "subInventCode",  <!-- 零件编码 -->
@@ -141,7 +141,7 @@
             SUB_INVENT_CODE,  <!-- 零件编码 -->
             SUB_INVENT_NAME,  <!-- 零件名称 -->
             FACTORY_CODE,  <!-- 厂区编码 -->
-            FACTORY_NAME,  <!-- 厂区名称 -->
+            FACTORY_NAME,  <!-- 工厂 -->
             ORG_NO,  <!-- 生产组编码 -->
             ORG_NAME,  <!-- 生产组名称 -->
             POOR_TYPE,  <!-- 不良品类 -->

src/main/webapp/HP/KC/HPKC002A.jsp

@@ -29,9 +29,9 @@
 
 	<EF:EFRegion id="result" title="记录集">
 		<EF:EFInput ename="inqu_result-0-hpsc006Id" type="hidden"/>
-		<EF:EFGrid blockId="result" autoDraw="override" autoFit="true" checkMode="row">
+		<EF:EFGrid blockId="result" autoDraw="override"  checkMode="row">
 			<EF:EFColumn ename="id" cname="库存ID" enable="false" width="60" align="center" hidden="true"/>
-			<EF:EFComboColumn ename="inventType" cname="存货类型" enable="false" width="10" align="center">
+			<EF:EFComboColumn ename="inventType" cname="存货类型" enable="false" width="100" align="center">
 				<EF:EFCodeOption codeName="hpjx.hpkc.inventType" />
 			</EF:EFComboColumn>
 			<EF:EFComboColumn ename="whCode" cname="仓库名称" enable="false" width="100" align="center"
@@ -42,7 +42,7 @@
 			                  blockName="invent_name_block_id" textField="textField" valueField="valueField"
 			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
 			</EF:EFComboColumn>
-			<EF:EFComboColumn ename="inventRecordId" cname="规格" enable="false" width="100" align="center"
+			<EF:EFComboColumn ename="inventRecordId" cname="规格" enable="false" width="150" align="center"
 			                  blockName="invent_spec_block_id" textField="textField" valueField="valueField"
 			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
 			</EF:EFComboColumn>
@@ -51,7 +51,7 @@
 				<EF:EFOptions blockId="proj_record_block_id" valueField="valueField" textField="textField" />
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="applyAmount" cname="申请数量" width="120" align="right" format="{0:N0}" required="true"/>
-			<EF:EFColumn ename="applyRemark" cname="申请说明" width="300" editType="textarea" copy="true"/>
+			<EF:EFColumn ename="applyRemark" cname="申请说明" width="200" editType="textarea" copy="true"/>
 			<EF:EFColumn ename="amount" cname="库存数量" enable="false" width="120" align="right" format="{0:N0}"
 			             sumType="all"/>
 			<EF:EFColumn ename="unitWeight" cname="单量(KG)" enable="false" width="120" align="right" format="{0:N3}"/>

src/main/webapp/HP/KC/HPKC003A.jsp

@@ -11,18 +11,18 @@
 			<div class="row">
 	<%--			<EF:EFInput cname="生产订单号" ename="prodOrderNo" blockId="inqu_status" row="0" colWidth="3"/>
 				<EF:EFInput cname="生产任务号" ename="prodTaskNo" blockId="inqu_status" row="0" colWidth="3"/>--%>
-				<EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="3"/>
-				<EF:EFInput cname="部件名称" ename="prdtName" blockId="inqu_status" row="0" colWidth="3"/>
-				<EF:EFInput cname="零件名称" ename="partName" blockId="inqu_status" row="0" colWidth="3"/>
+				<EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="4"/>
+				<EF:EFInput cname="部件名称" ename="prdtName" blockId="inqu_status" row="0" colWidth="4"/>
+				<EF:EFInput cname="零件名称" ename="partName" blockId="inqu_status" row="0" colWidth="4"/>
 
 			</div>
 			<div class="row">
-				<EF:EFSelect cname="工厂" blockId="inqu_status" ename="factoryCode" row="0" colWidth="3" filter="contains">
+				<EF:EFSelect cname="工厂" blockId="inqu_status" ename="factoryCode" row="0" colWidth="4" filter="contains">
 					<EF:EFOption label="全部" value=""/>
 					<EF:EFOptions blockId="factory_record_block_id" textField="textField" valueField="valueField"/>
 				</EF:EFSelect>
 				<%--<EF:EFInput cname="生产组名称" ename="orgName" blockId="inqu_status" row="0" colWidth="3"/>--%>
-					<EF:EFSelect cname="生产组" blockId="inqu_status" ename="groupCode" row="0" colWidth="3" filter="contains">
+					<EF:EFSelect cname="生产组" blockId="inqu_status" ename="groupCode" row="0" colWidth="4" filter="contains">
 						<EF:EFOption label="全部" value=""/>
 						<EF:EFOptions blockId="group_record_block_id" textField="textField" valueField="valueField"/>
 					</EF:EFSelect>
@@ -50,7 +50,7 @@
 			<EF:EFColumn ename="unCompleteNum" cname="待入库数量" enable="false" width="120" align="right" format="{0:N0}"/>
 			<EF:EFColumn ename="num" cname="任务数量" enable="false" width="120" align="right" format="{0:N0}"/>
 			<EF:EFColumn ename="totalWt" cname="任务重量（T）" enable="false" width="120" align="right" format="{0:N3}"/>
-			<EF:EFColumn ename="factoryName" cname="厂区名称" enable="false" width="150" align="center"/>
+			<EF:EFColumn ename="factoryName" cname="工厂" enable="false" width="150" align="center"/>
 			<EF:EFColumn ename="orgName" cname="生产组名称" enable="false" width="150" align="center"/>
 			<%--			<EF:EFColumn ename="remark" cname="备注" enable="false" width="150"/>
                         <EF:EFColumn ename="projCode" cname="项目号" enable="false" width="140" align="center"/>

src/main/webapp/HP/KC/HPKC004B.jsp

@@ -24,9 +24,9 @@
 	</EF:EFRegion>
 
 	<EF:EFRegion id="result" title="记录集">
-		<EF:EFGrid blockId="result" autoDraw="override" autoFit="true" checkMode="row">
+		<EF:EFGrid blockId="result" autoDraw="override"  checkMode="row">
 			<EF:EFColumn ename="id" cname="库存ID" enable="false" width="60" align="center" hidden="true"/>
-			<EF:EFComboColumn ename="inventType" cname="存货类型" enable="false" width="60" align="center">
+			<EF:EFComboColumn ename="inventType" cname="存货类型" enable="false" width="100" align="center">
 				<EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('2')"/>
 			</EF:EFComboColumn>
 			<EF:EFComboColumn ename="whCode" cname="仓库名称" enable="false" width="120" align="center"
@@ -37,11 +37,11 @@
 			                  blockName="invent_name_block_id" textField="textField" valueField="valueField"
 			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
 			</EF:EFComboColumn>
-			<EF:EFComboColumn ename="inventRecordId" cname="规格" enable="false" width="120" align="center"
+			<EF:EFComboColumn ename="inventRecordId" cname="规格" enable="false" width="150" align="center"
 			                  blockName="invent_spec_block_id" textField="textField" valueField="valueField"
 			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
 			</EF:EFComboColumn>
-			<EF:EFComboColumn ename="projCode" cname="项目名称" width="350" align="center" defaultValue="" required="true"
+			<EF:EFComboColumn ename="projCode" cname="项目名称" width="300" align="center" defaultValue="" required="true"
 							  filter="contains" >
 				<EF:EFOptions blockId="proj_record_block_id" valueField="valueField" textField="textField" />
 			</EF:EFComboColumn>

src/main/webapp/HP/PZ/HPPZ011.js

@@ -52,7 +52,7 @@ $(function () {
  * 页面加载时执行
  */
 $(window).load(function () {
-	// 厂区名称
+	// 工厂
 	let inInfo = new EiInfo();
 	EiCommunicator.send("HPPZ011", "queryComboBox", inInfo, {
 		onSuccess: function (ei) {
@@ -87,7 +87,7 @@ let save = function () {
 		let groupCode= item.get("groupCode");
 		let groupType= item.get("groupType");
 		if(factoryName===""){
-			message("选中的第"+(index+1)+"行\"厂区名称\"，不能为空!");
+			message("选中的第"+(index+1)+"行\"工厂\"，不能为空!");
 			flag = false;
 			return false;
 		}

src/main/webapp/HP/PZ/HPPZ011.jsp

@@ -8,7 +8,7 @@
 <EF:EFPage title="厂区管理">
 	<EF:EFRegion id="inqu" title="查询条件">
 		<div class="row">
-			<EF:EFInput cname="厂区名称" ename="factoryName" blockId="inqu_status" row="0" colWidth="3"/>
+			<EF:EFInput cname="工厂" ename="factoryName" blockId="inqu_status" row="0" colWidth="3"/>
 			<EF:EFSelect cname="生产组名称" ename="groupCode" blockId="inqu_status" row="0" colWidth="3" filter="contains">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFOptions blockId="group_record_block_id" textField="textField" valueField="valueField"/>
@@ -20,11 +20,11 @@
 		<EF:EFGrid blockId="result" autoDraw="override" checkMode="row">
 			<EF:EFColumn ename="id" cname="主键" hidden="true"/>
 			<EF:EFColumn ename="factoryCode" cname="厂区编码" enable="false" width="120" align="center" hidden="true"/>
-			<EF:EFColumn ename="factoryName" cname="厂区名称" width="120" align="center" required="true"/>
-<%--			<EF:EFPopupColumn ename="factoryName" cname="厂区名称" width="120" popupType="ServiceGrid"--%>
+			<EF:EFColumn ename="factoryName" cname="工厂" width="120" align="center" required="true"/>
+<%--			<EF:EFPopupColumn ename="factoryName" cname="工厂" width="120" popupType="ServiceGrid"--%>
 <%--			                  popupTitle="厂区列表" serviceName="HPPZ011" methodName="queryComboBox"--%>
 <%--			                  resultId="factory_record_block_id"--%>
-<%--			                  columnEnames="valueField,textField" columnCnames="厂区代码,厂区名称"--%>
+<%--			                  columnEnames="valueField,textField" columnCnames="厂区代码,工厂"--%>
 <%--			                  backFillColumnIds="valueField,textField" backFillFieldIds="factoryCode,factoryName"--%>
 <%--			                  valueField="textField" textField="textField" required="true"/>--%>
 			<EF:EFComboColumn ename="groupCode" cname="生产组名称" width="120" align="center"

src/main/webapp/HP/SC/HPSC005A.jsp

@@ -41,7 +41,7 @@
 			                  filter="contains" readonly="true">
 				<EF:EFOptions blockId="factory_record_block_id" valueField="valueField" textField="textField"/>
 			</EF:EFComboColumn>
-			<EF:EFColumn ename="factoryName" cname="厂区名称" enable="false" align="center" hidden="true"/>
+			<EF:EFColumn ename="factoryName" cname="工厂" enable="false" align="center" hidden="true"/>
 			<EF:EFColumn ename="orgNo" cname="生产组" width="110" align="center" required="true" readonly="true"/>
 			<EF:EFColumn ename="orgName" cname="生产组名称" enable="false" align="center" hidden="true"/>
 			<%--<EF:EFColumn ename="orgNo" cname="生产组代码" enable="false" hidden="true"/>--%>

src/main/webapp/HP/SC/HPSC005B.jsp

@@ -15,7 +15,7 @@
 			<EF:EFInput cname="零件名称" ename="partName" blockId="inqu_status" row="0" colWidth="3"/>
 		</div>
 		<div class="row">
-			<EF:EFSelect cname="厂区名称" ename="factoryCode" blockId="inqu_status" row="0" colWidth="3" filter="contains">
+			<EF:EFSelect cname="工厂" ename="factoryCode" blockId="inqu_status" row="0" colWidth="3" filter="contains">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFOptions blockId="factory_record_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
@@ -43,7 +43,7 @@
 			<EF:EFColumn ename="unCompleteNum" cname="剩余数量" enable="false" width="100" align="right" format="{0:N0}"/>
 			<EF:EFColumn ename="num" cname="数量" enable="false" width="100" align="right" format="{0:N0}"/>
 			<EF:EFColumn ename="totalWt" cname="总重(T)" enable="false" width="100" align="right" format="{0:N3}"/>
-			<EF:EFColumn ename="factoryName" cname="厂区名称" enable="false" width="140" align="center"/>
+			<EF:EFColumn ename="factoryName" cname="工厂" enable="false" width="140" align="center"/>
 			<EF:EFColumn ename="orgName" cname="生产组名称" enable="false" width="140" align="center"/>
 			<EF:EFColumn ename="prodOrderNo" cname="生产订单号" enable="false" width="140" align="center" hidden="true"/>
 			<EF:EFColumn ename="projCode" cname="项目号" enable="false" width="140" align="center" hidden="true"/>

src/main/webapp/HP/SC/HPSC005D.jsp

@@ -84,7 +84,7 @@
 			<EF:EFInput cname="剩余数量" blockId="result" ename="unCompleteNum" row="0" colWidth="4" readonly="true"/>
 			<EF:EFDatePicker cname="计划完成日期" blockId="result" ename="planCompletionDate"  row="0" colWidth="4"
 			                 format="yyyy-MM-dd" readonly="true"/>
-			<EF:EFInput cname="厂区名称" blockId="result" ename="factoryName" row="0" colWidth="4" readonly="true"/>
+			<EF:EFInput cname="工厂" blockId="result" ename="factoryName" row="0" colWidth="4" readonly="true"/>
 			<EF:EFInput cname="生产组名称" blockId="result" ename="orgName" row="0" colWidth="4" readonly="true"/>
 		</div>
 	</EF:EFRegion>

src/main/webapp/HP/SC/HPSC006.js

@@ -360,7 +360,25 @@ function checkIn(id) {
     });
 }
 checkInCallback = function () {
+    var block = detailGrid.getEiBlock();
+    var result = resultGrid.getCheckedRows()
+    if (rows.length < 1) {
+        message("请选择数据");
+        return;
+    }
+    if (block != null) {
+        block.setRows([]);
+        detailGrid.setEiBlock(block);
+    }
+    var info = new EiInfo()
+    var productionOrderNo = result[0]['prodOrderNo'];
 
+    info.set("productionOrderNo",productionOrderNo);
+    EiCommunicator.send("HPSC006","queryDetail",info,{
+        onSuccess:function(ei){//返回结果集
+            detailGrid.setEiInfo(ei);
+        },onFail:function(ei){}
+    },{async:false});
 }
 let selectStock = function (id) {
     JSColorbox.open({

src/main/webapp/HP/SC/HPSC006.jsp

@@ -78,12 +78,13 @@
                          data-regex="/^-?[0-9]{1,9}([.][0-9]{1,3})?$/"
                          data-errorprompt="请输入数字，该值最大可设置9位整数和3位小数！"/>
             <EF:EFColumn enable="false" format="{0:N3}" ename="totalWt" width="80" maxLength="12" displayType="0.000" cname="总重(T)"/>
-
+            <EF:EFColumn ename="planCompletionDate" required='true' cname="计划完成时间" editType="date"
+                         dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" width="120"/>
             <EF:EFComboColumn ename="factoryCode" cname="厂区" width="110" align="center" defaultValue=""
                               filter="contains" readonly="true">
                 <EF:EFOptions blockId="factory_record_block_id" valueField="valueField" textField="textField"/>
             </EF:EFComboColumn>
-            <EF:EFColumn ename="factoryName" cname="厂区名称" enable="false" align="center" hidden="true"/>
+            <EF:EFColumn ename="factoryName" cname="工厂" enable="false" align="center" hidden="true"/>
             <EF:EFColumn ename="orgNo" cname="下料组" width="110" align="center" readonly="true"/>
             <EF:EFColumn ename="orgName" cname="生产组名称" enable="false" align="center" hidden="true"/>
 
@@ -92,12 +93,11 @@
 <%--                <EF:EFOptions blockId="factory_record_block_id" valueField="valueField" textField="textField"/>--%>
 <%--            </EF:EFComboColumn>--%>
 <%--            <EF:EFColumn ename="orgNo" cname="下料组" width="110" align="center"  readonly="true"/>--%>
-            <EF:EFColumn ename="planCompletionDate" required='true' cname="计划完成时间" editType="date"
-                         dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" width="120"/>
-            <EF:EFColumn ename="actualCompletionDate" cname="实际完成时间" editType="date"
+
+            <EF:EFColumn ename="actualCompletionDate" cname="完成时间" editType="date"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" width="120" enable="false"/>
-            <EF:EFColumn enable="false" ename="actualCompletionNum" cname="实际完工数量" width="100" readonly="true"/>
-            <EF:EFColumn enable="false" ename="actualCompletionTotalWt" cname="实际完工重量（T)" width="100" readonly="true"/>
+            <EF:EFColumn enable="false" ename="actualCompletionNum" cname="完工数量" width="100" readonly="true"/>
+            <EF:EFColumn enable="false" ename="actualCompletionTotalWt" cname="完工重量（T)" width="100" readonly="true"/>
             <EF:EFComboColumn enable="false" align="center" ename="status" width="80" cname="状态">
                 <EF:EFOption label="计划中" value="0"/>
                 <EF:EFOption label="生产中" value="1"/>

src/main/webapp/HP/SC/HPSC006A.jsp

@@ -37,7 +37,7 @@
 			<EF:EFColumn enable="false" ename="reqNum" cname="领料记录" width="80" align="center" readonly="true"/>
 			<EF:EFColumn ename="productionOrderNo" cname="生产订单号" enable="false" width="150" align="center" hidden="true"/>
 			<EF:EFColumn ename="projName" cname="项目名称" enable="false" width="140" align="center"/>
-			<EF:EFColumn ename="factoryName" cname="厂区名称" enable="false" width="100" align="center"/>
+			<EF:EFColumn ename="factoryName" cname="工厂" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="prdtName" cname="部件名称" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="partName" cname="零件名称" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="inventName" cname="材料名称" enable="false" width="100" align="center"/>

src/main/webapp/HP/SC/HPSC006B.jsp

@@ -64,7 +64,7 @@
 			<EF:EFInput ename="detail-0-prdtName" cname="产品名称" colWidth="4" readonly="true"/>
 		</div>
 		<div class="row">
-			<EF:EFInput ename="detail-0-factoryName" cname="厂区名称" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-factoryName" cname="工厂" colWidth="4" readonly="true"/>
 			<EF:EFInput ename="detail-0-orgName" cname="下料组" colWidth="4" readonly="true"/>
 			<EF:EFInput ename="detail-0-partName" cname="零件名称" colWidth="4" readonly="true"/>
 

src/main/webapp/HP/SC/HPSC098.jsp

@@ -9,15 +9,15 @@
 	<EF:EFRegion id="inqu" title="查询条件">
 		<EF:EFInput cname="组类型" ename="orgType" blockId="inqu_status" row="0" type="hidden"/>
 		<div class="row">
-<%--			<EF:EFInput cname="厂区名称" ename="factoryName" blockId="inqu_status" row="0" colWidth="3"/>--%>
+<%--			<EF:EFInput cname="工厂" ename="factoryName" blockId="inqu_status" row="0" colWidth="3"/>--%>
 <%--			<EF:EFInput cname="组织名称" ename="groupName" blockId="inqu_status" row="0" colWidth="3"/>--%>
 
-			<EF:EFSelect ename="inqu_status-0-factoryCode" cname="厂区名称" colWidth="2" filter="contains"
+			<EF:EFSelect ename="inqu_status-0-factoryCode" cname="工厂" colWidth="3" filter="contains"
 						 template="#=textField#" valueTemplate="#=textField#">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFOptions blockId="factory_record_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
-			<EF:EFSelect ename="inqu_status-0-groupCode" cname="组织名称" filter="contains" required="false" colWidth="2"
+			<EF:EFSelect ename="inqu_status-0-groupCode" cname="工作组" filter="contains" required="false" colWidth="3"
 						 template="#=textField#" valueTemplate="#=valueField#" defaultValue="请选择">
 				<EF:EFOption label="请选择" value=""/>
 				<EF:EFOptions blockId="group_record_block_id" textField="textField" valueField="valueField"/>
@@ -28,9 +28,9 @@
 	<EF:EFRegion id="result" title="明细信息">
 		<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="single,row">
 			<EF:EFColumn ename="factoryCode" cname="厂区编码" enable="false" width="120" align="center" hidden="true"/>
-			<EF:EFColumn ename="factoryName" cname="厂区名称" enable="false" width="120" align="center" />
+			<EF:EFColumn ename="factoryName" cname="工厂" enable="false" width="120" align="center" />
 			<EF:EFColumn ename="groupCode" cname="组织编码" enable="false" width="120" align="center" hidden="true"/>
-			<EF:EFColumn ename="groupName" cname="组织名称" enable="false" width="120" align="center"/>
+			<EF:EFColumn ename="groupName" cname="工作组" enable="false" width="120" align="center"/>
 		</EF:EFGrid>
 	</EF:EFRegion>
 </EF:EFPage>

src/main/webapp/HP/ZL/HPZL001B.jsp

@@ -35,7 +35,7 @@
 			<EF:EFColumn ename="completeNum" cname="已入库数量" enable="false" width="120" align="right" format="{0:N0}"/>
 			<EF:EFColumn ename="num" cname="任务数量" enable="false" width="120" align="right" format="{0:N0}"/>
 			<EF:EFColumn ename="totalWt" cname="任务重量" enable="false" width="120" align="right" format="{0:N3}"/>
-			<EF:EFColumn ename="factoryName" cname="厂区名称" enable="false" width="150" align="center"/>
+			<EF:EFColumn ename="factoryName" cname="工厂" enable="false" width="150" align="center"/>
 			<EF:EFColumn ename="orgName" cname="生产组名称" enable="false" width="150" align="center"/>
 			<EF:EFColumn ename="remark" cname="备注" enable="false" width="150"/>
 			<EF:EFColumn ename="projCode" cname="项目号" enable="false" width="140" align="center"/>