Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/main/webapp/HP/SC/HPSC005.js
#	src/main/webapp/HP/SC/HPSC005.jsp

src/main/java/com/baosight/hpjx/common/InventTypeEnum.java

@@ -9,12 +9,13 @@ import java.util.*;
  * @Date 2024/1/10 14:29
  */
 public enum InventTypeEnum {
-    MATERIAL(1,"原材料"),
+    RAW(1,"原料"),
     CONSUMABLE(2,"耗材"),
     SEMI_FINISHED_PRODUCT(3,"零部件"),
     FINISHED_PRODUCT(4,"部件"),
 	WASTE(5,"废料"),
-	OTHER(6,"其他");
+	OTHER(6,"其他"),
+    MATERIAL(7,"材料");
 
     private Integer code;
 

src/main/java/com/baosight/hpjx/hp/bi/domain/HPBI001.java

@@ -392,7 +392,7 @@ public class HPBI001 extends DaoEPBase {
 	 * @param novValue
 	 */
 	public void setnovValue(String novValue) {
-		this.octValue = novValue;
+		this.novValue = novValue;
 	}
 
 	/**
@@ -409,7 +409,7 @@ public class HPBI001 extends DaoEPBase {
 	 * @param decValue
 	 */
 	public void setdecValue(String decValue) {
-		this.octValue = decValue;
+		this.decValue = decValue;
 	}
 
 	/**

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

@@ -7,6 +7,7 @@ import com.baosight.hpjx.core.dao.DaoUtils;
 import com.baosight.hpjx.hp.bi.domain.HPBI001;
 import com.baosight.hpjx.hp.constant.HPConstant;
 import com.baosight.hpjx.hp.kc.domain.HPKC001;
+import com.baosight.hpjx.hp.kc.domain.HPKC007;
 import com.baosight.hpjx.hp.kc.tools.HPKCTools;
 import com.baosight.hpjx.hp.pz.tools.HPPZTools;
 import com.baosight.hpjx.util.*;
@@ -31,7 +32,7 @@ public class ServiceHPBI001 extends ServiceBase {
 
 
     // 指定存货类型
-    private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.MATERIAL.getCode(),
+    private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.RAW.getCode(),
             InventTypeEnum.CONSUMABLE.getCode()};
 
     /**
@@ -40,9 +41,18 @@ public class ServiceHPBI001 extends ServiceBase {
      * @param inInfo
      * @return
      */
-/*    public EiInfo initLoad(EiInfo inInfo) {
-           return query(inInfo);
-    }*/
+    public EiInfo initLoad(EiInfo inInfo) {
+        try {
+            Map queryMap = new HashMap();
+            queryMap.put("inventTypes", DEFAULT_INVENT_CODE);
+            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), queryMap);
+            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), queryMap);
+            //inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC007().eiMetadata);
+        } catch (PlatException e) {
+            LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+        }
+        return inInfo;
+    }
 
     /**
      * 查询操作

src/main/java/com/baosight/hpjx/hp/bi/sql/HPBI001.xml

@@ -59,7 +59,7 @@
         '' AS DATE
         FROM DUAL
         UNION ALL
-        SELECT '人均产量（kg）' AS INDNAME,'' AS DAYVALUE,
+        SELECT '人均产量（kg）' AS INDNAME,111 AS DAYVALUE,
         14 AS MONVALUE, 14 AS YEARVALUE,
         14 AS JANVALUE, 14 AS FEBVALUE,
         14 AS MARVLAUE, 14 AS APRVALUE,
@@ -72,12 +72,12 @@
         FROM DUAL
         ) A
         WHERE 1=1
-        <isNotEmpty prepend=" AND " property="factory">
+<!--        <isNotEmpty prepend=" AND " property="factory">
             FACTORY LIKE CONCAT('%',CONCAT( #factory#,'%'))
-        </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="date">
+        </isNotEmpty>-->
+<!--        <isNotEmpty prepend=" AND " property="date">
             DATE = #date#
-        </isNotEmpty>
+        </isNotEmpty>-->
         <dynamic prepend="ORDER BY">
             <isEmpty property="orderBy">
                 INDNAME desc
@@ -102,12 +102,12 @@
         SELECT '人均日产' AS SERIES,'585kg' AS VALUE,NULL AS FACTORY,NULL AS DATE, 5 AS SORT  FROM DUAL
         ) A
         WHERE 1=1
-        <isNotEmpty prepend=" AND " property="factory">
+<!--        <isNotEmpty prepend=" AND " property="factory">
             FACTORY LIKE CONCAT('%',CONCAT( #factory#,'%'))
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="date">
             DATE = #date#
-        </isNotEmpty>
+        </isNotEmpty>-->
         <dynamic prepend="ORDER BY">
             <isEmpty property="orderBy">
                 SORT asc

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

@@ -44,7 +44,7 @@ public class HPKC001 extends DaoEPBase {
 	public static final String FIELD_INVENT_RECORD_ID = "inventRecordId";    		/* 存货档案ID*/
 	public static final String FIELD_AMOUNT = "amount";    		/* 数量*/
 	public static final String FIELD_WEIGHT = "weight";    		/* 重量*/
-	public static final String FIELD_REMARKS = "remarks";    		/* 备注*/
+	public static final String FIELD_REMARK = "remark";    		/* 备注*/
 	public static final String FIELD_DELETE_FLAG = "deleteFlag";    		/* 是否删除0.否1.是*/
 
 	public static final String COL_ID = "ID";    		/* 主键id*/
@@ -66,7 +66,7 @@ public class HPKC001 extends DaoEPBase {
 	public static final String COL_INVENT_RECORD_ID = "INVENT_RECORD_ID";    		/* 存货档案ID*/
 	public static final String COL_AMOUNT = "AMOUNT";    		/* 数量*/
 	public static final String COL_WEIGHT = "WEIGHT";    		/* 重量*/
-	public static final String COL_REMARKS = "REMARKS";    		/* 备注*/
+	public static final String COL_REMARK = "REMARK";    		/* 备注*/
 	public static final String COL_DELETE_FLAG = "DELETE_FLAG";    		/* 是否删除0.否1.是*/
 
 	public static final String QUERY = "HPKC001.query";
@@ -95,7 +95,7 @@ public class HPKC001 extends DaoEPBase {
 	private Long inventRecordId = new Long(0);	/* 存货档案ID*/
 	private BigDecimal amount = new BigDecimal("0");		/* 数量*/
 	private BigDecimal weight = new BigDecimal("0");		/* 重量*/
-	private String remarks = " ";		/* 备注*/
+	private String remark = " ";		/* 备注*/
 	private Integer deleteFlag;	/* 是否删除0.否1.是*/
 
 	/**
@@ -191,7 +191,7 @@ public class HPKC001 extends DaoEPBase {
 		eiColumn.setDescName("重量");
 		eiMetadata.addMeta(eiColumn);
 
-		eiColumn = new EiColumn(FIELD_REMARKS);
+		eiColumn = new EiColumn(FIELD_REMARK);
 		eiColumn.setDescName("备注");
 		eiMetadata.addMeta(eiColumn);
 
@@ -531,20 +531,20 @@ public class HPKC001 extends DaoEPBase {
 		this.weight = weight;
 	}
 	/**
-	 * get the remarks - 备注.
-	 * @return the remarks
+	 * get the remark - 备注.
+	 * @return the remark
 	 */
-	public String getRemarks() {
-		return this.remarks;
+	public String getRemark() {
+		return this.remark;
 	}
 
 	/**
-	 * set the remarks - 备注.
+	 * set the remark - 备注.
 	 *
-	 * @param remarks - 备注
+	 * @param remark - 备注
 	 */
-	public void setRemarks(String remarks) {
-		this.remarks = remarks;
+	public void setRemark(String remark) {
+		this.remark = remark;
 	}
 	/**
 	 * get the deleteFlag - 是否删除0.否1.是.
@@ -590,7 +590,7 @@ public class HPKC001 extends DaoEPBase {
 		setInventRecordId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_INVENT_RECORD_ID)), inventRecordId));
 		setAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_AMOUNT)), amount));
 		setWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_WEIGHT)), weight));
-		setRemarks(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REMARKS)), remarks));
+		setRemark(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REMARK)), remark));
 		setDeleteFlag(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_DELETE_FLAG)), deleteFlag));
 	}
 
@@ -621,7 +621,7 @@ public class HPKC001 extends DaoEPBase {
 		map.put(FIELD_INVENT_RECORD_ID, StringUtils.toString(inventRecordId, eiMetadata.getMeta(FIELD_INVENT_RECORD_ID)));
 		map.put(FIELD_AMOUNT, StringUtils.toString(amount, eiMetadata.getMeta(FIELD_AMOUNT)));
 		map.put(FIELD_WEIGHT, StringUtils.toString(weight, eiMetadata.getMeta(FIELD_WEIGHT)));
-		map.put(FIELD_REMARKS, StringUtils.toString(remarks, eiMetadata.getMeta(FIELD_REMARKS)));
+		map.put(FIELD_REMARK, StringUtils.toString(remark, eiMetadata.getMeta(FIELD_REMARK)));
 		map.put(FIELD_DELETE_FLAG, StringUtils.toString(deleteFlag, eiMetadata.getMeta(FIELD_DELETE_FLAG)));
 
 		return map;

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

@@ -32,9 +32,15 @@ public class HPKC006 extends DaoEPBase {
 	public static final String FIELD_INVENT_TYPE = "inventType";    		/* 存货类型*/
 	public static final String FIELD_INVENT_CODE = "inventCode";    		/* 存货编码*/
 	public static final String FIELD_INVENT_NAME = "inventName";    		/* 存货名称*/
-	public static final String FIELD_INVENT_RECORD_ID = "inventRecordId";    		/* 规格*/
+	public static final String FIELD_INVENT_RECORD_ID = "inventRecordId";    		/* 存货档案ID*/
 	public static final String FIELD_AMOUNT = "amount";    		/* 数量*/
 	public static final String FIELD_WEIGHT = "weight";    		/* 重量*/
+	public static final String FIELD_LENGTH = "length";    		/* 长*/
+	public static final String FIELD_WIDTH = "width";    		/* 宽*/
+	public static final String FIELD_THICK = "thick";    		/* 厚*/
+	public static final String FIELD_MATERIAL = "material";    		/* 材质*/
+	public static final String FIELD_COEFFICIENT = "coefficient";    		/* 系数*/
+	public static final String FIELD_UNIT = "unit";    		/* 单位*/
 	public static final String FIELD_STATUS = "status";    		/* 状态 0提交  1保存*/
 	public static final String FIELD_REMARK = "remark";    		/* 备注*/
 	public static final String FIELD_OLD_ENTER_NO = "oldEnterNo";    		/* 原入库单号*/
@@ -90,6 +96,12 @@ public class HPKC006 extends DaoEPBase {
 	private BigDecimal amount = new BigDecimal(0.00);		/* 数量*/
 	private BigDecimal weight = new BigDecimal(0.00);		/* 重量*/
 	private Integer status = new Integer(0);	/* 状态 0提交  1保存*/
+	private BigDecimal length = new BigDecimal(0.00);		/* 长*/
+	private BigDecimal width = new BigDecimal(0.00);		/* 宽*/
+	private BigDecimal thick = new BigDecimal(0.00);		/* 厚*/
+	private String material = " ";		/* 材质*/
+	private BigDecimal coefficient = new BigDecimal(0.00);		/* 系数*/
+	private String unit = " ";		/* 单位*/
 	private String remark = " ";		/* 备注*/
 	private String oldEnterNo = " ";		/* 原入库单号*/
 	private String createdBy = " ";		/* 创建人*/
@@ -165,6 +177,42 @@ public class HPKC006 extends DaoEPBase {
 		eiColumn.setDescName("重量");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_LENGTH);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(2);
+		eiColumn.setFieldLength(10);
+		eiColumn.setDescName("长");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_WIDTH);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(2);
+		eiColumn.setFieldLength(10);
+		eiColumn.setDescName("宽");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_THICK);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(2);
+		eiColumn.setFieldLength(10);
+		eiColumn.setDescName("厚");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_MATERIAL);
+		eiColumn.setDescName("材质");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_COEFFICIENT);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(2);
+		eiColumn.setFieldLength(10);
+		eiColumn.setDescName("系数");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_UNIT);
+		eiColumn.setDescName("单位");
+		eiMetadata.addMeta(eiColumn);
+
 		eiColumn = new EiColumn(FIELD_STATUS);
 		eiColumn.setDescName("状态 0提交  1保存");
 		eiMetadata.addMeta(eiColumn);
@@ -424,6 +472,102 @@ public class HPKC006 extends DaoEPBase {
 		this.weight = weight;
 	}
 	/**
+	 * get the length - 长.
+	 * @return the length
+	 */
+	public BigDecimal getLength() {
+		return this.length;
+	}
+
+	/**
+	 * set the length - 长.
+	 *
+	 * @param length - 长
+	 */
+	public void setLength(BigDecimal length) {
+		this.length = length;
+	}
+	/**
+	 * get the width - 宽.
+	 * @return the width
+	 */
+	public BigDecimal getWidth() {
+		return this.width;
+	}
+
+	/**
+	 * set the width - 宽.
+	 *
+	 * @param width - 宽
+	 */
+	public void setWidth(BigDecimal width) {
+		this.width = width;
+	}
+	/**
+	 * get the thick - 厚.
+	 * @return the thick
+	 */
+	public BigDecimal getThick() {
+		return this.thick;
+	}
+
+	/**
+	 * set the thick - 厚.
+	 *
+	 * @param thick - 厚
+	 */
+	public void setThick(BigDecimal thick) {
+		this.thick = thick;
+	}
+	/**
+	 * get the material - 材质.
+	 * @return the material
+	 */
+	public String getMaterial() {
+		return this.material;
+	}
+
+	/**
+	 * set the material - 材质.
+	 *
+	 * @param material - 材质
+	 */
+	public void setMaterial(String material) {
+		this.material = material;
+	}
+	/**
+	 * get the coefficient - 系数.
+	 * @return the coefficient
+	 */
+	public BigDecimal getCoefficient() {
+		return this.coefficient;
+	}
+
+	/**
+	 * set the coefficient - 系数.
+	 *
+	 * @param coefficient - 系数
+	 */
+	public void setCoefficient(BigDecimal coefficient) {
+		this.coefficient = coefficient;
+	}
+	/**
+	 * get the unit - 单位.
+	 * @return the unit
+	 */
+	public String getUnit() {
+		return this.unit;
+	}
+
+	/**
+	 * set the unit - 单位.
+	 *
+	 * @param unit - 单位
+	 */
+	public void setUnit(String unit) {
+		this.unit = unit;
+	}
+	/**
 	 * get the status - 状态 0提交  1保存.
 	 * @return the status
 	 */
@@ -604,6 +748,12 @@ public class HPKC006 extends DaoEPBase {
 		setInventRecordId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_INVENT_RECORD_ID)), inventRecordId));
 		setAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_AMOUNT)), amount));
 		setWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_WEIGHT)), weight));
+		setLength(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_LENGTH)), length));
+		setWidth(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_WIDTH)), width));
+		setThick(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_THICK)), thick));
+		setMaterial(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_MATERIAL)), material));
+		setCoefficient(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_COEFFICIENT)), coefficient));
+		setUnit(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UNIT)), unit));
 		setStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_STATUS)), status));
 		setRemark(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REMARK)), remark));
 		setOldEnterNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_OLD_ENTER_NO)), oldEnterNo));
@@ -636,6 +786,12 @@ public class HPKC006 extends DaoEPBase {
 		map.put(FIELD_INVENT_RECORD_ID, StringUtils.toString(inventRecordId, eiMetadata.getMeta(FIELD_INVENT_RECORD_ID)));
 		map.put(FIELD_AMOUNT, StringUtils.toString(amount, eiMetadata.getMeta(FIELD_AMOUNT)));
 		map.put(FIELD_WEIGHT, StringUtils.toString(weight, eiMetadata.getMeta(FIELD_WEIGHT)));
+		map.put(FIELD_LENGTH, StringUtils.toString(length, eiMetadata.getMeta(FIELD_LENGTH)));
+		map.put(FIELD_WIDTH, StringUtils.toString(width, eiMetadata.getMeta(FIELD_WIDTH)));
+		map.put(FIELD_THICK, StringUtils.toString(thick, eiMetadata.getMeta(FIELD_THICK)));
+		map.put(FIELD_MATERIAL, StringUtils.toString(material, eiMetadata.getMeta(FIELD_MATERIAL)));
+		map.put(FIELD_COEFFICIENT, StringUtils.toString(coefficient, eiMetadata.getMeta(FIELD_COEFFICIENT)));
+		map.put(FIELD_UNIT, StringUtils.toString(unit, eiMetadata.getMeta(FIELD_UNIT)));
 		map.put(FIELD_STATUS, StringUtils.toString(status, eiMetadata.getMeta(FIELD_STATUS)));
 		map.put(FIELD_REMARK, StringUtils.toString(remark, eiMetadata.getMeta(FIELD_REMARK)));
 		map.put(FIELD_OLD_ENTER_NO, StringUtils.toString(oldEnterNo, eiMetadata.getMeta(FIELD_OLD_ENTER_NO)));

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

@@ -36,7 +36,7 @@ public class ServiceHPKC001 extends ServiceBase {
 
 
     // 指定存货类型
-    private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.MATERIAL.getCode(),
+    private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.RAW.getCode(),
             InventTypeEnum.CONSUMABLE.getCode()};
 
     /**

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

@@ -32,7 +32,7 @@ import java.util.Map;
 public class ServiceHPKC002 extends ServiceBase {
 	
 	// 指定存货类型
-	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.MATERIAL.getCode(),
+	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.RAW.getCode(),
 			InventTypeEnum.CONSUMABLE.getCode()};
 	
 	/**

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

@@ -36,7 +36,7 @@ import java.util.Map;
 public class ServiceHPKC002A extends ServiceEPBase {
 	
 	// 指定存货类型
-	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.MATERIAL.getCode(),
+	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.RAW.getCode(),
 			InventTypeEnum.CONSUMABLE.getCode()};
 	
 	/**

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

@@ -31,7 +31,7 @@ import java.util.Map;
 public class ServiceHPKC004 extends ServiceBase {
 	
 	// 指定存货类型
-	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.MATERIAL.getCode(),
+	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.RAW.getCode(),
 			InventTypeEnum.CONSUMABLE.getCode(), InventTypeEnum.SEMI_FINISHED_PRODUCT.getCode(),
 			InventTypeEnum.FINISHED_PRODUCT.getCode()};
 	

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

@@ -8,6 +8,7 @@ import com.baosight.hpjx.hp.constant.HPConstant;
 import com.baosight.hpjx.hp.constant.HPSqlConstant;
 import com.baosight.hpjx.hp.kc.domain.HPKC006;
 import com.baosight.hpjx.hp.kc.tools.HPKCTools;
+import com.baosight.hpjx.hp.pz.domain.HPPZ006;
 import com.baosight.hpjx.hp.pz.tools.HPPZTools;
 import com.baosight.hpjx.util.AssertUtils;
 import com.baosight.hpjx.util.BeanUtils;
@@ -20,6 +21,7 @@ import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.service.impl.ServiceBase;
+import com.baosight.iplat4j.core.util.NumberUtils;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
 import org.apache.commons.collections.MapUtils;
 
@@ -38,7 +40,7 @@ import java.util.Map;
 public class ServiceHPKC006 extends ServiceBase {
 	
 	// 指定存货类型
-	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.MATERIAL.getCode(),
+	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.RAW.getCode(),
 			InventTypeEnum.CONSUMABLE.getCode(), InventTypeEnum.WASTE.getCode()};
 	
 	/**
@@ -52,7 +54,7 @@ public class ServiceHPKC006 extends ServiceBase {
 			Map queryMap = new HashMap();
 			queryMap.put("inventTypes", DEFAULT_INVENT_CODE);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), queryMap);
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), queryMap);
+			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);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC006().eiMetadata);
@@ -105,6 +107,18 @@ public class ServiceHPKC006 extends ServiceBase {
 				this.setBaseInfo(fKc006);
 				// 生成入库单号
 				fKc006.setOtherEnterNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.OTHER_ENTER_NO));
+				HPPZ006 hppz006= HPPZTools.checkAndSavePZ06(
+						Integer.parseInt(resultRows.get(i).get("inventType").toString()),
+						resultRows.get(i).get("inventName").toString(),
+						NumberUtils.toBigDecimal(resultRows.get(i).get("length")),
+						NumberUtils.toBigDecimal(resultRows.get(i).get("width")),
+						NumberUtils.toBigDecimal(resultRows.get(i).get("thick")),
+						NumberUtils.toBigDecimal(resultRows.get(i).get("coefficient")),
+						resultRows.get(i).get("material").toString(),
+						resultRows.get(i).get("unit").toString()
+				);
+				fKc006.setInventRecordId(hppz006.getId());
+				fKc006.setInventCode(hppz006.getInventCode());
 				DaoUtils.insert(HPKC006.INSERT, fKc006);
 				// 修改库存
 				HPKCTools.updateStock(fKc006.getWhCode(), fKc006.getInventRecordId(), fKc006.getAmount(),
@@ -168,8 +182,8 @@ public class ServiceHPKC006 extends ServiceBase {
 			HPKC006 fKc006 = new HPKC006();
 			fKc006.fromMap(resultRows.get(i));
 			AssertUtils.isEmpty(fKc006.getWhCode(), "仓库名称不能为空");
-			AssertUtils.isNull(fKc006.getInventCode(), "存货名称不能为空");
-			AssertUtils.isNull(fKc006.getInventRecordId(), "规格不能为空");
+			AssertUtils.isNull(fKc006.getInventName(), "存货名称不能为空");
+			//AssertUtils.isNull(fKc006.getInventRecordId(), "规格不能为空");
 			AssertUtils.isGt(BigDecimal.ZERO, fKc006.getAmount(), "数量必须大于0");
 			AssertUtils.isGt(BigDecimal.ZERO, fKc006.getWeight(), "重量必须大于0");
 		}
@@ -186,7 +200,7 @@ public class ServiceHPKC006 extends ServiceBase {
 		// 仓库名称
 		fKc006.setWhName(HPPZTools.getPz007ByCode(fKc006.getWhCode()).getWhName());
 		// 存货名称
-		fKc006.setInventName(HPPZTools.getPz004ByCode(fKc006.getInventCode()).getInventName());
+		//fKc006.setInventName(HPPZTools.getPz004ByCode(fKc006.getInventCode()).getInventName());
 	}
 	
 	/**

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

@@ -38,7 +38,7 @@ import java.util.Map;
 public class ServiceHPKC007 extends ServiceBase {
 	
 	// 指定存货类型
-	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.MATERIAL.getCode(),
+	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.RAW.getCode(),
 			InventTypeEnum.CONSUMABLE.getCode(), InventTypeEnum.WASTE.getCode()};
 	
 	/**

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

@@ -35,7 +35,7 @@ import java.util.Map;
 public class ServiceHPKC007A extends ServiceEPBase {
 	
 	// 指定存货类型
-	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.MATERIAL.getCode(),
+	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.RAW.getCode(),
 			InventTypeEnum.CONSUMABLE.getCode(), InventTypeEnum.WASTE.getCode()};
 	
 	/**

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

@@ -23,7 +23,7 @@
         INVENT_RECORD_ID as "inventRecordId",  <!-- 存货档案ID -->
         AMOUNT as "amount",  <!-- 数量 -->
         WEIGHT as "weight",  <!-- 重量 -->
-        REMARKS as "remarks",  <!-- 备注 -->
+        REMARK as "remark",  <!-- 备注 -->
         DELETE_FLAG as "deleteFlag" <!-- 是否删除0.否1.是 -->
     </sql>
 
@@ -85,8 +85,8 @@
         <isNotEmpty prepend=" AND " property="weight">
             WEIGHT = #weight#
         </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="remarks">
-            REMARKS = #remarks#
+        <isNotEmpty prepend=" AND " property="remark">
+            REMARK = #remark#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="deleteFlag">
             DELETE_FLAG = #deleteFlag#
@@ -153,13 +153,13 @@
             INVENT_RECORD_ID,  <!-- 存货档案ID -->
             AMOUNT,  <!-- 数量 -->
             WEIGHT,  <!-- 重量 -->
-            REMARKS,  <!-- 备注 -->
+            REMARK,  <!-- 备注 -->
             DELETE_FLAG  <!-- 是否删除0.否1.是 -->
         ) VALUES (
             #companyCode#, #depCode#, #createdBy#, #createdName#, #createdTime#,
-            #oldPurchaseNo#,#purchaseNo#, #receiptDate#, #whCode#, #whName#, #inventType#,
+            #purchaseNo#,#oldPurchaseNo#, #receiptDate#, #whCode#, #whName#, #inventType#,
             #inventCode#, #inventName#, #inventRecordId#, #amount#, #weight#,
-            #remarks#, #deleteFlag#
+            #remark#, #deleteFlag#
         )
     </insert>
 
@@ -189,7 +189,7 @@
             INVENT_RECORD_ID = #inventRecordId#,   <!-- 存货档案ID -->
             AMOUNT = #amount#,   <!-- 数量 -->
             WEIGHT = #weight#,   <!-- 重量 -->
-            REMARKS = #remarks#   <!-- 备注 -->
+            REMARK = #remark#   <!-- 备注 -->
         WHERE ID = #id#
 	</update>
 

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

@@ -3,28 +3,34 @@
 <sqlMap namespace="HPKC006">
 
     <sql id="column">
-        ID as "id",
-        COMPANY_CODE as "companyCode",  <!-- 企业编码 预留 -->
-        DEP_CODE as "depCode",  <!-- 部门编码 预留 -->
-        RECEIPT_DATE as "receiptDate",  <!-- 单据日期 -->
-        OTHER_ENTER_NO as "otherEnterNo",  <!-- 其他入库单号 -->
-        WH_CODE as "whCode",  <!-- 仓库编码 -->
-        WH_NAME as "whName",  <!-- 仓库名称 -->
-        INVENT_TYPE as "inventType",  <!-- 存货类型 -->
-        INVENT_CODE as "inventCode",  <!-- 存货编码 -->
-        INVENT_NAME as "inventName",  <!-- 存货名称 -->
-        INVENT_RECORD_ID as "inventRecordId",  <!-- 规格 -->
-        AMOUNT as "amount",  <!-- 数量 -->
-        WEIGHT as "weight",  <!-- 重量 -->
-        STATUS as "status",  <!-- 状态 0提交  1保存 -->
-        REMARK as "remark",  <!-- 备注 -->
-        OLD_ENTER_NO as "oldEnterNo",  <!-- 原入库单号 -->
-        CREATED_BY as "createdBy",  <!-- 创建人 -->
-        CREATED_NAME as "createdName",  <!-- 创建人名称 -->
-        CREATED_TIME as "createdTime",  <!-- 创建时间 -->
-        UPDATED_BY as "updatedBy",  <!-- 更新人 -->
-        UPDATED_NAME as "updatedName",  <!-- 更新人名称 -->
-        UPDATED_TIME as "updatedTime"  <!-- 更新时间 -->
+        A.ID as "id",
+        A.COMPANY_CODE as "companyCode",  <!-- 企业编码 预留 -->
+        A.DEP_CODE as "depCode",  <!-- 部门编码 预留 -->
+        A.RECEIPT_DATE as "receiptDate",  <!-- 单据日期 -->
+        A.OTHER_ENTER_NO as "otherEnterNo",  <!-- 其他入库单号 -->
+        A.WH_CODE as "whCode",  <!-- 仓库编码 -->
+        A.WH_NAME as "whName",  <!-- 仓库名称 -->
+        A.INVENT_TYPE as "inventType",  <!-- 存货类型 -->
+        A.INVENT_CODE as "inventCode",  <!-- 存货编码 -->
+        A.INVENT_NAME as "inventName",  <!-- 存货名称 -->
+        A.INVENT_RECORD_ID as "inventRecordId",  <!-- 规格 -->
+        A.AMOUNT as "amount",  <!-- 数量 -->
+        A.WEIGHT as "weight",  <!-- 重量 -->
+        B.LENGTH as "length",
+        B.WIDTH as "width",
+        B.THICK as "thick",
+        B.MATERIAL as "material",
+        B.COEFFICIENT as "coefficient",
+        B.UNIT AS "unit",
+        A.STATUS as "status",  <!-- 状态 0提交  1保存 -->
+        A.REMARK as "remark",  <!-- 备注 -->
+        A.OLD_ENTER_NO as "oldEnterNo",  <!-- 原入库单号 -->
+        A.CREATED_BY as "createdBy",  <!-- 创建人 -->
+        A.CREATED_NAME as "createdName",  <!-- 创建人名称 -->
+        A.CREATED_TIME as "createdTime",  <!-- 创建时间 -->
+        A.UPDATED_BY as "updatedBy",  <!-- 更新人 -->
+        A.UPDATED_NAME as "updatedName",  <!-- 更新人名称 -->
+        A.UPDATED_TIME as "updatedTime"  <!-- 更新时间 -->
     </sql>
 
     <sql id="condition">
@@ -95,7 +101,7 @@
                 $orderBy$
             </isNotEmpty>
             <isEmpty property="orderBy">
-                ID DESC
+                A.ID DESC
             </isEmpty>
         </dynamic>
     </sql>
@@ -103,10 +109,67 @@
     <select id="query" parameterClass="java.util.HashMap" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC006">
         SELECT
         <include refid="column"/>
-        FROM hpjx.t_hpkc006
+        FROM hpjx.t_hpkc006 A
+        LEFT JOIN hpjx.t_hppz006 B ON A.INVENT_RECORD_ID = B.ID
         WHERE 1=1
-        <include refid="condition"/>
-        <include refid="customCondition"/>
+        <isNotEmpty prepend=" AND " property="id">
+            A.ID = #id#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="companyCode">
+            A.COMPANY_CODE = #companyCode#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="depCode">
+            A.DEP_CODE = #depCode#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="receiptDate">
+            A.RECEIPT_DATE = #receiptDate#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="otherEnterNo">
+            A.OTHER_ENTER_NO = #otherEnterNo#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="whCode">
+            A.WH_CODE = #whCode#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="whName">
+            A.WH_NAME = #whName#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="inventType">
+            A.INVENT_TYPE = #inventType#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="inventCode">
+            A.INVENT_CODE = #inventCode#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="inventName">
+            A.INVENT_NAME = #inventName#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="inventRecordId">
+            A.INVENT_RECORD_ID = #inventRecordId#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="deleteFlag">
+            A.DELETE_FLAG = #deleteFlag#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="otherEnterNos">
+            A.OTHER_ENTER_NO IN <iterate close=")" open="(" conjunction="," property="otherEnterNos">#otherEnterNos[]#</iterate>
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="inventTypes">
+            A.INVENT_TYPE IN <iterate close=")" open="(" conjunction="," property="inventTypes">#inventTypes[]#</iterate>
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="spec">
+            <isEqual property="spec" compareValue="无规格">
+                A.INVENT_RECORD_ID IN (SELECT ID FROM ${hpjxSchema}.T_HPPZ006 WHERE SPEC = '')
+            </isEqual>
+            <isNotEqual property="spec" compareValue="无规格">
+                A.INVENT_RECORD_ID IN (SELECT ID FROM ${hpjxSchema}.T_HPPZ006 WHERE SPEC = #spec#)
+            </isNotEqual>
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="createdDateFrom">
+            A.CREATED_TIME &gt;= CONCAT(REPLACE(#createdDateFrom#, '-', ''), '000000')
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="createdDateTo">
+            A.CREATED_TIME &lt;= CONCAT(REPLACE(#createdDateTo#, '-', ''), '235959')
+        </isNotEmpty>
+        <!--<include refid="condition"/>-->
+        <!--<include refid="customCondition"/>-->
         <include refid="order"/>
     </select>
 

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

@@ -127,14 +127,16 @@
             AMOUNT,  <!-- 数量 -->
             WEIGHT,  <!-- 重量 -->
             CREATED_BY,  <!-- 创建人 -->
-            CREATED_TIME,  <!-- 创建时间 -->
+            CREATED_NAME,  <!-- 创建人 -->
+        CREATED_TIME,  <!-- 创建时间 -->
             UPDATED_BY,  <!-- 更新人 -->
-            UPDATED_TIME,  <!-- 更新时间 -->
+        UPDATED_NAME,  <!-- 更新人 -->
+        UPDATED_TIME,  <!-- 更新时间 -->
             VERSION
         ) VALUES (
             #companyCode#, #depCode#, #whCode#, #whName#, #inventType#,
             #inventCode#, #inventName#, #inventRecordId#, #amount#, #weight#,
-            #createdBy#, #createdTime#, #updatedBy#,
+            #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#,
             #updatedTime#, #version#
         )
 	</insert>

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

@@ -78,11 +78,11 @@ public class HPPZ006 extends DaoEPBase {
 	private String inventName = " ";		/* 存货名称*/
 	private Integer status = 1;	/* 状态 0未启用  1启用*/
 	private String spec = " ";		/* 规格*/
-	private BigDecimal length = new BigDecimal(0.00);		/* 长*/
-	private BigDecimal width = new BigDecimal(0.00);		/* 宽*/
-	private BigDecimal thick = new BigDecimal(0.00);		/* 厚*/
+	private BigDecimal length = new BigDecimal(0.000);		/* 长*/
+	private BigDecimal width = new BigDecimal(0.000);		/* 宽*/
+	private BigDecimal thick = new BigDecimal(0.000);		/* 厚*/
 	private String material = " ";		/* 材质*/
-	private BigDecimal coefficient = new BigDecimal(0.00);		/* 系数*/
+	private BigDecimal coefficient = new BigDecimal(0.000);		/* 系数*/
 	private String unit = " ";		/* 单位*/
 	private String createdBy = " ";		/* 创建人*/
 	private String createdName = " ";		/* 创建人名称*/

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

@@ -178,7 +178,11 @@ public class ServiceHPPZ004 extends ServiceBase {
 		map.put("inventType", eiInfo.getString("inventType"));
 		List<DdynamicEnum> list = new ArrayList<>();
 		list.add(DdynamicEnum.INVENT_NAME_BLOCK_ID);
-		CommonMethod.initBlock(eiInfo, list, map);
+		boolean isSplicingSymbol = true;
+		if (eiInfo.getString("isSplicingSymbol") != null) {
+			isSplicingSymbol = Boolean.parseBoolean(eiInfo.getString("isSplicingSymbol"));
+		}
+		CommonMethod.initBlock(eiInfo, list, map,isSplicingSymbol);
 		return eiInfo;
 	}
 	

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

@@ -38,7 +38,7 @@ public class ServiceHPPZ006 extends ServiceBase {
 	 */
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), null);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), null,false);
 			inInfo.setBlock(InitiateModeEnum.generatorEiBlock());
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPPZ006().eiMetadata);
 		} catch (PlatException e) {
@@ -78,6 +78,7 @@ public class ServiceHPPZ006 extends ServiceBase {
 				fPz006.fromMap(resultRows.get(i));
 				// 存货名称
 				fPz006.setInventName(HPPZTools.getPz004ByCode(fPz006.getInventCode()).getInventName());
+				fPz006.setSpec(HPPZTools.jointSpec(fPz006.getLength(),fPz006.getWidth(),fPz006.getThick()));
 				DaoUtils.insert(HPPZ006.INSERT, fPz006);
 			}
 			inInfo = this.query(inInfo);
@@ -126,6 +127,7 @@ public class ServiceHPPZ006 extends ServiceBase {
 				fPz006.fromMap(resultRows.get(i));
 				// 存货名称
 				fPz006.setInventName(HPPZTools.getPz004ByCode(fPz006.getInventCode()).getInventName());
+				fPz006.setSpec(HPPZTools.jointSpec(fPz006.getLength(),fPz006.getWidth(),fPz006.getThick()));
 				DaoUtils.update(HPPZ006.UPDATE, fPz006);
 			}
 			inInfo = this.query(inInfo);
@@ -165,40 +167,31 @@ public class ServiceHPPZ006 extends ServiceBase {
 	 * @return
 	 */
 	public EiInfo checkAndSave(EiInfo inInfo){
-		String inventType = inInfo.getString("inventType");
-		String inventCode = inInfo.getString("inventCode");
-		String inventName = inInfo.getString("inventName");
-		String length = inInfo.getString("length");
-		String width = inInfo.getString("width");
-		String thick = inInfo.getString("thick");
-		String material = inInfo.getString("material");
-		String coefficient = inInfo.getString("coefficient");
-		String unit = inInfo.getString("unit");
-		List<Map> list = dao.query("HPPZ006.queryByCondition",new HashMap<String,Object>(){{
-			put("inventType",inventType);
-			put("inventCode",inventCode);
-			put("inventName",inventName);
-			put("length", Objects.nonNull(length)?length:"");
-			put("width",Objects.nonNull(width)?width:"");
-			put("thick",Objects.nonNull(thick)?thick:"");
-			put("material",Objects.nonNull(material)?material:"");
-			put("coefficient",Objects.nonNull(coefficient)?coefficient:"");
-			put("unit",Objects.nonNull(unit)?unit:"");
-		}});
+		inInfo.setCell(EiConstant.queryBlock,0,HPPZ006.FIELD_INVENT_TYPE,inInfo.getString("inventType"));
+		inInfo.setCell(EiConstant.queryBlock,0,HPPZ006.FIELD_INVENT_CODE,inInfo.getString("inventCode"));
+		inInfo.setCell(EiConstant.queryBlock,0,HPPZ006.FIELD_INVENT_NAME,inInfo.getString("inventName"));
+		inInfo.setCell(EiConstant.queryBlock,0,HPPZ006.FIELD_LENGTH,inInfo.getString("length"));
+		inInfo.setCell(EiConstant.queryBlock,0,HPPZ006.FIELD_WIDTH,inInfo.getString("width"));
+		inInfo.setCell(EiConstant.queryBlock,0,HPPZ006.FIELD_THICK,inInfo.getString("thick"));
+		inInfo.setCell(EiConstant.queryBlock,0,HPPZ006.FIELD_MATERIAL,inInfo.getString("material"));
+		inInfo.setCell(EiConstant.queryBlock,0,HPPZ006.FIELD_COEFFICIENT,inInfo.getString("coefficient"));
+		inInfo.setCell(EiConstant.queryBlock,0,HPPZ006.FIELD_UNIT,inInfo.getString("unit"));
+		EiInfo eiInfo = super.query(inInfo,"HPPZ006.queryByCondition", new HPPZ006());
 		HPPZ006 hppz006 = new HPPZ006();
-		if(CollectionUtils.isEmpty(list)){
-			hppz006.fromMap(list.get(0));
+		if(CollectionUtils.isNotEmpty(eiInfo.getBlock(EiConstant.resultBlock).getRows())){
+			Map map = (Map) eiInfo.getBlock(EiConstant.resultBlock).getRows().get(0);
+			hppz006.fromMap(map);
 		}else{
 			// 生成编码
-			hppz006.setInventType(Integer.parseInt(inventType));
+			hppz006.setInventType(Integer.parseInt(inInfo.getString("inventType")));
 			hppz006.setInventCode(SequenceGenerator.getNextSequence(HPConstant.SequenceId.INVENT_CODE));
-			hppz006.setInventName(inventName);
-			hppz006.setLength(new BigDecimal(length));
-			hppz006.setWidth(new BigDecimal(width));
-			hppz006.setThick(new BigDecimal(thick));
-			hppz006.setMaterial(material);
-			hppz006.setCoefficient(new BigDecimal(coefficient));
-			hppz006.setUnit(unit);
+			hppz006.setInventName(inInfo.getString("inventCode"));
+			hppz006.setLength(new BigDecimal(inInfo.getString("length")));
+			hppz006.setWidth(new BigDecimal(inInfo.getString("width")));
+			hppz006.setThick(new BigDecimal(inInfo.getString("thick")));
+			hppz006.setMaterial(inInfo.getString("material"));
+			hppz006.setCoefficient(new BigDecimal(inInfo.getString("coefficient")));
+			hppz006.setUnit(inInfo.getString("unit"));
 			hppz006.setStatus(CommonConstant.YesNo.YES_1.intValue());
 			hppz006.setSpec(HPPZTools.jointSpec(hppz006.getLength(),hppz006.getWidth(),hppz006.getThick()));
 			DaoUtils.insert(HPPZ006.INSERT, hppz006);
@@ -236,9 +229,13 @@ public class ServiceHPPZ006 extends ServiceBase {
 		if (ObjectUtils.isEmpty(map.get("inventType"))) {
 			map.put("inventType", eiInfo.getString("inventType"));
 		}
+		boolean isSplicingSymbol = true;
+		if (eiInfo.getString("isSplicingSymbol") != null) {
+			isSplicingSymbol = Boolean.parseBoolean(eiInfo.getString("isSplicingSymbol"));
+		}
 		List<DdynamicEnum> list = new ArrayList<>();
 		list.add(DdynamicEnum.MATERIAL_RECORD_BLOCK_ID);
-		CommonMethod.initBlock(eiInfo, list, map);
+		CommonMethod.initBlock(eiInfo, list, map,isSplicingSymbol);
 		return eiInfo;
 	}
 

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

@@ -33,7 +33,7 @@ public class ServiceHPPZ007 extends ServiceBase {
 	 */
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), null);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), null,true);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPPZ007().eiMetadata);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
@@ -148,7 +148,11 @@ public class ServiceHPPZ007 extends ServiceBase {
 	public EiInfo queryComboBox(EiInfo inInfo) {
 		List<DdynamicEnum> list = new ArrayList<>();
 		list.add(DdynamicEnum.WH_RECORD_BLOCK_ID);
-		CommonMethod.initBlock(inInfo, list, EiInfoUtils.getFirstRow(inInfo));
+		boolean isSplicingSymbol = true;
+		if (inInfo.getString("isSplicingSymbol") != null) {
+			isSplicingSymbol = Boolean.parseBoolean(inInfo.getString("isSplicingSymbol"));
+		}
+		CommonMethod.initBlock(inInfo, list, EiInfoUtils.getFirstRow(inInfo),isSplicingSymbol);
 		return inInfo;
 	}
 	

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

@@ -96,19 +96,19 @@
             INVENT_NAME = #inventName#
         </isNotEmpty>
         <isNotNull prepend=" AND " property="length">
-            IFNULL(LENGTH,'') = #length#
+            IFNULL(LENGTH,'') = cast(#length# as decimal(20,3))
         </isNotNull>
         <isNotNull prepend=" AND " property="width">
-            IFNULL(WIDTH,'') = #width#
+            IFNULL(WIDTH,'') = cast(#width# as decimal(20,3))
         </isNotNull>
         <isNotNull prepend=" AND " property="thick">
-            IFNULL(THICK,'') = #thick#
+            IFNULL(THICK,'') = cast(#thick# as decimal(20,3))
         </isNotNull>
         <isNotNull prepend=" AND " property="material">
             IFNULL(MATERIAL,'') = #material#
         </isNotNull>
         <isNotNull prepend=" AND " property="coefficient">
-            IFNULL(COEFFICIENT,'') = #coefficient#
+            IFNULL(COEFFICIENT,'') =cast(#coefficient# as decimal(20,3))
         </isNotNull>
         <isNotNull prepend=" AND " property="unit">
             IFNULL(UNIT,'') = #unit#

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

@@ -65,7 +65,9 @@ public class HPSC002A extends DaoEPBase {
 	private String updatedBy = " ";		/* 修改人*/
 	private String updatedName = " ";		/* 修改人名称*/
 	private String updatedTime = " ";		/* 修改时间*/
-	
+
+	private String bizType = " ";		/* 业务类型*/
+
 	/**
 	 * initialize the metadata.
 	 */
@@ -120,8 +122,10 @@ public class HPSC002A extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_UPDATED_TIME);
 		eiColumn.setDescName("修改时间");
 		eiMetadata.addMeta(eiColumn);
-		
-		
+
+		eiColumn = new EiColumn("bizType");
+		eiColumn.setDescName("业务类型");
+		eiMetadata.addMeta(eiColumn);
 	}
 	
 	/**
@@ -324,6 +328,22 @@ public class HPSC002A extends DaoEPBase {
 		this.updatedTime = updatedTime;
 	}
 	/**
+	 * get the bizType - .
+	 * @return the bizType
+	 */
+	public String getBizType() {
+		return this.bizType;
+	}
+
+	/**
+	 * set the bizType -
+	 *
+	 * @param bizType -
+	 */
+	public void setBizType(String bizType) {
+		this.bizType = bizType;
+	}
+	/**
 	 * get the value from Map.
 	 *
 	 * @param map - source data map
@@ -343,6 +363,7 @@ public class HPSC002A 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));
+		setBizType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("bizType")), bizType));
 	}
 	
 	/**
@@ -364,7 +385,8 @@ public class HPSC002A 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("bizType", StringUtils.toString(bizType, eiMetadata.getMeta("bizType")));
+
 		return map;
 	}
 }

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

@@ -19,9 +19,9 @@ import java.util.Map;
  * @history 2024-01-25 16:47:50 create
  */
 public class HPSC002B extends DaoEPBase {
-	
+
 	private static final long serialVersionUID = 1L;
-	
+
 	public static final String FIELD_ID = "id";    		/* 主键ID*/
 	public static final String FIELD_COMPANY_CODE = "companyCode";    		/* 企业编码 预留*/
 	public static final String FIELD_DEPT_CODE = "deptCode";    		/* 部门编码 预留*/
@@ -34,7 +34,7 @@ public class HPSC002B 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 COL_ID = "ID";    		/* 主键ID*/
 	public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码 预留*/
 	public static final String COL_DEPT_CODE = "DEPT_CODE";    		/* 部门编码 预留*/
@@ -47,13 +47,13 @@ public class HPSC002B 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 QUERY = "HPSC002B.query";
-	public static final String COUNT = "HPSC002B.count";
-	public static final String INSERT = "HPSC002B.insert";
-	public static final String UPDATE = "HPSC002B.update";
-	public static final String DELETE = "HPSC002B.delete";
-	
+
+	public static final String QUERY = "HPSC002A.query";
+	public static final String COUNT = "HPSC002A.count";
+	public static final String INSERT = "HPSC002A.insert";
+	public static final String UPDATE = "HPSC002A.update";
+	public static final String DELETE = "HPSC002A.delete";
+
 	private Long id = null;	/* 主键ID*/
 	private String companyCode = " ";		/* 企业编码 预留*/
 	private String deptCode = " ";		/* 部门编码 预留*/
@@ -66,72 +66,76 @@ public class HPSC002B extends DaoEPBase {
 	private String updatedBy = " ";		/* 修改人*/
 	private String updatedName = " ";		/* 修改人名称*/
 	private String updatedTime = " ";		/* 修改时间*/
-	
+
+	private String bizType = " ";		/* 业务类型*/
+
 	/**
 	 * initialize the metadata.
 	 */
 	public void initMetaData() {
 		EiColumn eiColumn;
-		
+
 		eiColumn = new EiColumn(FIELD_ID);
 		eiColumn.setPrimaryKey(true);
 		eiColumn.setDescName("主键ID");
 		eiMetadata.addMeta(eiColumn);
-		
+
 		eiColumn = new EiColumn(FIELD_COMPANY_CODE);
 		eiColumn.setDescName("企业编码 预留");
 		eiMetadata.addMeta(eiColumn);
-		
+
 		eiColumn = new EiColumn(FIELD_DEPT_CODE);
 		eiColumn.setDescName("部门编码 预留");
 		eiMetadata.addMeta(eiColumn);
-		
+
 		eiColumn = new EiColumn(FIELD_MAT_ID);
 		eiColumn.setDescName("物料ID");
 		eiMetadata.addMeta(eiColumn);
-		
+
 		eiColumn = new EiColumn(FIELD_DOC_ID);
 		eiColumn.setDescName("文件ID");
 		eiMetadata.addMeta(eiColumn);
-		
+
 		eiColumn = new EiColumn(FIELD_DOC_NAME);
 		eiColumn.setDescName("文件名称");
 		eiMetadata.addMeta(eiColumn);
-		
+
 		eiColumn = new EiColumn(FIELD_CREATED_BY);
 		eiColumn.setDescName("创建人");
 		eiMetadata.addMeta(eiColumn);
-		
+
 		eiColumn = new EiColumn(FIELD_CREATED_NAME);
 		eiColumn.setDescName("创建人名称");
 		eiMetadata.addMeta(eiColumn);
-		
+
 		eiColumn = new EiColumn(FIELD_CREATED_TIME);
 		eiColumn.setDescName("创建时间");
 		eiMetadata.addMeta(eiColumn);
-		
+
 		eiColumn = new EiColumn(FIELD_UPDATED_BY);
 		eiColumn.setDescName("修改人");
 		eiMetadata.addMeta(eiColumn);
-		
+
 		eiColumn = new EiColumn(FIELD_UPDATED_NAME);
 		eiColumn.setDescName("修改人名称");
 		eiMetadata.addMeta(eiColumn);
-		
+
 		eiColumn = new EiColumn(FIELD_UPDATED_TIME);
 		eiColumn.setDescName("修改时间");
 		eiMetadata.addMeta(eiColumn);
-		
-		
+
+		eiColumn = new EiColumn("bizType");
+		eiColumn.setDescName("业务类型");
+		eiMetadata.addMeta(eiColumn);
 	}
-	
+
 	/**
 	 * the constructor.
 	 */
 	public HPSC002B() {
 		initMetaData();
 	}
-	
+
 	/**
 	 * get the id - 主键ID.
 	 * @return the id
@@ -139,7 +143,7 @@ public class HPSC002B extends DaoEPBase {
 	public Long getId() {
 		return this.id;
 	}
-	
+
 	/**
 	 * set the id - 主键ID.
 	 *
@@ -155,7 +159,7 @@ public class HPSC002B extends DaoEPBase {
 	public String getCompanyCode() {
 		return this.companyCode;
 	}
-	
+
 	/**
 	 * set the companyCode - 企业编码 预留.
 	 *
@@ -171,7 +175,7 @@ public class HPSC002B extends DaoEPBase {
 	public String getDeptCode() {
 		return this.deptCode;
 	}
-	
+
 	/**
 	 * set the deptCode - 部门编码 预留.
 	 *
@@ -187,7 +191,7 @@ public class HPSC002B extends DaoEPBase {
 	public Long getMatId() {
 		return this.matId;
 	}
-	
+
 	/**
 	 * set the matId - 物料ID.
 	 *
@@ -203,7 +207,7 @@ public class HPSC002B extends DaoEPBase {
 	public String getDocId() {
 		return this.docId;
 	}
-	
+
 	/**
 	 * set the docId - 文件ID.
 	 *
@@ -219,7 +223,7 @@ public class HPSC002B extends DaoEPBase {
 	public String getDocName() {
 		return this.getDocName();
 	}
-	
+
 	/**
 	 * set the docName - 文件名称.
 	 *
@@ -235,7 +239,7 @@ public class HPSC002B extends DaoEPBase {
 	public String getCreatedBy() {
 		return this.createdBy;
 	}
-	
+
 	/**
 	 * set the createdBy - 创建人.
 	 *
@@ -251,7 +255,7 @@ public class HPSC002B extends DaoEPBase {
 	public String getCreatedName() {
 		return this.createdName;
 	}
-	
+
 	/**
 	 * set the createdName - 创建人名称.
 	 *
@@ -267,7 +271,7 @@ public class HPSC002B extends DaoEPBase {
 	public String getCreatedTime() {
 		return this.createdTime;
 	}
-	
+
 	/**
 	 * set the createdTime - 创建时间.
 	 *
@@ -283,7 +287,7 @@ public class HPSC002B extends DaoEPBase {
 	public String getUpdatedBy() {
 		return this.updatedBy;
 	}
-	
+
 	/**
 	 * set the updatedBy - 修改人.
 	 *
@@ -299,7 +303,7 @@ public class HPSC002B extends DaoEPBase {
 	public String getUpdatedName() {
 		return this.updatedName;
 	}
-	
+
 	/**
 	 * set the updatedName - 修改人名称.
 	 *
@@ -315,7 +319,7 @@ public class HPSC002B extends DaoEPBase {
 	public String getUpdatedTime() {
 		return this.updatedTime;
 	}
-	
+
 	/**
 	 * set the updatedTime - 修改时间.
 	 *
@@ -325,13 +329,29 @@ public class HPSC002B extends DaoEPBase {
 		this.updatedTime = updatedTime;
 	}
 	/**
+	 * get the bizType - .
+	 * @return the bizType
+	 */
+	public String getBizType() {
+		return this.bizType;
+	}
+
+	/**
+	 * set the bizType -
+	 *
+	 * @param bizType -
+	 */
+	public void setBizType(String bizType) {
+		this.bizType = bizType;
+	}
+	/**
 	 * get the value from Map.
 	 *
 	 * @param map - source data map
 	 */
 	@Override
 	public void fromMap(Map map) {
-		
+
 		setId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_ID)), id));
 		setCompanyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_CODE)), companyCode));
 		setDeptCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEPT_CODE)), deptCode));
@@ -344,14 +364,15 @@ public class HPSC002B 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));
+		setBizType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("bizType")), bizType));
 	}
-	
+
 	/**
 	 * set the value to Map.
 	 */
 	@Override
 	public Map toMap() {
-		
+
 		Map map = new HashMap();
 		map.put(FIELD_ID, StringUtils.toString(id, eiMetadata.getMeta(FIELD_ID)));
 		map.put(FIELD_COMPANY_CODE, StringUtils.toString(companyCode, eiMetadata.getMeta(FIELD_COMPANY_CODE)));
@@ -365,7 +386,8 @@ public class HPSC002B 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("bizType", StringUtils.toString(bizType, eiMetadata.getMeta("bizType")));
+
 		return map;
 	}
 }

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

-/**
- * Generate time : 2024-01-10 16:44:48
- * Version : 1.0
- */
 package com.baosight.hpjx.hp.sc.domain;
 
-import com.baosight.iplat4j.core.data.DaoEPBase;
-import com.baosight.iplat4j.core.ei.EiColumn;
 import com.baosight.iplat4j.core.util.NumberUtils;
-import com.baosight.iplat4j.core.util.StringUtils;
-
 import java.math.BigDecimal;
+import com.baosight.iplat4j.core.ei.EiColumn;
+import com.baosight.iplat4j.core.data.DaoEPBase;
 import java.util.HashMap;
 import java.util.Map;
+import com.baosight.iplat4j.core.util.StringUtils;
 
 /**
- * THpsc002
+ * Project: <br>
+ * Title:HPSC006.java <br>
+ * Description: <br>
  *
+ * Copyrigth:Baosight Software LTD.co Copyright (c) 2019. <br>
+ *
+ * @version 1.0
+ * @history 2024-02-05 9:36:07 create
  */
 public class HPSC006 extends DaoEPBase {
 
-    private Long id = 0L;
-    private String companyCode = " ";        /* 企业编码 预留*/
-    private String deptCode = " ";        /* 部门编码 预留*/
-    private String projCode = " ";        /* 项目编码*/
-    private String projName = " ";        /* 项目名称*/
-    private String parentId = "";        /* 父节点-部件编码*/
-    private String parentPrdtName = " ";        /* 父节点-部件名称*/
-    private String type = " ";        /* 类别*/
-    private String leaf = "1";        /* 是否有叶子节点*/
-    private String sort = " ";        /* 排序字段*/
-    private String icon = " ";        /* 图片地址*/
-    private Integer prdtType = 0;       /*部件类型*/
-    private String prdtCode = " ";        /* 部件编码*/
-    private String prdtName = " ";        /* 部件名称*/
-    private Long inventRecordId = new Long(0);	/* 存货档案ID*/
-    private BigDecimal num = new BigDecimal(0.000);         /* 数量*/
-    private BigDecimal unitWt = new BigDecimal(0.000);        /* 单重*/
-    private BigDecimal totalWt = new BigDecimal(0.000);        /* 总重*/
-    private String filePath1 = " ";        /* 文件地址1*/
-    private String filePath2 = " ";        /* 文件地址2*/
-    private String filePath3 = " ";        /* 文件地址3*/
-    private String filePath4 = " ";        /* 文件地址4*/
-    private String filePath5 = " ";        /* 文件地址5*/
-    private Integer status = 0;        /* 状态   0-未提交，1-已提交*/
-    private Integer delStatus = 0;        /* 状态   1未删除，0已删除*/
-    private String createdBy = " ";        /* 创建人*/
-    private String createdTime;        /* 创建时间*/
-    private String updatedBy = " ";        /* 更新人*/
-    private String updatedTime;        /* 更新时间*/
-    private String remark = " ";        /* 备注*/
-    private Integer lv = 0;       /*层级*/
-
-    private String spec = " ";        /* 规格*/
-
-    private BigDecimal length = new BigDecimal(0.00);		/* 长*/
-    private BigDecimal width = new BigDecimal(0.00);		/* 宽*/
-    private BigDecimal thick = new BigDecimal(0.00);		/* 厚*/
-
-
-    /**
-     * initialize the metadata
+    private static final long serialVersionUID = 1L;
+
+    public static final String FIELD_ID = "id";
+    public static final String FIELD_COMPANY_CODE = "companyCode";    		/* 企业编码 预留*/
+    public static final String FIELD_PROJ_CODE = "projCode";    		/* 项目编码*/
+    public static final String FIELD_PROJ_NAME = "projName";    		/* 项目名称*/
+    public static final String FIELD_PRODUCTION_ORDER_NO = "productionOrderNo";    		/* 生产订单号*/
+    public static final String FIELD_INVENT_TYPE = "inventType";    		/* 物料类型*/
+    public static final String FIELD_INVENT_CODE = "inventCode";    		/* 物料编码*/
+    public static final String FIELD_INVENT_NAME = "inventName";    		/* 物料名称*/
+    public static final String FIELD_INVENT_LENGTH = "inventLength";    		/* 物料-长*/
+    public static final String FIELD_INVENT_WIDTH = "inventWidth";    		/* 物料-宽*/
+    public static final String FIELD_INVENT_THICK = "inventThick";    		/* 物料-厚*/
+    public static final String FIELD_INVENT_SPEC = "inventSpec";    		/* 物料规格*/
+    public static final String FIELD_PLAN_COMPLETION_DATE = "planCompletionDate";    		/* 计划完成日期*/
+    public static final String FIELD_NUM = "num";    		/* 计划数量*/
+    public static final String FIELD_UNIT_WT = "unitWt";    		/* 计划单重*/
+    public static final String FIELD_TOTAL_WT = "totalWt";    		/* 计划重量*/
+    public static final String FIELD_ACTUAL_COMPLETION_DATE = "actualCompletionDate";    		/* 实际完工日期*/
+    public static final String FIELD_ACTUAL_COMPLETION_NUM = "actualCompletionNum";    		/* 实际完工数量*/
+    public static final String FIELD_STATUS = "status";    		/* 状态   0-计划中，1-生产中，2-已完成*/
+    public static final String FIELD_ORG_NO = "orgNo";    		/* 生产组编码*/
+    public static final String FIELD_ORG_NAME = "orgName";    		/* 生产组名称*/
+    public static final String FIELD_FACTORY_CODE = "factoryCode";    		/* 厂区编码*/
+    public static final String FIELD_FACTORY_NAME = "factoryName";    		/* 厂区名称*/
+    public static final String FIELD_CREATED_BY = "createdBy";    		/* 创建人*/
+    public static final String FIELD_CREATED_TIME = "createdTime";    		/* 创建时间*/
+    public static final String FIELD_UPDATED_BY = "updatedBy";    		/* 更新人*/
+    public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 更新时间*/
+    public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
+    public static final String FIELD_REMARK = "remark";    		/* 备注*/
+    public static final String FIELD_FILE_PATH1 = "filePath1";    		/* 文件地址1*/
+    public static final String FIELD_INVENT_RECORD_ID = "inventRecordId";    		/* 存货档案ID*/
+
+    public static final String COL_ID = "ID";
+    public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码 预留*/
+    public static final String COL_PROJ_CODE = "PROJ_CODE";    		/* 项目编码*/
+    public static final String COL_PROJ_NAME = "PROJ_NAME";    		/* 项目名称*/
+    public static final String COL_PRODUCTION_ORDER_NO = "PRODUCTION_ORDER_NO";    		/* 生产订单号*/
+    public static final String COL_INVENT_TYPE = "INVENT_TYPE";    		/* 物料类型*/
+    public static final String COL_INVENT_CODE = "INVENT_CODE";    		/* 物料编码*/
+    public static final String COL_INVENT_NAME = "INVENT_NAME";    		/* 物料名称*/
+    public static final String COL_INVENT_LENGTH = "INVENT_LENGTH";    		/* 物料-长*/
+    public static final String COL_INVENT_WIDTH = "INVENT_WIDTH";    		/* 物料-宽*/
+    public static final String COL_INVENT_THICK = "INVENT_THICK";    		/* 物料-厚*/
+    public static final String COL_INVENT_SPEC = "INVENT_SPEC";    		/* 物料规格*/
+    public static final String COL_PLAN_COMPLETION_DATE = "PLAN_COMPLETION_DATE";    		/* 计划完成日期*/
+    public static final String COL_NUM = "NUM";    		/* 计划数量*/
+    public static final String COL_UNIT_WT = "UNIT_WT";    		/* 计划单重*/
+    public static final String COL_TOTAL_WT = "TOTAL_WT";    		/* 计划重量*/
+    public static final String COL_ACTUAL_COMPLETION_DATE = "ACTUAL_COMPLETION_DATE";    		/* 实际完工日期*/
+    public static final String COL_ACTUAL_COMPLETION_NUM = "ACTUAL_COMPLETION_NUM";    		/* 实际完工数量*/
+    public static final String COL_STATUS = "STATUS";    		/* 状态   0-计划中，1-生产中，2-已完成*/
+    public static final String COL_ORG_NO = "ORG_NO";    		/* 生产组编码*/
+    public static final String COL_ORG_NAME = "ORG_NAME";    		/* 生产组名称*/
+    public static final String COL_FACTORY_CODE = "FACTORY_CODE";    		/* 厂区编码*/
+    public static final String COL_FACTORY_NAME = "FACTORY_NAME";    		/* 厂区名称*/
+    public static final String COL_CREATED_BY = "CREATED_BY";    		/* 创建人*/
+    public static final String COL_CREATED_TIME = "CREATED_TIME";    		/* 创建时间*/
+    public static final String COL_UPDATED_BY = "UPDATED_BY";    		/* 更新人*/
+    public static final String COL_UPDATED_TIME = "UPDATED_TIME";    		/* 更新时间*/
+    public static final String COL_DEP_CODE = "DEP_CODE";    		/* 部门编码*/
+    public static final String COL_REMARK = "REMARK";    		/* 备注*/
+    public static final String COL_FILE_PATH1 = "FILE_PATH1";    		/* 文件地址1*/
+    public static final String COL_INVENT_RECORD_ID = "INVENT_RECORD_ID";    		/* 存货档案ID*/
+
+    public static final String QUERY = "t_hpsc006.query";
+    public static final String COUNT = "t_hpsc006.count";
+    public static final String INSERT = "t_hpsc006.insert";
+    public static final String UPDATE = "t_hpsc006.update";
+    public static final String DELETE = "t_hpsc006.delete";
+
+    private Long id = new Long(0);
+    private String companyCode = " ";		/* 企业编码 预留*/
+    private String projCode = " ";		/* 项目编码*/
+    private String projName = " ";		/* 项目名称*/
+    private String productionOrderNo = " ";		/* 生产订单号*/
+    private Integer inventType;	/* 物料类型*/
+    private String inventCode = " ";		/* 物料编码*/
+    private String inventName = " ";		/* 物料名称*/
+    private BigDecimal inventLength = new BigDecimal("0");		/* 物料-长*/
+    private BigDecimal inventWidth = new BigDecimal("0");		/* 物料-宽*/
+    private BigDecimal inventThick = new BigDecimal("0");		/* 物料-厚*/
+    private String inventSpec = " ";		/* 物料规格*/
+    private String planCompletionDate = " ";		/* 计划完成日期*/
+    private BigDecimal num = new BigDecimal(0.000);		/* 计划数量*/
+    private BigDecimal unitWt = new BigDecimal("0");		/* 计划单重*/
+    private BigDecimal totalWt = new BigDecimal(0.000);		/* 计划重量*/
+    private String actualCompletionDate = " ";		/* 实际完工日期*/
+    private BigDecimal actualCompletionNum = new BigDecimal("0");		/* 实际完工数量*/
+    private Integer status = new Integer(0);		/* 状态   0-计划中，1-生产中，2-已完成*/
+    private String orgNo = " ";		/* 生产组编码*/
+    private String orgName = " ";		/* 生产组名称*/
+    private String factoryCode = " ";		/* 厂区编码*/
+    private String factoryName = " ";		/* 厂区名称*/
+    private String createdBy = " ";		/* 创建人*/
+    private String createdTime = " ";		/* 创建时间*/
+    private String updatedBy = " ";		/* 更新人*/
+    private String updatedTime = " ";		/* 更新时间*/
+    private String depCode = " ";		/* 部门编码*/
+    private String remark = " ";		/* 备注*/
+    private String filePath1 = " ";		/* 文件地址1*/
+    private Integer inventRecordId = new Integer(0);		/* 存货档案ID*/
+
+    /**
+     * initialize the metadata.
      */
     public void initMetaData() {
         EiColumn eiColumn;
 
-        eiColumn = new EiColumn("id");
+        eiColumn = new EiColumn(FIELD_ID);
         eiColumn.setPrimaryKey(true);
         eiColumn.setDescName(" ");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("companyCode");
+        eiColumn = new EiColumn(FIELD_COMPANY_CODE);
         eiColumn.setDescName("企业编码 预留");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("deptCode");
-        eiColumn.setDescName("部门编码 预留");
-        eiMetadata.addMeta(eiColumn);
-
-        eiColumn = new EiColumn("projCode");
+        eiColumn = new EiColumn(FIELD_PROJ_CODE);
         eiColumn.setDescName("项目编码");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("projName");
+        eiColumn = new EiColumn(FIELD_PROJ_NAME);
         eiColumn.setDescName("项目名称");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("parentId");
-        eiColumn.setDescName("父节点-部件编码");
-        eiMetadata.addMeta(eiColumn);
-
-        eiColumn = new EiColumn("parentPrdtName");
-        eiColumn.setDescName("父节点-部件名称");
+        eiColumn = new EiColumn(FIELD_PRODUCTION_ORDER_NO);
+        eiColumn.setDescName("生产订单号");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("type");
-        eiColumn.setDescName("类别");
+        eiColumn = new EiColumn(FIELD_INVENT_TYPE);
+        eiColumn.setDescName("物料类型");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("leaf");
-        eiColumn.setDescName("是否有叶子节点");
+        eiColumn = new EiColumn(FIELD_INVENT_CODE);
+        eiColumn.setDescName("物料编码");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("sort");
-        eiColumn.setDescName("排序字段");
+        eiColumn = new EiColumn(FIELD_INVENT_NAME);
+        eiColumn.setDescName("物料名称");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("icon");
-        eiColumn.setDescName("图片地址");
+        eiColumn = new EiColumn(FIELD_INVENT_LENGTH);
+        eiColumn.setType("N");
+        eiColumn.setScaleLength(3);
+        eiColumn.setFieldLength(12);
+        eiColumn.setDescName("物料-长");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("prdtType");
-        eiColumn.setDescName("部件类型");
+        eiColumn = new EiColumn(FIELD_INVENT_WIDTH);
+        eiColumn.setType("N");
+        eiColumn.setScaleLength(3);
+        eiColumn.setFieldLength(12);
+        eiColumn.setDescName("物料-宽");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("prdtCode");
-        eiColumn.setDescName("部件编码");
+        eiColumn = new EiColumn(FIELD_INVENT_THICK);
+        eiColumn.setType("N");
+        eiColumn.setScaleLength(3);
+        eiColumn.setFieldLength(12);
+        eiColumn.setDescName("物料-厚");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("prdtName");
-        eiColumn.setDescName("部件名称");
+        eiColumn = new EiColumn(FIELD_INVENT_SPEC);
+        eiColumn.setDescName("物料规格");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("inventRecordId");
-        eiColumn.setDescName("存货档案ID");
+        eiColumn = new EiColumn(FIELD_PLAN_COMPLETION_DATE);
+        eiColumn.setDescName("计划完成日期");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("num");
-        eiColumn.setDescName("数量");
+        eiColumn = new EiColumn(FIELD_NUM);
+        eiColumn.setType("N");
+        eiColumn.setScaleLength(3);
+        eiColumn.setFieldLength(15);
+        eiColumn.setDescName("计划数量");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("unitWt");
+        eiColumn = new EiColumn(FIELD_UNIT_WT);
         eiColumn.setType("N");
         eiColumn.setScaleLength(3);
         eiColumn.setFieldLength(15);
-        eiColumn.setDescName("单重");
+        eiColumn.setDescName("计划单重");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("totalWt");
+        eiColumn = new EiColumn(FIELD_TOTAL_WT);
         eiColumn.setType("N");
         eiColumn.setScaleLength(3);
         eiColumn.setFieldLength(15);
-        eiColumn.setDescName("总重");
+        eiColumn.setDescName("计划重量");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("filePath1");
-        eiColumn.setDescName("文件地址1");
+        eiColumn = new EiColumn(FIELD_ACTUAL_COMPLETION_DATE);
+        eiColumn.setDescName("实际完工日期");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("filePath2");
-        eiColumn.setDescName("文件地址2");
+        eiColumn = new EiColumn(FIELD_ACTUAL_COMPLETION_NUM);
+        eiColumn.setType("N");
+        eiColumn.setScaleLength(3);
+        eiColumn.setFieldLength(15);
+        eiColumn.setDescName("实际完工数量");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("filePath3");
-        eiColumn.setDescName("文件地址3");
+        eiColumn = new EiColumn(FIELD_STATUS);
+        eiColumn.setDescName("状态   0-计划中，1-生产中，2-已完成");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("filePath4");
-        eiColumn.setDescName("文件地址4");
+        eiColumn = new EiColumn(FIELD_ORG_NO);
+        eiColumn.setDescName("生产组编码");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("filePath5");
-        eiColumn.setDescName("文件地址5");
+        eiColumn = new EiColumn(FIELD_ORG_NAME);
+        eiColumn.setDescName("生产组名称");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("status");
-        eiColumn.setDescName("状态   0-未提交，1-已提交");
+        eiColumn = new EiColumn(FIELD_FACTORY_CODE);
+        eiColumn.setDescName("厂区编码");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("delStatus");
-        eiColumn.setDescName("状态   1未删除，0已删除");
+        eiColumn = new EiColumn(FIELD_FACTORY_NAME);
+        eiColumn.setDescName("厂区名称");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("createdBy");
+        eiColumn = new EiColumn(FIELD_CREATED_BY);
         eiColumn.setDescName("创建人");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("createdTime");
+        eiColumn = new EiColumn(FIELD_CREATED_TIME);
         eiColumn.setDescName("创建时间");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("updatedBy");
+        eiColumn = new EiColumn(FIELD_UPDATED_BY);
         eiColumn.setDescName("更新人");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("updatedTime");
+        eiColumn = new EiColumn(FIELD_UPDATED_TIME);
         eiColumn.setDescName("更新时间");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("remark");
-        eiColumn.setDescName("备注");
+        eiColumn = new EiColumn(FIELD_DEP_CODE);
+        eiColumn.setDescName("部门编码");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("lv");
-        eiColumn.setDescName("层级");
+        eiColumn = new EiColumn(FIELD_REMARK);
+        eiColumn.setDescName("备注");
         eiMetadata.addMeta(eiColumn);
 
-
-        eiColumn = new EiColumn("spec");
-        eiColumn.setDescName("规格");
+        eiColumn = new EiColumn(FIELD_FILE_PATH1);
+        eiColumn.setDescName("文件地址1");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("length");
-        eiColumn.setType("N");
-        eiColumn.setScaleLength(2);
-        eiColumn.setFieldLength(10);
-        eiColumn.setDescName("长");
+        eiColumn = new EiColumn(FIELD_INVENT_RECORD_ID);
+        eiColumn.setDescName("存货档案ID");
         eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("width");
-        eiColumn.setType("N");
-        eiColumn.setScaleLength(2);
-        eiColumn.setFieldLength(10);
-        eiColumn.setDescName("宽");
-        eiMetadata.addMeta(eiColumn);
 
-        eiColumn = new EiColumn("thick");
-        eiColumn.setType("N");
-        eiColumn.setScaleLength(2);
-        eiColumn.setFieldLength(10);
-        eiColumn.setDescName("厚");
-        eiMetadata.addMeta(eiColumn);
     }
 
     /**
-     * the constructor
+     * the constructor.
      */
     public HPSC006() {
         initMetaData();
     }
 
     /**
-     * get the id
+     * get the id .
      * @return the id
      */
     public Long getId() {
@@ -238,14 +295,15 @@ public class HPSC006 extends DaoEPBase {
     }
 
     /**
-     * set the id
+     * set the id .
+     *
+     * @param id
      */
     public void setId(Long id) {
         this.id = id;
     }
-
     /**
-     * get the companyCode - 企业编码 预留
+     * get the companyCode - 企业编码 预留.
      * @return the companyCode
      */
     public String getCompanyCode() {
@@ -253,29 +311,15 @@ public class HPSC006 extends DaoEPBase {
     }
 
     /**
-     * set the companyCode - 企业编码 预留
+     * set the companyCode - 企业编码 预留.
+     *
+     * @param companyCode - 企业编码 预留
      */
     public void setCompanyCode(String companyCode) {
         this.companyCode = companyCode;
     }
-
-    /**
-     * get the deptCode - 部门编码 预留
-     * @return the deptCode
-     */
-    public String getDeptCode() {
-        return this.deptCode;
-    }
-
     /**
-     * set the deptCode - 部门编码 预留
-     */
-    public void setDeptCode(String deptCode) {
-        this.deptCode = deptCode;
-    }
-
-    /**
-     * get the projCode - 项目编码
+     * get the projCode - 项目编码.
      * @return the projCode
      */
     public String getProjCode() {
@@ -283,14 +327,15 @@ public class HPSC006 extends DaoEPBase {
     }
 
     /**
-     * set the projCode - 项目编码
+     * set the projCode - 项目编码.
+     *
+     * @param projCode - 项目编码
      */
     public void setProjCode(String projCode) {
         this.projCode = projCode;
     }
-
     /**
-     * get the projName - 项目名称
+     * get the projName - 项目名称.
      * @return the projName
      */
     public String getProjName() {
@@ -298,164 +343,159 @@ public class HPSC006 extends DaoEPBase {
     }
 
     /**
-     * set the projName - 项目名称
+     * set the projName - 项目名称.
+     *
+     * @param projName - 项目名称
      */
     public void setProjName(String projName) {
         this.projName = projName;
     }
-
-    /**
-     * get the parentId - 父节点-部件编码
-     * @return the parentId
-     */
-    public String getParentId() {
-        return this.parentId;
-    }
-
-    /**
-     * set the parentId - 父节点-部件编码
-     */
-    public void setParentId(String parentId) {
-        this.parentId = parentId;
-    }
-
     /**
-     * get the parentPrdtName - 父节点-部件名称
-     * @return the parentPrdtName
+     * get the productionOrderNo - 生产订单号.
+     * @return the productionOrderNo
      */
-    public String getParentPrdtName() {
-        return this.parentPrdtName;
+    public String getProductionOrderNo() {
+        return this.productionOrderNo;
     }
 
     /**
-     * set the parentPrdtName - 父节点-部件名称
+     * set the productionOrderNo - 生产订单号.
+     *
+     * @param productionOrderNo - 生产订单号
      */
-    public void setParentPrdtName(String parentPrdtName) {
-        this.parentPrdtName = parentPrdtName;
+    public void setProductionOrderNo(String productionOrderNo) {
+        this.productionOrderNo = productionOrderNo;
     }
-
     /**
-     * get the type - 类别
-     * @return the type
+     * get the inventType - 物料类型.
+     * @return the inventType
      */
-    public String getType() {
-        return this.type;
+    public Integer getInventType() {
+        return this.inventType;
     }
 
     /**
-     * set the type - 类别
+     * set the inventType - 物料类型.
+     *
+     * @param inventType - 物料类型
      */
-    public void setType(String type) {
-        this.type = type;
+    public void setInventType(Integer inventType) {
+        this.inventType = inventType;
     }
-
     /**
-     * get the leaf - 是否有叶子节点
-     * @return the leaf
+     * get the inventCode - 物料编码.
+     * @return the inventCode
      */
-    public String getLeaf() {
-        return this.leaf;
+    public String getInventCode() {
+        return this.inventCode;
     }
 
     /**
-     * set the leaf - 是否有叶子节点
+     * set the inventCode - 物料编码.
+     *
+     * @param inventCode - 物料编码
      */
-    public void setLeaf(String leaf) {
-        this.leaf = leaf;
+    public void setInventCode(String inventCode) {
+        this.inventCode = inventCode;
     }
-
     /**
-     * get the sort - 排序字段
-     * @return the sort
+     * get the inventName - 物料名称.
+     * @return the inventName
      */
-    public String getSort() {
-        return this.sort;
+    public String getInventName() {
+        return this.inventName;
     }
 
     /**
-     * set the sort - 排序字段
+     * set the inventName - 物料名称.
+     *
+     * @param inventName - 物料名称
      */
-    public void setSort(String sort) {
-        this.sort = sort;
+    public void setInventName(String inventName) {
+        this.inventName = inventName;
     }
-
     /**
-     * get the icon - 图片地址
-     * @return the icon
+     * get the inventLength - 物料-长.
+     * @return the inventLength
      */
-    public String getIcon() {
-        return this.icon;
+    public BigDecimal getInventLength() {
+        return this.inventLength;
     }
 
     /**
-     * set the icon - 图片地址
+     * set the inventLength - 物料-长.
+     *
+     * @param inventLength - 物料-长
      */
-    public void setIcon(String icon) {
-        this.icon = icon;
+    public void setInventLength(BigDecimal inventLength) {
+        this.inventLength = inventLength;
     }
-
     /**
-     * get the prdtType - 部件类型
-     * @return the prdtType
+     * get the inventWidth - 物料-宽.
+     * @return the inventWidth
      */
-    public Integer getPrdtType() {
-        return this.prdtType;
+    public BigDecimal getInventWidth() {
+        return this.inventWidth;
     }
 
     /**
-     * set the prdtType - 部件类型
+     * set the inventWidth - 物料-宽.
+     *
+     * @param inventWidth - 物料-宽
      */
-    public void setPrdtType(Integer prdtType) {
-        this.prdtType = prdtType;
+    public void setInventWidth(BigDecimal inventWidth) {
+        this.inventWidth = inventWidth;
     }
-
     /**
-     * get the prdtCode - 部件编码
-     * @return the prdtCode
+     * get the inventThick - 物料-厚.
+     * @return the inventThick
      */
-    public String getPrdtCode() {
-        return this.prdtCode;
+    public BigDecimal getInventThick() {
+        return this.inventThick;
     }
 
     /**
-     * set the prdtCode - 部件编码
+     * set the inventThick - 物料-厚.
+     *
+     * @param inventThick - 物料-厚
      */
-    public void setPrdtCode(String prdtCode) {
-        this.prdtCode = prdtCode;
+    public void setInventThick(BigDecimal inventThick) {
+        this.inventThick = inventThick;
     }
-
     /**
-     * get the prdtName - 部件名称
-     * @return the prdtName
+     * get the inventSpec - 物料规格.
+     * @return the inventSpec
      */
-    public String getPrdtName() {
-        return this.prdtName;
+    public String getInventSpec() {
+        return this.inventSpec;
     }
 
     /**
-     * set the prdtName - 部件名称
+     * set the inventSpec - 物料规格.
+     *
+     * @param inventSpec - 物料规格
      */
-    public void setPrdtName(String prdtName) {
-        this.prdtName = prdtName;
+    public void setInventSpec(String inventSpec) {
+        this.inventSpec = inventSpec;
     }
     /**
-     * get the inventRecordId - 存货档案ID.
-     * @return the inventRecordId
+     * get the planCompletionDate - 计划完成日期.
+     * @return the planCompletionDate
      */
-    public Long getInventRecordId() {
-        return this.inventRecordId;
+    public String getPlanCompletionDate() {
+        return this.planCompletionDate;
     }
 
     /**
-     * set the inventRecordId - 存货档案ID.
+     * set the planCompletionDate - 计划完成日期.
      *
-     * @param inventRecordId - 存货档案ID
+     * @param planCompletionDate - 计划完成日期
      */
-    public void setInventRecordId(Long inventRecordId) {
-        this.inventRecordId = inventRecordId;
+    public void setPlanCompletionDate(String planCompletionDate) {
+        this.planCompletionDate = planCompletionDate;
     }
     /**
-     * get the num - 数量
+     * get the num - 计划数量.
      * @return the num
      */
     public BigDecimal getNum() {
@@ -463,14 +503,15 @@ public class HPSC006 extends DaoEPBase {
     }
 
     /**
-     * set the num - 数量
+     * set the num - 计划数量.
+     *
+     * @param num - 计划数量
      */
     public void setNum(BigDecimal num) {
         this.num = num;
     }
-
     /**
-     * get the unitWt - 单重
+     * get the unitWt - 计划单重.
      * @return the unitWt
      */
     public BigDecimal getUnitWt() {
@@ -478,14 +519,15 @@ public class HPSC006 extends DaoEPBase {
     }
 
     /**
-     * set the unitWt - 单重
+     * set the unitWt - 计划单重.
+     *
+     * @param unitWt - 计划单重
      */
     public void setUnitWt(BigDecimal unitWt) {
         this.unitWt = unitWt;
     }
-
     /**
-     * get the totalWt - 总重
+     * get the totalWt - 计划重量.
      * @return the totalWt
      */
     public BigDecimal getTotalWt() {
@@ -493,119 +535,127 @@ public class HPSC006 extends DaoEPBase {
     }
 
     /**
-     * set the totalWt - 总重
+     * set the totalWt - 计划重量.
+     *
+     * @param totalWt - 计划重量
      */
     public void setTotalWt(BigDecimal totalWt) {
         this.totalWt = totalWt;
     }
-
     /**
-     * get the filePath1 - 文件地址1
-     * @return the filePath1
+     * get the actualCompletionDate - 实际完工日期.
+     * @return the actualCompletionDate
      */
-    public String getFilePath1() {
-        return this.filePath1;
+    public String getActualCompletionDate() {
+        return this.actualCompletionDate;
     }
 
     /**
-     * set the filePath1 - 文件地址1
+     * set the actualCompletionDate - 实际完工日期.
+     *
+     * @param actualCompletionDate - 实际完工日期
      */
-    public void setFilePath1(String filePath1) {
-        this.filePath1 = filePath1;
+    public void setActualCompletionDate(String actualCompletionDate) {
+        this.actualCompletionDate = actualCompletionDate;
     }
-
     /**
-     * get the filePath2 - 文件地址2
-     * @return the filePath2
+     * get the actualCompletionNum - 实际完工数量.
+     * @return the actualCompletionNum
      */
-    public String getFilePath2() {
-        return this.filePath2;
+    public BigDecimal getActualCompletionNum() {
+        return this.actualCompletionNum;
     }
 
     /**
-     * set the filePath2 - 文件地址2
+     * set the actualCompletionNum - 实际完工数量.
+     *
+     * @param actualCompletionNum - 实际完工数量
      */
-    public void setFilePath2(String filePath2) {
-        this.filePath2 = filePath2;
+    public void setActualCompletionNum(BigDecimal actualCompletionNum) {
+        this.actualCompletionNum = actualCompletionNum;
     }
-
     /**
-     * get the filePath3 - 文件地址3
-     * @return the filePath3
+     * get the status - 状态   0-计划中，1-生产中，2-已完成.
+     * @return the status
      */
-    public String getFilePath3() {
-        return this.filePath3;
+    public Integer getStatus() {
+        return this.status;
     }
 
     /**
-     * set the filePath3 - 文件地址3
+     * set the status - 状态   0-计划中，1-生产中，2-已完成.
+     *
+     * @param status - 状态   0-计划中，1-生产中，2-已完成
      */
-    public void setFilePath3(String filePath3) {
-        this.filePath3 = filePath3;
+    public void setStatus(Integer status) {
+        this.status = status;
     }
-
     /**
-     * get the filePath4 - 文件地址4
-     * @return the filePath4
+     * get the orgNo - 生产组编码.
+     * @return the orgNo
      */
-    public String getFilePath4() {
-        return this.filePath4;
+    public String getOrgNo() {
+        return this.orgNo;
     }
 
     /**
-     * set the filePath4 - 文件地址4
+     * set the orgNo - 生产组编码.
+     *
+     * @param orgNo - 生产组编码
      */
-    public void setFilePath4(String filePath4) {
-        this.filePath4 = filePath4;
+    public void setOrgNo(String orgNo) {
+        this.orgNo = orgNo;
     }
-
     /**
-     * get the filePath5 - 文件地址5
-     * @return the filePath5
+     * get the orgName - 生产组名称.
+     * @return the orgName
      */
-    public String getFilePath5() {
-        return this.filePath5;
+    public String getOrgName() {
+        return this.orgName;
     }
 
     /**
-     * set the filePath5 - 文件地址5
+     * set the orgName - 生产组名称.
+     *
+     * @param orgName - 生产组名称
      */
-    public void setFilePath5(String filePath5) {
-        this.filePath5 = filePath5;
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
     }
-
     /**
-     * get the status - 状态   0-未提交，1-已提交
-     * @return the status
+     * get the factoryCode - 厂区编码.
+     * @return the factoryCode
      */
-    public Integer getStatus() {
-        return this.status;
+    public String getFactoryCode() {
+        return this.factoryCode;
     }
 
     /**
-     * set the status - 状态   0-未提交，1-已提交
+     * set the factoryCode - 厂区编码.
+     *
+     * @param factoryCode - 厂区编码
      */
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setFactoryCode(String factoryCode) {
+        this.factoryCode = factoryCode;
     }
-
     /**
-     * get the delStatus - 状态   1未删除，0已删除
-     * @return the delStatus
+     * get the factoryName - 厂区名称.
+     * @return the factoryName
      */
-    public Integer getDelStatus() {
-        return this.delStatus;
+    public String getFactoryName() {
+        return this.factoryName;
     }
 
     /**
-     * set the delStatus - 状态   1未删除，0已删除
+     * set the factoryName - 厂区名称.
+     *
+     * @param factoryName - 厂区名称
      */
-    public void setDelStatus(Integer delStatus) {
-        this.delStatus = delStatus;
+    public void setFactoryName(String factoryName) {
+        this.factoryName = factoryName;
     }
-
     /**
-     * get the createdBy - 创建人
+     * get the createdBy - 创建人.
      * @return the createdBy
      */
     public String getCreatedBy() {
@@ -613,14 +663,15 @@ public class HPSC006 extends DaoEPBase {
     }
 
     /**
-     * set the createdBy - 创建人
+     * set the createdBy - 创建人.
+     *
+     * @param createdBy - 创建人
      */
     public void setCreatedBy(String createdBy) {
         this.createdBy = createdBy;
     }
-
     /**
-     * get the createdTime - 创建时间
+     * get the createdTime - 创建时间.
      * @return the createdTime
      */
     public String getCreatedTime() {
@@ -628,14 +679,15 @@ public class HPSC006 extends DaoEPBase {
     }
 
     /**
-     * set the createdTime - 创建时间
+     * set the createdTime - 创建时间.
+     *
+     * @param createdTime - 创建时间
      */
     public void setCreatedTime(String createdTime) {
         this.createdTime = createdTime;
     }
-
     /**
-     * get the updatedBy - 更新人
+     * get the updatedBy - 更新人.
      * @return the updatedBy
      */
     public String getUpdatedBy() {
@@ -643,14 +695,15 @@ public class HPSC006 extends DaoEPBase {
     }
 
     /**
-     * set the updatedBy - 更新人
+     * set the updatedBy - 更新人.
+     *
+     * @param updatedBy - 更新人
      */
     public void setUpdatedBy(String updatedBy) {
         this.updatedBy = updatedBy;
     }
-
     /**
-     * get the updatedTime - 更新时间
+     * get the updatedTime - 更新时间.
      * @return the updatedTime
      */
     public String getUpdatedTime() {
@@ -658,183 +711,157 @@ public class HPSC006 extends DaoEPBase {
     }
 
     /**
-     * set the updatedTime - 更新时间
+     * set the updatedTime - 更新时间.
+     *
+     * @param updatedTime - 更新时间
      */
     public void setUpdatedTime(String updatedTime) {
         this.updatedTime = updatedTime;
     }
-
     /**
-     * get the remark - 备注
-     * @return the remark
+     * get the depCode - 部门编码.
+     * @return the depCode
      */
-    public String getRemark() {
-        return this.remark;
+    public String getDepCode() {
+        return this.depCode;
     }
 
     /**
-     * set the remark - 备注
+     * set the depCode - 部门编码.
+     *
+     * @param depCode - 部门编码
      */
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public Integer getLv() {
-        return lv;
-    }
-
-    public void setLv(Integer lv) {
-        this.lv = lv;
+    public void setDepCode(String depCode) {
+        this.depCode = depCode;
     }
-
     /**
-     * get the sort - 规格
-     * @return the sort
+     * get the remark - 备注.
+     * @return the remark
      */
-    public String getSpec() {
-        return this.spec;
+    public String getRemark() {
+        return this.remark;
     }
 
     /**
-     * set the sort - 规格
-     */
-    public void setSpec(String spec) {
-        this.spec = spec;
-    }
-    /**
-     * get the length - 长.
-     * @return the length
-     */
-    public BigDecimal getLength() {
-        return this.length;
-    }
-    /**
-     * set the length - 长.
+     * set the remark - 备注.
      *
-     * @param length - 长
+     * @param remark - 备注
      */
-    public void setLength(BigDecimal length) {
-        this.length = length;
+    public void setRemark(String remark) {
+        this.remark = remark;
     }
     /**
-     * get the width - 宽.
-     * @return the width
+     * get the filePath1 - 文件地址1.
+     * @return the filePath1
      */
-    public BigDecimal getWidth() {
-        return this.width;
+    public String getFilePath1() {
+        return this.filePath1;
     }
 
     /**
-     * set the width - 宽.
+     * set the filePath1 - 文件地址1.
      *
-     * @param width - 宽
+     * @param filePath1 - 文件地址1
      */
-    public void setWidth(BigDecimal width) {
-        this.width = width;
+    public void setFilePath1(String filePath1) {
+        this.filePath1 = filePath1;
     }
     /**
-     * get the thick - 厚.
-     * @return the thick
+     * get the inventRecordId - 存货档案ID.
+     * @return the inventRecordId
      */
-    public BigDecimal getThick() {
-        return this.thick;
+    public Integer getInventRecordId() {
+        return this.inventRecordId;
     }
 
     /**
-     * set the thick - 厚.
+     * set the inventRecordId - 存货档案ID.
      *
-     * @param thick - 厚
+     * @param inventRecordId - 存货档案ID
      */
-    public void setThick(BigDecimal thick) {
-        this.thick = thick;
+    public void setInventRecordId(Integer inventRecordId) {
+        this.inventRecordId = inventRecordId;
     }
-
     /**
-     * get the value from Map
+     * get the value from Map.
+     *
+     * @param map - source data map
      */
+    @Override
     public void fromMap(Map map) {
 
-        setId(NumberUtils.toLong(StringUtils.toString(map.get("id")), id));
-        setCompanyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("companyCode")), companyCode));
-        setDeptCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("deptCode")), deptCode));
-        setProjCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("projCode")), projCode));
-        setProjName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("projName")), projName));
-        setParentId(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("parentId")), parentId));
-        setParentPrdtName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("parentPrdtName")), parentPrdtName));
-        setType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("type")), type));
-        setLeaf(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("leaf")), leaf));
-        setSort(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("sort")), sort));
-        setIcon(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("icon")), icon));
-        setPrdtType(NumberUtils.toInteger(StringUtils.toString(map.get("prdtType")), prdtType));
-        setPrdtCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("prdtCode")), prdtCode));
-        setPrdtName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("prdtName")), prdtName));
-        setInventRecordId(NumberUtils.toLong(StringUtils.toString(map.get("inventRecordId")), inventRecordId));
-        setNum(NumberUtils.toBigDecimal(StringUtils.toString(map.get("num")), num));
-        setUnitWt(NumberUtils.toBigDecimal(StringUtils.toString(map.get("unitWt")), unitWt));
-        setTotalWt(NumberUtils.toBigDecimal(StringUtils.toString(map.get("totalWt")), totalWt));
-        setFilePath1(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("filePath1")), filePath1));
-        setFilePath2(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("filePath2")), filePath2));
-        setFilePath3(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("filePath3")), filePath3));
-        setFilePath4(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("filePath4")), filePath4));
-        setFilePath5(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("filePath5")), filePath5));
-        setStatus(NumberUtils.toInteger(StringUtils.toString(map.get("status")), status));
-        setDelStatus(NumberUtils.toInteger(StringUtils.toString(map.get("delStatus")), delStatus));
-        setCreatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("createdBy")), createdBy));
-        setCreatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("createdTime")),createdTime));
-        setUpdatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("updatedBy")), updatedBy));
-        setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("updatedTime")),updatedTime));
-        setRemark(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("remark")), remark));
-        setLv(NumberUtils.toInteger(StringUtils.toString(map.get("lv")), lv));
-        setSpec(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("spec")), spec));
-        setLength(NumberUtils.toBigDecimal(StringUtils.toString(map.get("length")), length));
-        setWidth(NumberUtils.toBigDecimal(StringUtils.toString(map.get("width")), width));
-        setThick(NumberUtils.toBigDecimal(StringUtils.toString(map.get("thick")), thick));
-
-    }
-
-    /**
-     * set the value to Map
-     */
+        setId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_ID)), id));
+        setCompanyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_CODE)), companyCode));
+        setProjCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_CODE)), projCode));
+        setProjName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_NAME)), projName));
+        setProductionOrderNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRODUCTION_ORDER_NO)), productionOrderNo));
+        setInventType(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_INVENT_TYPE)), inventType));
+        setInventCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_CODE)), inventCode));
+        setInventName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_NAME)), inventName));
+        setInventLength(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_INVENT_LENGTH)), inventLength));
+        setInventWidth(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_INVENT_WIDTH)), inventWidth));
+        setInventThick(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_INVENT_THICK)), inventThick));
+        setInventSpec(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_SPEC)), inventSpec));
+        setPlanCompletionDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PLAN_COMPLETION_DATE)), planCompletionDate));
+        setNum(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_NUM)), num));
+        setUnitWt(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_UNIT_WT)), unitWt));
+        setTotalWt(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_TOTAL_WT)), totalWt));
+        setActualCompletionDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ACTUAL_COMPLETION_DATE)), actualCompletionDate));
+        setActualCompletionNum(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_ACTUAL_COMPLETION_NUM)), actualCompletionNum));
+        setStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_STATUS)), status));
+        setOrgNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ORG_NO)), orgNo));
+        setOrgName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ORG_NAME)), orgName));
+        setFactoryCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_CODE)), factoryCode));
+        setFactoryName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_NAME)), factoryName));
+        setCreatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_BY)), createdBy));
+        setCreatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_TIME)), createdTime));
+        setUpdatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_BY)), updatedBy));
+        setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime));
+        setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
+        setRemark(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REMARK)), remark));
+        setFilePath1(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FILE_PATH1)), filePath1));
+        setInventRecordId(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_INVENT_RECORD_ID)), inventRecordId));
+    }
+
+    /**
+     * set the value to Map.
+     */
+    @Override
     public Map toMap() {
 
         Map map = new HashMap();
-        map.put("id", StringUtils.toString(id, eiMetadata.getMeta("id")));
-        map.put("companyCode", StringUtils.toString(companyCode, eiMetadata.getMeta("companyCode")));
-        map.put("deptCode", StringUtils.toString(deptCode, eiMetadata.getMeta("deptCode")));
-        map.put("projCode", StringUtils.toString(projCode, eiMetadata.getMeta("projCode")));
-        map.put("projName", StringUtils.toString(projName, eiMetadata.getMeta("projName")));
-        map.put("parentId", StringUtils.toString(parentId, eiMetadata.getMeta("parentId")));
-        map.put("parentPrdtName", StringUtils.toString(parentPrdtName, eiMetadata.getMeta("parentPrdtName")));
-        map.put("type", StringUtils.toString(type, eiMetadata.getMeta("type")));
-        map.put("leaf", StringUtils.toString(leaf, eiMetadata.getMeta("leaf")));
-        map.put("sort", StringUtils.toString(sort, eiMetadata.getMeta("sort")));
-        map.put("icon", StringUtils.toString(icon, eiMetadata.getMeta("icon")));
-        map.put("prdtType", StringUtils.toString(prdtType, eiMetadata.getMeta("prdtType")));
-        map.put("prdtCode", StringUtils.toString(prdtCode, eiMetadata.getMeta("prdtCode")));
-        map.put("prdtName", StringUtils.toString(prdtName, eiMetadata.getMeta("prdtName")));
-        map.put("inventRecordId", StringUtils.toString(inventRecordId, eiMetadata.getMeta("inventRecordId")));
-        map.put("num", StringUtils.toString(num, eiMetadata.getMeta("num")));
-        map.put("unitWt", StringUtils.toString(unitWt, eiMetadata.getMeta("unitWt")));
-        map.put("totalWt", StringUtils.toString(totalWt, eiMetadata.getMeta("totalWt")));
-        map.put("filePath1", StringUtils.toString(filePath1, eiMetadata.getMeta("filePath1")));
-        map.put("filePath2", StringUtils.toString(filePath2, eiMetadata.getMeta("filePath2")));
-        map.put("filePath3", StringUtils.toString(filePath3, eiMetadata.getMeta("filePath3")));
-        map.put("filePath4", StringUtils.toString(filePath4, eiMetadata.getMeta("filePath4")));
-        map.put("filePath5", StringUtils.toString(filePath5, eiMetadata.getMeta("filePath5")));
-        map.put("status", StringUtils.toString(status, eiMetadata.getMeta("status")));
-        map.put("delStatus", StringUtils.toString(delStatus, eiMetadata.getMeta("delStatus")));
-        map.put("createdBy", StringUtils.toString(createdBy, eiMetadata.getMeta("createdBy")));
-        map.put("createdTime", StringUtils.toString(createdTime, eiMetadata.getMeta("createdTime")));
-        map.put("updatedBy", StringUtils.toString(updatedBy, eiMetadata.getMeta("updatedBy")));
-        map.put("updatedTime", StringUtils.toString(updatedTime, eiMetadata.getMeta("updatedTime")));
-        map.put("remark", StringUtils.toString(remark, eiMetadata.getMeta("remark")));
-        map.put("lv", StringUtils.toString(lv, eiMetadata.getMeta("lv")));
-        map.put("spec", StringUtils.toString(spec, eiMetadata.getMeta("spec")));
-        map.put("length", StringUtils.toString(length, eiMetadata.getMeta("length")));
-        map.put("width", StringUtils.toString(width, eiMetadata.getMeta("width")));
-        map.put("thick", StringUtils.toString(thick, eiMetadata.getMeta("thick")));
+        map.put(FIELD_ID, StringUtils.toString(id, eiMetadata.getMeta(FIELD_ID)));
+        map.put(FIELD_COMPANY_CODE, StringUtils.toString(companyCode, eiMetadata.getMeta(FIELD_COMPANY_CODE)));
+        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_PRODUCTION_ORDER_NO, StringUtils.toString(productionOrderNo, eiMetadata.getMeta(FIELD_PRODUCTION_ORDER_NO)));
+        map.put(FIELD_INVENT_TYPE, StringUtils.toString(inventType, eiMetadata.getMeta(FIELD_INVENT_TYPE)));
+        map.put(FIELD_INVENT_CODE, StringUtils.toString(inventCode, eiMetadata.getMeta(FIELD_INVENT_CODE)));
+        map.put(FIELD_INVENT_NAME, StringUtils.toString(inventName, eiMetadata.getMeta(FIELD_INVENT_NAME)));
+        map.put(FIELD_INVENT_LENGTH, StringUtils.toString(inventLength, eiMetadata.getMeta(FIELD_INVENT_LENGTH)));
+        map.put(FIELD_INVENT_WIDTH, StringUtils.toString(inventWidth, eiMetadata.getMeta(FIELD_INVENT_WIDTH)));
+        map.put(FIELD_INVENT_THICK, StringUtils.toString(inventThick, eiMetadata.getMeta(FIELD_INVENT_THICK)));
+        map.put(FIELD_INVENT_SPEC, StringUtils.toString(inventSpec, eiMetadata.getMeta(FIELD_INVENT_SPEC)));
+        map.put(FIELD_PLAN_COMPLETION_DATE, StringUtils.toString(planCompletionDate, eiMetadata.getMeta(FIELD_PLAN_COMPLETION_DATE)));
+        map.put(FIELD_NUM, StringUtils.toString(num, eiMetadata.getMeta(FIELD_NUM)));
+        map.put(FIELD_UNIT_WT, StringUtils.toString(unitWt, eiMetadata.getMeta(FIELD_UNIT_WT)));
+        map.put(FIELD_TOTAL_WT, StringUtils.toString(totalWt, eiMetadata.getMeta(FIELD_TOTAL_WT)));
+        map.put(FIELD_ACTUAL_COMPLETION_DATE, StringUtils.toString(actualCompletionDate, eiMetadata.getMeta(FIELD_ACTUAL_COMPLETION_DATE)));
+        map.put(FIELD_ACTUAL_COMPLETION_NUM, StringUtils.toString(actualCompletionNum, eiMetadata.getMeta(FIELD_ACTUAL_COMPLETION_NUM)));
+        map.put(FIELD_STATUS, StringUtils.toString(status, eiMetadata.getMeta(FIELD_STATUS)));
+        map.put(FIELD_ORG_NO, StringUtils.toString(orgNo, eiMetadata.getMeta(FIELD_ORG_NO)));
+        map.put(FIELD_ORG_NAME, StringUtils.toString(orgName, eiMetadata.getMeta(FIELD_ORG_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)));
+        map.put(FIELD_CREATED_BY, StringUtils.toString(createdBy, eiMetadata.getMeta(FIELD_CREATED_BY)));
+        map.put(FIELD_CREATED_TIME, StringUtils.toString(createdTime, eiMetadata.getMeta(FIELD_CREATED_TIME)));
+        map.put(FIELD_UPDATED_BY, StringUtils.toString(updatedBy, eiMetadata.getMeta(FIELD_UPDATED_BY)));
+        map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME)));
+        map.put(FIELD_DEP_CODE, StringUtils.toString(depCode, eiMetadata.getMeta(FIELD_DEP_CODE)));
+        map.put(FIELD_REMARK, StringUtils.toString(remark, eiMetadata.getMeta(FIELD_REMARK)));
+        map.put(FIELD_FILE_PATH1, StringUtils.toString(filePath1, eiMetadata.getMeta(FIELD_FILE_PATH1)));
+        map.put(FIELD_INVENT_RECORD_ID, StringUtils.toString(inventRecordId, eiMetadata.getMeta(FIELD_INVENT_RECORD_ID)));
 
         return map;
-
     }
-}
+}
\ No newline at end of file

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

 package com.baosight.hpjx.hp.sc.service;
 
 import com.baosight.hpjx.common.DdynamicEnum;
+import com.baosight.hpjx.core.constant.CommonConstant;
 import com.baosight.hpjx.core.dao.DaoUtils;
 import com.baosight.hpjx.core.security.UserSessionUtils;
 import com.baosight.hpjx.hp.constant.HPConstant;
@@ -31,11 +32,11 @@ public class ServiceHPSC001 extends ServiceBase {
      */
     public EiInfo initLoad(EiInfo inInfo) {
         try {
+            inInfo = super.query(inInfo, "HPSC001.query", new HPSC001());
             Map map = new HashMap();
             map.put("companyCode", UserSessionUtils.getCompanyCode());
-            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), map);
+            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), map,true);
             CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID), null);
-            inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPSC001().eiMetadata);
         } catch (PlatException e) {
             LogUtils.setDetailMsg(inInfo, e, "初始化失败");
         }
@@ -65,6 +66,7 @@ public class ServiceHPSC001 extends ServiceBase {
             for (int i = 0; i < eiBlock.getRowCount(); i++) {
                 Map<?, ?> map = eiBlock.getRow(i);
                 hpsc001.fromMap(map);
+                hpsc001.setStatus(CommonConstant.YesNo.NO_0);
                 hpsc001.setProjCode(SequenceGenerator.getNextSequence(HPConstant.SequenceId.PROJ_NUMBER));
                 DaoUtils.insert("HPSC001.insert",hpsc001);
             }
@@ -86,14 +88,13 @@ public class ServiceHPSC001 extends ServiceBase {
      * 修改操作.
      */
     public EiInfo update(EiInfo inInfo) {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {
             HPSC001 hpsc001 = new HPSC001();
             EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
             for (int i = 0; i < eiBlock.getRowCount(); i++) {
                 Map<?, ?> map = eiBlock.getRow(i);
                 hpsc001.fromMap(map);
-                DaoUtils.update("HPSC001.insert",hpsc001);
+                DaoUtils.update("HPSC001.update",hpsc001);
             }
             inInfo.setStatus(EiConstant.STATUS_SUCCESS);
             inInfo.setMsg("修改成功！");

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

@@ -335,6 +335,7 @@ public class ServiceHPSC002 extends ServiceBase {
                 Map sqlMap = new HashMap();
                 sqlMap.put("id",hppz002.getId());
                 sqlMap.put("filePath1",hppz002.getFilePath1());
+                sqlMap.put("bizType","WL");
                 DaoUtils.update("HPSC002.bindDocIdById", hppz002.toMap());
             }
         } catch (PlatException e) {

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

@@ -43,6 +43,7 @@ public class ServiceHPSC002A extends ServiceEPBase {
 			List<HPSC002> dbSc002s = dao.query("HPSC002.query", queryMap);
 			if (CollectionUtils.isNotEmpty(dbSc002s)) {
 				HPSC002 dbSc002 = dbSc002s.get(0);
+				inInfo.set("inqu_status-0-bizType", queryMap.get("bizType"));
 				inInfo.set("inqu_status-0-matId", queryMap.get("id"));
 				inInfo.set("inqu_status-0-projName", dbSc002.getProjName());
 				inInfo.set("inqu_status-0-prdtName", dbSc002.getPrdtName());

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

@@ -39,7 +39,8 @@ public class ServiceHPSC003 extends ServiceBase {
 	 * @return
 	 */
 	public EiInfo initLoad(EiInfo inInfo) {
-		CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), null);
+		CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID,DdynamicEnum.INVENT_NAME_BLOCK_ID),
+                new HashMap<String,Object>(){{put("prdtType",4);}});
 		HPSC003 HPSC003 = new HPSC003();
 		EiInfo outInfo = super.initLoad(inInfo, HPSC003);
 		outInfo.addBlock(EiConstant.resultBlock).addBlockMeta(HPSC003.eiMetadata);

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

@@ -2,6 +2,7 @@ package com.baosight.hpjx.hp.sc.service;
 
 import com.baosight.hpjx.common.DdynamicEnum;
 import com.baosight.hpjx.core.dao.DaoUtils;
+import com.baosight.hpjx.hp.sc.domain.HPSC003;
 import com.baosight.hpjx.hp.sc.domain.HPSC004;
 import com.baosight.hpjx.util.CommonMethod;
 import com.baosight.hpjx.util.EiInfoUtils;
@@ -11,6 +12,7 @@ import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.service.impl.ServiceBase;
 import com.baosight.iplat4j.core.web.threadlocal.UserSession;
+import org.springframework.security.core.parameters.P;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -55,6 +57,26 @@ public class ServiceHPSC004 extends ServiceBase {
                 Map<?, ?> map = eiBlock.getRow(i);
                 HPSC004.fromMap(map);
                 DaoUtils.insert("HPSC004.insert", HPSC004.toMap());
+                List list = this.dao.query("HPSC004.query", new HashMap<String,Object>(){{
+                    put("companyCode",HPSC004.getCompanyCode());
+                    put("projCode",HPSC004.getPrdtCode());
+                    put("parentId",HPSC004.getParentId());
+                    put("planCommentDate","");
+                    put("planCompletionDate","");
+                }});
+                if (list == null) {
+                    List<Map> list1 = this.dao.query("HPSC004.query", new HashMap<String,Object>(){{
+                        put("companyCode",HPSC004.getCompanyCode());
+                        put("projCode",HPSC004.getPrdtCode());
+                        put("parentId",HPSC004.getParentId());
+                    }});
+                    HPSC003 HPSC003 = new HPSC003();
+                    HPSC003.setCompanyCode(HPSC004.getCompanyCode());
+                    HPSC003.setPrdtCode(HPSC004.getPrdtCode());
+                    HPSC003.setPlanInfoNo(HPSC004.getParentId());
+                    HPSC003.setPlanCompletionDate(list1.get(0).get("planCompletionDate").toString());
+                    DaoUtils.update("HPSC003.updateDate", HPSC003.toMap());
+                }
             }
             inInfo.setStatus(EiConstant.STATUS_SUCCESS);
             inInfo.setMsg("新增成功！");

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

@@ -2,14 +2,12 @@ package com.baosight.hpjx.hp.sc.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baosight.hpjx.common.DdynamicEnum;
+import com.baosight.hpjx.common.HPConstants;
 import com.baosight.hpjx.core.constant.CommonConstant;
 import com.baosight.hpjx.core.dao.DaoUtils;
 import com.baosight.hpjx.hp.constant.HPConstant;
 import com.baosight.hpjx.hp.pz.tools.HPPZTools;
-import com.baosight.hpjx.hp.sc.domain.HPSC001;
-import com.baosight.hpjx.hp.sc.domain.HPSC006;
-import com.baosight.hpjx.hp.sc.domain.HPSC003;
-import com.baosight.hpjx.hp.sc.domain.HPSC004;
+import com.baosight.hpjx.hp.sc.domain.*;
 import com.baosight.hpjx.util.CommonMethod;
 import com.baosight.hpjx.util.LogUtils;
 import com.baosight.iplat4j.core.ei.EiBlock;
@@ -40,8 +38,9 @@ public class ServiceHPSC006 extends ServiceBase {
      */
     public EiInfo initLoad(EiInfo inInfo) {
         try {
-            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), null);
-            inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPSC006().eiMetadata);
+            HPSC005 HPSC005 = new HPSC005();
+            EiInfo outInfo = super.initLoad(inInfo, HPSC005);
+            outInfo.addBlock(EiConstant.resultBlock).addBlockMeta(HPSC005.eiMetadata);
         } catch (Exception e) {
             LogUtils.setDetailMsg(inInfo, e, "初始化失败");
         }
@@ -54,53 +53,55 @@ public class ServiceHPSC006 extends ServiceBase {
      */
     @Override
     public EiInfo query(EiInfo inInfo) {
+        HPSC005 HPSC005 = new HPSC005();
         /* 调用EI查询方法.*/
-        EiInfo outInfo = super.query(inInfo, "HPSC006.query", new HPSC006());
-        //调用本地服务
-//        EiInfo eiInfo_update = new EiInfo();
-//        eiInfo_update.set(EiConstant.serviceName, "HPSC006");
-//        eiInfo_update.set(EiConstant.methodName, "delete");
-//        EiBlock eiBlock_update = new EiBlock(EiConstant.resultBlock);
-//        EiInfo outInfo_update = XLocalManager.call(eiInfo_update);
+        EiInfo outInfo = super.query(inInfo, "HPSC005.query", new HPSC005());
+        EiBlock blcok = outInfo.addBlock(HPConstants.BLOCK_DETAIL);
+        blcok.setBlockMeta(new HPSC006().eiMetadata);
         return outInfo;
 
     }
 
+    public EiInfo queryDetail(EiInfo inInfo){
+        HPSC006 HPSC006 = new HPSC006();
+        EiInfo outInfo = new EiInfo();
+        //添加返回到前台的块，块名和前台的对应
+        EiBlock eiBlock = outInfo.addBlock("result");
+        HashMap params = new HashMap();
+        params.put("productionOrderNo",inInfo.get("productionOrderNo"));
+        List list = dao.query("HPSC006.queryDetail",params,0,-999999);
+        outInfo.addBlock("detail").addBlockMeta(HPSC006.eiMetadata);
+        outInfo.addBlock("detail").addRows(list);
+        outInfo.getBlock("detail").set("limit", list.size());
+        return outInfo;
+    }
+
     /**
      * 新增操作.
      */
     @Override
     public EiInfo insert(EiInfo inInfo) {
         try {
-            HPSC006 hppz002 = new HPSC006();
-            EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
+            HPSC006 HPSC006 = new HPSC006();
+            String productionOrderNo = inInfo.getString("productionOrderNo");
+            String projCode = inInfo.getString("projCode");
+            String projName = inInfo.getString("projName");
+            EiBlock eiBlock = inInfo.getBlock(HPConstants.BLOCK_DETAIL);
             for (int i = 0; i < eiBlock.getRowCount(); i++) {
                 Map<?, ?> map = eiBlock.getRow(i);
-                hppz002.fromMap(map);
-                hppz002.setLeaf("1");
-                // 计算总重
-                BigDecimal num = hppz002.getNum();
-                BigDecimal unitWt = hppz002.getUnitWt();
+                HPSC006.fromMap(map);
+                BigDecimal num = HPSC006.getNum();
+                BigDecimal unitWt = HPSC006.getUnitWt();
                 DecimalFormat decimalFormat = new DecimalFormat("#.000");
                 BigDecimal totalWt = new BigDecimal(decimalFormat.format(Math.round(num.multiply(unitWt).floatValue())));
-                hppz002.setDelStatus(CommonConstant.YesNo.NO_0.intValue());
-                hppz002.setTotalWt(totalWt);
-
-//                if (StringUtils.isNotEmpty(hppz002.getPrdtCode()) && !hppz002.getParentId().equals("root")) {
-//                    hppz002.setPrdtName(HPPZTools.getPz004ByCode(hppz002.getPrdtCode()).getInventName());
-//                }
-                hppz002.setSpec(HPPZTools.jointSpec(hppz002.getLength(),hppz002.getWidth(),hppz002.getThick()));
-                if(hppz002.getParentId().equals("root")){
-                    hppz002.setLv(new Integer(1));
-                }else{
-                    hppz002.setPrdtCode(HPPZTools.checkAndSavePZ04(hppz002.getPrdtType(),hppz002.getPrdtName()));
-                    Integer lv = (Integer) this.dao.get("HPSC006.queryLv","id",hppz002.getParentId());
-                    hppz002.setLv(lv.intValue()+1);
-                }
-                DaoUtils.insert("HPSC006.insert", hppz002.toMap());
-                if (!hppz002.getParentId().equals("root")) {
-                    this.checkTreeNodeLeaf(new Long(hppz002.getParentId()));
-                }
+                HPSC006.setInventSpec(HPPZTools.jointSpec(HPSC006.getInventLength(),HPSC006.getInventWidth(),HPSC006.getInventThick()));
+                HPSC006.setProjCode(projCode);
+                HPSC006.setProjName(projName);
+                HPSC006.setProductionOrderNo(productionOrderNo);
+                HPSC006.setStatus(CommonConstant.YesNo.NO_0.intValue());
+                HPSC006.setTotalWt(totalWt);
+                HPSC006.setInventCode(HPPZTools.checkAndSavePZ04(HPSC006.getInventType(),HPSC006.getInventName()));
+                DaoUtils.insert("HPSC006.insert",HPSC006);
             }
             inInfo.setStatus(EiConstant.STATUS_SUCCESS);
             inInfo.setMsg("新增成功！");
@@ -121,21 +122,25 @@ public class ServiceHPSC006 extends ServiceBase {
      */
     public EiInfo update(EiInfo inInfo) {
         try {
-            HPSC006 hppz002 = new HPSC006();
+            HPSC006 HPSC006 = new HPSC006();
+            String productionOrderNo = inInfo.getString("productionOrderNo");
+            String projCode = inInfo.getString("projCode");
+            String projName = inInfo.getString("projName");
             EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
             for (int i = 0; i < eiBlock.getRowCount(); i++) {
                 Map<?, ?> map = eiBlock.getRow(i);
-                hppz002.fromMap(map);
-                BigDecimal num = hppz002.getNum();
-                BigDecimal unitWt = hppz002.getUnitWt();
+                HPSC006.fromMap(map);
+                BigDecimal num = HPSC006.getNum();
+                BigDecimal unitWt = HPSC006.getUnitWt();
                 DecimalFormat decimalFormat = new DecimalFormat("#.000");
                 BigDecimal totalWt = new BigDecimal(decimalFormat.format(Math.round(num.multiply(unitWt).floatValue())));
-                hppz002.setDelStatus(CommonConstant.YesNo.NO_0.intValue());
-                hppz002.setTotalWt(totalWt);
-                if (StringUtils.isNotEmpty(hppz002.getPrdtCode()) && !hppz002.getParentId().equals("root")) {
-                    hppz002.setPrdtName(HPPZTools.getPz004ByCode(hppz002.getPrdtCode()).getInventName());
-                }
-                DaoUtils.update("HPSC006.update", hppz002.toMap());
+                HPSC006.setInventSpec(HPPZTools.jointSpec(HPSC006.getInventLength(),HPSC006.getInventWidth(),HPSC006.getInventThick()));
+                HPSC006.setProjCode(projCode);
+                HPSC006.setProjName(projName);
+                HPSC006.setProductionOrderNo(productionOrderNo);
+                HPSC006.setTotalWt(totalWt);
+                HPSC006.setInventCode(HPPZTools.checkAndSavePZ04(HPSC006.getInventType(),HPSC006.getInventName()));
+                DaoUtils.update("HPSC006.update",HPSC006);
             }
             inInfo.setStatus(EiConstant.STATUS_SUCCESS);
             inInfo.setMsg("修改成功！");
@@ -153,16 +158,14 @@ public class ServiceHPSC006 extends ServiceBase {
      * 删除操作.
      */
     public EiInfo delete(EiInfo eiInfo) {
-        HPSC006 hppz002 = new HPSC006();
+        HPSC006 HPSC006 = new HPSC006();
         EiBlock eiBlock = eiInfo.getBlock(EiConstant.resultBlock);
         try {
             for (int i = 0; i < eiBlock.getRowCount(); i++) {
                 Map<?, ?> map = eiBlock.getRow(i);
-                hppz002.fromMap(map);
-                this.dao.delete("HPSC006.delete", hppz002.toMap());
-                this.checkTreeNodeLeaf(new Long(hppz002.getParentId()));
-                //TODO 删除时 修改树结构
-                this.checkTreeNodeLeaf(new Long(hppz002.getId()));
+                HPSC006.fromMap(map);
+                this.dao.delete("HPSC006.delete", HPSC006.toMap());
+
             }
         } catch (PlatException e) {
             eiInfo.setStatus(EiConstant.STATUS_FAILURE);
@@ -171,173 +174,27 @@ public class ServiceHPSC006 extends ServiceBase {
             logError("删除失败！", e.getMessage());
             return eiInfo;
         }
+
         eiInfo.setStatus(EiConstant.STATUS_SUCCESS);
         eiInfo.setMsg("删除成功！");
         return eiInfo;
     }
 
-    /**
-     * 指定树节点
-     * @param inInfo
-     * @return
-     */
-    public EiInfo queryTreeRoot(EiInfo inInfo) {
-        Long projId =  NumberUtils.toLong(inInfo.get("projId"));
-        Map queryMap = new HashMap();
-        String root = "";
-        if (projId != null) {
-            Map map = new HashMap();
-            map.put("id", projId);
-            HPSC001 HPSC001 = (com.baosight.hpjx.hp.sc.domain.HPSC001) dao.get("HPSC001.queryDomainById", "id",projId);
-            root = HPSC001.getProjCode() + ":" + HPSC001.getProjName();
-        }
-        inInfo.set("root",root);
-        return inInfo;
-    }
-
-    //树查询服务
-    public EiInfo queryTreeNode(EiInfo inInfo) {
-        //1 获取参数
-        String pEname = inInfo.getCellStr(EiConstant.queryBlock, 0, "node");
-        if(StringUtils.equals("$",pEname)){
-            pEname = "root";
-        }
-        Long projId =  NumberUtils.toLong(inInfo.get("projId"));
-        Map queryMap = new HashMap();
-        queryMap.put("pEname", pEname);
-        if (projId != null) {
-            Map map = new HashMap();
-            map.put("id", projId);
-            List list = dao.query("HPSC001.queryDomainById", map);
-            if (list.size() > 0) {
-                String projCode = ((HPSC001)list.get(0)).getProjCode();
-                queryMap.put("projCode", projCode);
-            }
-        }
-        //2 查询节点
-        List rows = dao.query("HPSC006.queryTree", queryMap);
-        //3 增加节点block块
-        EiInfo outInfo = new EiInfo();
-        EiBlock outBlock = outInfo.addBlock(BeanUtil.isEmpty(pEname) ? "" : pEname);
-        outBlock.addRows(rows);
-        return outInfo;
-    }
-
-    /**
-     * 修改父级节点的LEAF状态为1
-     *
-     * @param id
-     */
-
-    public void checkTreeNodeLeaf(Long id) {
-        EiInfo eiInfo = new EiInfo();
-        //1 获取参数
-        Map queryMap = new HashMap();
-        queryMap.put("id", id);
-        List rows = this.dao.query("HPSC006.queryTreeNodeByParentPrtdCode", queryMap);
-        if(rows.size() > 0){
-            queryMap.put("leaf", "0");
-        }else{
-            queryMap.put("leaf", "1");
-        }
-        DaoUtils.update("HPSC006.updateTreeNodeLeaf", queryMap);
-    }
-
-
-    /**
-     * 提交 撤回.
-     */
-    public EiInfo check(EiInfo eiInfo) {
-        HPSC006 hppz002 = new HPSC006();
-        EiBlock eiBlock = eiInfo.getBlock(EiConstant.resultBlock);
-        try {
-            for (int i = 0; i < eiBlock.getRowCount(); i++) {
-                Map<?, ?> map = eiBlock.getRow(i);
-                hppz002.fromMap(map);
-                //限制一下，如果二级已经提交通过，这个时候不允许进行撤回
-                if(map.get("status").equals("0")) {
-                    //找到二级是否已经提交
-                    HPSC006 THPSC006 = (HPSC006) dao.get("HPSC006.query","id",hppz002.getId());
-                    if (THPSC006.getStatus() == 1) {
-                       // 二级如果已经提交了则需要去看看计划是否已经更新
-                    }
-                }
-                DaoUtils.update("HPSC006.check", hppz002.toMap());
-            }
-
-            // 处理三级提交之后判断是否都提交完成，如果都提交完成则二级直接提交通过
-            for (int i = 0; i < eiBlock.getRowCount(); i++) {
-                Map<?, ?> map = eiBlock.getRow(i);
-                hppz002.fromMap(map);
-                HPSC006 THPSC006 = (HPSC006) dao.get("HPSC006.query","id",hppz002.getId());
-                Map map1 = new HashMap();
-                map1.put("parentId",THPSC006.getParentId());
-                List list = dao.query("HPSC006.checkExamineNum", map1);
-                int num = NumberUtils.toint(list.get(0));
-                Map map2 = new HashMap();
-                if (num == 0) {
-                    map2.put("status",1);
-                    map2.put("id",THPSC006.getParentId());
-
-                    // 自动生成生产计划
-                    this.autoPlanInfo(THPSC006.getParentId());
-                } else {
-                    map2.put("status",0);
-                    map2.put("id",THPSC006.getParentId());
-                }
-                DaoUtils.update("HPSC006.check",map2);
-
-                //处理项目管理中物料状态
-                Map map3 = new HashMap();
-                map3.put("projCode",THPSC006.getProjCode());
-                List list1 = dao.query("HPSC006.checkExamineNum1", map3);
-                List list2 = dao.query("HPSC006.checkExamineNum1Count", map3);
-                //未提交数量
-                int num1 = NumberUtils.toint(list1.get(0));
-                //总量
-                int num2 = NumberUtils.toint(list2.get(0));
-
-                if (num1 == 0) {
-                    //都已经提交
-                    Map map4 = new HashMap();
-                    map4.put("projCode",THPSC006.getProjCode());
-                    map4.put("materialStatus",2);
-                    DaoUtils.update("HPSC001.checkByProjCode",map4);
-                } else if (num1 > 0 && num1 < num2) {
-                    // 部分提交
-                    Map map4 = new HashMap();
-                    map4.put("projCode",THPSC006.getProjCode());
-                    map4.put("materialStatus",1);
-                    DaoUtils.update("HPSC001.checkByProjCode",map4);
-                }
-
-            }
-        } catch (PlatException e) {
-            eiInfo.setStatus(EiConstant.STATUS_FAILURE);
-            eiInfo.setMsg("提交失败，原因参见详细错误描述！");
-            eiInfo.setDetailMsg(e.getMessage());
-            logError("提交失败！", e.getMessage());
-            return eiInfo;
-        }
-        eiInfo.setStatus(EiConstant.STATUS_SUCCESS);
-        eiInfo.setMsg("提交成功！");
-        return eiInfo;
-    }
 
     /**
      * 绑定附件
      */
     public EiInfo bindDocIdById(EiInfo eiInfo) {
-        HPSC006 hppz002 = new HPSC006();
+        HPSC006 HPSC006 = new HPSC006();
         EiBlock eiBlock = eiInfo.getBlock(EiConstant.resultBlock);
         try {
             for (int i = 0; i < eiBlock.getRowCount(); i++) {
                 Map<?, ?> map = eiBlock.getRow(i);
-                hppz002.fromMap(map);
+                HPSC006.fromMap(map);
                 Map sqlMap = new HashMap();
-                sqlMap.put("id",hppz002.getId());
-                sqlMap.put("filePath1",hppz002.getFilePath1());
-                DaoUtils.update("HPSC006.bindDocIdById", hppz002.toMap());
+                sqlMap.put("id",HPSC006.getId());
+                sqlMap.put("filePath1",HPSC006.getFilePath1());
+                DaoUtils.update("HPSC006.bindDocIdById", HPSC006.toMap());
             }
         } catch (PlatException e) {
             eiInfo.setStatus(EiConstant.STATUS_FAILURE);
@@ -351,69 +208,4 @@ public class ServiceHPSC006 extends ServiceBase {
         return eiInfo;
     }
 
-
-    /**
-     * 生产生产计划
-     * @param id
-     */
-    public void autoPlanInfo(String id) {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        HPSC006 THPSC006 = (HPSC006) dao.get("HPSC006.queryEntityByParentPrtdCode","id",id);
-        String SCJHD = SequenceGenerator.getNextSequence(HPConstant.SequenceId.HPSC003_PROD_NO);
-        //生成生产计划t_hpsc003
-        HPSC003 HPSC003 = new HPSC003();
-        HPSC003.setCompanyCode("");
-        HPSC003.setProjType(null);
-        HPSC003.setProjCode(THPSC006.getProjCode());
-        HPSC003.setProjName(THPSC006.getProjName());
-        HPSC003.setPlanInfoNo(SCJHD);
-        HPSC003.setInventRecordId(THPSC006.getInventRecordId());
-        HPSC003.setPrdtType(THPSC006.getPrdtType());
-        HPSC003.setPrdtCode(THPSC006.getPrdtCode());
-        HPSC003.setPrdtName(THPSC006.getPrdtName());
-        HPSC003.setSpec(THPSC006.getSpec());
-        HPSC003.setLength(THPSC006.getLength());
-        HPSC003.setWidth(THPSC006.getWidth());
-        HPSC003.setThick(THPSC006.getThick());
-        HPSC003.setRemark(THPSC006.getRemark());
-        HPSC003.setPlanCompletionDate("");
-        HPSC003.setStatus(0);
-        DaoUtils.insert("HPSC003.insert", HPSC003.toMap());
-
-        //生产计划详情
-        Map queryMap = new HashMap();
-        queryMap.put("parentId", id);
-        List<HPSC006> rows = this.dao.query("HPSC006.queryEntityByParentPrtdCode", queryMap);
-
-        for (int i = 0; i < rows.size(); i++) {
-            HPSC006 HPSC006 = rows.get(i);
-            HPSC004 HPSC004 = new HPSC004();
-            HPSC004.setCompanyCode("");
-            HPSC004.setDeptCode("");
-            HPSC004.setProjCode(HPSC006.getProjCode());
-            HPSC004.setProjName(HPSC006.getProjName());
-            HPSC004.setParentId(SCJHD);
-            HPSC004.setParentPrdtName(HPSC006.getParentPrdtName());
-            HPSC004.setInventRecordId(HPSC006.getInventRecordId());
-            HPSC004.setPrdtType(HPSC006.getPrdtType());
-            HPSC004.setPrdtCode(HPSC006.getPrdtCode());
-            HPSC004.setPrdtName(HPSC006.getPrdtName());
-            HPSC004.setSpec(HPSC006.getSpec());
-            HPSC004.setLength(HPSC006.getLength());
-            HPSC004.setWidth(HPSC006.getWidth());
-            HPSC004.setThick(HPSC006.getThick());
-            HPSC004.setRemark(HPSC006.getRemark());
-            HPSC004.setNum(HPSC006.getNum());
-            HPSC004.setUnitWt(HPSC006.getUnitWt());
-            HPSC004.setTotalWt(HPSC006.getTotalWt());
-            HPSC004.setFilePath1(HPSC006.getId().toString());
-            HPSC004.setPlanCommentDate("");
-            HPSC004.setPlanCompletionDate("");
-            HPSC004.setActualCompletionNum(NumberUtils.toBigDecimal(0.00));
-            HPSC004.setActualCompletionUnitWt(NumberUtils.toBigDecimal(0.00));
-            HPSC004.setActualCompletionDate("");
-            HPSC004.setDelStatus(1);
-            DaoUtils.insert("HPSC004.insert", HPSC004.toMap());
-        }
-    }
 }

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

 package com.baosight.hpjx.hp.sc.service;
 
 import com.baosight.hpjx.common.DdynamicEnum;
+import com.baosight.hpjx.core.security.UserSessionUtils;
 import com.baosight.hpjx.hp.sc.domain.HPSC001;
 import com.baosight.hpjx.util.CommonMethod;
 import com.baosight.hpjx.util.LogUtils;
@@ -22,7 +23,11 @@ public class ServiceHPSC011 extends ServiceBase {
      */
     public EiInfo initLoad(EiInfo inInfo) {
         try {
-            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), null);
+            inInfo.setCell(EiConstant.queryBlock, 0, "status", 1);
+            inInfo = super.query(inInfo, "HPSC001.query", new HPSC001());
+            Map map = new HashMap();
+            map.put("companyCode", UserSessionUtils.getCompanyCode());
+            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), map,true);
             CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID), null);
             inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPSC001().eiMetadata);
         } catch (PlatException e) {

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

@@ -36,6 +36,7 @@
 				UPDATED_BY	as "updatedBy",  <!-- 更新人 -->
 				UPDATED_TIME	as "updatedTime",  <!-- 更新时间 -->
 				DEP_CODE	as "depCode", <!-- 部门编码 -->
+				REMARK	as "remark", <!-- 备注 -->
 				MATERIAL_STATUS as "materialStatus"
 		FROM hpjx.t_hpsc001 WHERE 1=1
 		<isNotEmpty prepend=" AND " property="id">
@@ -158,9 +159,10 @@
 										CREATED_TIME,  <!-- 创建时间 -->
 										UPDATED_BY,  <!-- 更新人 -->
 										UPDATED_TIME,  <!-- 更新时间 -->
-										DEP_CODE  <!-- 部门编码 -->
+										DEP_CODE,  <!-- 部门编码 -->
+										REMARK
 										)		 
-	    VALUES (#id#, #companyCode#, #projType#, #projCode#, #projName#, #princ1#, #princ2#, #status#, 0, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #depCode#)
+	    VALUES (#id#, #companyCode#, #projType#, #projCode#, #projName#, #princ1#, #princ2#, #status#, 0, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #depCode#, #remark#)
 	</insert>
   
 	<delete id="delete">
@@ -183,8 +185,9 @@
 					CREATED_TIME	= #createdTime#,   <!-- 创建时间 -->  
 					UPDATED_BY	= #updatedBy#,   <!-- 更新人 -->  
 					UPDATED_TIME	= #updatedTime#,   <!-- 更新时间 -->  
-					DEP_CODE	= #depCode#  <!-- 部门编码 -->  
-			WHERE 	
+					DEP_CODE	= #depCode#,  <!-- 部门编码 -->
+					REMARK	= #remark#  <!-- 备注 -->
+		WHERE
 			ID = #id#
 	</update>
 
@@ -227,7 +230,8 @@
 	CREATED_TIME	as "createdTime",  <!-- 创建时间 -->
 	UPDATED_BY	as "updatedBy",  <!-- 更新人 -->
 	UPDATED_TIME	as "updatedTime",  <!-- 更新时间 -->
-	DEP_CODE	as "depCode" <!-- 部门编码 -->
+	DEP_CODE	as "depCode", <!-- 部门编码 -->
+		REMARK	as "remark" <!-- 备注 -->
 	FROM hpjx.t_hpsc001 WHERE 1=1
 	<isNotEmpty prepend=" AND " property="id">
 		ID = #id#

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

@@ -458,7 +458,7 @@
 	</update>
 
 	<update id="bindDocIdById">
-		UPDATE hpjx.t_hpsc002  SET  FILE_PATH1 = #filePath1# WHERE ID = #id#
+		UPDATE hpjx.t_hpsc002  SET  FILE_PATH1 = #filePath1# WHERE ID = #id# AND BIZ_TYPE = #bizType#
 	</update>
 
 

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

@@ -6,6 +6,7 @@
         A.ID as "id",
         A.COMPANY_CODE as "companyCode",  <!-- 企业编码 预留 -->
         A.DEPT_CODE as "deptCode",  <!-- 部门编码 预留 -->
+        A.BIZ_TYPE as "bizType",  <!-- 物料ID -->
         A.MAT_ID as "matId",  <!-- 物料ID -->
         A.DOC_ID as "docId",  <!-- 文件ID -->
         B.DOC_NAME as "docName",  <!-- 文件名称 -->
@@ -27,6 +28,9 @@
 		<isNotEmpty prepend=" AND " property="deptCode">
             A.DEPT_CODE = #deptCode#
 		</isNotEmpty>
+        <isNotEmpty prepend=" AND " property="bizType">
+            A.BIZ_TYPE = #bizType#
+        </isNotEmpty>
         <isNotEmpty prepend=" AND " property="matId">
             A.MAT_ID = #matId#
         </isNotEmpty>
@@ -95,13 +99,14 @@
 		INSERT INTO ${hpjxSchema}.T_HPSC002A (
             COMPANY_CODE,  <!-- 企业编码 预留 -->
             DEPT_CODE,  <!-- 部门编码 预留 -->
+            BIZ_TYPE,
             MAT_ID,  <!-- 物料ID -->
             DOC_ID,  <!-- 文件ID -->
             CREATED_BY,  <!-- 创建人 -->
             CREATED_NAME,  <!-- 创建人名称 -->
             CREATED_TIME  <!-- 创建时间 -->
         ) VALUES (
-            #companyCode#, #deptCode#, #matId#, #docId#, #createdBy#,
+            #companyCode#, #deptCode#, #bizType#, #matId#, #docId#, #createdBy#,
             #createdName#, #createdTime#
         )
 	</insert>

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

@@ -6,6 +6,7 @@
         A.ID as "id",
         A.COMPANY_CODE as "companyCode",  <!-- 企业编码 预留 -->
         A.DEPT_CODE as "deptCode",  <!-- 部门编码 预留 -->
+        A.BIZ_TYPE as "bizType",  <!-- 物料ID -->
         A.MAT_ID as "matId",  <!-- 物料ID -->
         A.DOC_ID as "docId",  <!-- 文件ID -->
         B.DOC_NAME as "docName",  <!-- 文件名称 -->
@@ -27,6 +28,9 @@
 		<isNotEmpty prepend=" AND " property="deptCode">
             A.DEPT_CODE = #deptCode#
 		</isNotEmpty>
+        <isNotEmpty prepend=" AND " property="bizType">
+            A.BIZ_TYPE = #bizType#
+        </isNotEmpty>
         <isNotEmpty prepend=" AND " property="matId">
             A.MAT_ID = #matId#
         </isNotEmpty>
@@ -95,17 +99,18 @@
     </select>
 
 	<insert id="insert">
-		INSERT INTO ${hpjxSchema}.T_HPSC002A (
-            COMPANY_CODE,  <!-- 企业编码 预留 -->
-            DEPT_CODE,  <!-- 部门编码 预留 -->
-            MAT_ID,  <!-- 物料ID -->
-            DOC_ID,  <!-- 文件ID -->
-            CREATED_BY,  <!-- 创建人 -->
-            CREATED_NAME,  <!-- 创建人名称 -->
-            CREATED_TIME  <!-- 创建时间 -->
+        INSERT INTO ${hpjxSchema}.T_HPSC002A (
+        COMPANY_CODE,  <!-- 企业编码 预留 -->
+        DEPT_CODE,  <!-- 部门编码 预留 -->
+        BIZ_TYPE,
+        MAT_ID,  <!-- 物料ID -->
+        DOC_ID,  <!-- 文件ID -->
+        CREATED_BY,  <!-- 创建人 -->
+        CREATED_NAME,  <!-- 创建人名称 -->
+        CREATED_TIME  <!-- 创建时间 -->
         ) VALUES (
-            #companyCode#, #deptCode#, #matId#, #docId#, #createdBy#,
-            #createdName#, #createdTime#
+        #companyCode#, #deptCode#, #bizType#, #matId#, #docId#, #createdBy#,
+        #createdName#, #createdTime#
         )
 	</insert>
 

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

 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://www.ibatis.com/dtd/sql-map-2.dtd">
+<!DOCTYPE sqlMap  PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" "http://ibatis.apache.org/dtd/sql-map-2.dtd">	<!--      table information
+		Generate time : 2024-01-17 10:33:49
+   		Version :  1.0
+		schema : hpjx
+		tableName : T_HPSC003
+		 ID  BIGINT   NOT NULL   primarykey, 
+		 COMPANY_CODE  VARCHAR   NOT NULL, 
+		 PROJ_TYPE  TINYINT, 
+		 PROJ_CODE  VARCHAR,
+		 PROJ_NAME  VARCHAR,
+		 PLAN_INFO_NO  VARCHAR,
+		 PRDT_CODE  VARCHAR, 
+		 PRDT_NAME  VARCHAR, 
+		 PLAN_COMPLETION_DATE  VARCHAR, 
+		 STATUS  TINYINT, 
+		 CREATED_BY  VARCHAR, 
+		 CREATED_TIME  DATETIME, 
+		 UPDATED_BY  VARCHAR, 
+		 UPDATED_TIME  DATETIME, 
+		 DEP_CODE  VARCHAR, 
+		 REMARK  VARCHAR
+	-->
 <sqlMap namespace="HPSC003">
 
 	<sql id="condition">
@@ -232,4 +253,17 @@
         ORDER BY PROJ_CODE
     </select>
 
+	<!--计划完成时间回写-->
+	<update id="updateDate">
+		UPDATE hpjx.T_HPSC003
+		SET
+		PLAN_COMPLETION_DATE = #planCompletionDate#,   <!-- 计划完成日期 -->
+		UPDATED_BY	= #updatedBy#,   <!-- 更新人 -->
+		UPDATED_TIME	= #updatedTime#   <!-- 更新时间 -->
+		WHERE
+		COMPANY_CODE = #companyCode#
+		AND PROJ_CODE = #projCode#
+		AND PLAN_INFO_NO = #planInfoNo#
+	</update>
+
 </sqlMap>

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

@@ -463,4 +463,26 @@
         </isNotEmpty>
         ORDER BY A.PROJ_CODE
     </select>
+
+	<select id="queryDate" parameterClass="java.util.HashMap" resultClass="com.baosight.hpjx.hp.sc.domain.HPSC004">
+		SELECT
+			MAX(PLAN_COMPLETION_DATE)	as "planCompletionDate"  <!-- 计划结束时间 -->
+		FROM hpjx.T_HPSC004 WHERE 1=1
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="projCode">
+			PROJ_CODE = #projCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="parentId">
+			PARENT_ID = #parentId#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="planCommentDate">
+			IFNULL(PLAN_COMMENT_DATE,'') = #planCommentDate#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="planCompletionDate">
+			IFNULL(PLAN_COMPLETION_DATE,'') = #planCompletionDate#
+		</isNotEmpty>
+
+	</select>
 </sqlMap>

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

 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://www.ibatis.com/dtd/sql-map-2.dtd">
-	<!--      table information
-		Generate time : 2024-01-11 11:34:26
+<!DOCTYPE sqlMap  PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" "http://ibatis.apache.org/dtd/sql-map-2.dtd">	<!--      table information
+		Generate time : 2024-02-05 9:36:07
    		Version :  1.0
-		tableName :hpjx.t_HPSC006 
+		schema : hpjx
+		tableName : T_HPSC006
 		 ID  BIGINT   NOT NULL   primarykey, 
-		 COMPANY_CODE  VARCHAR   NOT NULL, 
-		 DEPT_CODE  VARCHAR   NOT NULL, 
+		 COMPANY_CODE  VARCHAR, 
 		 PROJ_CODE  VARCHAR, 
 		 PROJ_NAME  VARCHAR, 
-		 PARENT_ID  VARCHAR,
-		 PARENT_PRDT_NAME  VARCHAR, 
-		 TYPE  VARCHAR   NOT NULL, 
-		 LEAF  VARCHAR   NOT NULL, 
-		 SORT  VARCHAR   NOT NULL, 
-		 ICON  VARCHAR   NOT NULL, 
-		 PRDT_CODE  VARCHAR, 
-		 PRDT_NAME  VARCHAR, 
-		 NUM  INTEGER   NOT NULL, 
-		 UNIT_WT  DECIMAL   NOT NULL, 
-		 TOTAL_WT  DECIMAL   NOT NULL, 
-		 FILE_PATH1  VARCHAR, 
-		 FILE_PATH2  VARCHAR, 
-		 FILE_PATH3  VARCHAR, 
-		 FILE_PATH4  VARCHAR, 
-		 FILE_PATH5  VARCHAR, 
+		 PRODUCTION_ORDER_NO  VARCHAR, 
+		 INVENT_TYPE  TINYINT, 
+		 INVENT_CODE  VARCHAR, 
+		 INVENT_NAME  VARCHAR, 
+		 INVENT_LENGTH  DECIMAL, 
+		 INVENT_WIDTH  DECIMAL, 
+		 INVENT_THICK  DECIMAL, 
+		 INVENT_SPEC  VARCHAR, 
+		 PLAN_COMPLETION_DATE  VARCHAR, 
+		 NUM  DECIMAL, 
+		 UNIT_WT  DECIMAL, 
+		 TOTAL_WT  DECIMAL, 
+		 ACTUAL_COMPLETION_DATE  VARCHAR, 
+		 ACTUAL_COMPLETION_NUM  DECIMAL, 
 		 STATUS  TINYINT, 
-		 DEL_STATUS  TINYINT, 
+		 ORG_NO  VARCHAR, 
+		 ORG_NAME  VARCHAR, 
+		 FACTORY_CODE  VARCHAR, 
+		 FACTORY_NAME  VARCHAR, 
 		 CREATED_BY  VARCHAR, 
-		 CREATED_TIME  DATETIME, 
+		 CREATED_TIME  VARCHAR, 
 		 UPDATED_BY  VARCHAR, 
-		 UPDATED_TIME  DATETIME, 
-		 REMARK  VARCHAR
+		 UPDATED_TIME  VARCHAR, 
+		 DEP_CODE  VARCHAR, 
+		 REMARK  VARCHAR, 
+		 FILE_PATH1  VARCHAR, 
+		 INVENT_RECORD_ID  INTEGER
 	-->
 <sqlMap namespace="HPSC006">
+	<sql id="column">
+		ID	as "id",
+		COMPANY_CODE	as "companyCode",  <!-- 企业编码 预留 -->
+		PROJ_CODE	as "projCode",  <!-- 项目编码 -->
+		PROJ_NAME	as "projName",  <!-- 项目名称 -->
+		PRODUCTION_ORDER_NO	as "productionOrderNo",  <!-- 生产订单号 -->
+		INVENT_TYPE	as "inventType",  <!-- 物料类型 -->
+		INVENT_CODE	as "inventCode",  <!-- 物料编码 -->
+		INVENT_NAME	as "inventName",  <!-- 物料名称 -->
+		INVENT_LENGTH	as "inventLength",  <!-- 物料-长 -->
+		INVENT_WIDTH	as "inventWidth",  <!-- 物料-宽 -->
+		INVENT_THICK	as "inventThick",  <!-- 物料-厚 -->
+		INVENT_SPEC	as "inventSpec",  <!-- 物料规格 -->
+		PLAN_COMPLETION_DATE	as "planCompletionDate",  <!-- 计划完成日期 -->
+		NUM	as "num",  <!-- 计划数量 -->
+		UNIT_WT	as "unitWt",  <!-- 计划单重 -->
+		TOTAL_WT	as "totalWt",  <!-- 计划重量 -->
+		ACTUAL_COMPLETION_DATE	as "actualCompletionDate",  <!-- 实际完工日期 -->
+		ACTUAL_COMPLETION_NUM	as "actualCompletionNum",  <!-- 实际完工数量 -->
+		STATUS	as "status",  <!-- 状态   0-计划中，1-生产中，2-已完成 -->
+		ORG_NO	as "orgNo",  <!-- 生产组编码 -->
+		ORG_NAME	as "orgName",  <!-- 生产组名称 -->
+		FACTORY_CODE	as "factoryCode",  <!-- 厂区编码 -->
+		FACTORY_NAME	as "factoryName",  <!-- 厂区名称 -->
+		CREATED_BY	as "createdBy",  <!-- 创建人 -->
+		CREATED_TIME	as "createdTime",  <!-- 创建时间 -->
+		UPDATED_BY	as "updatedBy",  <!-- 更新人 -->
+		UPDATED_TIME	as "updatedTime",  <!-- 更新时间 -->
+		DEP_CODE	as "depCode",  <!-- 部门编码 -->
+		REMARK	as "remark",  <!-- 备注 -->
+		FILE_PATH1	as "filePath1",  <!-- 文件地址1 -->
+		INVENT_RECORD_ID	as "inventRecordId" <!-- 存货档案ID -->
+	</sql>
 
-	<select id="query" parameterClass="java.util.HashMap" 
-			resultClass="com.baosight.hpjx.hp.sc.domain.HPSC006">
-		SELECT
-				ID	as "id",  
-				COMPANY_CODE	as "companyCode",  <!-- 企业编码 预留 -->
-				DEPT_CODE	as "deptCode",  <!-- 部门编码 预留 -->
-				PROJ_CODE	as "projCode",  <!-- 项目编码 -->
-				PROJ_NAME	as "projName",  <!-- 项目名称 -->
-				PARENT_ID	as "parentId",  <!-- 父节点-部件编码 -->
-				PARENT_PRDT_NAME	as "parentPrdtName",  <!-- 父节点-部件名称 -->
-				TYPE	as "type",  <!-- 类别 -->
-				LEAF	as "leaf",  <!-- 是否有叶子节点 -->
-				SORT	as "sort",  <!-- 排序字段 -->
-				ICON	as "icon",  <!-- 图片地址 -->
-				PRDT_TYPE	as "prdtType",
-				PRDT_CODE	as "prdtCode",  <!-- 部件编码 -->
-				PRDT_NAME	as "prdtName",  <!-- 部件名称 -->
-				INVENT_RECORD_ID as "inventRecordId",  <!-- 存货档案ID -->
-				NUM	as "num",  <!-- 数量 -->
-				UNIT_WT	as "unitWt",  <!-- 单重 -->
-				TOTAL_WT	as "totalWt",  <!-- 总重 -->
-				FILE_PATH1	as "filePath1",  <!-- 文件地址1 -->
-				FILE_PATH2	as "filePath2",  <!-- 文件地址2 -->
-				FILE_PATH3	as "filePath3",  <!-- 文件地址3 -->
-				FILE_PATH4	as "filePath4",  <!-- 文件地址4 -->
-				FILE_PATH5	as "filePath5",  <!-- 文件地址5 -->
-				STATUS	as "status",  <!-- 状态   0-未提交，1-已提交 -->
-				DEL_STATUS	as "delStatus",  <!-- 状态   1未删除，0已删除 -->
-				CREATED_BY	as "createdBy",  <!-- 创建人 -->
-				CREATED_TIME	as "createdTime",  <!-- 创建时间 -->
-				UPDATED_BY	as "updatedBy",  <!-- 更新人 -->
-				UPDATED_TIME	as "updatedTime",  <!-- 更新时间 -->
-				REMARK	as "remark", <!-- 备注 -->
-				LV 	as "lv",
-				SPEC 	as "spec",
-		LENGTH as "length",  <!-- 长 -->
-		WIDTH as "width",  <!-- 宽 -->
-		THICK as "thick"  <!-- 厚 -->
-
-		FROM hpjx.t_HPSC006 WHERE 1=1
-		AND PARENT_ID NOT IN ('root')
-		AND DEL_STATUS = 0
-		<isNotEmpty prepend=" AND " property="id">
-			ID = #id#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="parentId">
-			PARENT_ID = #parentId#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="prdtType">
-			PRDT_TYPE = #prdtType#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="prdtCode">
-			PRDT_CODE = #prdtCode#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="prdtName">
-			PRDT_NAME LIKE ('%$#prdtName#$%')
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="inventRecordId">
-			INVENT_RECORD_ID = #inventRecordId#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="projName">
-			PROJ_NAME LIKE ('%$projName$%')
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="status">
-			STATUS = #status#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="lv">
-			LV = #lv#
-		</isNotEmpty>
-		ORDER BY ID DESC
-<!--		<dynamic prepend="ORDER BY">-->
-<!--			<isEmpty property="orderBy">-->
-<!--				CREATED_TIME DESC-->
-<!--			</isEmpty>-->
-<!--		</dynamic>-->
-			
-	</select>
-
-	<select id="count" resultClass="int">
-		SELECT COUNT(*) FROM hpjx.t_HPSC006 WHERE 1=1
-		AND PARENT_ID NOT IN ('root')
-		AND DEL_STATUS = 0
-		<isNotEmpty prepend=" AND " property="id">
-			ID = #id#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="parentId">
-			PARENT_ID = #parentId#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="prdtType">
-			PRDT_TYPE = #prdtType#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="prdtCode">
-			PRDT_CODE = #prdtCode#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="prdtName">
-			PRDT_NAME LIKE ('%$#prdtName#$%')
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="projName">
-			PROJ_NAME LIKE ('%$projName$%')
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="inventRecordId">
-			INVENT_RECORD_ID = #inventRecordId#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="status">
-			STATUS = #status#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="lv">
-			LV = #lv#
-		</isNotEmpty>
-	</select>
-	
-	<!--  
+	<sql id="condition">
 		<isNotEmpty prepend=" AND " property="id">
 			ID = #id#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="companyCode">
 			COMPANY_CODE = #companyCode#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="deptCode">
-			DEPT_CODE = #deptCode#
-		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="projCode">
 			PROJ_CODE = #projCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="projName">
 			PROJ_NAME = #projName#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="parentId">
-			PARENT_ID = #parentId#
+		<isNotEmpty prepend=" AND " property="productionOrderNo">
+			PRODUCTION_ORDER_NO = #productionOrderNo#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="parentPrdtName">
-			PARENT_PRDT_NAME = #parentPrdtName#
+		<isNotEmpty prepend=" AND " property="inventType">
+			INVENT_TYPE = #inventType#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="type">
-			TYPE = #type#
+		<isNotEmpty prepend=" AND " property="inventCode">
+			INVENT_CODE = #inventCode#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="leaf">
-			LEAF = #leaf#
+		<isNotEmpty prepend=" AND " property="inventName">
+			INVENT_NAME = #inventName#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="sort">
-			SORT = #sort#
+		<isNotEmpty prepend=" AND " property="inventLength">
+			INVENT_LENGTH = #inventLength#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="icon">
-			ICON = #icon#
+		<isNotEmpty prepend=" AND " property="inventWidth">
+			INVENT_WIDTH = #inventWidth#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="prdtCode">
-			PRDT_CODE = #prdtCode#
+		<isNotEmpty prepend=" AND " property="inventThick">
+			INVENT_THICK = #inventThick#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="prdtName">
-			PRDT_NAME = #prdtName#
+		<isNotEmpty prepend=" AND " property="inventSpec">
+			INVENT_SPEC = #inventSpec#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="planCompletionDate">
+			PLAN_COMPLETION_DATE = #planCompletionDate#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="num">
 			NUM = #num#
@@ -195,26 +120,26 @@
 		<isNotEmpty prepend=" AND " property="totalWt">
 			TOTAL_WT = #totalWt#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="filePath1">
-			FILE_PATH1 = #filePath1#
+		<isNotEmpty prepend=" AND " property="actualCompletionDate">
+			ACTUAL_COMPLETION_DATE = #actualCompletionDate#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="filePath2">
-			FILE_PATH2 = #filePath2#
+		<isNotEmpty prepend=" AND " property="actualCompletionNum">
+			ACTUAL_COMPLETION_NUM = #actualCompletionNum#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="filePath3">
-			FILE_PATH3 = #filePath3#
+		<isNotEmpty prepend=" AND " property="status">
+			STATUS = #status#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="filePath4">
-			FILE_PATH4 = #filePath4#
+		<isNotEmpty prepend=" AND " property="orgNo">
+			ORG_NO = #orgNo#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="filePath5">
-			FILE_PATH5 = #filePath5#
+		<isNotEmpty prepend=" AND " property="orgName">
+			ORG_NAME = #orgName#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="status">
-			STATUS = #status#
+		<isNotEmpty prepend=" AND " property="factoryCode">
+			FACTORY_CODE = #factoryCode#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="delStatus">
-			DEL_STATUS = #delStatus#
+		<isNotEmpty prepend=" AND " property="factoryName">
+			FACTORY_NAME = #factoryName#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="createdBy">
 			CREATED_BY = #createdBy#
@@ -228,270 +153,130 @@
 		<isNotEmpty prepend=" AND " property="updatedTime">
 			UPDATED_TIME = #updatedTime#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="depCode">
+			DEP_CODE = #depCode#
+		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="remark">
 			REMARK = #remark#
 		</isNotEmpty>
-	-->
-
-	<insert id="insert">
-		INSERT INTO hpjx.t_HPSC006 (ID,
-										COMPANY_CODE,  <!-- 企业编码 预留 -->
-										DEPT_CODE,  <!-- 部门编码 预留 -->
-										PROJ_CODE,  <!-- 项目编码 -->
-										PROJ_NAME,  <!-- 项目名称 -->
-										PARENT_ID,  <!-- 父节点-部件编码 -->
-										PARENT_PRDT_NAME,  <!-- 父节点-部件名称 -->
-										TYPE,  <!-- 类别 -->
-										LEAF,  <!-- 是否有叶子节点 -->
-										SORT,  <!-- 排序字段 -->
-										ICON,  <!-- 图片地址 -->
-										PRDT_TYPE,
-										PRDT_CODE,  <!-- 部件编码 -->
-										PRDT_NAME,  <!-- 部件名称 -->
-										INVENT_RECORD_ID,  <!-- 存货档案ID -->
-										NUM,  <!-- 数量 -->
-										UNIT_WT,  <!-- 单重 -->
-										TOTAL_WT,  <!-- 总重 -->
-										FILE_PATH1,  <!-- 文件地址1 -->
-										FILE_PATH2,  <!-- 文件地址2 -->
-										FILE_PATH3,  <!-- 文件地址3 -->
-										FILE_PATH4,  <!-- 文件地址4 -->
-										FILE_PATH5,  <!-- 文件地址5 -->
-										STATUS,  <!-- 状态   0-未提交，1-已提交 -->
-										DEL_STATUS,  <!-- 状态   1未删除，0已删除 -->
-										CREATED_BY,  <!-- 创建人 -->
-										CREATED_TIME,  <!-- 创建时间 -->
-										UPDATED_BY,  <!-- 更新人 -->
-										UPDATED_TIME,  <!-- 更新时间 -->
-										REMARK,  <!-- 备注 -->
-										LV,
-		SPEC,
-		LENGTH,  <!-- 长 -->
-		WIDTH,  <!-- 宽 -->
-		THICK  <!-- 厚 -->
-										)		 
-	    VALUES (#id#, #companyCode#, #deptCode#, #projCode#, #projName#, #parentId#, #parentPrdtName#,
-		#type#, #leaf#, #sort#, #icon#, #prdtType#, #prdtCode#, #prdtName#, #inventRecordId#, #num#,
-		#unitWt#, #totalWt#, #filePath1#, #filePath2#, #filePath3#, #filePath4#, #filePath5#, #status#,
-		#delStatus#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #remark#, #lv#, #spec#,
-		#length#, #width#, #thick#)
-	</insert>
-  
-	<delete id="delete">
-		DELETE FROM hpjx.t_HPSC006 WHERE 
-			ID = #id#
-	</delete>
-
-	<update id="update">
-		UPDATE hpjx.t_HPSC006 
-		SET 
-					COMPANY_CODE	= #companyCode#,   <!-- 企业编码 预留 -->  
-					DEPT_CODE	= #deptCode#,   <!-- 部门编码 预留 -->  
-					PROJ_CODE	= #projCode#,   <!-- 项目编码 -->  
-					PROJ_NAME	= #projName#,   <!-- 项目名称 -->  
-					PARENT_ID	= #parentId#,   <!-- 父节点-部件编码 -->
-					PARENT_PRDT_NAME	= #parentPrdtName#,   <!-- 父节点-部件名称 -->
-					TYPE	= #type#,   <!-- 类别 -->  
-					LEAF	= #leaf#,   <!-- 是否有叶子节点 -->  
-					SORT	= #sort#,   <!-- 排序字段 -->  
-					ICON	= #icon#,   <!-- 图片地址 -->  
-					PRDT_CODE	= #prdtCode#,   <!-- 部件编码 -->
-					PRDT_TYPE	= #prdtType#,
-					PRDT_NAME	= #prdtName#,   <!-- 部件名称 -->
-					INVENT_RECORD_ID = #inventRecordId#,   <!-- 存货档案ID -->
-					NUM	= #num#,   <!-- 数量 -->
-					UNIT_WT	= #unitWt#,   <!-- 单重 -->  
-					TOTAL_WT	= #totalWt#,   <!-- 总重 -->  
-					FILE_PATH1	= #filePath1#,   <!-- 文件地址1 -->  
-					FILE_PATH2	= #filePath2#,   <!-- 文件地址2 -->  
-					FILE_PATH3	= #filePath3#,   <!-- 文件地址3 -->  
-					FILE_PATH4	= #filePath4#,   <!-- 文件地址4 -->  
-					FILE_PATH5	= #filePath5#,   <!-- 文件地址5 -->  
-					STATUS	= #status#,   <!-- 状态   0-未提交，1-已提交 -->
-					DEL_STATUS	= #delStatus#,   <!-- 状态   1未删除，0已删除 -->  
-					CREATED_BY	= #createdBy#,   <!-- 创建人 -->  
-					CREATED_TIME	= #createdTime#,   <!-- 创建时间 -->  
-					UPDATED_BY	= #updatedBy#,   <!-- 更新人 -->  
-					UPDATED_TIME	= #updatedTime#,   <!-- 更新时间 -->  
-					REMARK	= #remark#,  <!-- 备注 -->
-		SPEC = #spec#,   <!-- 规格 -->
-		LENGTH = #length#,   <!-- 长 -->
-		WIDTH = #width#,   <!-- 宽 -->
-		THICK = #thick#   <!-- 厚 -->
-			WHERE 	
-			ID = #id#
-	</update>
-
-
-	<select id="queryTree" resultClass="java.util.HashMap">
-		SELECT
-		ID as "nodeId",
-		PRDT_TYPE	as "prdtType",
-		PRDT_CODE as "prdtCode",   <!-- 项目编码 -->
-		PROJ_CODE as "projCode",   <!-- 项目编码 -->
-		PRDT_name as "prdtName",   <!-- 项目编码 -->
-		PROJ_NAME as "projName",<!-- 项目名称 -->
-		ID as "label",  <!-- 名部件编码-->
-		PRDT_NAME as "text",  <!-- 部件名称 -->
-		INVENT_RECORD_ID as "inventRecordId",  <!-- 存货档案ID -->
-		PARENT_ID as "pId", <!-- 父节点编码 -->
-		TYPE as "type",  <!-- 类别 -->
-		LEAF as "leaf",  <!-- 是否有叶子节点 -->
-		SORT as "sort",  <!-- 排序字段 -->
-		ICON as "icon", <!-- 图片地址 -->
-		LV as "lv",
-		SPEC as "spec"
-		FROM
-		hpjx.t_HPSC006
-		WHERE
-		1=1
-		<isNotEmpty prepend=" AND " property="pEname">
-			PARENT_ID = #pEname#
+		<isNotEmpty prepend=" AND " property="filePath1">
+			FILE_PATH1 = #filePath1#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="projCode">
-			PROJ_CODE = #projCode#
+		<isNotEmpty prepend=" AND " property="inventRecordId">
+			INVENT_RECORD_ID = #inventRecordId#
 		</isNotEmpty>
-		ORDER BY CREATED_TIME DESC
-	</select>
+	</sql>
 
-	<select id="queryTreeNodeByParentPrtdCode" resultClass="java.util.HashMap">
+	<sql id="order">
+		<dynamic prepend="ORDER BY">
+			<isNotEmpty property="orderBy">
+				$orderBy$
+			</isNotEmpty>
+			<isEmpty property="orderBy">
+				ID asc
+			</isEmpty>
+		</dynamic>
+	</sql>
+
+	<select id="query" parameterClass="java.util.HashMap"
+			resultClass="com.baosight.hpjx.hp.sc.domain.HPSC006">
 		SELECT
-		ID	as "id",
-		COMPANY_CODE	as "companyCode",  <!-- 企业编码 预留 -->
-		DEPT_CODE	as "deptCode",  <!-- 部门编码 预留 -->
-		PROJ_CODE	as "projCode",  <!-- 项目编码 -->
-		PROJ_NAME	as "projName",  <!-- 项目名称 -->
-		PARENT_ID	as "parentId",  <!-- 父节点-部件编码 -->
-		PARENT_PRDT_NAME	as "parentPrdtName",  <!-- 父节点-部件名称 -->
-		TYPE	as "type",  <!-- 类别 -->
-		LEAF	as "leaf",  <!-- 是否有叶子节点 -->
-		SORT	as "sort",  <!-- 排序字段 -->
-		ICON	as "icon",  <!-- 图片地址 -->
-		PRDT_TYPE	as "prdtType",
-		PRDT_CODE	as "prdtCode",  <!-- 部件编码 -->
-		PRDT_NAME	as "prdtName",  <!-- 部件名称 -->
-		INVENT_RECORD_ID as "inventRecordId",  <!-- 存货档案ID -->
-		NUM	as "num",  <!-- 数量 -->
-		UNIT_WT	as "unitWt",  <!-- 单重 -->
-		TOTAL_WT	as "totalWt",  <!-- 总重 -->
-		FILE_PATH1	as "filePath1",  <!-- 文件地址1 -->
-		FILE_PATH2	as "filePath2",  <!-- 文件地址2 -->
-		FILE_PATH3	as "filePath3",  <!-- 文件地址3 -->
-		FILE_PATH4	as "filePath4",  <!-- 文件地址4 -->
-		FILE_PATH5	as "filePath5",  <!-- 文件地址5 -->
-		STATUS	as "status",  <!-- 状态   0-未提交，1-已提交 -->
-		DEL_STATUS	as "delStatus",  <!-- 状态   1未删除，0已删除 -->
-		CREATED_BY	as "createdBy",  <!-- 创建人 -->
-		CREATED_TIME	as "createdTime",  <!-- 创建时间 -->
-		UPDATED_BY	as "updatedBy",  <!-- 更新人 -->
-		UPDATED_TIME	as "updatedTime",  <!-- 更新时间 -->
-		REMARK	as "remark", <!-- 备注 -->
-		LV 	as "lv",
-		SPEC as "spec",
-		LENGTH as "length",  <!-- 长 -->
-		WIDTH as "width",  <!-- 宽 -->
-		THICK as "thick"  <!-- 厚 -->
-		FROM hpjx.t_HPSC006
-		WHERE 1 = 1
-		<isNotEmpty prepend=" AND " property="id">
-			PARENT_ID = #id#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="projCode">
-			PROJ_CODE = #projCode#
-		</isNotEmpty>
+		<include refid="column"/>
+		FROM ${hpjxSchema}.T_HPSC006 WHERE 1=1
+		<include refid="condition" />
+		<include refid="order" />
 	</select>
 
+	<select id="count" resultClass="int">
+		SELECT COUNT(*) FROM ${hpjxSchema}.T_HPSC006 WHERE 1=1
+		<include refid="condition" />
+	</select>
 
-	<select id="queryEntityByParentPrtdCode" parameterClass="java.util.HashMap"
+	<select id="queryDetail" parameterClass="java.util.HashMap"
 			resultClass="com.baosight.hpjx.hp.sc.domain.HPSC006">
 		SELECT
-		ID	as "id",
-		COMPANY_CODE	as "companyCode",  <!-- 企业编码 预留 -->
-		DEPT_CODE	as "deptCode",  <!-- 部门编码 预留 -->
-		PROJ_CODE	as "projCode",  <!-- 项目编码 -->
-		PROJ_NAME	as "projName",  <!-- 项目名称 -->
-		PARENT_ID	as "parentId",  <!-- 父节点-部件编码 -->
-		PARENT_PRDT_NAME	as "parentPrdtName",  <!-- 父节点-部件名称 -->
-		TYPE	as "type",  <!-- 类别 -->
-		LEAF	as "leaf",  <!-- 是否有叶子节点 -->
-		SORT	as "sort",  <!-- 排序字段 -->
-		ICON	as "icon",  <!-- 图片地址 -->
-		PRDT_TYPE	as "prdtType",
-		PRDT_CODE	as "prdtCode",  <!-- 部件编码 -->
-		PRDT_NAME	as "prdtName",  <!-- 部件名称 -->
-		INVENT_RECORD_ID as "inventRecordId",  <!-- 存货档案ID -->
-		NUM	as "num",  <!-- 数量 -->
-		UNIT_WT	as "unitWt",  <!-- 单重 -->
-		TOTAL_WT	as "totalWt",  <!-- 总重 -->
-		FILE_PATH1	as "filePath1",  <!-- 文件地址1 -->
-		FILE_PATH2	as "filePath2",  <!-- 文件地址2 -->
-		FILE_PATH3	as "filePath3",  <!-- 文件地址3 -->
-		FILE_PATH4	as "filePath4",  <!-- 文件地址4 -->
-		FILE_PATH5	as "filePath5",  <!-- 文件地址5 -->
-		STATUS	as "status",  <!-- 状态   0-未提交，1-已提交 -->
-		DEL_STATUS	as "delStatus",  <!-- 状态   1未删除，0已删除 -->
-		CREATED_BY	as "createdBy",  <!-- 创建人 -->
-		CREATED_TIME	as "createdTime",  <!-- 创建时间 -->
-		UPDATED_BY	as "updatedBy",  <!-- 更新人 -->
-		UPDATED_TIME	as "updatedTime",  <!-- 更新时间 -->
-		REMARK	as "remark", <!-- 备注 -->
-		LV 	as "lv",
-		SPEC as "spec",
-		LENGTH as "length",  <!-- 长 -->
-		WIDTH as "width",  <!-- 宽 -->
-		THICK as "thick"  <!-- 厚 -->
-		FROM hpjx.t_HPSC006  WHERE 1 = 1
-		<isNotEmpty prepend=" AND " property="id">
-			ID = #id#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="parentId">
-			PARENT_ID = #parentId#
-		</isNotEmpty>
+		<include refid="column"/>
+		FROM ${hpjxSchema}.T_HPSC006 WHERE 1=1
+		<include refid="condition" />
+		<include refid="order" />
 	</select>
 
-	<update id="updateTreeNodeLeaf">
-		UPDATE hpjx.t_HPSC006  SET  LEAF = #leaf# WHERE ID = #id#
-	</update>
+	<insert id="insert">
+		INSERT INTO ${hpjxSchema}.T_HPSC006 (
+		COMPANY_CODE,  <!-- 企业编码 预留 -->
+		PROJ_CODE,  <!-- 项目编码 -->
+		PROJ_NAME,  <!-- 项目名称 -->
+		PRODUCTION_ORDER_NO,  <!-- 生产订单号 -->
+		INVENT_TYPE,  <!-- 物料类型 -->
+		INVENT_CODE,  <!-- 物料编码 -->
+		INVENT_NAME,  <!-- 物料名称 -->
+		INVENT_LENGTH,  <!-- 物料-长 -->
+		INVENT_WIDTH,  <!-- 物料-宽 -->
+		INVENT_THICK,  <!-- 物料-厚 -->
+		INVENT_SPEC,  <!-- 物料规格 -->
+		PLAN_COMPLETION_DATE,  <!-- 计划完成日期 -->
+		NUM,  <!-- 计划数量 -->
+		UNIT_WT,  <!-- 计划单重 -->
+		TOTAL_WT,  <!-- 计划重量 -->
+		ACTUAL_COMPLETION_DATE,  <!-- 实际完工日期 -->
+		ACTUAL_COMPLETION_NUM,  <!-- 实际完工数量 -->
+		STATUS,  <!-- 状态   0-计划中，1-生产中，2-已完成 -->
+		ORG_NO,  <!-- 生产组编码 -->
+		ORG_NAME,  <!-- 生产组名称 -->
+		FACTORY_CODE,  <!-- 厂区编码 -->
+		FACTORY_NAME,  <!-- 厂区名称 -->
+		CREATED_BY,  <!-- 创建人 -->
+		CREATED_TIME,  <!-- 创建时间 -->
+		UPDATED_BY,  <!-- 更新人 -->
+		UPDATED_TIME,  <!-- 更新时间 -->
+		DEP_CODE,  <!-- 部门编码 -->
+		REMARK,  <!-- 备注 -->
+		FILE_PATH1,  <!-- 文件地址1 -->
+		INVENT_RECORD_ID  <!-- 存货档案ID -->
+		)
+		VALUES (#companyCode#, #projCode#, #projName#, #productionOrderNo#, #inventType#, #inventCode#, #inventName#, #inventLength#, #inventWidth#, #inventThick#, #inventSpec#, #planCompletionDate#, #num#, #unitWt#, #totalWt#, #actualCompletionDate#, #actualCompletionNum#, #status#, #orgNo#, #orgName#, #factoryCode#, #factoryName#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #depCode#, #remark#, #filePath1#, #inventRecordId#)
+	</insert>
 
-	<update id="check">
-		UPDATE hpjx.t_HPSC006  SET  status = #status# WHERE ID = #id#
-	</update>
+	<delete id="delete">
+		DELETE FROM ${hpjxSchema}.T_HPSC006 WHERE
+			ID = #id#
+	</delete>
 
-	<update id="bindDocIdById">
-		UPDATE hpjx.t_HPSC006  SET  FILE_PATH1 = #filePath1# WHERE ID = #id#
+	<update id="update">
+		UPDATE ${hpjxSchema}.T_HPSC006
+		SET
+		COMPANY_CODE	= #companyCode#,   <!-- 企业编码 预留 -->
+		PROJ_CODE	= #projCode#,   <!-- 项目编码 -->
+		PROJ_NAME	= #projName#,   <!-- 项目名称 -->
+		PRODUCTION_ORDER_NO	= #productionOrderNo#,   <!-- 生产订单号 -->
+		INVENT_TYPE	= #inventType#,   <!-- 物料类型 -->
+		INVENT_CODE	= #inventCode#,   <!-- 物料编码 -->
+		INVENT_NAME	= #inventName#,   <!-- 物料名称 -->
+		INVENT_LENGTH	= #inventLength#,   <!-- 物料-长 -->
+		INVENT_WIDTH	= #inventWidth#,   <!-- 物料-宽 -->
+		INVENT_THICK	= #inventThick#,   <!-- 物料-厚 -->
+		INVENT_SPEC	= #inventSpec#,   <!-- 物料规格 -->
+		PLAN_COMPLETION_DATE	= #planCompletionDate#,   <!-- 计划完成日期 -->
+		NUM	= #num#,   <!-- 计划数量 -->
+		UNIT_WT	= #unitWt#,   <!-- 计划单重 -->
+		TOTAL_WT	= #totalWt#,   <!-- 计划重量 -->
+		ACTUAL_COMPLETION_DATE	= #actualCompletionDate#,   <!-- 实际完工日期 -->
+		ACTUAL_COMPLETION_NUM	= #actualCompletionNum#,   <!-- 实际完工数量 -->
+		STATUS	= #status#,   <!-- 状态   0-计划中，1-生产中，2-已完成 -->
+		ORG_NO	= #orgNo#,   <!-- 生产组编码 -->
+		ORG_NAME	= #orgName#,   <!-- 生产组名称 -->
+		FACTORY_CODE	= #factoryCode#,   <!-- 厂区编码 -->
+		FACTORY_NAME	= #factoryName#,   <!-- 厂区名称 -->
+		CREATED_BY	= #createdBy#,   <!-- 创建人 -->
+		CREATED_TIME	= #createdTime#,   <!-- 创建时间 -->
+		UPDATED_BY	= #updatedBy#,   <!-- 更新人 -->
+		UPDATED_TIME	= #updatedTime#,   <!-- 更新时间 -->
+		DEP_CODE	= #depCode#,   <!-- 部门编码 -->
+		REMARK	= #remark#,   <!-- 备注 -->
+		FILE_PATH1	= #filePath1#,   <!-- 文件地址1 -->
+		INVENT_RECORD_ID	= #inventRecordId#  <!-- 存货档案ID -->
+		WHERE
+		ID = #id#
 	</update>
 
-
-	<select id="checkExamineNum1" resultClass="int">
-		SELECT COUNT(1) from hpjx.t_HPSC006
-		WHERE 1 = 1
-		AND PARENT_ID != 'root'
-		AND `STATUS` = 0
-		<isNotEmpty prepend=" AND " property="projCode">
-			PROJ_CODE = #projCode#
-		</isNotEmpty>
-	</select>
-
-	<select id="queryLv" resultClass="int">
-		SELECT LV from hpjx.t_HPSC006
-		WHERE ID = #id#
-	</select>
-
-	<select id="checkExamineNum1Count" resultClass="int">
-		SELECT COUNT(1) from hpjx.t_HPSC006
-		WHERE 1 = 1
-		AND PARENT_ID != 'root'
-		<isNotEmpty prepend=" AND " property="projCode">
-			PROJ_CODE = #projCode#
-		</isNotEmpty>
-	</select>
-
-	<select id="checkExamineNum" resultClass="int">
-		SELECT COUNT(1) FROM hpjx.t_HPSC006
-		WHERE LEAF = '1'
-		AND STATUS = 0 AND DEL_STATUS = 0
-		<isNotEmpty prepend=" AND " property="parentId">
-			PARENT_ID = #parentId#
-		</isNotEmpty>
-	</select>
-</sqlMap>
+</sqlMap>
\ No newline at end of file

src/main/java/com/baosight/hpjx/util/CommonMethod.java

@@ -32,7 +32,7 @@ public class CommonMethod {
      * 公用下拉方法
      */
     public static void initBlock(EiInfo inInfo, List<DdynamicEnum> tableParams, Map<String, Object> selectParams){
-        initBlock(inInfo, tableParams, selectParams,true);
+        initBlock(inInfo, tableParams, selectParams,false);
     }
 
     /**

src/main/webapp/HP/BI/HPBI001.js

 $(function () {
-
+    $(document).ready(function() {
+        $("#inqu_status-0-date").data("kendoDatePicker").value(new Date());
+    });
+    //$("#inqu_status-date").data("kendoDatePicker").value(new Date());
+    //$(element) .data("kendoDatePicker").value(Date)
+    $("#QUERY").click();
 /*    $("#QUERY").on("click", function () {
         resultGrid.dataSource.page(1);
         buildOption("scrb");
@@ -21,6 +26,7 @@ $(function () {
                     $('#mrsj').append(str);
                 })
                 buildOption("scrb");
+                resultGrid.dataSource.page(1);
             },
             // 服务调用失败后的回调函数 onFail
             onFail: function(errorMsg, status, e) {
@@ -28,8 +34,8 @@ $(function () {
                 console.log(errorMsg)
             }
         }, {async: true});
-        resultGrid.dataSource.page(1);
-        buildOption("scrb");
+        //resultGrid.dataSource.page(1);
+        //buildOption("scrb");
     });
     // 导出
     $("#EXPORT").on("click", function () {
@@ -39,30 +45,7 @@ $(function () {
         $(".k-menu-link").click();
     });
 
-    IPLATUI.EFGrid.result = {
-        pageable: {
-            pageSize: 20,
-            pageSizes: [10, 20, 50, 70, 100],
-        },
-        columns: [
-            {
-                field: "operator",
-                template: function (item) {
-                    let auditStatus = item.status;
-                    let template = '';
-                    if (auditStatus == 0) {
-                        template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;" ' +
-                            'onclick="check(' + item.id + ',1)" >提交</a>';
-                    }
-                    // else if (auditStatus == 1) {
-                    //     template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;" ' +
-                    //         'onclick="check(' + item.id + ',0)" >撤回</a>';
-                    // }
-                    return template;
-                }
-            }
-        ],
-    }
+
 });
 
 function check(id, auditStatus) {
@@ -89,7 +72,8 @@ function buildOption(vid){
     var colors = ['#5470C6', '#91CC75', '#EE6666'];
     var option = {
         title: {
-            text: '柱状图与折线图'
+            text: '生产月报',
+            left: 'center'
         },
         tooltip: {
             trigger: 'axis',
@@ -106,7 +90,7 @@ function buildOption(vid){
         xAxis: {
             type: 'category',
             //boundaryGap: false,
-            data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+            data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月']
         },
         yAxis: [
             {
@@ -127,7 +111,7 @@ function buildOption(vid){
                 color: '#4874CB',
                 yAxisIndex: 0,
                 barWidth: 15,
-                data: [120, 200, 150, 80, 70, 110, 130]
+                data: [120, 200, 150, 80, 70, 110, 130,120, 200, 150, 80, 70]
             },
             {
                 name: '生产人数（吨）',
@@ -135,14 +119,14 @@ function buildOption(vid){
                 color: '#EE822F',
                 yAxisIndex: 0,
                 barWidth: 15,
-                data: [130, 120, 200, 160, 80, 70, 140]
+                data: [130, 120, 200, 160, 80, 70, 140,130, 120, 200, 160, 80]
             },
             {
                 name: '人均产量（kg）',
                 type: 'line',
                 color:'#F2BA03',
                 yAxisIndex: 1, // 指定该系列在y轴上的位置，默认是0，可选为：0 | 1 | 2 | ... | n (正整数)
-                data: [130, 120, 200, 160, 80, 70, 140]
+                data: [130, 120, 200, 160, 80, 70, 140,130, 120, 200, 160, 80]
             }
         ]
     };

src/main/webapp/HP/BI/HPBI001.jsp

@@ -13,11 +13,20 @@
     <EF:EFRegion id="inqu" title="查询条件">
 
         <div class="row">
-            <EF:EFSelect cname="工厂" defaultValue="0" ename="inqu_status-0-factory" colWidth="3">
+<%--            <EF:EFSelect cname="工厂" defaultValue="0" ename="inqu_status-0-factory" colWidth="3">
                 <EF:EFOption label="黄陂" value="黄陂"/>
                 <EF:EFOption label="红安" value="红安"/>
+            </EF:EFSelect>--%>
+
+            <EF:EFSelect cname="工厂" ename="inqu_status-0-factory" colWidth="3" filter="contains">
+               <%--<EF:EFOption label="全部" value=""/>--%>
+                <EF:EFOptions blockId="factory_record_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
-            <EF:EFDatePicker ename="inqu_status-date" colWidth="3" cname="日期:"
+<%--            <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"/>
+            </EF:EFSelect>--%>
+            <EF:EFDatePicker ename="inqu_status-0-date" colWidth="3" cname="日期:"
                              format="yyyy-MM-dd"/>
         </div>
 <%--        <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>--%>
@@ -32,7 +41,7 @@
 
     <EF:EFRegion id="result" title="汇总数据">
         <EF:EFGrid blockId="result" autoDraw="no">
-            <EF:EFColumn ename="id" cname="主键" hidden="true"/>
+           <%-- <EF:EFColumn ename="id" cname="主键" hidden="true"/>--%>
             <EF:EFColumn ename="indNmae"  cname="指标名称" readonly="true"/>
             <EF:EFColumn ename="dayValue" cname="日" readonly="true"/>
             <EF:EFColumn   ename="monValue" cname="月" readonly="true"/>

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

@@ -70,6 +70,16 @@ $(function() {
                     refreshSelect(container, inInfo);
                 }
             }, {
+                field: "material",
+                template: function (dataItem) {
+                    for (let i = 0; i < inventAllGlobalData.length; i++) {
+                        if (inventAllGlobalData[i]['valueField'] === dataItem['inventRecordId']) {
+                            return inventAllGlobalData[i]['param1Field'];
+                        }
+                    }
+                    return "";
+                }
+            }, {
                 field: "unit",
                 template: function (dataItem) {
                     for (let i = 0; i < inventAllGlobalData.length; i++) {

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

@@ -48,8 +48,8 @@
             <EF:EFColumn ename="id" cname="内码" hidden="true"/>
             <EF:EFColumn ename="purchaseNo" cname="采购单号" enable="false" width="140" align="center"/>
             <EF:EFColumn ename="receiptDate" cname="单据日期" width="90" align="center" editType="date"
-                         dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
-            <EF:EFComboColumn ename="inventType" cname="存货类型" width="100" align="center" required="true">
+                         dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true" readonly="true"/>
+            <EF:EFComboColumn ename="inventType" cname="存货类型" width="100" align="center" required="true" readonly="true">
                 <EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="whCode" cname="仓库名称" width="120" align="center" required="true" readonly="true"/>
@@ -57,8 +57,8 @@
             <EF:EFColumn ename="inventRecordId" cname="规格" width="120" align="center"/>
             <EF:EFColumn ename="material" cname="材质" width="120" align="center" enable="false"/>
             <EF:EFColumn ename="unit" cname="单位" width="120" align="center" enable="false"/>
-            <EF:EFColumn ename="amount" cname="数量" format="{0:N3}" maxLength="20" width="90" align="right"/>
-            <EF:EFColumn ename="weight" cname="重量" format="{0:N3}" maxLength="20" width="90" align="right"/>
+            <EF:EFColumn ename="amount" cname="数量" format="{0:N3}" maxLength="20" width="90" align="right" readonly="true"/>
+            <EF:EFColumn ename="weight" cname="重量" format="{0:N3}" maxLength="20" width="90" align="right" readonly="true"/>
             <EF:EFColumn ename="remark" cname="备注" width="150" readonly="true"/>
 	        <EF:EFColumn ename="oldPurchaseNo" cname="原采购单号" enable="false" width="140" align="center"/>
             <EF:EFColumn ename="createdName" cname="创建人" enable="false" width="100" align="center"/>

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

 let whNameGlobalData = [];
 let inventNameGlobalData = [];
 let specGlobalData = [];
+let firstLoad = 0;
 $(function() {
 
 	IPLATUI.EFGrid = {
@@ -30,16 +31,56 @@ $(function() {
 					refreshSelect(container, inInfo);
 				}
 			}, {
-				field: "inventCode",
+				field: "inventName",
 				template: function (dataItem) {
+					//let flag = false;
 					for (let i = 0; i < inventNameGlobalData.length; i++) {
-						if (inventNameGlobalData[i]['valueField'] === dataItem['inventCode']) {
+						if (inventNameGlobalData[i]['textField'] === dataItem['inventName']) {
+							dataItem.inventCode = inventNameGlobalData[i]['valueField']
+							//flag= true;
 							return inventNameGlobalData[i]['textField'];
 						}
 					}
-					return "";
+					return dataItem.inventName;
 				},
 				editor: function (container, options) {
+					var grid = container.closest(".k-grid").data("kendoGrid");
+					var input = $('<input />');
+					var dataSource;
+
+					input.attr("name", options.field);
+					input.attr("id", options.field);
+					input.appendTo(container);
+
+					var eiInfo = new EiInfo();
+					eiInfo.set("inqu_status-0-inventTypes", [1, 2, 5]);
+					eiInfo.set("inqu_status-0-inventType", options.model["inventType"]);
+					eiInfo.set("isSplicingSymbol",false);
+					//eiInfo.set("inqu_status-0-inventTypes", [1, 2, 5]);
+					//eiInfo.set("inqu_status-0-inventCode", options.model["inventCode"]);
+					//eiInfo.set("inqu_status-0-company_name", options.model["company_name"]);
+
+					EiCommunicator.send("HPPZ004", "queryComboBox", eiInfo, {
+						onSuccess: function (ei) {
+							dataSource = ei.getBlock("invent_name_block_id").getMappedRows();
+							inventNameGlobalData = dataSource;
+						}, onFail: function (ei) {
+						}
+					}, {async: false});
+
+					input.kendoAutoComplete({
+						valuePrimitive: true,
+						dataSource: dataSource,
+						dataTextField: "textField",
+						dataValueField: "valueField",
+						required: "true",
+						optionLabelTemplate: "#:textField#",
+						valueTemplate: "#:valueField#",
+						template: "#:textField#",
+						filter: "contains"
+					});
+				}
+				/*editor: function (container, options) {
 					let inInfo = new EiInfo();
 					inInfo.set("inqu_status-0-inventTypes", [1, 2, 5]);
 					inInfo.set("inqu_status-0-inventType", options.model["inventType"]);
@@ -48,13 +89,35 @@ $(function() {
 					inInfo.set("blockId", "material_record_block_id");
 					inInfo.set("field", options.field);
 					refreshSelect(container, inInfo);
-				}
+				}*/
 			}, {
 				field: "inventRecordId",
 				template: function (dataItem) {
 					for (let i = 0; i < specGlobalData.length; i++) {
 						if (specGlobalData[i]['valueField'] === dataItem['inventRecordId']) {
-							return specGlobalData[i]['textField'];
+							let inventRecordId = specGlobalData[i]['textField'];
+							/*if (firstLoad === 1){
+								let inInfo = new EiInfo();
+								inInfo.set("inqu_status-0-id", dataItem['inventRecordId']);
+								EiCommunicator.send("HPPZ006", "query", inInfo, {
+									onSuccess: function (ei) {
+										let data = ei.blocks.result.rows;
+										var id = "#datacell__5";
+										$(id).text(e.model.inventCode)
+										dataItem["length"] = data[0][8]
+										dataItem["width"] = data[0][9]
+										dataItem["thick"] = data[0][10]
+										dataItem["material"] = data[0][11]
+										dataItem["coefficient"] = data[0][12]
+										dataItem["unit"] = data[0][13]
+										firstLoad = 0;
+									},
+									onFail: function (ei) {
+									}
+								}, {async: false});
+								//queryHPPZ006(inInfo,dataItem)
+							}*/
+							return inventRecordId;
 						}
 					}
 					return "";
@@ -71,6 +134,49 @@ $(function() {
 				}
 			}],
 			loadComplete: function (grid) {
+			},
+			//beforeAdd:function(){firstLoad = 1},
+			onSave:function () {
+				//firstLoad = 1;
+			},
+			afterEdit: function (e) {
+				if (e.field === "inventRecordId") {
+					let inInfo = new EiInfo();
+					inInfo.set("inqu_status-0-id", e.model.inventRecordId);
+					EiCommunicator.send("HPPZ006", "query", inInfo, {
+						onSuccess: function (ei) {
+							let data = ei.blocks.result.rows;
+							//var id = "#datacell__5";
+							//$(id).text(e.model.inventCode)
+							resultGrid.setCellValue(e.model,"length",data[0][8])
+							resultGrid.setCellValue(e.model,"width",data[0][9])
+							resultGrid.setCellValue(e.model,"thick",data[0][10])
+							resultGrid.setCellValue(e.model,"material",data[0][11])
+							resultGrid.setCellValue(e.model,"coefficient",data[0][12])
+							resultGrid.setCellValue(e.model,"unit",data[0][13])
+
+							//dataItem["length"] = data[0][8]
+							//dataItem["width"] = data[0][9]
+							//dataItem["thick"] = data[0][10]
+							//dataItem["material"] = data[0][11]
+							//dataItem["coefficient"] = data[0][12]
+							//dataItem["unit"] = data[0][13]
+							firstLoad = 0;
+						},
+						onFail: function (ei) {
+						}
+					}, {async: false});
+					//firstLoad = 1;
+					/*var id = "#datacell_"+e.row+"_5";
+					$(id).text(e.model.inventCode)
+					resultGrid.setCellValue({
+						list:7,
+						field:"inventRecordId",
+						cellValue:e.model.inventCode
+					})
+					console.log(e.model.inventCode);*/
+					//e.preventDefault(); // 不关闭单元格
+				}
 			}
 		}
 	}
@@ -89,6 +195,7 @@ $(window).load(function () {
 	// 仓库名称
 	let inInfo = new EiInfo();
 	inInfo.set("inqu_status-0-inventTypes", [1, 2, 5]);
+	inInfo.set("isSplicingSymbol", false);
 	EiCommunicator.send("HPPZ007", "queryComboBox", inInfo, {
 		onSuccess: function (ei) {
 			whNameGlobalData = ei.getBlock("wh_record_block_id").getMappedRows();
@@ -121,6 +228,7 @@ $(window).load(function () {
  */
 let query = function () {
 	resultGrid.dataSource.page(1); // 点击查询按钮，从第1页开始查询
+	firstLoad = 0;
 }
 
 /**
@@ -139,3 +247,22 @@ let save = function () {
 	});
 }
 
+
+let queryHPPZ006 =function (inInfo,row) {
+	// 仓库名称
+	EiCommunicator.send("HPPZ006", "query", inInfo, {
+		onSuccess: function (ei) {
+			let data = ei.blocks.result.rows;
+			row.length = data[0][8]
+			row.width = data[0][9]
+			row.thick = data[0][10]
+			row.material = data[0][11]
+			row.coefficient = data[0][12]
+			row.unit = data[0][13]
+			firstLoad = 0;
+		},
+		onFail: function (ei) {
+		}
+	}, {async: false});
+}
+

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

@@ -48,17 +48,23 @@
 			<EF:EFColumn ename="otherEnterNo" cname="入库单号" enable="false" width="130" 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="inventType" cname="存货类型" width="100" align="center" required="true"
-			                  readonly="true">
+			<EF:EFComboColumn ename="inventType" cname="存货类型" width="100" align="center" required="true" readonly="true">
 				<EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('1', '2', '5')"/>
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="whCode" cname="仓库名称" width="120" align="center" required="true" readonly="true"/>
-			<EF:EFColumn ename="inventCode" cname="存货名称" width="120" align="center" required="true" readonly="true"/>
-			<EF:EFColumn ename="inventRecordId" cname="规格" width="120" align="center" required="true" readonly="true"/>
+			<EF:EFColumn ename="inventCode" cname="存货名称" width="120" align="center" required="true" readonly="true" hidden ="true"/>
+			<EF:EFColumn ename="inventName" cname="存货名称" width="120" align="center" required="true" readonly="true"/>
+			<EF:EFColumn ename="inventRecordId" cname="规格" width="120" align="center" required="false" readonly="true"/>
 			<EF:EFColumn ename="amount" cname="数量" format="{0:N3}" maxLength="20" width="100" align="right"
 			             sumType="all" required="true" readonly="true"/>
 			<EF:EFColumn ename="weight" cname="重量" format="{0:N3}" maxLength="20" width="100" align="right"
 			             sumType="all" required="true" readonly="true"/>
+			<EF:EFColumn ename="length" cname="长" width="120" align="center" format="{0:N3}" required="false" readonly="true"/>
+			<EF:EFColumn ename="width" cname="宽" width="120" align="center" format="{0:N3}" required="false" readonly="true"/>
+			<EF:EFColumn ename="thick" cname="厚" width="120" align="center" format="{0:N3}" required="false" readonly="true"/>
+			<EF:EFColumn ename="material" cname="材质" width="120" align="center"  required="false" readonly="true"/>
+			<EF:EFColumn ename="coefficient" cname="系数" width="120" align="center" format="{0:N3}" required="false" readonly="true"/>
+			<EF:EFColumn ename="unit" cname="单位" width="120" align="center" required="false" readonly="true"/>
 			<EF:EFColumn ename="remark" cname="备注" width="150" maxLength="255" readonly="true"/>
 			<EF:EFColumn ename="createdName" cname="创建人" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="createdTime" cname="创建日期" enable="false" width="140" align="center"

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

@@ -31,20 +31,20 @@
 	    <EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
 		    <EF:EFColumn ename="id" cname="内码" hidden="true"/>
 			<EF:EFColumn ename="inventRecordId" cname="存货档案ID" hidden="true"/>
-			<EF:EFComboColumn ename="whCode" cname="仓库编码" width="120" columnTemplate="#=textField#"
-		                      itemTemplate="#=textField#" blockName="wh_record_block_id"
-		                      textField="textField" valueField="valueField"
-		                      align="center" filter="contains">
-		    </EF:EFComboColumn>
-			<EF:EFComboColumn ename="inventType" cname="存货类型" width="100" align="center" required="true">
+			<EF:EFComboColumn ename="inventType" cname="存货类型" width="100" align="center" required="true" enable="false">
 				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
 			</EF:EFComboColumn>
-			<EF:EFColumn ename="inventCode" cname="存货名称" width="120" align="center" required="true"/>
-			<EF:EFColumn ename="spec" cname="规格" width="120" align="center"/>
-			<EF:EFColumn ename="material" cname="材质" width="120" align="center"/>
-			<EF:EFColumn ename="unit" cname="单位" width="120" align="center"/>
-		    <EF:EFColumn ename="amount" cname="数量" format="{0:N3}" maxLength="20" width="90" align="right"/>
-		    <EF:EFColumn ename="weight" cname="重量" format="{0:N3}" maxLength="20" width="90" align="right"/>
+			<EF:EFComboColumn ename="whCode" cname="仓库名称" width="120" columnTemplate="#=textField#"
+			itemTemplate="#=textField#" blockName="wh_record_block_id"
+			textField="textField" valueField="valueField"
+			align="center" filter="contains" enable="false">
+			</EF:EFComboColumn>
+			<EF:EFColumn ename="inventCode" cname="存货名称" width="120" align="center" required="true" enable="false"/>
+			<EF:EFColumn ename="spec" cname="规格" width="120" align="center" enable="false"/>
+			<EF:EFColumn ename="material" cname="材质" width="120" align="center" enable="false"/>
+			<EF:EFColumn ename="unit" cname="单位" width="120" align="center" enable="false"/>
+		    <EF:EFColumn ename="amount" cname="数量" format="{0:N3}" maxLength="20" width="90" align="right" enable="false"/>
+		    <EF:EFColumn ename="weight" cname="重量" format="{0:N3}" maxLength="20" width="90" align="right" enable="false"/>
 		    <EF:EFColumn ename="createdBy" cname="创建人" enable="false" width="100" align="center"/>
 		    <EF:EFColumn ename="createdTime" cname="创建时刻" enable="false" width="140" align="center"
 		                 editType="datetime" parseFormats="['yyyyMMddHHmmss']"/>

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

@@ -31,23 +31,23 @@
     <EF:EFRegion id="result" title="明细信息">
 	    <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"/>
+			<EF:EFColumn ename="prodNo" cname="生产单号" width="120" align="center" required="true" enable="false"/>
 			<EF:EFComboColumn ename="whCode" cname="仓库编码" width="120" columnTemplate="#=textField#"
 		                      itemTemplate="#=textField#" blockName="wh_record_block_id"
 		                      textField="textField" valueField="valueField"
-		                      align="center" filter="contains" required="true">
+		                      align="center" filter="contains" required="true" enable="false">
 		    </EF:EFComboColumn>
-			<EF:EFColumn ename="projCode" cname="项目编号" width="120" align="center" required="true"/>
-			<EF:EFColumn ename="projName" cname="项目名称" width="120" align="center" required="true"/>
-			<EF:EFColumn ename="inventCode" cname="部件名称" width="120" align="center" required="true"/>
-			<EF:EFColumn ename="subInventCode" cname="零部件名称" width="120" align="center" required="true"/>
-			<EF:EFColumn ename="length" cname="长" format="{0:N3}" maxLength="20" width="90" align="right"/>
-			<EF:EFColumn ename="width" cname="宽" format="{0:N3}" maxLength="20" width="90" align="right"/>
-			<EF:EFColumn ename="thich" cname="厚" format="{0:N3}" maxLength="20" width="90" align="right"/>
-		    <EF:EFColumn ename="amount" cname="数量" format="{0:N3}" maxLength="20" width="90" align="right" required="true"/>
-			<EF:EFColumn ename="unitWeight" cname="单重" format="{0:N3}" maxLength="20" width="90" align="right"/>
-			<EF:EFColumn ename="weight" cname="重量" format="{0:N3}" maxLength="20" width="90" align="right"/>
-			<EF:EFColumn ename="remark" cname="备注" width="120" align="center"/>
+			<EF:EFColumn ename="projCode" cname="项目编号" width="120" align="center" required="true" enable="false"/>
+			<EF:EFColumn ename="projName" cname="项目名称" width="120" align="center" required="true" enable="false"/>
+			<EF:EFColumn ename="inventCode" cname="部件名称" width="120" align="center" required="true" enable="false"/>
+			<EF:EFColumn ename="subInventCode" cname="零部件名称" width="120" align="center" required="true" enable="false"/>
+			<EF:EFColumn ename="length" cname="长" format="{0:N3}" maxLength="20" width="90" align="right" enable="false"/>
+			<EF:EFColumn ename="width" cname="宽" format="{0:N3}" maxLength="20" width="90" align="right" enable="false"/>
+			<EF:EFColumn ename="thich" cname="厚" format="{0:N3}" maxLength="20" width="90" align="right" enable="false"/>
+		    <EF:EFColumn ename="amount" cname="数量" format="{0:N3}" maxLength="20" width="90" align="right" required="true" enable="false"/>
+			<EF:EFColumn ename="unitWeight" cname="单重" format="{0:N3}" maxLength="20" width="90" align="right" enable="false"/>
+			<EF:EFColumn ename="weight" cname="重量" format="{0:N3}" maxLength="20" width="90" align="right" enable="false"/>
+			<EF:EFColumn ename="remark" cname="备注" width="120" align="center" enable="false"/>
 			<EF:EFColumn ename="createdBy" cname="创建人" enable="false" width="100" align="center"/>
 		    <EF:EFColumn ename="createdTime" cname="创建时刻" enable="false" width="140" align="center"
 		                 editType="datetime" parseFormats="['yyyyMMddHHmmss']"/>

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

@@ -10,7 +10,7 @@
 		<div class="row">
 			<EF:EFSelect ename="inqu_status-0-custType" cname="供应商类型" colWidth="3">
 				<EF:EFOption label="全部" value=""/>
-				<EF:EFOptions blockId="company_type_block_id" textField="textField" valueField="valueField"/>
+				<EF:EFCodeOption codeName="hpjx.hppz.companyType"/>
 			</EF:EFSelect>
 			<EF:EFInput ename="inqu_status-0-custName" cname="供应商名称" colWidth="3" readonly="false"/>
 			<EF:EFSelect ename="inqu_status-0-status" cname="状态" colWidth="3">
@@ -24,12 +24,10 @@
 		<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
 			<EF:EFColumn ename="id" cname="内码" hidden="true"/>
 			<EF:EFColumn ename="custCode" cname="供应商编码" enable="false" width="100" align="center"/>
-			<EF:EFColumn ename="custName" cname="供应商名称" width="100" required="true"/>
-			<EF:EFComboColumn ename="custType" cname="供应商类型" width="100" align="center"
-			                  blockName="company_type_block_id" textField="textField" valueField="valueField"
-			                  columnTemplate="#=textField#" itemTemplate="#=textField#"
-			                  optionLabel=" " required="true">
+			<EF:EFComboColumn ename="custType" cname="供应商类型" width="100" align="center" required="true">
+				<EF:EFCodeOption codeName="hpjx.hppz.companyType"/>
 			</EF:EFComboColumn>
+			<EF:EFColumn ename="custName" cname="供应商名称" width="100" required="true"/>
 			<EF:EFColumn ename="address" cname="地址" width="120" required="true"/>
 			<EF:EFComboColumn ename="status" cname="状态" align="center" width="100" required="true">
 				<EF:EFCodeOption codeName="hpjx.hpjx.status"/>

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

@@ -8,10 +8,9 @@
 
 	<EF:EFRegion id="inqu" title="查询条件">
 		<div class="row">
-			<EF:EFInput cname="客户名称" ename="custName" blockId="inqu_status" row="0" colWidth="3"/>
-			<EF:EFSelect ename="inqu_status-0-custType" cname="客户类型" colWidth="3">
+			<EF:EFSelect ename="custType" blockId="inqu_status" cname="客户类型" row="0" colWidth="3">
 				<EF:EFOption label="全部" value=""/>
-				<EF:EFOptions blockId="company_type_block_id" textField="textField" valueField="valueField"/>
+				<EF:EFCodeOption codeName="hpjx.hppz.companyType"/>
 			</EF:EFSelect>
 			<EF:EFSelect ename="inqu_status-0-status" cname="状态" colWidth="3">
 				<EF:EFOption label="全部" value=""/>
@@ -24,9 +23,8 @@
 		<EF:EFGrid blockId="result" autoDraw="override" checkMode="row">
 			<EF:EFColumn ename="id" cname="主键" hidden="true"/>
 			<EF:EFColumn ename="custCode" cname="客户编码" enable="false" width="100" align="center"/>
-			<EF:EFComboColumn ename="custType" cname="客户类型" width="100" align="center"
-			                  blockName="company_type_block_id" textField="textField" valueField="valueField"
-			                  required="true">
+			<EF:EFComboColumn ename="custType" cname="客户类型" width="100" align="center" required="true">
+				<EF:EFCodeOption codeName="hpjx.hppz.companyType"/>
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="custName" cname="客户名称" width="120" align="center" required="true"/>
 			<EF:EFColumn ename="address" cname="地址" width="150" align="center" required="true"/>

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

@@ -17,12 +17,12 @@ $(function() {
 		}, {
 			field: "width",
 			template: function (options) {
-				return options.length == 0 ? "-" : options.length;
+				return options.width == 0 ? "-" : options.width;
 			}
 		}, {
 			field: "thick",
 			template: function (options) {
-				return options.length == 0 ? "-" : options.length;
+				return options.thick == 0 ? "-" : options.thick;
 			}
 		}, {
 			field: "createdName",

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

@@ -30,12 +30,12 @@
 				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="inventCode" cname="存货名称" width="120" align="center" requird="true"/>
-			<EF:EFColumn ename="spec" cname="规格" width="120" align="center" maxLength="50"/>
+			<EF:EFColumn ename="spec" cname="规格" width="120" align="center" maxLength="50"  enable="false"/>
 			<EF:EFColumn ename="length" cname="长" width="100" align="right" format="{0:N2}" maxLength="10"/>
 			<EF:EFColumn ename="width" cname="宽" width="100" align="right" format="{0:N2}" maxLength="10"/>
 			<EF:EFColumn ename="thick" cname="厚" width="100" align="right" format="{0:N2}" maxLength="10"/>
 			<EF:EFColumn ename="material" cname="材质" width="100" align="center" required="true"/>
-			<EF:EFColumn ename="coefficient" cname="系数" width="100" align="right" format="{0:N2}" maxLength="10"/>
+			<EF:EFColumn ename="coefficient" cname="系数" width="100" align="right" format="{0:N2}" maxLength="10" defaultValue="1"/>
 			<EF:EFColumn ename="unit" cname="单位" width="100" align="center" required="true"/>
 			<EF:EFComboColumn ename="status" cname="状态" align="center" width="100" required="true">
 				<EF:EFCodeOption codeName="hpjx.hpjx.status"/>

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

@@ -12,13 +12,13 @@
     <EF:EFRegion id="inqu" title="查询条件">
 
         <div class="row">
+            <EF:EFInput ename="inqu_status-0-projCode" cname="项目编码" colWidth="3"/>
+            <EF:EFInput ename="inqu_status-0-projName" cname="项目名称" colWidth="3"/>
             <EF:EFSelect ename="inqu_status-0-projType" cname="项目类型" colWidth="3" filter="contains"
                          template="#=textField#" valueTemplate="#=textField#">
                 <EF:EFOption label="全部" value=""/>
                 <EF:EFCodeOption codeName="hpjx.hpsc.projType"/>
             </EF:EFSelect>
-            <EF:EFInput ename="inqu_status-0-projCode" cname="项目编码" colWidth="3"/>
-            <EF:EFInput ename="inqu_status-0-projName" cname="项目名称" colWidth="3"/>
             <EF:EFSelect cname="单据状态" optionLabel="全部" ename="inqu_status-0-status" colWidth="3">
                 <EF:EFOption label="未提交" value="0"/>
                 <EF:EFOption label="已提交" value="1"/>
@@ -38,27 +38,27 @@
     <EF:EFRegion id="result" title="记录集">
         <EF:EFGrid blockId="result" autoDraw="no">
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
+            <EF:EFColumn ename="projCode" enable="false" cname="项目编码" readonly="true"/>
             <EF:EFComboColumn ename="projType" cname="项目类型" width="100" align="center" required="true"
                               columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="true">
                 <EF:EFCodeOption codeName="hpjx.hpsc.projType"/>
             </EF:EFComboColumn>
-            <EF:EFColumn ename="projCode" enable="false" cname="项目编码" readonly="true"/>
             <EF:EFColumn required="true"  ename="projName" cname="项目名称" readonly="true"/>
-            <EF:EFComboColumn ename="princ1" cname="本公司项目负责人" width="120" align="center" required="true"
+            <EF:EFComboColumn ename="princ1" cname="项目负责人" width="120" align="center" required="true"
                               blockName="user_block_id" textField="textField" valueField="valueField"
                               columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="true"
                               filter="contains">
             </EF:EFComboColumn>
-            <EF:EFComboColumn ename="princ2" cname="客户项目负责人" width="120" align="center" required="true"
+            <EF:EFComboColumn ename="princ2" cname="客户负责人" width="120" align="center" required="true"
                               blockName="customer_record_block_id" textField="textField" valueField="valueField"
                               columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="true"
                               filter="contains">
             </EF:EFComboColumn>
+            <EF:EFColumn ename="remark" cname="备注" />
             <EF:EFComboColumn enable="false" align="center" ename="status" cname="状态" readonly="true">
                 <EF:EFOption label="未提交" value="0"/>
                 <EF:EFOption label="已提交" value="1"/>
             </EF:EFComboColumn>
-            <EF:EFColumn   ename="remark" cname="备注" readonly="true"/>
             <EF:EFColumn ename="operator" cname="操作" width="100"  enable="false" readonly="false"/>
         </EF:EFGrid>
     </EF:EFRegion>

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

@@ -377,7 +377,7 @@ function openUploadFile(id) {
  */
 function showUploadFile(id) {
 	JSColorbox.open({
-		href: "HPSC002A?methodName=initLoad&inqu_status-0-id=" + id,
+		href: "HPSC002A?methodName=initLoad&inqu_status-0-bizType='WL'?inqu_status-0-id=" + id,
 		title: "<div style='text-align: center;'>附件清单</div>",
 		width: "80%",
 		height: "80%",

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

@@ -79,6 +79,21 @@ $(function () {
                     NotificationUtil({
                         msg: '请选择一条或多条数据'
                     }, "warning");
+
+                }
+                let flag = false;
+                for (let i = 0; i <rowCount.length; i++) {
+                    let startT = new Date(rowCount[i].planCommentDate).getTime();
+                    let endT = new Date(rowCount[i].planCompletionDate).getTime();
+                    if (startT > endT) {
+                        flag = true;
+                        break
+                    }
+                }
+                if (flag){
+                    NotificationUtil({
+                        msg: '计划结束时间不能小于计划开始时间'
+                    }, "warning");
                     return false;
                 }
                 var btnNode = $(this);
@@ -108,6 +123,19 @@ $(function () {
                 });
 
             },
+            afterEdit: function (e) {
+                if (e.field === "planCompletionDate") {
+                    let startT = new Date(e.model.planCommentDate).getTime();
+                    let endT = new Date(e.model.planCompletionDate).getTime();
+                    if (startT > endT) {
+                        e.preventDefault();
+                        NotificationUtil({
+                            msg: '计划结束时间不能小于计划开始时间'
+                        }, "warning");
+
+                    }
+                }
+            },
             columns: [
                 {
                     field: "operator",
@@ -152,7 +180,7 @@ $(function () {
 
 function showUploadFile(id) {
     JSColorbox.open({
-        href: "HPSC002B?methodName=initLoad&inqu_status-0-id=" + id,
+        href: "HPSC002B?methodName=initLoad&inqu_status-0-bizType='WL'?inqu_status-0-id=" + id,
         title: "<div style='text-align: center;'>附件清单</div>",
         width: "80%",
         height: "80%",

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

@@ -14,11 +14,11 @@
         <div class="row" > <%--    blockId="inqu_status"    --%>
             <EF:EFInput blockId="inqu_status" ename="projCode" colWidth="3" cname="项目编号:" />
             <EF:EFInput blockId="inqu_status" ename="projName" colWidth="3" cname="项目名称:" />
-            <EF:EFSelect ename="inqu_status-0-prdtType" cname="部件类型" colWidth="3" filter="contains"
+            <%--<EF:EFSelect ename="inqu_status-0-prdtType" cname="部件类型" colWidth="3" filter="contains"
                          template="#=textField#" valueTemplate="#=textField#">
                 <EF:EFOption label="全部" value=""/>
                 <EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('3','4')"/>
-            </EF:EFSelect>
+            </EF:EFSelect>--%>
             <EF:EFSelect ename="inqu_status-0-prdtCode" cname="部件名称" filter="contains" required="false" colWidth="3"
                          template="#=textField#" valueTemplate="#=valueField#" defaultValue="请选择">
                 <EF:EFOption label="请选择" value=""/>
@@ -49,7 +49,7 @@
             <EF:EFColumn hidden="true" enable="false" ename="spec"  cname="规格" readonly="true"/>
             <EF:EFColumn enable="false" ename="remark" cname="备注" readonly="true"/>
             <EF:EFColumn ename="planCompletionDate" cname="计划完成日期" editType="date" dateFormat="yyyy/MM/dd" width="150"
-                         required='true' readonly="true"/>
+                         required='true'/>
             <EF:EFColumn enable="false" ename="schedule" cname="生产完工进度" format="{0:N2}" readonly="true"/>
             <EF:EFComboColumn enable="false" ename="status" cname="状态">
                 <EF:EFOption label="未提交" value="0"/>

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

-var inventNameGlobalData = [];
-// 传递参数  将附件ID与当前记录ID进行绑定
-// let rowId = '';
-let parentId = '';
-let projCode = '';
-var strs;
-var url = location.search; //获取url中"?"符后的字串
-if (url.indexOf("?") != -1) {    //判断是否有参数
-    var str = url.substr(1); //从第一个字符开始 因为第0个是?号 获取所有除问号的所有符串
-    strs = str.split("=");   //用等号进行分隔 （因为知道只有一个参数 所以直接用等号进分隔 如果有多个参数 要用&号分隔 再用等号进行分隔）
-    // console.log('strs=' + strs)         //直接弹出第一个参数 （如果有多个参数 还要进行循环的）
-}
+ids = [];
 $(function () {
-    IPLATUI.EFTree = {
-        "materialTree": {
-             ROOT: "root:项目列表",
-            /**
-             * 树加载完成后的回调函数
-             * @param options: 树的配置项
-             */
-            query: function (postEiInfo, model) {
-                postEiInfo.set("projId",strs?strs[1] : null);
-                return postEiInfo;
-            },
-            loadComplete: function (options) {
-                // 保持结点展开状态
-                var expanded = Cookies.get('expanded');
-                if (expanded) {
-                    Cookies.remove('expanded');
-                    expanded = JSON.parse(expanded);
-                    $("#menu").data("kendoTreeView").expandPath(_.keys(expanded));
-                }
-            },
-            /**
-             * 选中树结点时触发的事件，注意点击树 折叠/展开 的图标不会触发此事件
-             *
-             * @param e
-             * e.sender     kendoTree对象, tree01Tree（EFTree的id + "Tree"）
-             * e.node       点击的节点DOM元素
-             */
-            select: function (e) {
-                var nodeData = this.dataItem(e.node);
-                let eiInfo = new EiInfo();
-                eiInfo.set("inqu_status-0-inventTypes", [3, 4]);
-                var dataSource;
-                EiCommunicator.send("HPPZ006", "queryPrdtComboBox", eiInfo, {
-                    onSuccess: function (ei) {
-                        dataSource = ei.getBlock("invent_prdt_name_block_id").getMappedRows();
-                        inventNameGlobalData = dataSource;
-                    },
-                    onFail: function (ei) {
-                    }
-                }, {async: false});
-                IPLATUI.EFTree.materialTree.selectTreeNode.nodeId = nodeData.nodeId;
-                IPLATUI.EFTree.materialTree.selectTreeNode.prdtCode = nodeData.prdtCode;
-                IPLATUI.EFTree.materialTree.selectTreeNode.projCode = nodeData.projCode;
-                IPLATUI.EFTree.materialTree.selectTreeNode.prdtName = nodeData.prdtName;
-                IPLATUI.EFTree.materialTree.selectTreeNode.projName = nodeData.projName;
-                // 重新查询EFGrid
-                parentId = nodeData.nodeId;
-                query();
-            },
-            selectTreeNode: {}
-        }
-    };
 
     $("#QUERY").on("click", function () {
         query();
-
     });
 
+    $("#ASSIGN").on("click", function () {
+        //重置全局变量
+        ids = [];
+        let rows = resultGrid.getCheckedRows()
+        if (rows.length < 1) {
+            message("请至少选择一条需要分派的数据");
+            return;
+        }
+
+        JSColorbox.open({
+            href: "HPSC098?methodName=initLoad",
+            title: "<div style='text-align: center;'>选择组织</div>",
+            width: "40%",
+            height: "70%",
+            callbackName: assignCallback
+        });
+        //分派可修改，不做判断
+        let num = 0;
+        rows.forEach(function(element) {
+            if (element.status == 1) {
+                num++;
+            }
+            ids.push(element.id)
+        });
+        // if (num > 0) {
+        //     message("勾选的数据中有已经分派的数据！");
+        //     return;
+        // } else {
+        //
+        // }
+    });
     IPLATUI.EFGrid = {
-        result: {
+        "result" : {
             pageable: {
-                pageSize: 10,
-                pageSizes: [10, 20, 50, 100,200],
+                pageSize: 20,
+                pageSizes: [10, 20, 50, 70, 100],
             },
-            loadComplete: function (grid) { // 在Grid加载完成后，才能给Grid上的按钮绑定事件
-                $("#SC02").on("click", function () {
-                    if (grid.getCheckedBlockData().rows.length === 0) {
-                        IPLAT.alert({
-                            message: '<b>请勾选一项</b>',
-                            okFn: function (e) {
-                            },
-                            title: '提示'
-                        });
-                    } else {
-                        console.log(grid.getCheckedBlockData().rows[0][10]);
-                    }
 
-                });
-            },
             onSuccess: function (e) {
                 if(e.eiInfo.extAttr.methodName == 'update'
-                ||e.eiInfo.extAttr.methodName == 'insert'){
+                    ||e.eiInfo.extAttr.methodName == 'insert'){
                     query();
                 }
             },
-            query: function () {
-                var ei = new EiInfo();
-                ei.set("inqu_status-0-prdtType",$("#inqu_status-0-prdtType").val());
-                ei.set("inqu_status-0-prdtCode",$("#inqu_status-0-prdtCode").val());
-                ei.set("inqu_status-0-status",$("#inqu_status-0-status").val());
-                ei.set("inqu_status-0-parentId",parentId? parentId : strs[1]);
-                // ei.set("inqu_status-0-parentId",-1);
-
-                return ei;
-            },
-            /**
-             * 点击行首checkbox，勾选行时触发的事件
-             * @param e     kendo的Event对象
-             * e.sender     kendoGrid对象，resultGrid
-             * e.fake       用于区分是手动点击的事件还是模拟的事件
-             * e.checked    用于区分是勾选还是取消勾选
-             * e.model      勾选或取消勾选的行数据，kendo.data.Model
-             * e.row        当前行的行号
-             * e.tr         行的tr,包括固定列和数据列 jquery对象
-             */
-            onCheckRow: function (e) {
-                if (e.checked) {
-                    console.log('选中');
-                }
-            },
-            /**
-             * EFGrid新增行之前触发的事件，可以根据业务逻辑控制是否进行新增
-             * @param e 事件对象
-             * e.sender Grid对象
-             * e.preventDefault 阻止事件发生
-             */
-            beforeAdd: function (e) {
-                var logic = IPLATUI.EFTree.materialTree.selectTreeNode.nodeId ? false : true;
-                if (logic) {  // 通过业务逻辑判断, 控制是否进行新增
-                    IPLAT.alert({
-                        message: '<b>请选择项目列表</b>',
-                        okFn: function (e) {
-                        },
-                        title: '提示'
-                    });
-                    e.preventDefault();
+            onRowClick : function(e) {
+                var block = detailGrid.getEiBlock();
+                if (block != null) {
+                    block.setRows([]);
+                    detailGrid.setEiBlock(block);
                 }
+                var info = new EiInfo()
+                var productionOrderNo = e.model['productionOrderNo'];
+                var projCode = e.model['projCode'];
+                var projName = e.model['projName'];
+
+                info.set("productionOrderNo",productionOrderNo);
+                EiCommunicator.send("HPSC006","queryDetail",info,{
+                    onSuccess:function(ei){//返回结果集
+                        detailGrid.setEiInfo(ei);
+                        $('#productionOrderNo').val(productionOrderNo)
+                        $('#projCode').val(projCode)
+                        $('#projName').val(projName)
+                    },onFail:function(ei){}
+                },{async:false});
             },
-            /**
-             * EFGrid新增行时触发的事件，此时数据行tr元素还未渲染
-             * @param e 事件对象
-             * e.sender Grid对象
-             * e.preventDefault 不会触发dataBound，不渲染tr
-             * e.index 插入的行号
-             * e.items 将要插入的数据行数组([Model,Model, ...])
-             */
-            onAdd: function (e) {
-                // 动态设置默认邮箱
-                let selectTreeNode = IPLATUI.EFTree.materialTree.selectTreeNode;
-                $.each(e.items, function (index, item) {
-                    item['projCode'] = selectTreeNode.projCode;
-                    item['projName'] = selectTreeNode.projName;
-                    item['parentId'] = selectTreeNode.nodeId;
-                    item['parentPrdtName'] = selectTreeNode.prdtName;
-                });
-            },
-            /**
-             * 点击Grid保存按钮时触发的事件
-             * @param e 事件对象
-             * e.sender Grid对象
-             */
-            onSave: function (e) {
-                // 不向后台保存
-                var tree = $("#materialTree").data("kendoTreeView");
-                var inInfo = new EiInfo();
-                EiCommunicator.send("HPSC006", "queryTreeNode", inInfo, {//传入参数
-                    onSuccess: function (inInfo) {
-                        tree.reload("root");//更新树
-                    }
-                });
-            },
-            /**
-             * 点击Grid删除按钮时触发的事件
-             * @param e 事件对象
-             * e.sender Grid对象
-             */
-            onDelete: function (e) {
-                // 不向后台保存
-                console.log(e)
-                var tree = $("#materialTree").data("kendoTreeView");
-                var inInfo = new EiInfo();
-                EiCommunicator.send("HPSC006", "queryTreeNode", inInfo, {//传入参数
-                    onSuccess: function (inInfo) {
-                        tree.reload("root");//更新树
+            columns: [
+                {
+                    field: "operator",
+                    template: function (item) {
+                        let filePath1 = item.filePath1;
+                        let status = item.status;
+                        let template = '';
+                        if (filePath1) {
+                            template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+                                + 'onclick="showUploadFile(' + filePath1 + ')"  >附件清单</a>';
+                        }
+                        return template
                     }
-                });
-            },
+                }
+            ],
+        },
+        "detail":{
             toolbarConfig: {
-                hidden: false, // true时，不显示功能按钮，但保留setting导出按钮
-                // add: false, // 不显示新增按钮
-                // cancel: false, // 不显示取消按钮
-                // save: false, // 不显示保存按钮
-                delete: true, // 显示删除按钮
+
             },
             columns: [
                 {
                     field: "operator",
                     template: function (item) {
-                        console.log(item)
-                        let auditStatus = item.status;
-                        let lv = item.lv
                         let template = '';
-	                    // template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
-		                //     + 'onclick="openUploadFile(' + item.id + ',1)" >附件上传</a>';
-	                    template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
-		                    + 'onclick="showUploadFile(' + item.id + ')"  >附件清单</a>';
-	                    if (lv === '3') {
-		                    if (auditStatus == 0) {
-                                template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
-                                    'onclick="check(' + item.id + ',1)" >提交</a>';
-                            } else {
-                                template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
-                                    'onclick="check(' + item.id + ',0)" >撤回</a>';
-                            }
-                        }
-                        return template;
+                            template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+                                + 'onclick="showUploadFile(' + filePath1 + ')"  >附件清单</a>';
+                        return template
                     }
                 },{
-                    field: "prdtName",
+                    field: "inventName",
                     query: function (container, options) {
                         let eiInfo = new EiInfo();
-                        eiInfo.set("inqu_status-0-inventTypes", [3, 4]);
-                        eiInfo.set("inqu_status-0-inventType", options.model["prdtType"]);
+                        eiInfo.set("inventType", options.model["inventType"]);
                         return eiInfo;
                     }
-                }, {
-                    field: "parentPrdtName",
-                    template: function (dataItem) {
-                        if(dataItem.lv > 2){
-                            return dataItem['parentPrdtName'];
-                        }
-                        return "";
-                    }
                 }
-                // {
-                //     field: "inventRecordId",
-                //     template: function (dataItem) {
-                //         for (let i = 0; i < inventNameGlobalData.length; i++) {
-                //             if (inventNameGlobalData[i]['valueField'] === dataItem['inventRecordId']) {
-                //                 return inventNameGlobalData[i]['textField']+'-'+inventNameGlobalData[i]['param1Field'];
-                //             }
-                //         }
-                //         return "";
-                //     },
-                //     editor: function (container, options) {
-                //         var grid = container.closest(".k-grid").data("kendoGrid");
-                //         var cellIndex = grid.cellIndex(container);
-                //         var input = $('<input />');
-                //         input.attr("name", options.field);
-                //         input.attr("id", options.field);
-                //         input.appendTo(container);
-                //         let eiInfo = new EiInfo();
-                //         eiInfo.set("inqu_status-0-inventTypes", [3, 4]);
-                //         eiInfo.set("inqu_status-0-inventType", options.model["prdtType"]);
-                //         var dataSource;
-                //         EiCommunicator.send("HPPZ006", "queryPrdtComboBox", eiInfo, {
-                //             onSuccess: function (ei) {
-                //                 dataSource = ei.getBlock("invent_prdt_name_block_id").getMappedRows();
-                //                 inventNameGlobalData = dataSource;
-                //             },
-                //             onFail: function (ei) {
-                //             }
-                //         }, {async: false});
-                //         input.kendoDropDownList({
-                //             valuePrimitive: true,
-                //             dataTextField: "textField",
-                //             dataParam1Field: "param1Field",
-                //             dataValueField: "valueField",
-                //             dataSource: dataSource,
-                //             template: "#=textField#-#=param1Field#"
-                //         });
-                //     }
-                // }
             ],
-            loadComplete: function (grid) {
-                // 此grid对象
-                // grid.dataSource.bind("change", function(e) {
-                //     if (e.field == "inventRecordId") {
-                //         var tr,index;
-                //         // 获取此model元素信息
-                //         var item = e.items[0];
-                //         for (let i = 0; i < inventNameGlobalData.length; i++) {
-                //             if (inventNameGlobalData[i]['valueField'] === item.inventRecordId) {
-                //                 resultGrid.setCellValue(item, 'prdtCode', inventNameGlobalData[i]['textField'])
-                //             }
-                //         }
-                //     }
-                // });
-            }
-        },
-    };
 
-// 关闭事件
-    IPLATUI.EFWindow = {
-        "uploadFile": {
-            close: function (e) {
-                let $iframe = uploadFileWindow.element.children("iframe");
-                let iframejQuery = $iframe[0].contentWindow.$; // 子窗口中的jQuery对象
-                let uploadFile = iframejQuery("#fileDocId").val();
-	            if (isBlank(uploadFile)) {
-		            return;
-	            }
-                let inEiInfo = new EiInfo();
-                // inEiInfo.set("result-0-id", rowId);
-                inEiInfo.set("result-0-filePath1", uploadFile);
-                EiCommunicator.send('HPSC006', 'bindDocIdById', inEiInfo, {
-                        onSuccess(response) {
-                            query();
-                        },
-                        onFail(errorMessage, status, e) {
-                            NotificationUtil("执行失败！", "error");
-                        }
-                    },
-                    {
-                        async: false
-                    }
-                );
-            },
         }
-    };
 
-    //部件类型下拉联动
-    $('input[name="inqu_status-0-prdtType"]').change(function () {
-        var inInfo=new EiInfo();
-        var prdtType=$("#inqu_status-0-prdtType").val();
-        inInfo.set("inventType",prdtType);
-        EiCommunicator.send("HPPZ004", "queryComboBox", inInfo, {
-            onSuccess: function (ei) {
-                var input=$("#inqu_status-0-prdtCode");
-                dataEdition=ei.getBlock("invent_name_block_id").getMappedRows();
-                input.kendoDropDownList({
-                    valuePrimitive: true,
-                    dataTextField: "textField",
-                    dataValueField: "valueField",
-                    optionLabel:"请选择",
-                    dataSource: dataEdition,
-                    template: "#=textField#"
-                });
-            }, onFail: function (ei) {
-            }
-        }, {async: false});
-    });
+    }
 });
-$(window).load(function () {
-    // 存货名称
-    let inInfo = new EiInfo();
-    inInfo.set("inqu_status-0-inventTypes", [3, 4]);
-    EiCommunicator.send("HPPZ006", "queryPrdtComboBox", inInfo, {
-        onSuccess: function (ei) {
-            inventNameGlobalData = ei.getBlock("invent_prdt_name_block_id").getMappedRows();
-        },
-        onFail: function (ei) {
-        }
-    }, {async: false});
-    // 查
-    query();
-});
-
-/**
- * 查询
- */
-let query = function () {
+query = function () {
     resultGrid.dataSource.page(1);
 }
-function openUploadFile(id) {
-    uploadFileWindow.open().center();
-    // rowId = id;
-}
-
-/**
- * 显示附件清单
- *
- * @param id
- */
 function showUploadFile(id) {
-	JSColorbox.open({
-		href: "HPSC006A?methodName=initLoad&inqu_status-0-id=" + id,
-		title: "<div style='text-align: center;'>附件清单</div>",
-		width: "80%",
-		height: "80%",
-	});
+    JSColorbox.open({
+        href: "HPSC002A?methodName=initLoad&inqu_status-0-bizType='XL'?inqu_status-0-id=" + id,
+        title: "<div style='text-align: center;'>附件清单</div>",
+        width: "80%",
+        height: "80%",
+    });
 }
-
-function check(id, auditStatus) {
-    const inEiInfo = new EiInfo();
-    inEiInfo.set("result-0-id", id);
-    inEiInfo.set("result-0-status", auditStatus);
-    EiCommunicator.send('HPSC006', 'check', inEiInfo, {
-            onSuccess(response) {
-                NotificationUtil(response.msg);
-                query();
-            },
-            onFail(errorMessage, status, e) {
-                NotificationUtil("执行失败！", "error");
+assignCallback = function (id) {
+    var info = new EiInfo()
+    info.set("ids",ids.join(','));
+    info.set("id",id);
+    EiCommunicator.send("HPSC005","assign",info,{
+        onSuccess:function(ei){//返回结果集
+            if (ei["status"] == -1) {
+                NotificationUtil(ei, "error");
+            } else {
+                NotificationUtil({
+                    msg: '修改成功'
+                });
+                // 刷新列表
+                resultGrid.dataSource.page(1);
+                // 关闭弹窗
+                JSColorbox.close();
             }
-        },
-        {
-            async: false
-        }
-    );
+
+        },onFail:function(ei){}
+    },{async:false});
+
+
 }
+

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

@@ -4,86 +4,105 @@
 <%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
 
 <c:set var="ctx" value="${pageContext.request.contextPath}"/>
+
+<script>
+    var ctx = "${ctx}";
+</script>
 <head>
     <%--    <link rel="stylesheet" href="${ctx}/css/simulatedOperation.css"/>--%>
 </head>
-<EF:EFPage title="下料清单">
-    <EF:EFRegion id="inqu" title="查询条件">
-        <div class="row">
-            <EF:EFSelect ename="inqu_status-0-prdtType" cname="部件类型" colWidth="3" filter="contains"
-                         template="#=textField#" valueTemplate="#=textField#">
-                <EF:EFOption label="全部" value=""/>
-                <EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('3','4')"/>
-            </EF:EFSelect>
-            <EF:EFSelect cname="部件名称" ename="inqu_status-0-prdtCode" filter="contains" defultValue="">
-                <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
-            </EF:EFSelect>
-            <EF:EFSelect cname="状态" optionLabel="全部" ename="inqu_status-0-status" colWidth="3">
-                <EF:EFOption label="未提交" value="0"/>
-                <EF:EFOption label="已提交" value="1"/>
-            </EF:EFSelect>
+<EF:EFPage title="生产下料">
+
+    <EF:EFRegion id="inqu" title="查询条件"><%-- type="query" efRegionShowClear="true" efRegionSave="true"--%>
+
+        <div class="row"> <%--    blockId="inqu_status" row="0"   --%>
+            <EF:EFInput blockId="inqu_status" ename="projCode" cname="项目号:" row="0"/>
+            <EF:EFInput blockId="inqu_status" ename="projName" cname="项目名称:" row="0"/>
+            <EF:EFInput blockId="inqu_status" ename="productionOrderNo" cname="生产订单号:" row="0"/>
+            <EF:EFDatePicker blockId="inqu_status" ename="planCompletionDate" cname="计划完成日期:" row="0" format="yyyy-MM-dd" />
+            <EF:EFInput blockId="inqu_status" ename="orgNo" cname="生产组:" row="0"/>
+
         </div>
-<%--        <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>--%>
+        <%--        <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>--%>
     </EF:EFRegion>
-    <div id="splitter" class="i-fit-height" style="display: inline">
-        <div id="left-pane" class="i-fit-height" style="width: 20%;float:left;">
-            <EF:EFRegion id="projTree" title="BOM结构图" fitHeight="true">
-                <EF:EFTree id="materialTree"
-                           valueField="label"
-                           textField="text"
-                           hasChildren="leaf"
-                           serviceName="HPSC006"
-                           methodName="queryTreeNode">
-                </EF:EFTree>
-            </EF:EFRegion>
-        </div>
 
-        <div id="right-pane" class="i-fit-height" style="width: 80%;float: right">
-            <EF:EFRegion id="result" title="明细信息">
-                <EF:EFGrid blockId="result" autoDraw="no" checkMode="single">
-                    <EF:EFColumn ename="id" cname="主键" hidden="true"/>
-                    <EF:EFColumn ename="level" cname="层级" hidden="true"/>
-                    <EF:EFColumn enable="false" ename="projCode" cname="项目编码"/>
-                    <EF:EFColumn enable="false" ename="projName" cname="项目名称"/>
-                    <EF:EFComboColumn cname="部件类型" ename="prdtType" width="90" align="center" required="true">
-                        <EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('3','4')"/>
-                    </EF:EFComboColumn>
-                    <EF:EFPopupColumn ename="prdtName" cname="部件名称" width="200" popupType="ServiceGrid"
-                                      popupTitle="部件信息" serviceName="HPPZ006" methodName="queryPrdtComboBox" resultId="invent_prdt_name_block_id"
-                                      columnEnames="param1Field,textField"
-                                      columnCnames="部件名称,部件编码"
-                                      backFillColumnIds="param1Field,textField"
-                                      backFillFieldIds="prdtName,prdtCode"
-                                      valueField="param1Field" textField="param1Field"/>
-                    <EF:EFColumn ename="prdtCode"  cname="部件编码"/>
-                    <EF:EFColumn ename="length"  cname="长" format="{0:N3}"/>
-                    <EF:EFColumn ename="width"  cname="宽" format="{0:N3}"/>
-                    <EF:EFColumn ename="thick"  cname="厚" format="{0:N3}"/>
-                    <EF:EFColumn ename="remark" cname="备注" />
-                    <EF:EFColumn enable="false" ename="parentId" hidden="true" cname="上级部件名称"/>
-                    <EF:EFColumn enable="false" ename="parentPrdtName" cname="上级部件名称"/>
-                    <EF:EFColumn ename="num" required="true" cname="数量"/>
-                    <EF:EFColumn ename="unitWt" required="true" format="{0:N3}" cname="单重"/>
-                    <EF:EFColumn enable="false" format="{0:N3}" ename="totalWt" cname="总重"/>
-                    <EF:EFComboColumn enable="false" ename="status" align="center"
-                                      columnTemplate="#=textField#" optionLabel=" "
-                                      itemTemplate="#=textField#" textField="textField"
-                                      valueField="valueField" cname="提交状态">
-                        <EF:EFOption label="未提交" value="0"></EF:EFOption>
-                        <EF:EFOption label="已提交" value="1"></EF:EFOption>
-                    </EF:EFComboColumn>
-                    <EF:EFColumn ename="operator" cname="操作" width="200"  enable="false" readonly="false"/>
-                </EF:EFGrid>
-            </EF:EFRegion>
-        </div>
-    </div>
-    <%-- EEDM8010页面加载时，不会加载EEDM6000 (lazyload="true") --%>
-    <EF:EFWindow id="uploadFile" url="${ctx}/web/HPSC099" lazyload="true" refresh="true">
-    </EF:EFWindow>
+    <EF:EFRegion id="result" title="生产任务集">
+
+        <EF:EFGrid blockId="result" autoDraw="no">
+
+            <EF:EFColumn ename="id" cname="主键" hidden="true"/>
+            <EF:EFColumn enable="false" ename="projCode" cname="项目号" />
+            <EF:EFColumn enable="false" ename="projName" cname="项目名称"/>
+            <EF:EFColumn enable="false" ename="productionOrderNo" cname="生产订单号"/>
+            <EF:EFComboColumn ename="prdtType" cname="部件类型" width="90" align="center" enable="false">
+                <EF:EFCodeOption codeName="hpjx.hpkc.inventType" />
+            </EF:EFComboColumn>
+            <EF:EFColumn enable="false" ename="prdtCode" cname="部件编码"/>
+            <EF:EFColumn enable="false" ename="prdtName" cname="部件名称"/>
+            <EF:EFColumn enable="false" ename="remark" cname="部件备注"/>
+            <EF:EFComboColumn ename="partType" cname="零件类型" width="90" align="center" enable="false">
+                <EF:EFCodeOption codeName="hpjx.hpkc.inventType" />
+            </EF:EFComboColumn>
+            <EF:EFColumn enable="false" ename="partCode" cname="零件编码"/>
+            <EF:EFColumn enable="false" ename="partName" cname="零件名称"/>
+            <EF:EFColumn enable="false" ename="partSpec" cname="零件规格"/>
+            <EF:EFColumn enable="false" ename="remark1" cname="零件备注"/>
+
+            <EF:EFColumn enable="false" ename="planCompletionDate" cname="计划完成日期"/>
+            <EF:EFColumn enable="false" ename="num" cname="计划数量"/>
+            <EF:EFColumn enable="false" ename="totalWt" cname="计划重量"/>
+            <EF:EFComboColumn enable="false" align="center" ename="status" cname="状态">
+                <EF:EFOption label="未派工" value="0"/>
+                <EF:EFOption label="部分派工" value="1"/>
+                <EF:EFOption label="全部派工" value="2"/>
+            </EF:EFComboColumn>
+            <EF:EFColumn enable="false" ename="factoryName" cname="厂区名称"/>
+            <EF:EFColumn enable="false" ename="orgName" cname="生产组"/>
+        </EF:EFGrid>
+    </EF:EFRegion>
+
+    <EF:EFRegion id="detail" title="物料清单">
+        <EF:EFInput ename="projCode"  type="hidden"/>
+        <EF:EFInput ename="projName"  type="hidden"/>
+        <EF:EFInput ename="productionOrderNo"  type="hidden"/>
+        <EF:EFGrid blockId="detail" autoDraw="no">
+            <EF:EFColumn ename="id" cname="主键" hidden="true"/>
+            <EF:EFComboColumn cname="材料类型" ename="inventType" width="90" align="center" required="true">
+                <EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('7')"/>
+            </EF:EFComboColumn>
+            <EF:EFPopupColumn ename="inventName" cname="材料名称" width="200" popupType="ServiceGrid"
+                              popupTitle="材料信息" serviceName="HPPZ004" methodName="queryComboBox" resultId="invent_name_block_id"
+                              columnEnames="textField,valueField"
+                              columnCnames="材料名称,材料编码"
+                              backFillColumnIds="textField,valueField"
+                              backFillFieldIds="inventName,inventCode"
+                              valueField="textField" textField="textField"/>
+            <EF:EFColumn ename="inventCode" enable="false" cname="材料编码"/>
+            <EF:EFColumn ename="inventLength"  cname="长" format="{0:N3}"/>
+            <EF:EFColumn ename="inventWidth"  cname="宽" format="{0:N3}"/>
+            <EF:EFColumn ename="inventThick"  cname="厚" format="{0:N3}"/>
+            <EF:EFColumn ename="remark" cname="备注" />
+            <EF:EFColumn ename="num" cname="计划数量"/>
+            <EF:EFColumn ename="unitWt" format="{0:N3}" cname="计划单重"/>
+            <EF:EFColumn enable="false" format="{0:N3}" ename="totalWt" cname="计划总重"/>
+            <EF:EFColumn ename="planCompletionDate" required='true' cname="计划完成时间" editType="date" dateFormat="yyyy/MM/dd" width="150"/>
+            <EF:EFColumn ename="actualCompletionDate" cname="实际完成时间" editType="date" dateFormat="yyyy/MM/dd" width="150"
+                         enable="false"/>
+            <EF:EFColumn enable="false" ename="actualCompletionNum" cname="实际完工数量" readonly="true"/>
+            <EF:EFComboColumn enable="false" align="center" ename="status" cname="状态">
+                <EF:EFOption label="计划中" value="0"/>
+                <EF:EFOption label="生产中" value="1"/>
+                <EF:EFOption label="已完成" value="2"/>
+            </EF:EFComboColumn>
+            <EF:EFColumn enable="false" ename="factoryName" cname="厂区名称"/>
+            <EF:EFColumn enable="false" ename="orgName" cname="生产组"/>
+            <EF:EFColumn ename="operator" cname="操作" width="100"  enable="false" readonly="false"/>
+        </EF:EFGrid>
+    </EF:EFRegion>
 </EF:EFPage>
+
+
 <script>
-    let ctx="${ctx}";
+    var ctx = "${ctx}";
 </script>
-
 <script src="${ctx}/HP/SC/HPSC006.js"></script>
\ No newline at end of file

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

@@ -17,6 +17,7 @@ $(function () {
                 template: function (item) {
                     let template = '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
                         'onclick="jump(' + item.id + ')" >物料清单</a>';
+
                     return template;
                 }
             }
@@ -29,7 +30,4 @@ function jump(id) {
     window.open(herf);
 }
 
-function jump2(id) {
-    var herf= ctx + "\\web\\"+ "HPSC006?inqu_status-0-projId=" + id;
-    window.open(herf);
-}
+

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

@@ -16,13 +16,13 @@
     <EF:EFRegion id="inqu" title="查询条件"><%-- type="query" efRegionShowClear="true" efRegionSave="true"--%>
 
         <div class="row"> <%--    blockId="inqu_status" row="0"   --%>
+            <EF:EFInput ename="inqu_status-0-projCode" cname="项目编码" colWidth="3"/>
+            <EF:EFInput ename="inqu_status-0-projName" cname="项目名称" colWidth="3"/>
             <EF:EFSelect ename="inqu_status-0-projType" cname="项目类型" colWidth="3" filter="contains"
                          template="#=textField#" valueTemplate="#=textField#">
                 <EF:EFOption label="全部" value=""/>
                 <EF:EFCodeOption codeName="hpjx.hpsc.projType"/>
             </EF:EFSelect>
-            <EF:EFInput ename="inqu_status-0-projCode" cname="项目编码" colWidth="3"/>
-            <EF:EFInput ename="inqu_status-0-projName" cname="项目名称" colWidth="3"/>
             <EF:EFSelect cname="物料提交状态" optionLabel="全部" ename="inqu_status-0-materialStatus" colWidth="3">
                 <EF:EFOption label="未提交" value="0"/>
                 <EF:EFOption label="部分提交" value="1"/>
@@ -43,29 +43,28 @@
     <EF:EFRegion id="result" title="记录集">
         <EF:EFGrid blockId="result" autoDraw="no">
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
+            <EF:EFColumn enable="false"  ename="projCode" cname="项目编码"/>
             <EF:EFComboColumn ename="projType" cname="项目类型" width="100" align="center" required="true"
                               columnTemplate="#=textField#" itemTemplate="#=textField#">
                 <EF:EFCodeOption codeName="hpjx.hpsc.projType"/>
             </EF:EFComboColumn>
-            <EF:EFColumn enable="false"  ename="projCode" cname="项目编码"/>
             <EF:EFColumn enable="false"  ename="projName" cname="项目名称"/>
-            <EF:EFComboColumn ename="princ1" cname="本公司项目负责人" width="120" align="center" required="true"
+            <EF:EFComboColumn ename="princ1" cname="项目负责人" width="120" align="center" required="true"
                               blockName="user_block_id" textField="textField" valueField="valueField"
                               columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="true"
                               filter="contains">
             </EF:EFComboColumn>
-            <EF:EFComboColumn ename="princ2" cname="客户项目负责人" width="120" align="center" required="true"
+            <EF:EFComboColumn ename="princ2" cname="客户负责人" width="120" align="center" required="true"
                               blockName="customer_record_block_id" textField="textField" valueField="valueField"
                               columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="true"
                               filter="contains">
             </EF:EFComboColumn>
-            <EF:EFComboColumn required="true" align="center" ename="materialStatus" cname="物料提交状态" defaultValue="0">
+            <EF:EFColumn  enable="false" ename="remark" cname="备注"/>
+            <EF:EFComboColumn align="center" ename="materialStatus" cname="物料提交状态" defaultValue="0">
                 <EF:EFOption label="未提交" value="0"/>
                 <EF:EFOption label="部分提交" value="1"/>
                 <EF:EFOption label="全部提交" value="2"/>
             </EF:EFComboColumn>
-
-            <EF:EFColumn  enable="false" ename="remark" cname="备注"/>
             <EF:EFColumn ename="operator" cname="操作" width="100"  enable="false" readonly="false"/>
         </EF:EFGrid>
     </EF:EFRegion>