Merge branch 'dev' of http://git.pseer.com/platform/hp-smart into dev-sx

.gitignore

+# maven ignore
+target/
+*.war
+*.zip
+*.tar
+*.tar.gz
+
+# eclipse ignore
+.settings/
+.project
+.classpath
+.springBeans
+
+# IntelliJ ignore
+*.iml
+*.ipr
+*.iws
+.git/
+.idea/
+out/
+
+# temp ignore
+*.log
+*.cache
+*.diff
+*.patch
+*.tmp
+
+# system ignore
+.DS_Store
+Thumbs.db
+
+*.factorypath
+
+# maven version
+pom.xml.versionsBackup
+
+**/overlays/

src/main/java/com/baosight/hpjx/core/enums/OrgTypeEnum.java

@@ -10,6 +10,7 @@ public enum OrgTypeEnum {
 	DEPT("dept", "部门"),
 	PROD_GROUP("prodGroup", "生产组"),
 	CUT_GROUP("cutGroup", "下料组"),
+	SYN_GROUP("synGroup", "综合组"),
 	;
 	
 	private String code;

src/main/java/com/baosight/hpjx/hp/bi/service/ServiceHPBI002.java

@@ -524,15 +524,16 @@ public class ServiceHPBI002 extends ServiceBase {
         List tempContentList = Arrays.asList(json.split(","));
         tempArr.add(tempContentList);
         JSONObject item = new JSONObject();
-        list1.forEach(obj -> {
+        String DIVLIST = "";
         // 处理obj
-            String DIVLIST = "<div style=\"width: 400px; height: 50px;color:#FFFFFF;font-weight: bold;text-align: left;font-size: 24px;\">"
-                    +obj.get("GROUP_NAME")+"</div><div style=\"width: 400px; height: 50px;color:#FFFFFF;text-align: left;font-size: 20px;\">"
-                    +obj.get("PART_NAME")+"</div>";
+        for (Map obj : list1) {
+            DIVLIST = DIVLIST + "<div style=\"width: 500px; height: 50px;color:#FACC14;font-weight: bold;text-align: left;font-size: 20px;\">"
+                    + obj.get("GROUP_NAME") + "</div><div style=\"white-space: pre-wrap;width: 500px; height: 60px;color:#FFFFFF;text-align: left;font-size: 18px;\">"
+                    + obj.get("PART_NAME") + "</div>";
+        }
         List datalist =new ArrayList();
         datalist.add(DIVLIST);
         tempArr.add(datalist);
-        });
         JSONArray ids = new JSONArray();
         ids.add(idsStr);
         item.put("ids", ids);

src/main/java/com/baosight/hpjx/hp/kc/domain/HPKC001.java

@@ -45,6 +45,8 @@ public class HPKC001 extends DaoEPBase {
 	public static final String FIELD_REMARK = "remark";    		/* 备注*/
 	public static final String FIELD_OLD_PURCHASE_NO = "oldPurchaseNo";    		/* 原采购单号*/
 	public static final String FIELD_DELETE_FLAG = "deleteFlag";    		/* 是否删除0.否1.是*/
+	public static final String FIELD_FACTORY_CODE = "factoryCode";    		/* 厂区编码*/
+	public static final String FIELD_FACTORY_NAME = "factoryName";    		/* 工厂*/
 	
 	public static final String COL_ID = "ID";    		/* 主键id*/
 	public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码 预留*/
@@ -69,6 +71,8 @@ public class HPKC001 extends DaoEPBase {
 	public static final String COL_REMARK = "REMARK";    		/* 备注*/
 	public static final String COL_OLD_PURCHASE_NO = "OLD_PURCHASE_NO";    		/* 原采购单号*/
 	public static final String COL_DELETE_FLAG = "DELETE_FLAG";    		/* 是否删除0.否1.是*/
+	public static final String COL_FACTORY_CODE = "FACTORY_CODE";    		/* 厂区编码*/
+	public static final String COL_FACTORY_NAME = "FACTORY_NAME";    		/* 工厂*/
 	
 	public static final String QUERY = "HPKC001.query";
 	public static final String COUNT = "HPKC001.count";
@@ -99,6 +103,8 @@ public class HPKC001 extends DaoEPBase {
 	private String remark = " ";		/* 备注*/
 	private String oldPurchaseNo = " ";		/* 原采购单号*/
 	private Integer deleteFlag;	/* 是否删除0.否1.是*/
+	private String factoryCode = " ";		/* 厂区编码*/
+	private String factoryName = " ";		/* 工厂*/
 	
 	/**
 	 * initialize the metadata.
@@ -208,6 +214,14 @@ public class HPKC001 extends DaoEPBase {
 		eiColumn.setDescName("是否删除0.否1.是");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_FACTORY_CODE);
+		eiColumn.setDescName("厂区编码");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_FACTORY_NAME);
+		eiColumn.setDescName("工厂");
+		eiMetadata.addMeta(eiColumn);
+		
 		
 	}
 	
@@ -587,6 +601,38 @@ public class HPKC001 extends DaoEPBase {
 		this.deleteFlag = deleteFlag;
 	}
 	/**
+	 * get the factoryCode - 厂区编码.
+	 * @return the factoryCode
+	 */
+	public String getFactoryCode() {
+		return this.factoryCode;
+	}
+
+	/**
+	 * set the factoryCode - 厂区编码.
+	 *
+	 * @param factoryCode - 厂区编码
+	 */
+	public void setFactoryCode(String factoryCode) {
+		this.factoryCode = factoryCode;
+	}
+	/**
+	 * get the factoryName - 工厂.
+	 * @return the factoryName
+	 */
+	public String getFactoryName() {
+		return this.factoryName;
+	}
+
+	/**
+	 * set the factoryName - 工厂.
+	 *
+	 * @param factoryName - 工厂
+	 */
+	public void setFactoryName(String factoryName) {
+		this.factoryName = factoryName;
+	}
+	/**
 	 * get the value from Map.
 	 *
 	 * @param map - source data map
@@ -617,6 +663,8 @@ public class HPKC001 extends DaoEPBase {
 		setRemark(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REMARK)), remark));
 		setOldPurchaseNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_OLD_PURCHASE_NO)), oldPurchaseNo));
 		setDeleteFlag(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_DELETE_FLAG)), deleteFlag));
+		setFactoryCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_CODE)), factoryCode));
+		setFactoryName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_NAME)), factoryName));
 	}
 	
 	/**
@@ -649,6 +697,8 @@ public class HPKC001 extends DaoEPBase {
 		map.put(FIELD_REMARK, StringUtils.toString(remark, eiMetadata.getMeta(FIELD_REMARK)));
 		map.put(FIELD_OLD_PURCHASE_NO, StringUtils.toString(oldPurchaseNo, eiMetadata.getMeta(FIELD_OLD_PURCHASE_NO)));
 		map.put(FIELD_DELETE_FLAG, StringUtils.toString(deleteFlag, eiMetadata.getMeta(FIELD_DELETE_FLAG)));
+		map.put(FIELD_FACTORY_CODE, StringUtils.toString(factoryCode, eiMetadata.getMeta(FIELD_FACTORY_CODE)));
+		map.put(FIELD_FACTORY_NAME, StringUtils.toString(factoryName, eiMetadata.getMeta(FIELD_FACTORY_NAME)));
 		
 		return map;
 	}

src/main/java/com/baosight/hpjx/hp/kc/domain/HPKC002.java

@@ -46,6 +46,8 @@ public class HPKC002 extends DaoEPBase {
 	public static final String FIELD_KC_ID = "kcId";    		/* 库存ID*/
 	public static final String FIELD_OLD_REQ_NO = "oldReqNo";    		/* 原领料单号*/
 	public static final String FIELD_DELETE_FLAG = "deleteFlag";    		/* 是否删除0.否1.是*/
+	public static final String FIELD_FACTORY_CODE = "factoryCode";    		/* 厂区编码*/
+	public static final String FIELD_FACTORY_NAME = "factoryName";    		/* 工厂*/
 
 	public static final String FIELD_HPSC006_ID = "hpsc006Id";
 
@@ -79,6 +81,8 @@ public class HPKC002 extends DaoEPBase {
 	public static final String COL_HPSC006_ID = "HPSC006_ID";
 	public static final String COL_PROJ_CODE = "PROJ_CODE";    		/* 项目编码*/
 	public static final String COL_PROJ_NAME = "PROJ_NAME";    		/* 项目名称*/
+	public static final String COL_FACTORY_CODE = "FACTORY_CODE";    		/* 厂区编码*/
+	public static final String COL_FACTORY_NAME = "FACTORY_NAME";    		/* 工厂*/
 
 	public static final String QUERY = "HPKC002.query";
 	public static final String COUNT = "HPKC002.count";
@@ -113,6 +117,8 @@ public class HPKC002 extends DaoEPBase {
 	private Long hpsc006Id;
 	private String projCode = " ";		/* 项目编码*/
 	private String projName = " ";		/* 项目名称*/
+	private String factoryCode = " ";		/* 厂区编码*/
+	private String factoryName = " ";		/* 工厂*/
 
 	/**
 	 * initialize the metadata.
@@ -238,6 +244,14 @@ public class HPKC002 extends DaoEPBase {
 		eiColumn.setDescName("项目名称");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_FACTORY_CODE);
+		eiColumn.setDescName("厂区编码");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_FACTORY_NAME);
+		eiColumn.setDescName("工厂");
+		eiMetadata.addMeta(eiColumn);
+
 
 	}
 	
@@ -682,6 +696,38 @@ public class HPKC002 extends DaoEPBase {
 		this.hpsc006Id = hpsc006Id;
 	}
 	/**
+	 * get the factoryCode - 厂区编码.
+	 * @return the factoryCode
+	 */
+	public String getFactoryCode() {
+		return this.factoryCode;
+	}
+
+	/**
+	 * set the factoryCode - 厂区编码.
+	 *
+	 * @param factoryCode - 厂区编码
+	 */
+	public void setFactoryCode(String factoryCode) {
+		this.factoryCode = factoryCode;
+	}
+	/**
+	 * get the factoryName - 工厂.
+	 * @return the factoryName
+	 */
+	public String getFactoryName() {
+		return this.factoryName;
+	}
+
+	/**
+	 * set the factoryName - 工厂.
+	 *
+	 * @param factoryName - 工厂
+	 */
+	public void setFactoryName(String factoryName) {
+		this.factoryName = factoryName;
+	}
+	/**
 	 * get the value from Map.
 	 *
 	 * @param map - source data map
@@ -716,6 +762,8 @@ public class HPKC002 extends DaoEPBase {
 		setHpsc006Id(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_HPSC006_ID)), hpsc006Id));
 		setProjCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_CODE)), projCode));
 		setProjName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_NAME)), projName));
+		setFactoryCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_CODE)), factoryCode));
+		setFactoryName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_NAME)), factoryName));
 	}
 	
 	/**
@@ -753,6 +801,8 @@ public class HPKC002 extends DaoEPBase {
 
 		map.put(FIELD_PROJ_CODE, StringUtils.toString(projCode, eiMetadata.getMeta(FIELD_PROJ_CODE)));
 		map.put(FIELD_PROJ_NAME, StringUtils.toString(projName, eiMetadata.getMeta(FIELD_PROJ_NAME)));
+		map.put(FIELD_FACTORY_CODE, StringUtils.toString(factoryCode, eiMetadata.getMeta(FIELD_FACTORY_CODE)));
+		map.put(FIELD_FACTORY_NAME, StringUtils.toString(factoryName, eiMetadata.getMeta(FIELD_FACTORY_NAME)));
 
 		return map;
 	}

src/main/java/com/baosight/hpjx/hp/kc/domain/HPKC003.java

@@ -59,6 +59,7 @@ public class HPKC003 extends DaoEPBase {
 	public static final String FIELD_PART_THICK = "partThick";    		/* 零件-厚*/
 	public static final String FIELD_PART_SPEC = "partSpec";    		/* 零件规格*/
 	public static final String FIELD_REMARK1 = "remark1";    		/* 备注*/
+	public static final String FIELD_FACTORY_CODE = "factoryCode";            /* 厂区编码*/
 	
 	public static final String COL_ID = "ID";    		/* ID*/
 	public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码 预留*/
@@ -97,6 +98,7 @@ public class HPKC003 extends DaoEPBase {
 	public static final String COL_PART_THICK = "PART_THICK";    		/* 零件-厚*/
 	public static final String COL_PART_SPEC = "PART_SPEC";    		/* 零件规格*/
 	public static final String COL_REMARK1 = "REMARK1";    		/* 备注*/
+	public static final String COL_FACTORY_CODE = "FACTORY_CODE";            /* 厂区编码*/
 	
 	public static final String QUERY = "HPKC003.query";
 	public static final String COUNT = "HPKC003.count";
@@ -141,6 +143,7 @@ public class HPKC003 extends DaoEPBase {
 	private BigDecimal partThick = new BigDecimal("0");		/* 零件-厚*/
 	private String partSpec = " ";		/* 零件规格*/
 	private String remark1 = " ";		/* 备注*/
+	private String factoryCode = " ";        /* 厂区编码*/
 	
 	/**
 	 * initialize the metadata.
@@ -321,6 +324,10 @@ public class HPKC003 extends DaoEPBase {
 		eiColumn.setDescName("备注");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_FACTORY_CODE);
+		eiColumn.setDescName("厂区编码");
+		eiMetadata.addMeta(eiColumn);
+		
 		
 	}
 	
@@ -923,6 +930,15 @@ public class HPKC003 extends DaoEPBase {
 	public void setRemark1(String remark1) {
 		this.remark1 = remark1;
 	}
+
+	public String getFactoryCode() {
+		return factoryCode;
+	}
+
+	public void setFactoryCode(String factoryCode) {
+		this.factoryCode = factoryCode;
+	}
+
 	/**
 	 * get the value from Map.
 	 *
@@ -968,6 +984,7 @@ public class HPKC003 extends DaoEPBase {
 		setPartThick(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PART_THICK)), partThick));
 		setPartSpec(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PART_SPEC)), partSpec));
 		setRemark1(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REMARK1)), remark1));
+		setFactoryCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_CODE)), factoryCode));
 	}
 	
 	/**
@@ -1014,6 +1031,7 @@ public class HPKC003 extends DaoEPBase {
 		map.put(FIELD_PART_THICK, StringUtils.toString(partThick, eiMetadata.getMeta(FIELD_PART_THICK)));
 		map.put(FIELD_PART_SPEC, StringUtils.toString(partSpec, eiMetadata.getMeta(FIELD_PART_SPEC)));
 		map.put(FIELD_REMARK1, StringUtils.toString(remark1, eiMetadata.getMeta(FIELD_REMARK1)));
+		map.put(FIELD_FACTORY_CODE, StringUtils.toString(factoryCode, eiMetadata.getMeta(FIELD_FACTORY_CODE)));
 		
 		return map;
 	}

src/main/java/com/baosight/hpjx/hp/kc/domain/HPKC004.java

@@ -54,6 +54,8 @@ public class HPKC004 extends DaoEPBase {
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 修改时间*/
 	public static final String FIELD_DELETE_FLAG = "deleteFlag";    		/* 是否删除*/
 	public static final String FIELD_INVENT_RECORD_ID = "inventRecordId";    		/* 存货档案ID*/
+	public static final String FIELD_FACTORY_CODE = "factoryCode";    		/* 厂区编码*/
+	public static final String FIELD_FACTORY_NAME = "factoryName";    		/* 工厂*/
 
 
 	public static final String COL_ID = "ID";    		/* ID*/
@@ -88,6 +90,8 @@ public class HPKC004 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_INVENT_RECORD_ID = "INVENT_RECORD_ID";    		/* 存货档案ID*/
+	public static final String COL_FACTORY_CODE = "FACTORY_CODE";    		/* 厂区编码*/
+	public static final String COL_FACTORY_NAME = "FACTORY_NAME";    		/* 工厂*/
 
 	public static final String QUERY = "HPKC004.query";
 	public static final String COUNT = "HPKC004.count";
@@ -127,6 +131,8 @@ public class HPKC004 extends DaoEPBase {
 	private String updatedTime = " ";		/* 修改时间*/
 	private Integer deleteFlag;	/* 是否删除*/
 	private Long inventRecordId = new Long(0);	/* 存货档案ID*/
+	private String factoryCode = " ";		/* 厂区编码*/
+	private String factoryName = " ";		/* 工厂*/
 
 	/**
 	 * initialize the metadata.
@@ -280,6 +286,14 @@ public class HPKC004 extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_INVENT_RECORD_ID);
 		eiColumn.setDescName("存货档案ID");
 		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_FACTORY_CODE);
+		eiColumn.setDescName("厂区编码");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_FACTORY_NAME);
+		eiColumn.setDescName("工厂");
+		eiMetadata.addMeta(eiColumn);
 	}
 
 	/**
@@ -802,6 +816,38 @@ public class HPKC004 extends DaoEPBase {
 		this.inventRecordId = inventRecordId;
 	}
 	/**
+	 * get the factoryCode - 厂区编码.
+	 * @return the factoryCode
+	 */
+	public String getFactoryCode() {
+		return this.factoryCode;
+	}
+
+	/**
+	 * set the factoryCode - 厂区编码.
+	 *
+	 * @param factoryCode - 厂区编码
+	 */
+	public void setFactoryCode(String factoryCode) {
+		this.factoryCode = factoryCode;
+	}
+	/**
+	 * get the factoryName - 工厂.
+	 * @return the factoryName
+	 */
+	public String getFactoryName() {
+		return this.factoryName;
+	}
+
+	/**
+	 * set the factoryName - 工厂.
+	 *
+	 * @param factoryName - 工厂
+	 */
+	public void setFactoryName(String factoryName) {
+		this.factoryName = factoryName;
+	}
+	/**
 	 * get the value from Map.
 	 *
 	 * @param map - source data map
@@ -841,6 +887,8 @@ public class HPKC004 extends DaoEPBase {
 		setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime));
 		setDeleteFlag(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_DELETE_FLAG)), deleteFlag));
 		setInventRecordId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_INVENT_RECORD_ID)), inventRecordId));
+		setFactoryCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_CODE)), factoryCode));
+		setFactoryName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_NAME)), factoryName));
 	}
 
 	/**
@@ -882,6 +930,8 @@ public class HPKC004 extends DaoEPBase {
 		map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME)));
 		map.put(FIELD_DELETE_FLAG, StringUtils.toString(deleteFlag, eiMetadata.getMeta(FIELD_DELETE_FLAG)));
 		map.put(FIELD_INVENT_RECORD_ID, StringUtils.toString(inventRecordId, eiMetadata.getMeta(FIELD_INVENT_RECORD_ID)));
+		map.put(FIELD_FACTORY_CODE, StringUtils.toString(factoryCode, eiMetadata.getMeta(FIELD_FACTORY_CODE)));
+		map.put(FIELD_FACTORY_NAME, StringUtils.toString(factoryName, eiMetadata.getMeta(FIELD_FACTORY_NAME)));
 		return map;
 	}
 }

src/main/java/com/baosight/hpjx/hp/kc/domain/HPKC005.java

@@ -52,6 +52,8 @@ public class HPKC005 extends DaoEPBase {
 	public static final String FIELD_UPDATED_NAME = "updatedName";    		/* 更新人名称*/
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 更新时间*/
 	public static final String FIELD_DELETE_FLAG = "deleteFlag";    		/* 是否删除0.否1.是*/
+	public static final String FIELD_FACTORY_CODE = "factoryCode";    		/* 厂区编码*/
+	public static final String FIELD_FACTORY_NAME = "factoryName";    		/* 工厂*/
 	
 	public static final String COL_ID = "ID";
 	public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码 预留*/
@@ -83,6 +85,8 @@ public class HPKC005 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_DELETE_FLAG = "DELETE_FLAG";    		/* 是否删除0.否1.是*/
+	public static final String COL_FACTORY_CODE = "FACTORY_CODE";    		/* 厂区编码*/
+	public static final String COL_FACTORY_NAME = "FACTORY_NAME";    		/* 工厂*/
 	
 	public static final String QUERY = "HPKC005.query";
 	public static final String COUNT = "HPKC005.count";
@@ -120,6 +124,8 @@ public class HPKC005 extends DaoEPBase {
 	private String updatedName = " ";		/* 更新人名称*/
 	private String updatedTime = " ";		/* 更新时间*/
 	private Integer deleteFlag;	/* 是否删除0.否1.是*/
+	private String factoryCode = " ";		/* 厂区编码*/
+	private String factoryName = " ";		/* 工厂*/
 	
 	/**
 	 * initialize the metadata.
@@ -272,6 +278,14 @@ public class HPKC005 extends DaoEPBase {
 		eiColumn.setDescName("是否删除0.否1.是");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_FACTORY_CODE);
+		eiColumn.setDescName("厂区编码");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_FACTORY_NAME);
+		eiColumn.setDescName("工厂");
+		eiMetadata.addMeta(eiColumn);
+		
 		
 	}
 	
@@ -763,6 +777,38 @@ public class HPKC005 extends DaoEPBase {
 		this.deleteFlag = deleteFlag;
 	}
 	/**
+	 * get the factoryCode - 厂区编码.
+	 * @return the factoryCode
+	 */
+	public String getFactoryCode() {
+		return this.factoryCode;
+	}
+
+	/**
+	 * set the factoryCode - 厂区编码.
+	 *
+	 * @param factoryCode - 厂区编码
+	 */
+	public void setFactoryCode(String factoryCode) {
+		this.factoryCode = factoryCode;
+	}
+	/**
+	 * get the factoryName - 工厂.
+	 * @return the factoryName
+	 */
+	public String getFactoryName() {
+		return this.factoryName;
+	}
+
+	/**
+	 * set the factoryName - 工厂.
+	 *
+	 * @param factoryName - 工厂
+	 */
+	public void setFactoryName(String factoryName) {
+		this.factoryName = factoryName;
+	}
+	/**
 	 * get the value from Map.
 	 *
 	 * @param map - source data map
@@ -800,6 +846,8 @@ public class HPKC005 extends DaoEPBase {
 		setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_NAME)), updatedName));
 		setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime));
 		setDeleteFlag(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_DELETE_FLAG)), deleteFlag));
+		setFactoryCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_CODE)), factoryCode));
+		setFactoryName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_NAME)), factoryName));
 	}
 	
 	/**
@@ -839,7 +887,8 @@ public class HPKC005 extends DaoEPBase {
 		map.put(FIELD_UPDATED_NAME, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_UPDATED_NAME)));
 		map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME)));
 		map.put(FIELD_DELETE_FLAG, StringUtils.toString(deleteFlag, eiMetadata.getMeta(FIELD_DELETE_FLAG)));
-		
+		map.put(FIELD_FACTORY_CODE, StringUtils.toString(factoryCode, eiMetadata.getMeta(FIELD_FACTORY_CODE)));
+		map.put(FIELD_FACTORY_NAME, StringUtils.toString(factoryName, eiMetadata.getMeta(FIELD_FACTORY_NAME)));
 		return map;
 	}
 }

src/main/java/com/baosight/hpjx/hp/kc/domain/HPKC006.java

@@ -53,6 +53,8 @@ public class HPKC006 extends DaoEPBase {
 	public static final String FIELD_UPDATED_NAME = "updatedName";    		/* 更新人名称*/
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 更新时间*/
 	public static final String FIELD_DELETE_FLAG = "deleteFlag";    		/* 是否删除0.否1.是*/
+	public static final String FIELD_FACTORY_CODE = "factoryCode";    		/* 厂区编码*/
+	public static final String FIELD_FACTORY_NAME = "factoryName";    		/* 工厂*/
 	
 	public static final String COL_ID = "ID";
 	public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码 预留*/
@@ -78,6 +80,8 @@ public class HPKC006 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_DELETE_FLAG = "DELETE_FLAG";    		/* 是否删除0.否1.是*/
+	public static final String COL_FACTORY_CODE = "FACTORY_CODE";    		/* 厂区编码*/
+	public static final String COL_FACTORY_NAME = "FACTORY_NAME";    		/* 工厂*/
 	
 	public static final String QUERY = "HPKC006.query";
 	public static final String COUNT = "HPKC006.count";
@@ -115,6 +119,8 @@ public class HPKC006 extends DaoEPBase {
 	private String updatedName = " ";		/* 更新人名称*/
 	private String updatedTime = " ";		/* 更新时间*/
 	private Integer deleteFlag;		/* 是否删除0.否1.是*/
+	private String factoryCode = " ";		/* 厂区编码*/
+	private String factoryName = " ";		/* 工厂*/
 	
 	/**
 	 * initialize the metadata.
@@ -264,6 +270,14 @@ public class HPKC006 extends DaoEPBase {
 		eiColumn.setDescName("是否删除0.否1.是");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_FACTORY_CODE);
+		eiColumn.setDescName("厂区编码");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_FACTORY_NAME);
+		eiColumn.setDescName("工厂");
+		eiMetadata.addMeta(eiColumn);
+		
 		
 	}
 	
@@ -759,6 +773,38 @@ public class HPKC006 extends DaoEPBase {
 		this.deleteFlag = deleteFlag;
 	}
 	/**
+	 * get the factoryCode - 厂区编码.
+	 * @return the factoryCode
+	 */
+	public String getFactoryCode() {
+		return this.factoryCode;
+	}
+
+	/**
+	 * set the factoryCode - 厂区编码.
+	 *
+	 * @param factoryCode - 厂区编码
+	 */
+	public void setFactoryCode(String factoryCode) {
+		this.factoryCode = factoryCode;
+	}
+	/**
+	 * get the factoryName - 工厂.
+	 * @return the factoryName
+	 */
+	public String getFactoryName() {
+		return this.factoryName;
+	}
+
+	/**
+	 * set the factoryName - 工厂.
+	 *
+	 * @param factoryName - 工厂
+	 */
+	public void setFactoryName(String factoryName) {
+		this.factoryName = factoryName;
+	}
+	/**
 	 * get the value from Map.
 	 *
 	 * @param map - source data map
@@ -796,6 +842,8 @@ public class HPKC006 extends DaoEPBase {
 		setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_NAME)), updatedName));
 		setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime));
 		setDeleteFlag(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_DELETE_FLAG)), deleteFlag));
+		setFactoryCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_CODE)), factoryCode));
+		setFactoryName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_NAME)), factoryName));
 	}
 	
 	/**
@@ -835,6 +883,8 @@ public class HPKC006 extends DaoEPBase {
 		map.put(FIELD_UPDATED_NAME, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_UPDATED_NAME)));
 		map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME)));
 		map.put(FIELD_DELETE_FLAG, StringUtils.toString(deleteFlag, eiMetadata.getMeta(FIELD_DELETE_FLAG)));
+		map.put(FIELD_FACTORY_CODE, StringUtils.toString(factoryCode, eiMetadata.getMeta(FIELD_FACTORY_CODE)));
+		map.put(FIELD_FACTORY_NAME, StringUtils.toString(factoryName, eiMetadata.getMeta(FIELD_FACTORY_NAME)));
 		
 		return map;
 	}

src/main/java/com/baosight/hpjx/hp/kc/domain/HPKC007.java

@@ -47,6 +47,8 @@ public class HPKC007 extends DaoEPBase {
 	public static final String FIELD_UPDATED_NAME = "updatedName";    		/* 更新人名称*/
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 更新时间*/
 	public static final String FIELD_DELETE_FLAG = "deleteFlag";    		/* 是否删除0.否1.是*/
+	public static final String FIELD_FACTORY_CODE = "factoryCode";    		/* 厂区编码*/
+	public static final String FIELD_FACTORY_NAME = "factoryName";    		/* 工厂*/
 	
 	public static final String COL_ID = "ID";
 	public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码 预留*/
@@ -73,6 +75,8 @@ public class HPKC007 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_DELETE_FLAG = "DELETE_FLAG";    		/* 是否删除0.否1.是*/
+	public static final String COL_FACTORY_CODE = "FACTORY_CODE";    		/* 厂区编码*/
+	public static final String COL_FACTORY_NAME = "FACTORY_NAME";    		/* 工厂*/
 	
 	public static final String QUERY = "HPKC007.query";
 	public static final String COUNT = "HPKC007.count";
@@ -105,7 +109,8 @@ public class HPKC007 extends DaoEPBase {
 	private String updatedName = " ";		/* 更新人名称*/
 	private String updatedTime = " ";		/* 更新时间*/
 	private Integer deleteFlag;	/* 是否删除0.否1.是*/
-	
+	private String factoryCode = " ";		/* 厂区编码*/
+	private String factoryName = " ";		/* 工厂*/
 	/**
 	 * initialize the metadata.
 	 */
@@ -222,6 +227,13 @@ public class HPKC007 extends DaoEPBase {
 		eiColumn.setDescName("是否删除0.否1.是");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_FACTORY_CODE);
+		eiColumn.setDescName("厂区编码");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_FACTORY_NAME);
+		eiColumn.setDescName("工厂");
+		eiMetadata.addMeta(eiColumn);
 		
 	}
 	
@@ -633,6 +645,38 @@ public class HPKC007 extends DaoEPBase {
 		this.deleteFlag = deleteFlag;
 	}
 	/**
+	 * get the factoryCode - 厂区编码.
+	 * @return the factoryCode
+	 */
+	public String getFactoryCode() {
+		return this.factoryCode;
+	}
+
+	/**
+	 * set the factoryCode - 厂区编码.
+	 *
+	 * @param factoryCode - 厂区编码
+	 */
+	public void setFactoryCode(String factoryCode) {
+		this.factoryCode = factoryCode;
+	}
+	/**
+	 * get the factoryName - 工厂.
+	 * @return the factoryName
+	 */
+	public String getFactoryName() {
+		return this.factoryName;
+	}
+
+	/**
+	 * set the factoryName - 工厂.
+	 *
+	 * @param factoryName - 工厂
+	 */
+	public void setFactoryName(String factoryName) {
+		this.factoryName = factoryName;
+	}
+	/**
 	 * get the value from Map.
 	 *
 	 * @param map - source data map
@@ -665,6 +709,8 @@ public class HPKC007 extends DaoEPBase {
 		setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_NAME)), updatedName));
 		setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime));
 		setDeleteFlag(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_DELETE_FLAG)), deleteFlag));
+		setFactoryCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_CODE)), factoryCode));
+		setFactoryName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_NAME)), factoryName));
 	}
 	
 	/**
@@ -699,6 +745,8 @@ public class HPKC007 extends DaoEPBase {
 		map.put(FIELD_UPDATED_NAME, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_UPDATED_NAME)));
 		map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME)));
 		map.put(FIELD_DELETE_FLAG, StringUtils.toString(deleteFlag, eiMetadata.getMeta(FIELD_DELETE_FLAG)));
+		map.put(FIELD_FACTORY_CODE, StringUtils.toString(factoryCode, eiMetadata.getMeta(FIELD_FACTORY_CODE)));
+		map.put(FIELD_FACTORY_NAME, StringUtils.toString(factoryName, eiMetadata.getMeta(FIELD_FACTORY_NAME)));
 		
 		return map;
 	}

src/main/java/com/baosight/hpjx/hp/kc/domain/HPKC010.java

@@ -42,6 +42,8 @@ public class HPKC010 extends DaoEPBase {
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 更新时间*/
 	public static final String FIELD_VERSION = "version";    		/* 版本号*/
 	public static final String FIELD_PROJ_NAME = "projName";    		/* 项目名称*/
+	public static final String FIELD_FACTORY_CODE = "factoryCode";    		/* 厂区编码*/
+	public static final String FIELD_FACTORY_NAME = "factoryName";    		/* 工厂*/
 	
 	public static final String COL_ID = "ID";
 	public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码*/
@@ -63,6 +65,8 @@ public class HPKC010 extends DaoEPBase {
 	public static final String COL_UPDATED_TIME = "UPDATED_TIME";    		/* 更新时间*/
 	public static final String COL_VERSION = "VERSION";    		/* 版本号*/
 	public static final String COL_PROJ_NAME = "PROJ_NAME";    		/* 项目名称*/
+	public static final String COL_FACTORY_CODE = "FACTORY_CODE";    		/* 厂区编码*/
+	public static final String COL_FACTORY_NAME = "FACTORY_NAME";    		/* 工厂*/
 	
 	public static final String QUERY = "HPKC010.query";
 	public static final String COUNT = "HPKC010.count";
@@ -90,6 +94,8 @@ public class HPKC010 extends DaoEPBase {
 	private String updatedTime = " ";		/* 更新时间*/
 	private Integer version;		/* 版本号*/
 	private String projName = " ";		/* 项目名称*/
+	private String factoryCode = " ";		/* 厂区编码*/
+	private String factoryName = " ";		/* 工厂*/
 	
 	/**
 	 * initialize the metadata.
@@ -187,6 +193,14 @@ public class HPKC010 extends DaoEPBase {
 		eiColumn.setDescName("项目名称");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_FACTORY_CODE);
+		eiColumn.setDescName("厂区编码");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_FACTORY_NAME);
+		eiColumn.setDescName("工厂");
+		eiMetadata.addMeta(eiColumn);
+		
 		
 	}
 	
@@ -518,6 +532,38 @@ public class HPKC010 extends DaoEPBase {
 		this.projName = projName;
 	}
 	/**
+	 * get the factoryCode - 厂区编码.
+	 * @return the factoryCode
+	 */
+	public String getFactoryCode() {
+		return this.factoryCode;
+	}
+
+	/**
+	 * set the factoryCode - 厂区编码.
+	 *
+	 * @param factoryCode - 厂区编码
+	 */
+	public void setFactoryCode(String factoryCode) {
+		this.factoryCode = factoryCode;
+	}
+	/**
+	 * get the factoryName - 工厂.
+	 * @return the factoryName
+	 */
+	public String getFactoryName() {
+		return this.factoryName;
+	}
+
+	/**
+	 * set the factoryName - 工厂.
+	 *
+	 * @param factoryName - 工厂
+	 */
+	public void setFactoryName(String factoryName) {
+		this.factoryName = factoryName;
+	}
+	/**
 	 * get the value from Map.
 	 *
 	 * @param map - source data map
@@ -545,6 +591,8 @@ public class HPKC010 extends DaoEPBase {
 		setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime));
 		setVersion(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_VERSION)), version));
 		setProjName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_NAME)), projName));
+		setFactoryCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_CODE)), factoryCode));
+		setFactoryName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_NAME)), factoryName));
 	}
 	
 	/**
@@ -574,6 +622,8 @@ public class HPKC010 extends DaoEPBase {
 		map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME)));
 		map.put(FIELD_VERSION, StringUtils.toString(version, eiMetadata.getMeta(FIELD_VERSION)));
 		map.put(FIELD_PROJ_NAME, StringUtils.toString(projName, eiMetadata.getMeta(FIELD_PROJ_NAME)));
+		map.put(FIELD_FACTORY_CODE, StringUtils.toString(factoryCode, eiMetadata.getMeta(FIELD_FACTORY_CODE)));
+		map.put(FIELD_FACTORY_NAME, StringUtils.toString(factoryName, eiMetadata.getMeta(FIELD_FACTORY_NAME)));
 		
 		return map;
 	}

src/main/java/com/baosight/hpjx/hp/kc/domain/HPKC011.java

@@ -50,6 +50,8 @@ public class HPKC011 extends DaoEPBase {
 	public static final String FIELD_UPDATED_NAME = "updatedName";    		/* 更新人名称*/
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 更新时间*/
 	public static final String FIELD_VERSION = "version";    		/* 版本号*/
+	public static final String FIELD_FACTORY_CODE = "factoryCode";    		/* 厂区编码*/
+	public static final String FIELD_FACTORY_NAME = "factoryName";    		/* 工厂*/
 
 	public static final String COL_ID = "FIELD_ID";
 	public static final String COL_COMPANY_CODE = "FIELD_COMPANY_CODE";    		/* 企业编码*/
@@ -78,6 +80,8 @@ public class HPKC011 extends DaoEPBase {
 	public static final String COL_UPDATED_NAME = "FIELD_UPDATED_NAME";    		/* 更新人名称*/
 	public static final String COL_UPDATED_TIME = "FIELD_UPDATED_TIME";    		/* 更新时间*/
 	public static final String COL_VERSION = "FIELD_VERSION";    		/* 版本号*/
+	public static final String COL_FACTORY_CODE = "FACTORY_CODE";    		/* 厂区编码*/
+	public static final String COL_FACTORY_NAME = "FACTORY_NAME";    		/* 工厂*/
 
 	public static final String QUERY = "HPKC011.query";
 	public static final String COUNT = "HPKC011.count";
@@ -114,6 +118,8 @@ public class HPKC011 extends DaoEPBase {
 	private String updatedName = " ";		/* 更新人名称*/
 	private String updatedTime = " ";		/* 更新时间*/
 	private Integer version = null;		/* 版本号*/
+	private String factoryCode = " ";		/* 厂区编码*/
+	private String factoryName = " ";		/* 工厂*/
 
 	/**
 	 * initialize the metadata.
@@ -248,6 +254,14 @@ public class HPKC011 extends DaoEPBase {
 		eiColumn.setDescName("版本号");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_FACTORY_CODE);
+		eiColumn.setDescName("厂区编码");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_FACTORY_NAME);
+		eiColumn.setDescName("工厂");
+		eiMetadata.addMeta(eiColumn);
+
 
 	}
 
@@ -524,6 +538,7 @@ public class HPKC011 extends DaoEPBase {
 		return this.version;
 	}
 
+	
 	/**
 	 * set the version - 版本号.
 	 *
@@ -614,6 +629,39 @@ public class HPKC011 extends DaoEPBase {
 	}
 
 	/**
+	 * get the factoryCode - 厂区编码.
+	 * @return the factoryCode
+	 */
+	public String getFactoryCode() {
+		return this.factoryCode;
+	}
+
+	/**
+	 * set the factoryCode - 厂区编码.
+	 *
+	 * @param factoryCode - 厂区编码
+	 */
+	public void setFactoryCode(String factoryCode) {
+		this.factoryCode = factoryCode;
+	}
+	/**
+	 * get the factoryName - 工厂.
+	 * @return the factoryName
+	 */
+	public String getFactoryName() {
+		return this.factoryName;
+	}
+
+	/**
+	 * set the factoryName - 工厂.
+	 *
+	 * @param factoryName - 工厂
+	 */
+	public void setFactoryName(String factoryName) {
+		this.factoryName = factoryName;
+	}
+
+	/**
 	 * get the value from Map.
 	 *
 	 * @param map - source data map
@@ -648,6 +696,8 @@ public class HPKC011 extends DaoEPBase {
 		setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_NAME)), updatedName));
 		setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime));
 		setVersion(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_VERSION)), version));
+		setFactoryCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_CODE)), factoryCode));
+		setFactoryName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_NAME)), factoryName));
 	}
 	
 	/**
@@ -684,6 +734,8 @@ public class HPKC011 extends DaoEPBase {
 		map.put(FIELD_UPDATED_NAME, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_UPDATED_NAME)));
 		map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME)));
 		map.put(FIELD_VERSION, StringUtils.toString(version, eiMetadata.getMeta(FIELD_VERSION)));
+		map.put(FIELD_FACTORY_CODE, StringUtils.toString(factoryCode, eiMetadata.getMeta(FIELD_FACTORY_CODE)));
+		map.put(FIELD_FACTORY_NAME, StringUtils.toString(factoryName, eiMetadata.getMeta(FIELD_FACTORY_NAME)));
 		
 		return map;
 	}

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC001.java

@@ -57,6 +57,7 @@ public class ServiceHPKC001 extends ServiceBase {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), queryMap);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), queryMap);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_ALL_BLOCK_ID), queryMap, false);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), null, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC001().eiMetadata);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
@@ -158,7 +159,7 @@ public class ServiceHPKC001 extends ServiceBase {
 		DaoUtils.insert(HPKC001.INSERT, fKc001);
 		// 修改库存
 		HPKCTools.updateStock(fKc001.getWhCode(), fKc001.getInventRecordId(), fKc001.getAmount(),
-				fKc001.getUnitWeight(), fKc001.getWeight());
+				fKc001.getUnitWeight(), fKc001.getWeight(),fKc001.getFactoryCode());
 	}
 	
 	/**
@@ -213,7 +214,7 @@ public class ServiceHPKC001 extends ServiceBase {
 		try {
 			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
 			// 入库单号
-			List<String> otherEnterNos = ObjectUtils.listKey(resultRows, "otherEnterNo");
+			List<String> otherEnterNos = ObjectUtils.listKey(resultRows, "purchaseNo");
 			// 锁记录
 			HPKCTools.HpKc001. lock(otherEnterNos);
 			// 查询数据库记录
@@ -251,7 +252,7 @@ public class ServiceHPKC001 extends ServiceBase {
 			DaoUtils.insert(HPKC001.INSERT, newKc006);
 			// 修改库存
 			HPKCTools.updateStock(dbKc001.getWhCode(), dbKc001.getInventRecordId(), dbKc001.getAmount().negate(),
-					dbKc001.getUnitWeight(), dbKc001.getWeight().negate());
+					dbKc001.getUnitWeight(), dbKc001.getWeight().negate(),fKc001.getFactoryCode());
 		}
 	}
 	

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC002.java

@@ -51,6 +51,7 @@ public class ServiceHPKC002 extends ServiceBase {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), queryMap, false);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROJ_RECORD_BLOCK_ID), null, false);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_ALL_BLOCK_ID), queryMap, false);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), null, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC002().eiMetadata);
 			inInfo.setBlock(InventTypeEnum.generatorEiBlock());
 		} catch (PlatException e) {
@@ -114,7 +115,7 @@ public class ServiceHPKC002 extends ServiceBase {
 				DaoUtils.insert(HPKC002.INSERT, newKc002);
 				// 修改库存
 				HPKCTools.updateStock(dbKc002.getWhCode(), dbKc002.getInventRecordId(),
-						dbKc002.getAmount(), dbKc002.getUnitWeight(), dbKc002.getWeight());
+						dbKc002.getAmount(), dbKc002.getUnitWeight(), dbKc002.getWeight(),dbKc002.getFactoryCode());
 			}
 			inInfo = this.query(inInfo);
 			inInfo.setStatus(EiConstant.STATUS_DEFAULT);

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC002A.java

@@ -66,6 +66,7 @@ public class ServiceHPKC002A extends ServiceEPBase {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), queryMap, false);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), queryMap, false);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROJ_RECORD_BLOCK_ID), null, false);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), null, false);
 			String hpsc006Id = inInfo.getString("inqu_status-0-hpsc006Id");
 			if (StringUtils.isNotBlank(hpsc006Id)) {
 				inInfo.set("inqu_result-0-hpsc006Id", hpsc006Id);
@@ -172,7 +173,7 @@ public class ServiceHPKC002A extends ServiceEPBase {
 			DaoUtils.insert(HPKC002.INSERT, newKc002);
 			// 修改库存数量
 			HPKCTools.updateStock(newKc002.getWhCode(), newKc002.getInventRecordId(),
-					newKc002.getAmount().negate(), dbKc010.getUnitWeight(), newKc002.getWeight().negate());
+					newKc002.getAmount().negate(), dbKc010.getUnitWeight(), newKc002.getWeight().negate(),dbKc010.getFactoryCode());
 		}
 	}
 }

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC002B.java

@@ -164,7 +164,7 @@ public class ServiceHPKC002B extends ServiceEPBase {
 			DaoUtils.insert(HPKC002.INSERT, newKc002);
 			// 修改库存数量
 			HPKCTools.updateStock(newKc002.getWhCode(), newKc002.getInventRecordId(),
-					newKc002.getAmount().negate(), dbKc010.getUnitWeight(), newKc002.getWeight().negate());
+					newKc002.getAmount().negate(), dbKc010.getUnitWeight(), newKc002.getWeight().negate(),dbKc010.getFactoryCode());
 		}
 	}
 }

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC003.java

@@ -50,6 +50,7 @@ public class ServiceHPKC003 extends ServiceBase {
 		try {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), new HashMap<String,Object>(){{put("inventTypes",new String[]{"2","3"});}}, false);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), null);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), null, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC003().eiMetadata);
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
@@ -115,7 +116,7 @@ public class ServiceHPKC003 extends ServiceBase {
 				HPSCTools.HpSc005a.updateCompleteNum(newKc003.getProdTaskNo(), newKc003.getAmount());
 				// 修改库存
 				HPKCTools.updateProdStock(newKc003.getWhCode(), newKc003.getProdOrderNo(),
-						newKc003.getAmount(), newKc003.getWeight());
+						newKc003.getAmount(), newKc003.getWeight(),newKc003.getFactoryCode());
 			}
 			eiInfo.setStatus(EiConstant.STATUS_SUCCESS);
 			eiInfo.setMsg("删除成功！");

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC003A.java

@@ -151,7 +151,7 @@ public class ServiceHPKC003A extends ServiceEPBase {
 				HPSCTools.HpSc005a.updateCompleteNum(fSc005b.getProdTaskNo(), applyNum);
 				// 修改库存
 				HPKCTools.updateProdStock(newKc003.getWhCode(), newKc003.getProdOrderNo(),
-						newKc003.getAmount(), newKc003.getWeight());
+						newKc003.getAmount(), newKc003.getWeight(),fSc005b.getFactoryCode());
 			}
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "生成入库单失败");

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC004.java

@@ -8,6 +8,7 @@ import com.baosight.hpjx.core.dao.DaoUtils;
 import com.baosight.hpjx.hp.constant.HPConstant;
 import com.baosight.hpjx.hp.kc.domain.HPKC004;
 import com.baosight.hpjx.hp.kc.domain.HPKC010;
+import com.baosight.hpjx.hp.kc.domain.HPKC011;
 import com.baosight.hpjx.hp.kc.tools.HPKCTools;
 import com.baosight.hpjx.util.BeanUtils;
 import com.baosight.hpjx.util.CommonMethod;
@@ -53,6 +54,7 @@ public class ServiceHPKC004 extends ServiceBase {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), queryMap);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_SPEC_BLOCK_ID), queryMap, false);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), queryMap, false);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), null, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC004().eiMetadata);
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
@@ -99,9 +101,14 @@ public class ServiceHPKC004 extends ServiceBase {
 			// 查询数据库记录
 			Map<String, HPKC004> mapKc004 = HPKCTools.HpKc004.map(saleNos);
 			for (int i = 0; i < resultRows.size(); i++) {
+				HPKC011 hpkc011 = null;
+				HPKC010 hpkc010 = null;
 				HPKC004 fKc004 = new HPKC004();
 				fKc004.fromMap(resultRows.get(i));
-				HPKC010 hpkc010 = HPKCTools.HpKc010.listById(fKc004.getKcId());
+				if (!fKc004.getSubInventCode().equals(" "))
+				hpkc011 = HPKCTools.HpKc011.listById(fKc004.getKcId());
+				else
+				 hpkc010 = HPKCTools.HpKc010.listById(fKc004.getKcId());
 				DaoUtils.update(HPKC004.DELETE, fKc004);
 				// 生成红冲记录
 				HPKC004 dbKc004 = mapKc004.get(fKc004.getSaleNo());
@@ -116,12 +123,12 @@ public class ServiceHPKC004 extends ServiceBase {
 				newKc004.setDeleteFlag(CommonConstant.YesNo.YES_1);
 				DaoUtils.insert(HPKC004.INSERT, newKc004);
 				// 修改库存
-				if (dbKc004.getProdNo().equals(" "))
+				if (hpkc010!=null)
 				HPKCTools.updateStock(dbKc004.getWhCode(), hpkc010.getInventRecordId(),
-				dbKc004.getAmount(), dbKc004.getWeight().multiply(new BigDecimal(1000)));
+				dbKc004.getAmount(), dbKc004.getWeight().multiply(new BigDecimal(1000)),hpkc010.getFactoryCode());
 				else
 				HPKCTools.updateProdStock(dbKc004.getWhCode(), dbKc004.getProdNo(),
-				dbKc004.getAmount(), dbKc004.getWeight());
+				dbKc004.getAmount(), dbKc004.getWeight(),hpkc011.getFactoryCode());
 			}
 			inInfo = this.query(inInfo);
 			inInfo.setStatus(EiConstant.STATUS_DEFAULT);

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC004A.java

@@ -47,6 +47,7 @@ public class ServiceHPKC004A extends ServiceEPBase {
 	@Override
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), null, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC011().eiMetadata);
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
@@ -114,7 +115,7 @@ public class ServiceHPKC004A extends ServiceEPBase {
 				DaoUtils.insert(HPKC004.INSERT, newKc004);
 				// 修改库存数量
 				HPKCTools.updateProdStock(newKc004.getWhCode(), newKc004.getProdNo(),
-						newKc004.getAmount().negate(), newKc004.getWeight().negate());
+						newKc004.getAmount().negate(), newKc004.getWeight().negate(),dbKc011.getFactoryCode());
 			}
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "生成出库单失败");

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC004B.java

@@ -58,6 +58,7 @@ public class ServiceHPKC004B extends ServiceEPBase {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), queryMap, false);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), queryMap, false);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROJ_RECORD_BLOCK_ID), queryMap2, false);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), null, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC010().eiMetadata);
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
@@ -163,7 +164,7 @@ public class ServiceHPKC004B extends ServiceEPBase {
 
 			// 修改库存数量
 			HPKCTools.updateStock(newKc004.getWhCode(), dbKc010.getInventRecordId(),
-					newKc004.getAmount().negate(), dbKc010.getUnitWeight(), newKc004.getWeight().negate());
+					newKc004.getAmount().negate(), dbKc010.getUnitWeight(), newKc004.getWeight().negate(),dbKc010.getFactoryCode());
 		}
 	}
 }

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC005.java

@@ -142,7 +142,7 @@ public class ServiceHPKC005 extends ServiceBase {
 		DaoUtils.insert(HPKC005.INSERT, fKc005);
 		// 修改库存
 		HPKCTools.updateStock(fKc005.getWhCode(), fKc005.getInventRecordId(),
-				fKc005.getDiffAmount(), fKc005.getDiffWeight());
+				fKc005.getDiffAmount(), fKc005.getDiffWeight(),fKc005.getFactoryCode());
 	}
 	
 	/**
@@ -238,7 +238,7 @@ public class ServiceHPKC005 extends ServiceBase {
 			DaoUtils.insert(HPKC005.INSERT, newKc005);
 			// 修改库存
 			HPKCTools.updateStock(newKc005.getWhCode(), newKc005.getInventRecordId(),
-					newKc005.getDiffAmount(), newKc005.getDiffWeight());
+					newKc005.getDiffAmount(), newKc005.getDiffWeight(),newKc005.getFactoryCode());
 		}
 	}
 	

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC005A.java

@@ -150,7 +150,7 @@ public class ServiceHPKC005A extends ServiceEPBase {
 			DaoUtils.insert(HPKC005.INSERT, newKc005);
 			// 修改库存数量
 			HPKCTools.updateStock(newKc005.getWhCode(), newKc005.getInventRecordId(),
-					newKc005.getDiffAmount(), newKc005.getDiffWeight());
+					newKc005.getDiffAmount(), newKc005.getDiffWeight(),dbKc010.getFactoryCode());
 		}
 	}
 }

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC006.java

@@ -59,6 +59,7 @@ public class ServiceHPKC006 extends ServiceBase {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), queryMap,false);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_SPEC_BLOCK_ID), queryMap);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), queryMap, false);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), null, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC006().eiMetadata);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
@@ -155,7 +156,7 @@ public class ServiceHPKC006 extends ServiceBase {
 		DaoUtils.insert(HPKC006.INSERT, fKc006);
 		// 修改库存
 		HPKCTools.updateStock(fKc006.getWhCode(), fKc006.getInventRecordId(), fKc006.getAmount(),
-				fKc006.getWeight());
+				fKc006.getWeight(), fKc006.getFactoryCode());
 	}
 	
 	/**
@@ -220,7 +221,7 @@ public class ServiceHPKC006 extends ServiceBase {
 				DaoUtils.insert(HPKC006.INSERT, newKc006);
 				// 修改库存
 				HPKCTools.updateStock(dbKc006.getWhCode(), dbKc006.getInventRecordId(), dbKc006.getAmount().negate(),
-						dbKc006.getWeight().negate());
+						dbKc006.getWeight().negate(),dbKc006.getFactoryCode());
 			}
 			inInfo = this.query(inInfo);
 			inInfo.setStatus(EiConstant.STATUS_DEFAULT);

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC007.java

@@ -57,6 +57,7 @@ public class ServiceHPKC007 extends ServiceBase {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), queryMap);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_SPEC_BLOCK_ID), queryMap, false);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), queryMap, false);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), null, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC007().eiMetadata);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
@@ -110,7 +111,7 @@ public class ServiceHPKC007 extends ServiceBase {
 				DaoUtils.insert(HPKC007.INSERT, fKc007);
 				// 修改库存
 				HPKCTools.updateStock(fKc007.getWhCode(), fKc007.getInventRecordId(), fKc007.getAmount().negate(),
-						fKc007.getWeight().negate());
+						fKc007.getWeight().negate(),fKc007.getFactoryCode());
 			}
 			inInfo = this.query(inInfo);
 			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
@@ -151,7 +152,7 @@ public class ServiceHPKC007 extends ServiceBase {
 				BigDecimal diffWeight = fKc007.getWeight().subtract(dbKc007.getWeight());
 				// 修改库存
 				HPKCTools.updateStock(fKc007.getWhCode(), fKc007.getInventRecordId(), diffAmount.negate(),
-						diffWeight.negate());
+						diffWeight.negate(), dbKc007.getFactoryCode());
 			}
 			inInfo = this.query(inInfo);
 			inInfo.setStatus(EiConstant.STATUS_SUCCESS);
@@ -225,7 +226,7 @@ public class ServiceHPKC007 extends ServiceBase {
 				DaoUtils.insert(HPKC007.INSERT, newKc007);
 				// 修改库存
 				HPKCTools.updateStock(dbKc007.getWhCode(), dbKc007.getInventRecordId(), dbKc007.getAmount(),
-						dbKc007.getWeight());
+						dbKc007.getWeight(),dbKc007.getFactoryCode());
 			}
 			inInfo = this.query(inInfo);
 			inInfo.setStatus(EiConstant.STATUS_DEFAULT);

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC007A.java

@@ -56,6 +56,7 @@ public class ServiceHPKC007A extends ServiceEPBase {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), queryMap);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_SPEC_BLOCK_ID), queryMap, false);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), queryMap, false);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), null, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC010().eiMetadata);
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
@@ -149,7 +150,7 @@ public class ServiceHPKC007A extends ServiceEPBase {
 			DaoUtils.insert(HPKC007.INSERT, kc007);
 			// 修改库存数量
 			HPKCTools.updateStock(kc007.getWhCode(), kc007.getInventRecordId(), kc007.getAmount().negate(),
-					kc007.getWeight().negate());
+					kc007.getWeight().negate(),kc007.getFactoryCode());
 		}
 	}
 	

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC010.java

@@ -54,6 +54,7 @@ public class ServiceHPKC010 extends ServiceBase {
 		CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.MATERIAL_RECORD_BLOCK_ID), queryMap);
 		CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_SPEC_BLOCK_ID), queryMap);
 		CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), queryMap, false);
+		CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), null, false);
 		return inInfo;
 	}
 	
@@ -124,6 +125,7 @@ public class ServiceHPKC010 extends ServiceBase {
 					throw new PlatException("当前库存为空，库存变更数量与重量不能小于等于0！");
 				}
 				generatorBaseInfo(newObj);
+				newObj.setFactoryCode(inInfo.getString("factoryCode"));
 				DaoUtils.insert("HPKC010.insert", newObj);
 			} else {
 				//修改

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC011.java

@@ -46,6 +46,7 @@ public class ServiceHPKC011 extends ServiceBase {
 		Map paramMap = new HashMap<String,Object>(){{
 			put("inventTypes", InventTypeEnum.getProdTypes());
 		}};
+		CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), null, false);
 		CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), paramMap);
 		CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.MATERIAL_RECORD_BLOCK_ID), paramMap);
 		return outInfo;
@@ -98,6 +99,7 @@ public class ServiceHPKC011 extends ServiceBase {
 	public EiInfo updateStock(EiInfo inInfo){
 		String whCode = inInfo.getString("whCode");
 		String prodNo = inInfo.getString("prodNo");
+		String factoryCode = inInfo.getString("factoryCode");
 		BigDecimal amount = new BigDecimal(inInfo.getString("amount"));
 		BigDecimal weight = new BigDecimal(inInfo.getString("weight"));
 		String companyCode = UserSessionUtils.getCompanyCode();
@@ -115,6 +117,7 @@ public class ServiceHPKC011 extends ServiceBase {
 						||weight.compareTo(BigDecimal.ZERO)<0){
 					throw new PlatException("当前库存为空，库存变更数量与重量不能小于等于0！");
 				}
+				newObj.setFactoryCode(factoryCode);
 				generatorBaseInfo(newObj);
 				DaoUtils.insert("HPKC011.insert",newObj);
 			}else{

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC001.xml

@@ -25,7 +25,9 @@
         WEIGHT as "weight",  <!-- 重量 -->
         REMARK as "remark",  <!-- 备注 -->
         OLD_PURCHASE_NO as "oldPurchaseNo",  <!-- 原采购单号 -->
-        DELETE_FLAG as "deleteFlag" <!-- 是否删除0.否1.是 -->
+        DELETE_FLAG as "deleteFlag", <!-- 是否删除0.否1.是 -->
+        FACTORY_CODE as "factoryCode",  <!-- 厂区编码 -->
+        FACTORY_NAME as "factoryName"  <!-- 工厂 -->
     </sql>
 
 	<sql id="condition">
@@ -95,6 +97,15 @@
         <isNotEmpty prepend=" AND " property="oldPurchaseNo">
             OLD_PURCHASE_NO = #oldPurchaseNo#
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="factoryCode">
+            FACTORY_CODE = #factoryCode#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="factoryName">
+            FACTORY_NAME = #factoryName#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="purchaseNos">
+            PURCHASE_NO IN <iterate close=")" open="(" conjunction="," property="purchaseNos">#purchaseNos[]#</iterate>
+        </isNotEmpty>
 	</sql>
 
     <sql id="customCondition">
@@ -160,12 +171,14 @@
             UNIT_WEIGHT,  <!-- 单重 -->
             WEIGHT,  <!-- 重量 -->
             REMARK,  <!-- 备注 -->
-            DELETE_FLAG  <!-- 是否删除0.否1.是 -->
+            DELETE_FLAG,  <!-- 是否删除0.否1.是 -->
+            FACTORY_CODE,  <!-- 厂区编码 -->
+            FACTORY_NAME  <!-- 工厂 -->
         ) VALUES (
             #companyCode#, #depCode#, #createdBy#, #createdName#, #createdTime#,
             #purchaseNo#,#oldPurchaseNo#, #receiptDate#, #whCode#, #whName#, #inventType#,
             #inventCode#, #inventName#, #inventRecordId#, #amount#, #unitWeight#, #weight#,
-            #remark#, #deleteFlag#
+            #remark#, #deleteFlag#,#factoryCode#, #factoryName#
         )
     </insert>
 
@@ -180,10 +193,24 @@
 		WHERE ID = #id#
 	</update>
 
+    <update id="lock">
+        UPDATE ${hpjxSchema}.t_hpkc001
+        SET CREATED_TIME = CREATED_TIME
+        WHERE 1=1
+        <isNotEmpty prepend=" AND " property="purchaseNo">
+            PURCHASE_NO = #purchaseNo#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="purchaseNos">
+            PURCHASE_NO IN <iterate close=")" open="(" conjunction="," property="purchaseNos">#purchaseNos[]#</iterate>
+        </isNotEmpty>
+    </update>
+
     <!-- 统计库存 -->
     <select id="statDate" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC001">
         SELECT
             COMPANY_CODE AS "companyCode",
+            FACTORY_CODE as "factoryCode",
+            FACTORY_NAME as "factoryName",
             DEP_CODE AS "depCode",
             WH_CODE AS "whCode",
             INVENT_TYPE AS "inventType",
@@ -196,7 +223,7 @@
         <isNotEmpty prepend=" AND " property="createdTimeFrom">
             CREATED_TIME BETWEEN #createdTimeFrom# AND #createdTimeTo#
         </isNotEmpty>
-        GROUP BY COMPANY_CODE, DEP_CODE, WH_CODE, INVENT_TYPE, INVENT_CODE, INVENT_RECORD_ID
+        GROUP BY COMPANY_CODE, DEP_CODE, WH_CODE, INVENT_TYPE, INVENT_CODE, INVENT_RECORD_ID,FACTORY_CODE,FACTORY_NAME
     </select>
 
 </sqlMap>

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC002.xml

@@ -28,7 +28,9 @@
         OLD_REQ_NO as "oldReqNo",  <!-- 原领料单号 -->
         DELETE_FLAG as "deleteFlag", <!-- 是否删除0.否1.是 -->
         PROJ_CODE as "projCode",
-        HPSC006_ID as "hpsc006Id"
+        HPSC006_ID as "hpsc006Id",
+        FACTORY_CODE as "factoryCode",  <!-- 厂区编码 -->
+        FACTORY_NAME as "factoryName"  <!-- 工厂 -->
     </sql>
 
 	<sql id="condition">
@@ -98,6 +100,12 @@
         <isNotEmpty prepend=" AND " property="hpsc006Id">
             HPSC006_ID = #hpsc006Id#
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="factoryCode">
+            FACTORY_CODE = #factoryCode#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="factoryName">
+            FACTORY_NAME = #factoryName#
+        </isNotEmpty>
 	</sql>
 
     <sql id="customCondition">
@@ -167,12 +175,14 @@
             KC_ID,  <!-- 库存ID -->
             OLD_REQ_NO,  <!-- 原领料单号 -->
             DELETE_FLAG,  <!-- 是否删除0.否1.是 -->
-        PROJ_CODE,HPSC006_ID
+        PROJ_CODE,HPSC006_ID,
+        FACTORY_CODE,  <!-- 厂区编码 -->
+        FACTORY_NAME  <!-- 工厂 -->
         ) VALUES (
             #companyCode#, #depCode#, #createdBy#, #createdName#, #createdTime#,
             #reqNo#, #receiptDate#, #whCode#, #whName#, #inventType#, #inventCode#,
             #inventName#, #inventRecordId#, #amount#, #unitWeight#, #weight#, #remark#, #kcId#,
-            #oldReqNo#, #deleteFlag#, #projCode#, #hpsc006Id#
+            #oldReqNo#, #deleteFlag#, #projCode#, #hpsc006Id#,#factoryCode#, #factoryName#
         )
     </insert>
 
@@ -198,6 +208,8 @@
     <select id="statDate" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC002">
         SELECT
             COMPANY_CODE AS "companyCode",
+            FACTORY_CODE as "factoryCode",
+            FACTORY_NAME as "factoryName",
             DEP_CODE AS "depCode",
             WH_CODE AS "whCode",
             INVENT_TYPE AS "inventType",
@@ -210,7 +222,7 @@
         <isNotEmpty prepend=" AND " property="createdTimeFrom">
             CREATED_TIME BETWEEN #createdTimeFrom# AND #createdTimeTo#
         </isNotEmpty>
-        GROUP BY COMPANY_CODE, DEP_CODE, WH_CODE, INVENT_TYPE, INVENT_CODE, INVENT_RECORD_ID
+        GROUP BY COMPANY_CODE, DEP_CODE, WH_CODE, INVENT_TYPE, INVENT_CODE, INVENT_RECORD_ID,FACTORY_CODE,FACTORY_NAME
     </select>
 
     <select id="countNumByProjCode" resultClass="int">

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC003.xml

@@ -39,7 +39,8 @@
         PART_WIDTH as "partWidth",  <!-- 零件-宽 -->
         PART_THICK as "partThick",  <!-- 零件-厚 -->
         PART_SPEC as "partSpec",  <!-- 零件规格 -->
-        REMARK1 as "remark1" <!-- 备注 -->
+        REMARK1 as "remark1", <!-- 备注 -->
+        FACTORY_CODE as "factoryCode"  <!-- 厂区编码 -->
     </sql>
 
     <sql id="condition">
@@ -82,6 +83,9 @@
         <isNotEmpty prepend=" AND " property="deleteFlag">
             DELETE_FLAG = #deleteFlag#
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="factoryCode">
+            FACTORY_CODE = #factoryCode#
+        </isNotEmpty>
     </sql>
 
     <sql id="customCondition">
@@ -152,14 +156,15 @@
             PART_WIDTH,  <!-- 零件-宽 -->
             PART_THICK,  <!-- 零件-厚 -->
             PART_SPEC,  <!-- 零件规格 -->
-            REMARK1  <!-- 备注 -->
+            REMARK1,  <!-- 备注 -->
+            FACTORY_CODE  <!-- 厂区编码 -->
         ) VALUES (
             #companyCode#, #depCode#, #documentDate#, #prodNo#, #whCode#, #whName#, #amount#,
             #weight#, #remark#, #createdBy#, #createdName#, #createdTime#, #prodOrderNo#,
             #prodTaskNo#, #deleteFlag#, #prodNoOld#, #projCode#, #projName#, #prdtType#,
             #prdtCode#, #prdtName#, #prdtLength#, #prdtWidth#, #prdtThick#, #prdtSpec#,
             #partType#, #partCode#, #partName#, #partLength#, #partWidth#, #partThick#,
-            #partSpec#, #remark1#
+            #partSpec#, #remark1#, #factoryCode#
         )
     </insert>
 
@@ -191,13 +196,14 @@
             PRDT_CODE AS "prdtCode",
             PART_CODE AS "partCode",
             COALESCE(SUM(AMOUNT), 0) AS "amount",
-            COALESCE(SUM(WEIGHT), 0) AS "weight"
+            COALESCE(SUM(WEIGHT), 0) AS "weight",
+            FACTORY_CODE as "factoryCode"
         FROM ${hpjxSchema}.T_HPKC003
         WHERE 1=1
         <isNotEmpty prepend=" AND " property="createdTimeFrom">
             CREATED_TIME BETWEEN #createdTimeFrom# AND #createdTimeTo#
         </isNotEmpty>
-        GROUP BY COMPANY_CODE, DEP_CODE, WH_CODE, PROJ_CODE, PRDT_CODE, PART_CODE
+        GROUP BY COMPANY_CODE, DEP_CODE, WH_CODE, PROJ_CODE, PRDT_CODE, PART_CODE, FACTORY_CODE
     </select>
 
 </sqlMap>

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC004.xml

@@ -33,7 +33,9 @@
         UPDATED_BY as "updatedBy",  <!-- 修改人 -->
         UPDATED_NAME as "updatedName",  <!-- 修改人名称 -->
         UPDATED_TIME as "updatedTime",  <!-- 修改时间 -->
-        DELETE_FLAG as "deleteFlag" <!-- 是否删除 -->
+        DELETE_FLAG as "deleteFlag", <!-- 是否删除 -->
+        FACTORY_CODE as "factoryCode",  <!-- 厂区编码 -->
+        FACTORY_NAME as "factoryName"  <!-- 工厂 -->
     </sql>
 
 	<sql id="condition">
@@ -94,6 +96,12 @@
         <isNotEmpty prepend=" AND " property="deleteFlag">
             DELETE_FLAG = #deleteFlag#
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="factoryCode">
+            FACTORY_CODE = #factoryCode#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="factoryName">
+            FACTORY_NAME = #factoryName#
+        </isNotEmpty>
     </sql>
 
     <sql id="customCondition">
@@ -172,12 +180,15 @@
             CREATED_BY,  <!-- 创建人 -->
             CREATED_NAME,  <!-- 创建人名称 -->
             CREATED_TIME,  <!-- 创建时间 -->
-            DELETE_FLAG  <!-- 是否删除 -->
+            DELETE_FLAG,  <!-- 是否删除 -->
+        FACTORY_CODE,  <!-- 厂区编码 -->
+        FACTORY_NAME  <!-- 工厂 -->
         ) VALUES (
             #companyCode#, #depCode#, #receiptDate#, #saleNo#, #whCode#, #whName#, #prodNo#,
             #projCode#, #projName#, #inventCode#, #inventName#, #subInventCode#, #subInventName#,
             #length#, #width#, #thick#, #amount#, #unitWeight#, #weight#, #remark#, #kcId#,
-            #oldSaleNo#, #isPrint#, #createdBy#, #createdName#, #createdTime#, #deleteFlag#
+            #oldSaleNo#, #isPrint#, #createdBy#, #createdName#, #createdTime#, #deleteFlag#,#factoryCode#, #factoryName#
+
         )
     </insert>
     <!-- 逻辑删除 -->
@@ -210,7 +221,9 @@
             UPDATED_BY = #updatedBy#,   <!-- 修改人 -->
             UPDATED_NAME = #updatedName#,   <!-- 修改人名称 -->
             UPDATED_TIME = #updatedTime#,   <!-- 修改时间 -->
-            DELETE_FLAG = #deleteFlag#  <!-- 是否删除 -->
+            DELETE_FLAG = #deleteFlag#,  <!-- 是否删除 -->
+        FACTORY_CODE = #factoryCode#,
+        FACTORY_NAME = #factoryName#
         WHERE ID = #id#
 	</update>
 
@@ -239,6 +252,8 @@
     <select id="statDate" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC004">
         SELECT
             COMPANY_CODE AS "companyCode",
+            FACTORY_CODE as "factoryCode",
+            FACTORY_NAME as "factoryName",
             DEP_CODE AS "depCode",
             WH_CODE AS "whCode",
             PROJ_CODE AS "projCode",
@@ -251,7 +266,7 @@
         <isNotEmpty prepend=" AND " property="createdTimeFrom">
             CREATED_TIME BETWEEN #createdTimeFrom# AND #createdTimeTo#
         </isNotEmpty>
-        GROUP BY COMPANY_CODE, DEP_CODE, WH_CODE, PROJ_CODE, INVENT_CODE, SUB_INVENT_CODE
+        GROUP BY COMPANY_CODE, DEP_CODE, WH_CODE, PROJ_CODE, INVENT_CODE, SUB_INVENT_CODE,FACTORY_CODE,FACTORY_NAME
     </select>
 
 </sqlMap>

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC005.xml

@@ -30,7 +30,9 @@
         UPDATED_BY as "updatedBy",  <!-- 更新人 -->
         UPDATED_NAME as "updatedName",  <!-- 更新人名称 -->
         UPDATED_TIME as "updatedTime",  <!-- 更新时间 -->
-        DELETE_FLAG as "deleteFlag" <!-- 是否删除0.否1.是 -->
+        DELETE_FLAG as "deleteFlag", <!-- 是否删除0.否1.是 -->
+        FACTORY_CODE as "factoryCode",  <!-- 厂区编码 -->
+        FACTORY_NAME as "factoryName"  <!-- 工厂 -->
     </sql>
 
 	<sql id="condition">
@@ -85,6 +87,12 @@
         <isNotEmpty prepend=" AND " property="deleteFlag">
             DELETE_FLAG = #deleteFlag#
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="factoryCode">
+            FACTORY_CODE = #factoryCode#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="factoryName">
+            FACTORY_NAME = #factoryName#
+        </isNotEmpty>
 	</sql>
 
     <sql id="customCondition">
@@ -173,13 +181,15 @@
             CREATED_BY,  <!-- 创建人 -->
             CREATED_NAME,  <!-- 创建人名称 -->
             CREATED_TIME,  <!-- 创建时间 -->
-            DELETE_FLAG  <!-- 是否删除0.否1.是 -->
+            DELETE_FLAG,  <!-- 是否删除0.否1.是 -->
+        FACTORY_CODE,  <!-- 厂区编码 -->
+        FACTORY_NAME  <!-- 工厂 -->
         )  VALUES (
             #companyCode#, #depCode#, #receiptDate#, #checkNo#, #whCode#, #whName#,
             #inventType#, #inventCode#, #inventName#, #inventRecordId#, #bookAmount#,
             #bookWeight#, #entityAmount#, #entityWeight#, #diffAmount#, #diffWeight#,
             #kcId#, #remark#, #oldCheckNo#, #createdBy#, #createdName#, #createdTime#,
-            #deleteFlag#
+            #deleteFlag#,#factoryCode#, #factoryName#
         )
     </insert>
 
@@ -207,7 +217,9 @@
             REMARK = #remark#,   <!-- 备注 -->
             UPDATED_BY = #updatedBy#,   <!-- 更新人 -->
             UPDATED_NAME = #updatedName#,   <!-- 更新人名称 -->
-            UPDATED_TIME = #updatedTime#  <!-- 更新时间 -->
+            UPDATED_TIME = #updatedTime#,  <!-- 更新时间 -->
+        FACTORY_CODE = #factoryCode#,
+        FACTORY_NAME = #factoryName#
 		WHERE ID = #id#
 	</update>
 
@@ -228,6 +240,8 @@
     <select id="statDate" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC005">
         SELECT
             COMPANY_CODE AS "companyCode",
+            FACTORY_CODE as "factoryCode",
+            FACTORY_NAME as "factoryName",
             DEP_CODE AS "depCode",
             WH_CODE AS "whCode",
             INVENT_TYPE AS "inventType",
@@ -240,7 +254,7 @@
         <isNotEmpty prepend=" AND " property="createdTimeFrom">
             CREATED_TIME BETWEEN #createdTimeFrom# AND #createdTimeTo#
         </isNotEmpty>
-        GROUP BY COMPANY_CODE, DEP_CODE, WH_CODE, INVENT_TYPE, INVENT_CODE, INVENT_RECORD_ID
+        GROUP BY COMPANY_CODE, DEP_CODE, WH_CODE, INVENT_TYPE, INVENT_CODE, INVENT_RECORD_ID,FACTORY_CODE,FACTORY_NAME
     </select>
 
 </sqlMap>

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC006.xml

@@ -31,7 +31,9 @@
         B.THICK as "thick",
         B.MATERIAL as "material",
         B.COEFFICIENT as "coefficient",
-        B.UNIT AS "unit"
+        B.UNIT AS "unit",
+        A.FACTORY_CODE as "factoryCode",  <!-- 厂区编码 -->
+        A.FACTORY_NAME as "factoryName"  <!-- 工厂 -->
     </sql>
 
     <sql id="condition">
@@ -71,6 +73,12 @@
         <isNotEmpty prepend=" AND " property="deleteFlag">
             A.DELETE_FLAG = #deleteFlag#
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="factoryCode">
+            A.FACTORY_CODE = #factoryCode#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="factoryName">
+            A.FACTORY_NAME = #factoryName#
+        </isNotEmpty>
     </sql>
 
     <sql id="customCondition">
@@ -155,11 +163,13 @@
             CREATED_BY,  <!-- 创建人 -->
             CREATED_NAME,  <!-- 创建人名称 -->
             CREATED_TIME,  <!-- 创建时间 -->
-            DELETE_FLAG
+            DELETE_FLAG,
+            FACTORY_CODE,  <!-- 厂区编码 -->
+            FACTORY_NAME  <!-- 工厂 -->
         ) VALUES (
             #companyCode#, #depCode#, #receiptDate#, #otherEnterNo#, #whCode#, #whName#,
             #inventType#, #inventCode#, #inventName#, #inventRecordId#, #amount#, #unitWeight#, #weight#,
-            #remark#, #oldEnterNo#, #createdBy#, #createdName#, #createdTime#, #deleteFlag#
+            #remark#, #oldEnterNo#, #createdBy#, #createdName#, #createdTime#, #deleteFlag#,#factoryCode#, #factoryName#
         )
     </insert>
 
@@ -185,6 +195,8 @@
     <select id="statDate" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC006">
         SELECT
             COMPANY_CODE AS "companyCode",
+            FACTORY_CODE as "factoryCode",
+            FACTORY_NAME as "factoryName",
             DEP_CODE AS "depCode",
             WH_CODE AS "whCode",
             INVENT_TYPE AS "inventType",
@@ -197,7 +209,7 @@
         <isNotEmpty prepend=" AND " property="createdTimeFrom">
             CREATED_TIME BETWEEN #createdTimeFrom# AND #createdTimeTo#
         </isNotEmpty>
-        GROUP BY COMPANY_CODE, DEP_CODE, WH_CODE, INVENT_TYPE, INVENT_CODE, INVENT_RECORD_ID
+        GROUP BY COMPANY_CODE, DEP_CODE, WH_CODE, INVENT_TYPE, INVENT_CODE, INVENT_RECORD_ID,FACTORY_CODE,FACTORY_NAME
     </select>
 
 </sqlMap>

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC007.xml

@@ -26,7 +26,9 @@
         CREATED_TIME as "createdTime",  <!-- 创建时间 -->
         UPDATED_BY as "updatedBy",  <!-- 更新人 -->
         UPDATED_NAME as "updatedName",  <!-- 更新人名称 -->
-        UPDATED_TIME as "updatedTime" <!-- 更新时间 -->
+        UPDATED_TIME as "updatedTime", <!-- 更新时间 -->
+        FACTORY_CODE as "factoryCode",  <!-- 厂区编码 -->
+        FACTORY_NAME as "factoryName"  <!-- 工厂 -->
     </sql>
 
     <sql id="condition">
@@ -66,6 +68,12 @@
         <isNotEmpty prepend=" AND " property="deleteFlag">
             DELETE_FLAG = #deleteFlag#
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="factoryCode">
+            FACTORY_CODE = #factoryCode#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="factoryName">
+            FACTORY_NAME = #factoryName#
+        </isNotEmpty>
     </sql>
 
     <sql id="customCondition">
@@ -148,11 +156,13 @@
             CREATED_BY,  <!-- 创建人 -->
             CREATED_NAME,  <!-- 创建人名称 -->
             CREATED_TIME,  <!-- 创建时间 -->
-            DELETE_FLAG
+            DELETE_FLAG,
+            FACTORY_CODE,  <!-- 厂区编码 -->
+            FACTORY_NAME  <!-- 工厂 -->
         ) VALUES (
             #companyCode#, #depCode#, #receiptDate#, #otherOuterNo#, #whCode#, #whName#,
             #inventType#, #inventCode#, #inventName#, #inventRecordId#, #amount#, #unitWeight#, #weight#,
-            #kcId#, #remark#, #oldOuterNo#, #createdBy#, #createdName#, #createdTime#, #deleteFlag#
+            #kcId#, #remark#, #oldOuterNo#, #createdBy#, #createdName#, #createdTime#, #deleteFlag#,#factoryCode#, #factoryName#
         )
     </insert>
 
@@ -178,6 +188,8 @@
     <select id="statDate" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC007">
         SELECT
             COMPANY_CODE AS "companyCode",
+            FACTORY_CODE as "factoryCode",
+            FACTORY_NAME as "factoryName",
             DEP_CODE AS "depCode",
             WH_CODE AS "whCode",
             INVENT_TYPE AS "inventType",
@@ -190,7 +202,7 @@
         <isNotEmpty prepend=" AND " property="createdTimeFrom">
             CREATED_TIME BETWEEN #createdTimeFrom# AND #createdTimeTo#
         </isNotEmpty>
-        GROUP BY COMPANY_CODE, DEP_CODE, WH_CODE, INVENT_TYPE, INVENT_CODE, INVENT_RECORD_ID
+        GROUP BY COMPANY_CODE, DEP_CODE, WH_CODE, INVENT_TYPE, INVENT_CODE, INVENT_RECORD_ID,FACTORY_CODE,FACTORY_NAME
     </select>
 
 </sqlMap>

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC010.xml

@@ -21,7 +21,9 @@
         UPDATED_BY as "updatedBy",  <!-- 更新人 -->
         UPDATED_NAME as "updatedName",  <!-- 更新人名称 -->
         UPDATED_TIME as "updatedTime",  <!-- 更新时间 -->
-        VERSION as "version" <!-- 版本号 -->
+        VERSION as "version", <!-- 版本号 -->
+        FACTORY_CODE as "factoryCode",  <!-- 厂区编码 -->
+        FACTORY_NAME as "factoryName"  <!-- 工厂 -->
     </sql>
 
 	<sql id="condition">
@@ -64,6 +66,12 @@
         <isNotEmpty prepend=" AND " property="version">
             VERSION = #version#
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="factoryCode">
+            FACTORY_CODE = #factoryCode#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="factoryName">
+            FACTORY_NAME = #factoryName#
+        </isNotEmpty>
 
     </sql>
 
@@ -134,12 +142,14 @@
             UPDATED_BY,  <!-- 更新人 -->
             UPDATED_NAME,  <!-- 更新人 -->
             UPDATED_TIME,  <!-- 更新时间 -->
-            VERSION
+            VERSION,
+            FACTORY_CODE,  <!-- 厂区编码 -->
+            FACTORY_NAME  <!-- 工厂 -->
         ) VALUES (
             #companyCode#, #depCode#, #whCode#, #whName#, #inventType#,
             #inventCode#, #inventName#, #inventRecordId#, #amount#, #unitWeight#, #weight#,
             #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#,
-            #updatedTime#, #version#
+            #updatedTime#, #version#,#factoryCode#, #factoryName#
         )
 	</insert>
 

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC011.xml

@@ -29,7 +29,9 @@
         UPDATED_BY as "updatedBy",  <!-- 更新人 -->
         UPDATED_NAME as "updatedName",  <!-- 更新人名称 -->
         UPDATED_TIME as "updatedTime",  <!-- 更新时间 -->
-        VERSION as "version" <!-- 版本号 -->
+        VERSION as "version", <!-- 版本号 -->
+        FACTORY_CODE as "factoryCode",  <!-- 厂区编码 -->
+        FACTORY_NAME as "factoryName"  <!-- 工厂 -->
     </sql>
 
 	<sql id="condition">
@@ -81,6 +83,12 @@
         <isNotEmpty prepend=" AND " property="version">
             VERSION = #version#
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="factoryCode">
+            FACTORY_CODE = #factoryCode#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="factoryName">
+            FACTORY_NAME = #factoryName#
+        </isNotEmpty>
 
     </sql>
 
@@ -148,13 +156,15 @@
             UPDATED_BY,  <!-- 更新人 -->
         UPDATED_NAME,  <!-- 更新人 -->
         UPDATED_TIME,  <!-- 更新时间 -->
-            VERSION
+            VERSION,
+        FACTORY_CODE,  <!-- 厂区编码 -->
+        FACTORY_NAME  <!-- 工厂 -->
         ) VALUES (
             #companyCode#, #depCode#, #whCode#, #whName#, #prodNo#, #projCode#, #projName#,
             #inventCode#, #inventName#, #subInventCode#, #subInventName#, #length#, #width#, #thick#,#prdtSpec#,
             #amount#, #unitWeight#, #weight#, #remark#,
             #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#,
-            #updatedTime#, #version#
+            #updatedTime#, #version#,#factoryCode#, #factoryName#
         )
 	</insert>
 

src/main/java/com/baosight/hpjx/hp/kc/tools/HPKCTools.java

@@ -49,7 +49,7 @@ public class HPKCTools {
 				return;
 			}
 			Map queryMap = new HashMap();
-			queryMap.put("otherEnterNos", otherEnterNos);
+			queryMap.put("purchaseNos", otherEnterNos);
 			DaoBase.getInstance().update(HPSqlConstant.HPKC001.LOCK, queryMap);
 		}
 		
@@ -64,7 +64,7 @@ public class HPKCTools {
 				return null;
 			}
 			Map queryMap = new HashMap();
-			queryMap.put("otherEnterNos", otherEnterNos);
+			queryMap.put("purchaseNos", otherEnterNos);
 			return DaoBase.getInstance().query(HPKC001.QUERY, queryMap);
 		}
 		
@@ -448,8 +448,8 @@ public class HPKCTools {
 	 * @param amount
 	 * @param weight
 	 */
-	public static void updateStock(String whCode, Long inventRecordId, BigDecimal amount, BigDecimal weight) {
-		updateStock(whCode, inventRecordId, amount, BigDecimal.ZERO, weight);
+	public static void updateStock(String whCode, Long inventRecordId, BigDecimal amount, BigDecimal weight,String factCode) {
+		updateStock(whCode, inventRecordId, amount, BigDecimal.ZERO, weight,factCode);
 	}
 	
 	/**
@@ -476,6 +476,18 @@ public class HPKCTools {
 		}
 
 		/**
+		 * 查询
+		 *
+		 * @param id
+		 * @return
+		 */
+		public static HPKC011 listById(Long id) {
+			Map queryMap = new HashMap();
+			queryMap.put("id", id);
+			return (HPKC011) DaoBase.getInstance().query(HPKC011.QUERY, queryMap).get(0);
+		}
+		
+		/**
 		 * 查询库存信息
 		 *
 		 * @param ids
@@ -516,7 +528,7 @@ public class HPKCTools {
 	 * @param weight
 	 */
 	public static void updateStock(String whCode, Long inventRecordId, BigDecimal amount, BigDecimal unitWeight,
-			BigDecimal weight) {
+			BigDecimal weight,String factoryCode) {
 		if (amount.compareTo(BigDecimal.ZERO) == 0) {
 			throw new PlatException("入库数量不能为空");
 		}
@@ -526,6 +538,7 @@ public class HPKCTools {
 		inInfo.set("amount", amount);
 		inInfo.set("unitWeight", unitWeight);
 		inInfo.set("weight", weight);
+		inInfo.set("factoryCode", factoryCode);
 		inInfo.set(EiConstant.serviceName, "HPKC010");
 		inInfo.set(EiConstant.methodName, "updateStock");
 		EiInfo outInfo = XLocalManager.call(inInfo);
@@ -668,7 +681,7 @@ public class HPKCTools {
 	 * @param amount
 	 * @param weight
 	 */
-	public static void updateProdStock(String whCode, String prodNo, BigDecimal amount, BigDecimal weight) {
+	public static void updateProdStock(String whCode, String prodNo, BigDecimal amount, BigDecimal weight,String factoryCode) {
 		if (amount.compareTo(BigDecimal.ZERO) == 0 && weight.compareTo(BigDecimal.ZERO) == 0) {
 			return;
 		}
@@ -677,6 +690,7 @@ public class HPKCTools {
 		inInfo.set("prodNo", prodNo);
 		inInfo.set("amount", amount);
 		inInfo.set("weight", weight);
+		inInfo.set("factoryCode", factoryCode);
 		inInfo.set(EiConstant.serviceName, "HPKC011");
 		inInfo.set(EiConstant.methodName, "updateStock");
 		EiInfo outInfo = XLocalManager.call(inInfo);

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

@@ -35,6 +35,8 @@ public class HPPZ007 extends DaoEPBase {
 	public static final String FIELD_UPDATED_BY = "updatedBy";    		/* 修改人*/
 	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 COL_ID = "ID";
 	public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码 预留*/
@@ -50,6 +52,8 @@ public class HPPZ007 extends DaoEPBase {
 	public static final String COL_UPDATED_BY = "UPDATED_BY";    		/* 修改人*/
 	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 QUERY = "HPPZ007.query";
 	public static final String COUNT = "HPPZ007.count";
@@ -71,6 +75,9 @@ public class HPPZ007 extends DaoEPBase {
 	private String updatedBy = " ";		/* 修改人*/
 	private String updatedName = " ";		/* 修改人名称*/
 	private String updatedTime = " ";		/* 修改时间*/
+	private String factoryCode = " ";        /* 厂区编码*/
+	private String factoryName = " ";        /* 工厂*/
+
 
 	/**
 	 * initialize the metadata.
@@ -135,6 +142,14 @@ public class HPPZ007 extends DaoEPBase {
 		eiColumn.setDescName("修改时间");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_FACTORY_CODE);
+		eiColumn.setDescName("厂区编码");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_FACTORY_NAME);
+		eiColumn.setDescName("工厂");
+		eiMetadata.addMeta(eiColumn);
+
 
 	}
 
@@ -369,6 +384,23 @@ public class HPPZ007 extends DaoEPBase {
 	public void setUpdatedTime(String updatedTime) {
 		this.updatedTime = updatedTime;
 	}
+
+	public String getFactoryCode() {
+		return factoryCode;
+	}
+
+	public void setFactoryCode(String factoryCode) {
+		this.factoryCode = factoryCode;
+	}
+
+	public String getFactoryName() {
+		return factoryName;
+	}
+
+	public void setFactoryName(String factoryName) {
+		this.factoryName = factoryName;
+	}
+
 	/**
 	 * get the value from Map.
 	 *
@@ -391,6 +423,8 @@ public class HPPZ007 extends DaoEPBase {
 		setUpdatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_BY)), updatedBy));
 		setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_NAME)), updatedName));
 		setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime));
+		setFactoryCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_CODE)), factoryCode));
+		setFactoryName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_NAME)), factoryName));
 	}
 
 	/**
@@ -414,6 +448,8 @@ public class HPPZ007 extends DaoEPBase {
 		map.put(FIELD_UPDATED_BY, StringUtils.toString(updatedBy, eiMetadata.getMeta(FIELD_UPDATED_BY)));
 		map.put(FIELD_UPDATED_NAME, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_UPDATED_NAME)));
 		map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME)));
+		map.put(FIELD_FACTORY_CODE, StringUtils.toString(factoryCode, eiMetadata.getMeta(FIELD_FACTORY_CODE)));
+		map.put(FIELD_FACTORY_NAME, StringUtils.toString(factoryName, eiMetadata.getMeta(FIELD_FACTORY_NAME)));
 
 		return map;
 	}

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

@@ -40,6 +40,7 @@ public class HPPZ014 extends DaoEPBase {
 	public static final String FIELD_USER_ID = "userId";    		/* 用户ID*/
 	public static final String FIELD_USER_NAME = "userName";    		/* 用户名称*/
 	public static final String FIELD_REG_DATE = "regDate";    		/* 登记日期*/
+	public static final String FIELD_MAN_HOUR = "manHour";    		/* 工时*/
 
 	public static final String COL_ID = "ID";
 	public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码*/
@@ -59,6 +60,7 @@ public class HPPZ014 extends DaoEPBase {
 	public static final String COL_USER_ID = "USER_ID";    		/* 用户ID*/
 	public static final String COL_USER_NAME = "USER_NAME";    		/* 用户名称*/
 	public static final String COL_REG_DATE = "REG_DATE";    		/* 登记日期*/
+	public static final String COL_MAN_HOUR = "MAN_HOUR";    		/* 工时*/
 
 	public static final String QUERY = "HPPZ014.query";
 	public static final String COUNT = "HPPZ014.count";
@@ -84,6 +86,7 @@ public class HPPZ014 extends DaoEPBase {
 	private String userId = " ";		/* 用户ID*/
 	private String userName = " ";		/* 用户名称*/
 	private String regDate;	/* 登记日期*/
+	private Long manHour;
 
 	/**
 	 * initialize the metadata.
@@ -164,6 +167,12 @@ public class HPPZ014 extends DaoEPBase {
 		eiColumn.setDescName("登记日期");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_MAN_HOUR);
+		eiColumn.setType("N");
+		eiColumn.setFieldLength(20);
+		eiColumn.setDescName("工时");
+		eiMetadata.addMeta(eiColumn);
+
 
 	}
 
@@ -462,6 +471,15 @@ public class HPPZ014 extends DaoEPBase {
 	public void setRegDate(String regDate) {
 		this.regDate = regDate;
 	}
+
+	public Long getManHour() {
+		return manHour;
+	}
+
+	public void setManHour(Long manHour) {
+		this.manHour = manHour;
+	}
+
 	/**
 	 * get the value from Map.
 	 *
@@ -488,6 +506,7 @@ public class HPPZ014 extends DaoEPBase {
 		setUserId(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_USER_ID)), userId));
 		setUserName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_USER_NAME)), userName));
 		setRegDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REG_DATE)), regDate));
+		setManHour(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_MAN_HOUR)), manHour));
 	}
 
 	/**
@@ -515,6 +534,7 @@ public class HPPZ014 extends DaoEPBase {
 		map.put(FIELD_USER_ID, StringUtils.toString(userId, eiMetadata.getMeta(FIELD_USER_ID)));
 		map.put(FIELD_USER_NAME, StringUtils.toString(userName, eiMetadata.getMeta(FIELD_USER_NAME)));
 		map.put(FIELD_REG_DATE, StringUtils.toString(regDate, eiMetadata.getMeta(FIELD_REG_DATE)));
+		map.put(FIELD_MAN_HOUR, StringUtils.toString(manHour, eiMetadata.getMeta(FIELD_MAN_HOUR)));
 
 		return map;
 	}

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

@@ -38,6 +38,7 @@ public class ServiceHPPZ007 extends ServiceBase {
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), null,true);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), null, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPPZ007().eiMetadata);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");

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

@@ -200,4 +200,22 @@ public class ServiceHPPZ014 extends ServiceBase {
 		return inInfo;
 	}
 
+	@OperationLogAnnotation(operModul = "用工登记", operType = "修改", operDesc = "修改操作")
+	@Override
+	public EiInfo update(EiInfo inInfo) {
+		try {
+			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+			for (Map resultRow : resultRows) {
+				HPPZ014 fPz014 = new HPPZ014();
+				fPz014.fromMap(resultRow);
+				DaoUtils.update(HPPZ014.UPDATE, fPz014);
+			}
+			inInfo = this.query(inInfo);
+			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据修改成功!");
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "修改失败");
+		}
+		return inInfo;
+	}
 }

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

@@ -16,7 +16,9 @@
         CREATED_TIME as "createdTime",  <!-- 创建时间 -->
         UPDATED_BY as "updatedBy",  <!-- 修改人 -->
         UPDATED_NAME as "updatedName",  <!-- 修改人名称 -->
-        UPDATED_TIME as "updatedTime" <!-- 修改时间 -->
+        UPDATED_TIME as "updatedTime", <!-- 修改时间 -->
+        FACTORY_CODE as "factoryCode",  <!-- 厂区编码 -->
+        FACTORY_NAME as "factoryName"  <!-- 工厂 -->
     </sql>
 
     <sql id="condition">
@@ -45,6 +47,9 @@
         <isNotEmpty prepend=" AND " property="status">
             STATUS = #status#
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="factoryCode">
+            FACTORY_CODE = #factoryCode#
+        </isNotEmpty>
     </sql>
 
     <sql id="customCondition">
@@ -93,10 +98,12 @@
             STATUS,  <!-- 状态 0未启用  1启用 -->
             CREATED_BY,  <!-- 创建人 -->
             CREATED_NAME,  <!-- 创建人名称 -->
-            CREATED_TIME  <!-- 创建时间 -->
+            CREATED_TIME,  <!-- 创建时间 -->
+            FACTORY_CODE,  <!-- 厂区编码 -->
+            FACTORY_NAME  <!-- 工厂 -->
         ) VALUES (
             #companyCode#, #depCode#, #whType#, #whCode#, #whName#, #princ#, #status#,
-            #createdBy#, #createdName#, #createdTime#
+            #createdBy#, #createdName#, #createdTime#, #factoryCode#, #factoryName#
         )
     </insert>
 
@@ -112,6 +119,8 @@
             WH_NAME = #whName#,   <!-- 仓库名称 -->
             PRINC = #princ#,   <!-- 负责人 -->
             STATUS = #status#,   <!-- 状态 0未启用  1启用 -->
+            FACTORY_CODE = #factoryCode#,   <!-- 厂区编码 -->
+            FACTORY_NAME = #factoryName#,   <!-- 工厂 -->
             UPDATED_BY = #updatedBy#,   <!-- 修改人 -->
             UPDATED_NAME = #updatedName#,   <!-- 修改人名称 -->
             UPDATED_TIME = #updatedTime#  <!-- 修改时间 -->

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

@@ -20,7 +20,8 @@
         GROUP_NAME as "groupName",  <!-- 生产组名称 -->
         USER_ID as "userId",  <!-- 用户ID -->
         USER_NAME as "userName",  <!-- 用户名称 -->
-        REG_DATE as "regDate" <!-- 登记日期 -->
+        REG_DATE as "regDate", <!-- 登记日期 -->
+        MAN_HOUR as "manHour" <!-- 工时 -->
     </sql>
 
 	<sql id="condition">
@@ -77,6 +78,9 @@
         <isNotEmpty prepend=" AND " property="regDate">
             REG_DATE = #regDate#
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="manHour">
+            MAN_HOUR = #manHour#
+        </isNotEmpty>
 	</sql>
 
     <sql id="customCondition">
@@ -163,6 +167,7 @@
     <delete id="update">
         UPDATE ${hpjxSchema}.T_HPPZ014
         SET
+        MAN_HOUR = #manHour#,
         <include refid="updateRevise"/>
         WHERE ID = #id#
     </delete>

src/main/java/com/baosight/hpjx/util/importer/impl/XlsImporter.java

@@ -115,9 +115,21 @@ public class XlsImporter implements Importer {
 
                 if(keyCname.equals(cell.getContents())){
                     //处理字典
-                    if (columnValue.indexOf("-") > 0) {
+   /*                 if (columnValue.indexOf("-") > 0) {
                         beanValue.put(keyValue, columnValue.split("-")[0]);
                         continue;
+                    }*/
+                    if (columnValue.equals("3-零件")) {
+                        beanValue.put(keyValue, "3");
+                        continue;
+                    }
+                    if (columnValue.equals("4-部件")) {
+                        beanValue.put(keyValue, "4");
+                        continue;
+                    }
+                    if (columnValue.equals("2-耗材")) {
+                        beanValue.put(keyValue, "2");
+                        continue;
                     }
                     //数字进行特定转换
                     if (column.getType()=="N"){

src/main/java/com/baosight/xservices/xs/og/service/ServiceXSOG0801A.java

@@ -52,8 +52,8 @@ public class ServiceXSOG0801A extends ServiceEPBase {
 			if (CommonConstant.Field.ROOT.equals(parentOrgId)) {
 				condition = String.format(" ITEM_CODE = '%s'", OrgTypeEnum.FACTORY.getCode());
 			} else {
-				condition = String.format(" ITEM_CODE IN ('%s', '%s', '%s')", OrgTypeEnum.DEPT.getCode(),
-						OrgTypeEnum.PROD_GROUP.getCode(), OrgTypeEnum.CUT_GROUP.getCode());
+				condition = String.format(" ITEM_CODE IN ('%s', '%s', '%s', '%s')", OrgTypeEnum.DEPT.getCode(),
+						OrgTypeEnum.PROD_GROUP.getCode(), OrgTypeEnum.CUT_GROUP.getCode(),OrgTypeEnum.SYN_GROUP.getCode());
 			}
 			List<Map> orgTypes = CodeValueTools.getCodeValues(CodesetConstant.XsOg.ORG_TYPE, condition);
 			inInfo.addBlock("orgTypeBlock").addRows(orgTypes);

src/main/resources/META-INF/resources/iPlatV7-index.js

@@ -171,6 +171,7 @@
             $("#new-window-view").css("display", "none");
             $("#tab-view").css("display", "none");
         }
+        $(".fa-files-o").click()
     };
 
 

src/main/webapp/HP/KC/HPKC001.js

@@ -32,6 +32,7 @@ $(function() {
 	                // 1.原料，2.耗材
                     inInfo.set("inqu_status-0-inventTypes", [1, 2]);
                     inInfo.set("inqu_status-0-whType", options.model["inventType"]);
+					inInfo.set("inqu_status-0-factoryCode", options.model["factoryCode"]);
 	                inInfo.set("inqu_status-0-isSplicingSymbol", false);
                     inInfo.set("serviceName", "HPPZ007");
                     inInfo.set("methodName", "queryComboBox");

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

@@ -36,6 +36,10 @@
 	        </EF:EFDateSpan>
         </div>
 	    <div class="row">
+			<EF:EFSelect ename="inqu_status-0-factoryCode" cname="厂区" colWidth="3" filter="contains" defultValue="">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="factory_record_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
 		    <EF:EFSelect cname="是否删除" ename="inqu_status-0-deleteFlag" colWidth="3" defaultValue="0">
 			    <EF:EFOption label="全部" value=""/>
 			    <EF:EFCodeOption codeName="hpjx.hpjx.deleteFlag"/>
@@ -49,6 +53,10 @@
 			<EF:EFColumn ename="purchaseNo" cname="采购单号" enable="false" width="130" align="center"/>
 			<EF:EFColumn ename="receiptDate" cname="单据日期" width="90" align="center" editType="date"
 			             dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true" readonly="true"/>
+			<EF:EFComboColumn ename="factoryCode" required="true"  cname="厂区" width="110" align="center" defaultValue=""
+							  filter="contains" readonly="true">
+				<EF:EFOptions blockId="factory_record_block_id" valueField="valueField" textField="textField"/>
+			</EF:EFComboColumn>
 			<EF:EFComboColumn ename="inventType" cname="存货类型" width="80" align="center" required="true"
 			                  readonly="true">
 				<EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('1', '2')"/>

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

@@ -36,6 +36,10 @@
 		    </EF:EFDateSpan>
 	    </div>
 	    <div class="row">
+			<EF:EFSelect ename="inqu_status-0-factoryCode" cname="厂区" colWidth="3" filter="contains" defultValue="">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="factory_record_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
 		    <EF:EFSelect cname="是否删除" ename="inqu_status-0-deleteFlag" colWidth="3" defaultValue="0">
 			    <EF:EFOption label="全部" value=""/>
 			    <EF:EFCodeOption codeName="hpjx.hpjx.deleteFlag"/>
@@ -53,6 +57,10 @@
 			<EF:EFColumn ename="reqNo" cname="领料单号" enable="false" width="140" align="center"/>
 			<EF:EFColumn ename="receiptDate" cname="单据日期" enable="false" width="90" align="center"
 			             editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
+			<EF:EFComboColumn ename="factoryCode" enable="false" cname="厂区" width="110" align="center" defaultValue=""
+							  filter="contains" readonly="true">
+				<EF:EFOptions blockId="factory_record_block_id" valueField="valueField" textField="textField"/>
+			</EF:EFComboColumn>
 			<EF:EFComboColumn ename="inventType" cname="存货类型" enable="false" width="100" align="center">
 				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
 			</EF:EFComboColumn>

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

@@ -8,6 +8,10 @@
 <EF:EFPage title="库存查询">
 	<EF:EFRegion id="inqu" title="查询区域" type="query">
 		<div class="row">
+			<EF:EFSelect ename="inqu_status-0-factoryCode" cname="厂区" colWidth="3" filter="contains" defultValue="">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="factory_record_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
 			<EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('1', '2')"/>
@@ -20,6 +24,8 @@
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
+		</div>
+		<div class="row">
 			<EF:EFSelect ename="inqu_status-0-spec" cname="规格" colWidth="3" filter="contains">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFOptions blockId="spec_name_block_id" textField="textField" valueField="valueField"/>
@@ -34,6 +40,10 @@
 			<EF:EFComboColumn ename="inventType" cname="存货类型" enable="false" width="100" align="center">
 				<EF:EFCodeOption codeName="hpjx.hpkc.inventType" />
 			</EF:EFComboColumn>
+			<EF:EFComboColumn ename="factoryCode" enable="false"  cname="厂区" width="110" align="center" defaultValue=""
+							  filter="contains" readonly="true">
+				<EF:EFOptions blockId="factory_record_block_id" valueField="valueField" textField="textField"/>
+			</EF:EFComboColumn>
 			<EF:EFComboColumn ename="whCode" cname="仓库名称" enable="false" width="100" align="center"
 			                  blockName="wh_record_block_id" textField="textField" valueField="valueField"
 			                  columnTemplate="#=textField#" itemTemplate="#=textField#">

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

@@ -10,16 +10,16 @@
 	    <div class="row">
 		    <EF:EFDatePicker cname="单据日期" ename="documentDate" blockId="inqu_status" row="0" colWidth="3"
 		                     format="yyyy-MM-dd" readonly="true"/>
+			<EF:EFSelect cname="厂区" blockId="inqu_status" ename="factoryCode" row="0" colWidth="3" filter="contains">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="factory_record_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
 		    <EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="3"/>
 		    <EF:EFSelect cname="仓库名称" ename="whCode" blockId="inqu_status" row="0" colWidth="3"
 		                 filter="contains" defultValue="">
 			    <EF:EFOption label="全部" value=""/>
 			    <EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
 		    </EF:EFSelect>
-		    <EF:EFSelect cname="是否删除" ename="deleteFlag" blockId="inqu_status" row="0" colWidth="3" defaultValue="0">
-			    <EF:EFOption label="全部" value=""/>
-			    <EF:EFCodeOption codeName="hpjx.hpjx.deleteFlag"/>
-		    </EF:EFSelect>
 	    </div>
 	    <div class="row">
 		    <EF:EFInput cname="部件名称" ename="prdtName" blockId="inqu_status" row="0" colWidth="3"/>
@@ -30,6 +30,10 @@
 			</EF:EFDateSpan>
 	    </div>
 	    <div class="row">
+			<EF:EFSelect cname="是否删除" ename="deleteFlag" blockId="inqu_status" row="0" colWidth="3" defaultValue="0">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFCodeOption codeName="hpjx.hpjx.deleteFlag"/>
+			</EF:EFSelect>
 				<%--		    <EF:EFInput cname="生产订单号" ename="prodOrderNo" blockId="inqu_status" row="0" colWidth="3"/>
                 <EF:EFInput cname="生产任务号" ename="prodTaskNo" blockId="inqu_status" row="0" colWidth="3"/>--%>
 	    </div>
@@ -42,6 +46,10 @@
 			<EF:EFColumn ename="documentDate" cname="单据日期" width="100" align="center" editType="date" readonly="true"
 			             dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
 			<%--<EF:EFColumn ename="projCode" cname="项目号" enable="false" width="140" align="center"/>--%>
+			<EF:EFComboColumn ename="factoryCode" cname="厂区" width="110" align="center" defaultValue="" required="true"
+							  filter="contains">
+				<EF:EFOptions blockId="factory_record_block_id" valueField="valueField" textField="textField"/>
+			</EF:EFComboColumn>
 			<EF:EFColumn ename="projName" cname="项目名称" enable="false" width="140" align="center"/>
 			<EF:EFComboColumn ename="whCode" cname="仓库名称" enable="false" width="120" align="center"
 			                  blockName="wh_record_block_id" textField="textField" valueField="valueField"

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

@@ -17,6 +17,7 @@ $(function () {
 					// 1.原料，2.耗材
 					inInfo.set("inqu_status-0-inventTypes", [3]);
 					inInfo.set("inqu_status-0-whType", options.model["inventType"]);
+					inInfo.set("inqu_status-0-factoryCode", options.model["factoryCode"]);
 					inInfo.set("inqu_status-0-isSplicingSymbol", false);
 					inInfo.set("serviceName", "HPPZ007");
 					inInfo.set("methodName", "queryComboBox");

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

@@ -8,7 +8,6 @@
 <EF:EFPage title="生产任务查询">
 	<EF:EFRegion id="inqu" title="查询区域" type="query">
 			<div class="row">
-			<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="4"/>
@@ -27,7 +26,7 @@
 						<EF:EFOptions blockId="group_record_block_id" textField="textField" valueField="valueField"/>
 					</EF:EFSelect>
 			</div>
-		</div>
+
 	</EF:EFRegion>
 
 	<EF:EFRegion id="result" title="记录集">

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

@@ -41,6 +41,10 @@
 		    <EF:EFColumn ename="receiptDate" cname="单据日期" enable="false" width="90" align="center"
 		                 editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
 		    <EF:EFColumn ename="projName" cname="项目名称" enable="false" width="140" align="center"/>
+			<EF:EFComboColumn ename="factoryCode" enable="false"  cname="厂区" width="110" align="center" defaultValue=""
+							  filter="contains" readonly="true">
+				<EF:EFOptions blockId="factory_record_block_id" valueField="valueField" textField="textField"/>
+			</EF:EFComboColumn>
 			<EF:EFComboColumn ename="whCode" cname="仓库名称" enable="false" width="120" align="center"
 							  blockName="wh_record_block_id" textField="textField" valueField="valueField"
 							  columnTemplate="#=textField#" itemTemplate="#=textField#">

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

@@ -9,6 +9,10 @@
 	<EF:EFRegion id="inqu" title="查询区域" type="query">
 		<div class="row">
 			<div class="row">
+				<EF:EFSelect ename="inqu_status-0-factoryCode" cname="厂区" colWidth="3" filter="contains" defultValue="">
+					<EF:EFOption label="全部" value=""/>
+					<EF:EFOptions blockId="factory_record_block_id" textField="textField" valueField="valueField"/>
+				</EF:EFSelect>
 				<EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="3"/>
 				<EF:EFInput cname="部件名称" ename="inventName" blockId="inqu_status" row="0" colWidth="3"/>
 				<EF:EFInput cname="零件名称" ename="subInventName" blockId="inqu_status" row="0" colWidth="3"/>
@@ -19,6 +23,10 @@
 	<EF:EFRegion id="result" title="记录集">
 		<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="factoryCode" enable="false"  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="whName" cname="仓库名称" enable="false" width="140" align="center"/>
 			<EF:EFColumn ename="projName" cname="项目名称" enable="false" width="140" align="center"/>
 			<EF:EFColumn ename="inventName" cname="部件名称" enable="false" width="120" align="center"/>

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

@@ -8,6 +8,10 @@
 <EF:EFPage title="库存查询">
 	<EF:EFRegion id="inqu" title="查询区域" type="query">
 		<div class="row">
+			<EF:EFSelect ename="inqu_status-0-factoryCode" cname="厂区" colWidth="3" filter="contains" defultValue="">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="factory_record_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
 			<EF:EFSelect cname="仓库名称" ename="inqu_status-0-whCode" colWidth="3" filter="contains">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
@@ -26,6 +30,10 @@
 	<EF:EFRegion id="result" title="记录集">
 		<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="factoryCode" enable="false"  cname="厂区" width="110" align="center" defaultValue=""
+							  filter="contains" readonly="true">
+				<EF:EFOptions blockId="factory_record_block_id" valueField="valueField" textField="textField"/>
+			</EF:EFComboColumn>
 			<EF:EFComboColumn ename="inventType" cname="存货类型" enable="false" width="100" align="center">
 				<EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('2')"/>
 			</EF:EFComboColumn>

src/main/webapp/HP/KC/HPKC006.js

@@ -35,6 +35,7 @@ $(function() {
 					// 1.原料，2.耗材，5.废料
 					inInfo.set("inqu_status-0-inventTypes", [1, 2, 5]);
 					inInfo.set("inqu_status-0-whType", options.model["inventType"]);
+					inInfo.set("inqu_status-0-factoryCode", options.model["factoryCode"]);
 					inInfo.set("inqu_status-0-isSplicingSymbol", false);
 					inInfo.set("serviceName", "HPPZ007");
 					inInfo.set("methodName", "queryComboBox");

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

@@ -35,6 +35,10 @@
 			</EF:EFDateSpan>
 		</div>
 		<div class="row">
+			<EF:EFSelect ename="inqu_status-0-factoryCode" cname="厂区" colWidth="3" filter="contains" defultValue="">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="factory_record_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
 			<EF:EFSelect cname="是否删除" ename="inqu_status-0-deleteFlag" colWidth="3" defaultValue="0">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFCodeOption codeName="hpjx.hpjx.deleteFlag"/>
@@ -48,6 +52,10 @@
 			<EF:EFColumn ename="otherEnterNo" cname="入库单号" enable="false" width="150" align="center"/>
 			<EF:EFColumn ename="receiptDate" cname="单据日期" editType="date" dateFormat="yyyy-MM-dd"
 			             parseFormats="['yyyyMMdd']" width="90" align="center" required="true" readonly="true"/>
+			<EF:EFComboColumn ename="factoryCode" required="true"  cname="厂区" width="110" align="center" defaultValue=""
+							  filter="contains" readonly="true">
+				<EF:EFOptions blockId="factory_record_block_id" valueField="valueField" textField="textField"/>
+			</EF:EFComboColumn>
 			<EF:EFComboColumn ename="inventType" cname="存货类型" width="80" align="center" required="true"
 			                  readonly="true">
 				<EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('1', '2', '5')"/>

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

@@ -35,6 +35,10 @@
 		    </EF:EFDateSpan>
 	    </div>
 	    <div class="row">
+			<EF:EFSelect ename="inqu_status-0-factoryCode" cname="厂区" colWidth="3" filter="contains" defultValue="">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="factory_record_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
 		    <EF:EFSelect cname="是否删除" ename="inqu_status-0-deleteFlag" colWidth="3" defaultValue="0">
 			    <EF:EFOption label="全部" value=""/>
 			    <EF:EFCodeOption codeName="hpjx.hpjx.deleteFlag"/>
@@ -51,6 +55,10 @@
 			<EF:EFComboColumn ename="inventType" cname="存货类型" enable="false" width="100" align="center">
 				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
 			</EF:EFComboColumn>
+			<EF:EFComboColumn ename="factoryCode" enable="false" cname="厂区" width="110" align="center" defaultValue=""
+							  filter="contains" readonly="true">
+				<EF:EFOptions blockId="factory_record_block_id" valueField="valueField" textField="textField"/>
+			</EF:EFComboColumn>
 			<EF:EFComboColumn ename="whCode" cname="仓库名称" enable="false" width="120" align="center"
 			                  blockName="wh_record_block_id" textField="textField" valueField="valueField"
 			                  columnTemplate="#=textField#" itemTemplate="#=textField#">

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

@@ -8,6 +8,10 @@
 <EF:EFPage title="库存查询">
 	<EF:EFRegion id="inqu" title="查询区域" type="query">
 		<div class="row">
+			<EF:EFSelect ename="inqu_status-0-factoryCode" cname="厂区" colWidth="3" filter="contains" defultValue="">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="factory_record_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
 			<EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('1', '2', '5')"/>
@@ -20,6 +24,8 @@
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
+		</div>
+		<div class="row">
 			<EF:EFSelect ename="inqu_status-0-spec" cname="规格" colWidth="3" filter="contains">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFOptions blockId="spec_name_block_id" textField="textField" valueField="valueField"/>
@@ -33,6 +39,10 @@
 			<EF:EFComboColumn ename="inventType" cname="存货类型" enable="false" width="100" align="center">
 				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
 			</EF:EFComboColumn>
+			<EF:EFComboColumn ename="factoryCode" enable="false" cname="厂区" width="110" align="center" defaultValue=""
+							  filter="contains" readonly="true">
+				<EF:EFOptions blockId="factory_record_block_id" valueField="valueField" textField="textField"/>
+			</EF:EFComboColumn>
 			<EF:EFComboColumn ename="whCode" cname="仓库名称" enable="false" width="120" align="center"
 			                  blockName="wh_record_block_id" textField="textField" valueField="valueField"
 			                  columnTemplate="#=textField#" itemTemplate="#=textField#">

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

@@ -8,6 +8,10 @@
 <EF:EFPage title="实时库存管理">
 	<EF:EFRegion id="inqu" title="查询条件">
 		<div class="row">
+			<EF:EFSelect ename="inqu_status-0-factoryCode" cname="厂区" colWidth="3" filter="contains" defultValue="">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="factory_record_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
 			<EF:EFSelect ename="inqu_status-0-whCode" cname="仓库名称" colWidth="3" filter="contains" defultValue="">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
@@ -21,6 +25,8 @@
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFOptions blockId="material_record_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
+		</div>
+		<div class="row">
 			<EF:EFSelect ename="inqu_status-0-spec" cname="规格" colWidth="3" filter="contains" defultValue="">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFOptions blockId="spec_name_block_id" textField="textField" valueField="valueField"/>
@@ -35,6 +41,10 @@
 			<EF:EFComboColumn ename="inventType" cname="存货类型" width="100" align="center" required="true" enable="false">
 				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
 			</EF:EFComboColumn>
+			<EF:EFComboColumn ename="factoryCode" required="true"  cname="厂区" width="110" align="center" defaultValue=""
+							  filter="contains" readonly="true">
+				<EF:EFOptions blockId="factory_record_block_id" valueField="valueField" textField="textField"/>
+			</EF:EFComboColumn>
 			<EF:EFComboColumn ename="whCode" cname="仓库名称" width="120" columnTemplate="#=textField#"
 			                  itemTemplate="#=textField#" blockName="wh_record_block_id"
 			                  textField="textField" valueField="valueField"

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

@@ -11,6 +11,10 @@
 			<%--<EF:EFInput blockId="inqu_status" ename="projCode" colWidth="3" cname="项目编号:" />--%>
 			<EF:EFInput blockId="inqu_status" ename="projName" colWidth="3" cname="项目名称:" />
 <%--			<EF:EFInput blockId="inqu_status" ename="prodNo" colWidth="3" cname="生产单号:" />--%>
+				<EF:EFSelect ename="inqu_status-0-factoryCode" cname="厂区" colWidth="3" filter="contains" defultValue="">
+					<EF:EFOption label="全部" value=""/>
+					<EF:EFOptions blockId="factory_record_block_id" textField="textField" valueField="valueField"/>
+				</EF:EFSelect>
 			<EF:EFSelect ename="inqu_status-0-whCode" cname="仓库名称" colWidth="3" filter="contains" defultValue="">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
@@ -33,6 +37,10 @@
 	    <EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
 		    <EF:EFColumn ename="id" cname="内码" hidden="true"/>
 <%--			<EF:EFColumn ename="prodNo" cname="生产单号" width="120" align="center" required="true" enable="false"/>--%>
+			<EF:EFComboColumn ename="factoryCode" cname="厂区" width="110" align="center" defaultValue=""
+							  filter="contains" readonly="true" enable="false" >
+				<EF:EFOptions blockId="factory_record_block_id" valueField="valueField" textField="textField"/>
+			</EF:EFComboColumn>
 			<EF:EFComboColumn ename="whCode" cname="仓库名称" width="120" columnTemplate="#=textField#"
 		                      itemTemplate="#=textField#" blockName="wh_record_block_id"
 		                      textField="textField" valueField="valueField"

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

@@ -8,6 +8,10 @@
 <EF:EFPage title="仓库档案">
 	<EF:EFRegion id="inqu" title="查询条件">
 		<div class="row">
+			<EF:EFSelect cname="厂区" blockId="inqu_status" ename="factoryCode" row="0" colWidth="3" filter="contains">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="factory_record_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
 			<EF:EFInput cname="仓库名称:" blockId="inqu_status" ename="whName" row="0" colWidth="3"/>
 			<EF:EFSelect cname="仓库类型:" blockId="inqu_status" ename="whType" row="0" colWidth="3">
 				<EF:EFOption label="全部" value=""/>
@@ -23,6 +27,10 @@
 	<EF:EFRegion id="result" title="记录集">
 		<EF:EFGrid blockId="result" autoDraw="override" checkMode="row">
 			<EF:EFColumn ename="id" cname="主键" hidden="true"/>
+			<EF:EFComboColumn ename="factoryCode" cname="厂区" width="110" align="center" defaultValue="" required="true"
+							  filter="contains">
+				<EF:EFOptions blockId="factory_record_block_id" valueField="valueField" textField="textField"/>
+			</EF:EFComboColumn>
 			<EF:EFColumn ename="whCode" cname="仓库编码" enable="false" width="120" align="center"/>
 			<EF:EFColumn ename="whName" cname="仓库名称" width="120" align="center" required="true"/>
 			<EF:EFComboColumn ename="whType" cname="仓库类型" width="120" align="center" required="true">

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

@@ -183,6 +183,7 @@ let checkIn = function () {
 let checkInCallback = function (regDate) {
 	let inInfo = new EiInfo();
 	inInfo.set("main-0-regDate", regDate);
+	inInfo.set("main-0-manHour","8")
 	JSUtils.submitGridsData("result", "HPPZ014", "checkIn", false,
 		function (res) {
 			if (res.status > -1) {

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

@@ -15,7 +15,7 @@
 			<EF:EFSelect cname="部门类型" blockId="inqu_status" ename="groupType" row="0" colWidth="3" filter="contains"
 			             defultValue="">
 				<EF:EFOption label="全部" value=""/>
-				<EF:EFCodeOption codeName="xs.og.orgType" condition="ITEM_CODE IN ('prodGroup', 'cutGroup')"/>
+				<EF:EFCodeOption codeName="xs.og.orgType" condition="ITEM_CODE IN ('prodGroup', 'cutGroup','synGroup')"/>
 			</EF:EFSelect>
 			<EF:EFSelect cname="生产部门" blockId="inqu_status" ename="groupCode" row="0" colWidth="3" filter="contains">
 				<EF:EFOption label="全部" value=""/>
@@ -46,7 +46,7 @@
 				<EF:EFOptions blockId="factory_record_block_id" valueField="valueField" textField="textField"/>
 			</EF:EFComboColumn>
 			<EF:EFComboColumn ename="groupType" cname="部门类型" width="80" align="center" required="true">
-				<EF:EFCodeOption codeName="xs.og.orgType" condition="ITEM_CODE IN ('prodGroup', 'cutGroup')"/>
+				<EF:EFCodeOption codeName="xs.og.orgType" condition="ITEM_CODE IN ('prodGroup', 'cutGroup', 'synGroup')"/>
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="groupCode" cname="生产部门" width="120" align="center" required="true"/>
 			<EF:EFComboColumn ename="gender" cname="性别" width="80" align="center" required="true" readonly="true"

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

@@ -15,7 +15,7 @@
 			<EF:EFSelect cname="部门类型" blockId="inqu_status" ename="groupType" row="0" colWidth="3" filter="contains"
 			             defultValue="">
 				<EF:EFOption label="全部" value=""/>
-				<EF:EFCodeOption codeName="xs.og.orgType" condition="ITEM_CODE IN ('prodGroup', 'cutGroup')"/>
+				<EF:EFCodeOption codeName="xs.og.orgType" condition="ITEM_CODE IN ('prodGroup', 'cutGroup', 'synGroup')"/>
 			</EF:EFSelect>
 			<EF:EFSelect cname="生产部门" blockId="inqu_status" ename="groupCode" row="0" colWidth="3" filter="contains">
 				<EF:EFOption label="全部" value=""/>
@@ -47,7 +47,7 @@
 				<EF:EFOptions blockId="factory_record_block_id" valueField="valueField" textField="textField"/>
 			</EF:EFComboColumn>
 			<EF:EFComboColumn ename="groupType" cname="部门类型" enable="false" width="80" align="center">
-				<EF:EFCodeOption codeName="xs.og.orgType" condition="ITEM_CODE IN ('prodGroup', 'cutGroup')"/>
+				<EF:EFCodeOption codeName="xs.og.orgType" condition="ITEM_CODE IN ('prodGroup', 'cutGroup', 'synGroup')"/>
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="groupName" cname="生产部门" enable="false" width="120" align="center"/>
 			<EF:EFComboColumn ename="groupCode" cname="生产部门" enable="false" width="110" align="center" hidden="true">
@@ -59,6 +59,7 @@
 				<EF:EFCodeOption codeName="xservices.xs.sex"/>
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="mobile" cname="联系方式" enable="false" width="120" align="center"/>
+			<EF:EFColumn ename="manHour" cname="工时(小时)" enable="true" width="120" align="center"/>
 			<EF:EFColumn cname="创建人" ename="createdName" enable="false" align="center"/>
 			<EF:EFColumn cname="创建时间" ename="createdTime" enable="false" width="140" align="center"
 			             editType="datetime" parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"/>

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

@@ -396,11 +396,13 @@ $(function () {
             },
             success: function (e) {
                 debugger;
-                var src = e.response.docUrl;
+                var src;
                 var className;
                 if ("run" == projectEnv) {
+                    src = e.response.docUrl + e.response.docType
                     className = e.response.groupId;
                 } else {
+                    src = e.response.docUrl
                     className = e.response.docTag;
                 }
                 var parentId = IPLATUI.EFTree.materialTree.selectTreeNode.nodeId;

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

+var pageOffset = 1;  //当前主页数
 $(function () {
-
     $("#QUERY").on("click", query);
 
     IPLATUI.EFGrid = {
@@ -11,7 +11,7 @@ $(function () {
 		    columns: [{
 			    field: "operator",
 			    template: function (item) {
-				    console.log(item)
+				    //console.log(item)
 				    let auditStatus = item.status;
 				    let template = '';
 				    if (item.matId != null) {
@@ -40,6 +40,18 @@ $(function () {
 				    return template;
 			    }
 		    }],
+            /**
+             * 翻页事件，点翻页按钮，输入页数跳转时触发
+             * @param e 事件对象
+             * e.sender Grid对象
+             * e.page 期望翻到的页数
+             */
+            page: function (e) {
+                // 禁止翻页
+                //e.preventDefault();
+                pageOffset = e.page;
+                console.log(e.page);
+            },
             onSave: function (e) {
                 // 阻止默认请求，使用自定义保存
                 e.preventDefault();
@@ -87,6 +99,12 @@ $(function () {
                 btnNode.attr("disabled", true);
                 saveDetail(btnNode);
             },
+            onSuccess: function (e) {
+                if (e.eiInfo.extAttr.methodName == 'update'
+                    || e.eiInfo.extAttr.methodName == 'insert') {
+                    query();
+                }
+            },
 	        columns: [{
 		        field: "operator",
 		        title: "操作",
@@ -261,8 +279,9 @@ function autoProductionschedulCallback1 () {
     JSColorbox.close();
 }
 
-let query = function () {
-	resultGrid.dataSource.page(1);
+let query = function (page) {
+    let offset = page!=undefined?page:1;
+	resultGrid.dataSource.page(offset);
 }
 
 function check_time(model,rows){
@@ -346,10 +365,12 @@ function saveDetail(btn) {
     if(flag) {
         JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
             ok: function () {
-                JSUtils.submitGridsData("detail", "HPSC003", "updatePlanDetail", true);
+                let reslu = JSUtils.submitGridsData("detail", "HPSC003", "updatePlanDetail", true);
+                console.log("修改保存："+reslu);
                 //释放禁用按钮
                 btn.attr("disabled", false);
-                query();
+                query(pageOffset)
+
             }
         });
     }

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

@@ -117,7 +117,11 @@ $(function () {
                         let template = '';
                         if (filePath1) {
                             template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
-                                + 'onclick="showUploadFile(' + filePath1 + ')"  >附件清单</a>';
+                                + 'onclick="showUploadFile(' + filePath1 + ',\'WL\')"  >物料附件清单</a>';
+                        }
+                        if (filePath1) {
+                            template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+                                + 'onclick="showUploadFile(' + filePath1 + ',\'XL\')"  >下料附件清单</a>';
                         }
                         return template
                     }
@@ -137,8 +141,8 @@ $(function () {
                         let projCode = item.projCode;
                         let template = '';
                         if (filePath1) {
-                            template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
-                                + 'onclick="showUploadFile(' + filePath1 + ')"  >附件清单</a>';
+/*                            template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+                                + 'onclick="showUploadFile(' + filePath1 + ')"  >附件清单</a>';*/
                             if (status >= 1) {
                                 template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
                                     + 'onclick="checkIn(' + filePath1 + ')"  >登记</a>';
@@ -277,11 +281,13 @@ $(function () {
             },
             success: function (e) {
                 let rows = resultGrid.getCheckedRows()[0];
-                var src = e.response.docUrl;
+                var src;
                 var className;
                 if ("run" == projectEnv) {
+                    src = e.response.docUrl + e.response.docType
                     className = e.response.groupId;
                 } else {
+                    src = e.response.docUrl
                     className = e.response.docTag;
                 }
                 var projCode = rows.projCode;
@@ -357,9 +363,9 @@ function reqDetails(projCode) {
         height: "90%"
     });
 }
-function showUploadFile(id) {
+function showUploadFile(id,type) {
     JSColorbox.open({
-        href: "HPSC002A?methodName=initLoad&inqu_status-0-bizType=XL&inqu_status-0-id=" + id,
+        href: "HPSC002A?methodName=initLoad&inqu_status-0-bizType="+type+"&inqu_status-0-id=" + id,
         title: "<div style='text-align: center;'>附件清单</div>",
         width: "80%",
         height: "80%",
@@ -375,11 +381,26 @@ function checkIn(id) {
         callbackName: checkInCallback
     });
 }
-checkInCallback = function (e) {
-    // 刷新列表
+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);
-    // 关闭弹窗
-    JSColorbox.close();
+        },onFail:function(ei){}
+    },{async:false});
 }
 let selectStock = function (id) {
     JSColorbox.open({

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

@@ -45,7 +45,7 @@
         <EF:EFInput ename="productionOrderNo"  type="hidden"/>
         <EF:EFGrid blockId="detail" autoDraw="no">
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
-            <EF:EFColumn ename="operator" cname="操作" width="200"  enable="false" readonly="false"/>
+            <EF:EFColumn ename="operator" cname="操作" width="100"  enable="false" readonly="false"/>
             <EF:EFColumn enable="false" ename="reqNum" cname="领料记录" width="80" align="center" readonly="true"/>
 
 <%--        <EF:EFComboColumn cname="材料类型" ename="inventType" width="80" align="center" required="true" >--%>