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

README.md

-# hp-smart
+# Hp Smart
 
 
 
@@ -15,14 +15,14 @@ Already a pro? Just edit this README.md and make it your own. Want to make it ea
 
 ```
 cd existing_repo
-git remote add origin https://gitlab.baocloud.cn/bggf/smart/hp-smart.git
+git remote add origin http://git.pseer.com/platform/hp-smart.git
 git branch -M main
 git push -uf origin main
 ```
 
 ## Integrate with your tools
 
-- [ ] [Set up project integrations](http://gitlab.baocloud.cn/bggf/smart/hp-smart/-/settings/integrations)
+- [ ] [Set up project integrations](http://git.pseer.com/platform/hp-smart/-/settings/integrations)
 
 ## Collaborate with your team
 
@@ -46,7 +46,7 @@ Use the built-in continuous integration in GitLab.
 
 # Editing this README
 
-When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.
+When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!).  Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.
 
 ## Suggestions for a good README
 Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.

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 -> {
-            // 处理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>";
-            List datalist =new ArrayList();
-            datalist.add(DIVLIST);
-            tempArr.add(datalist);
-        });
+        String DIVLIST = "";
+        // 处理obj
+        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.
@@ -207,6 +213,14 @@ public class HPKC001 extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_DELETE_FLAG);
 		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/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.
@@ -263,6 +269,14 @@ public class HPKC006 extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_DELETE_FLAG);
 		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.
 	 */
@@ -221,7 +226,14 @@ public class HPKC007 extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_DELETE_FLAG);
 		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.
@@ -186,6 +192,14 @@ public class HPKC010 extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_PROJ_NAME);
 		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);
+
 
 	}
 
@@ -523,6 +537,7 @@ public class HPKC011 extends DaoEPBase {
 	public Integer getVersion() {
 		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, "初始化失败");

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

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

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, "初始化失败");

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, "初始化失败");

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, "初始化失败");

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, "初始化失败");

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;
 	}
 	

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;

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,12 @@
         <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>
 	</sql>
 
     <sql id="customCondition">
@@ -160,12 +168,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>
 
@@ -184,6 +194,8 @@
     <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 +208,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/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/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/xservices/xs/og/service/ServiceXSOG0801.java

@@ -4,6 +4,7 @@ import com.baosight.hpjx.core.constant.CommonConstant;
 import com.baosight.hpjx.core.enums.OrgTypeEnum;
 import com.baosight.hpjx.core.security.UserSessionUtils;
 import com.baosight.hpjx.hp.constant.HPConstant;
+import com.baosight.hpjx.hp.pz.domain.HPPZ013;
 import com.baosight.hpjx.hp.pz.tools.HPPZTools;
 import com.baosight.hpjx.hp.sc.domain.HPSC005B;
 import com.baosight.hpjx.hp.sc.tools.HPSCTools;
@@ -12,6 +13,7 @@ import com.baosight.hpjx.hp.xs.tools.HPXSTools;
 import com.baosight.hpjx.util.AssertUtils;
 import com.baosight.hpjx.util.LogUtils;
 import com.baosight.hpjx.util.MapUtils;
+import com.baosight.hpjx.util.StringUtils;
 import com.baosight.iplat4j.common.ed.domain.TEDCM01;
 import com.baosight.iplat4j.core.data.dao.DaoFactory;
 import com.baosight.iplat4j.core.ei.EiBlock;
@@ -304,38 +306,45 @@ public class ServiceXSOG0801 extends ServiceBase {
 	 * @return
 	 */
 	public EiInfo insertUserByOrgId(EiInfo inInfo) {
-		String errorMsg = "";
-		List insertList = new ArrayList();
-		List<Map> rows = inInfo.getBlock(EiConstant.resultBlock).getRows();
-		for (int i = 0; i < rows.size(); ++i) {
-			Map row = rows.get(i);
-			Map map = new HashMap();
-			map.put("userId", row.get("userId"));
-			List<XSOG02> userResults = dao.query("XSOG02.queryByOrgIdAndUserId", map);
-			if (userResults.size() > 0) {
-				errorMsg = errorMsg + "\n添加用户[" + row.get("loginName") + "]失败，选择用户已为其他组织机构成员";
-			} else {
-				inInfo.getBlock(EiConstant.resultBlock).setCell(i, "recCreator", UserSession.getLoginName());
-				insertList.add(inInfo.getBlock(EiConstant.resultBlock).getRow(i));
+		try {
+			String errorMsg = "";
+			List insertList = new ArrayList();
+			List<Map> rows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+			for (int i = 0; i < rows.size(); ++i) {
+				Map row = rows.get(i);
+				// 厂区工人不能同时存在多个组
+				Map queryMap = new HashMap();
+				queryMap.put("userId", row.get("userId"));
+				List<HPPZ013> dbPz013s = dao.query(HPPZ013.QUERY, queryMap);
+				if (dbPz013s.size() > 0) {
+					// 用户是工人时，只能有一个组织
+					List<XSOG02> userResults = dao.query("XSOG02.queryByOrgIdAndUserId", queryMap);
+					if (userResults.size() > 0) {
+						errorMsg = errorMsg + "\n添加用户[" + row.get("loginName") + "]失败，选择用户已为其他组织机构成员";
+						continue;
+					}
+				}
+				row.put("recCreator", UserSession.getLoginName());
+				insertList.add(row);
+			}
+			if (insertList.size() == 0) {
+				inInfo.setMsg(errorMsg);
+				inInfo.setStatus(EiConstant.STATUS_FAILURE);
+				return inInfo;
 			}
-		}
-		
-		if (insertList.size() == 0) {
-			inInfo.setMsg(errorMsg);
-			inInfo.setStatus(-1);
-			return inInfo;
-		} else {
 			EiInfo call = new EiInfo();
 			call.set("list", insertList);
 			call.set(EiConstant.serviceId, "S_XS_90");
 			EiInfo outInfo = XServiceManager.call(call);
-			if (!"".equals(errorMsg)) {
+			if (StringUtils.isNotBlank(errorMsg)) {
 				outInfo.addMsg(errorMsg);
-				outInfo.setStatus(0);
+				outInfo.setStatus(EiConstant.STATUS_DEFAULT);
 			}
-			
 			return outInfo;
+		}catch (Exception e){
+			LogUtils.setMsg(inInfo, e, "添加失败");
 		}
+		return inInfo;
 	}
 	
 	/**
@@ -736,30 +745,34 @@ public class ServiceXSOG0801 extends ServiceBase {
 	}
 	
 	public EiInfo queryUserDetailTemplateImpl(EiInfo inInfo) {
-		Map param = new HashMap();
-		param.put("codesetCode", inInfo.get("codesetCode"));
-		param.put("projectName", "XSERVICES");
-		String gridBlockId = (String) inInfo.get("gridBlockId");
-		Map attr = inInfo.getBlock(gridBlockId).getAttr();
-		int limit = (Integer) attr.get("limit");
-		int offset = (Integer) attr.get("offset");
-		List result = DaoFactory.getPlatSqlDao().query("EDCM01.query", param, 0, -999999);
-		int end = offset + limit;
-		int size = result.size();
-		int actualEndIndex = Math.min(end, size);
-		if (offset > size) {
-			result = new ArrayList();
-		} else {
-			result = result.subList(offset, actualEndIndex);
+		try {
+			Map param = new HashMap();
+			param.put("codesetCode", inInfo.get("codesetCode"));
+			param.put("projectName", "XSERVICES");
+			String gridBlockId = (String) inInfo.get("gridBlockId");
+			Map attr = inInfo.getBlock(gridBlockId).getAttr();
+			int limit = (Integer) attr.get("limit");
+			int offset = attr.get("offset") == null ? 0 : (Integer) attr.get("offset");
+			List result = DaoFactory.getPlatSqlDao().query("EDCM01.query", param, 0, -999999);
+			int end = offset + limit;
+			int size = result.size();
+			int actualEndIndex = Math.min(end, size);
+			if (offset > size) {
+				result = new ArrayList();
+			} else {
+				result = result.subList(offset, actualEndIndex);
+			}
+			EiInfo outInfo = new EiInfo();
+			outInfo.setMsg("查询成功，共" + result.size() + "条记录");
+			outInfo.addBlock((String) inInfo.get("gridBlockId")).setRows(result);
+			attr.put("count", size);
+			outInfo.getBlock((String) inInfo.get("gridBlockId")).setAttr(attr);
+			outInfo.getBlock((String) inInfo.get("gridBlockId")).setBlockMeta((new TEDCM01()).eiMetadata);
+			return outInfo;
+		} catch (Exception e) {
+			LogUtils.setMsg(inInfo, e, "查询失败");
 		}
-		
-		EiInfo outInfo = new EiInfo();
-		outInfo.setMsg("查询成功，共" + result.size() + "条记录");
-		outInfo.addBlock((String) inInfo.get("gridBlockId")).setRows(result);
-		attr.put("count", size);
-		outInfo.getBlock((String) inInfo.get("gridBlockId")).setAttr(attr);
-		outInfo.getBlock((String) inInfo.get("gridBlockId")).setBlockMeta((new TEDCM01()).eiMetadata);
-		return outInfo;
+		return inInfo;
 	}
 	
 	public EiInfo queryUserMetadataImpl(EiInfo inInfo) {

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/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/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/HPPZ013.jsp

@@ -5,7 +5,7 @@
 
 <c:set var="ctx" value="${pageContext.request.contextPath}"/>
 
-<EF:EFPage title="用工管理">
+<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">

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>';
@@ -278,12 +282,7 @@ $(function () {
             success: function (e) {
                 let rows = resultGrid.getCheckedRows()[0];
                 var src = e.response.docUrl;
-                var className;
-                if ("run" == projectEnv) {
-                    className = e.response.groupId;
-                } else {
-                    className = e.response.docTag;
-                }
+                var className = e.response.docTag;
                 var projCode = rows.projCode;
                 var projName = rows.projName;
                 var productionOrderNo = rows.prodOrderNo;
@@ -357,9 +356,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,8 +374,26 @@ function checkIn(id) {
         callbackName: checkInCallback
     });
 }
-checkInCallback = function (e) {
-    detailGrid.setEiInfo(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);
+        },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" >--%>