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

src/main/java/com/baosight/hggp/common/DdynamicEnum.java

@@ -60,6 +60,13 @@ public enum DdynamicEnum {
 
     /**
      * 模块：存货类型
+     * 用途：存货类型下拉框 (不默认状态)
+     * 编写：
+     */
+    INVENT_TYPE_BOX_BLOCK_ID("invent_type_box_block_id","inventType","inventTypeName","status","HGPZ004.queryInventTypeBox"),
+
+    /**
+     * 模块：存货类型
      * 用途：父级存货类型下拉框
      * 编写：
      */
@@ -74,6 +81,13 @@ public enum DdynamicEnum {
 
     /**
      * 模块：存货档案
+     * 用途：存货档案下拉框 (不默认状态)
+     * 编写：
+     */
+    INVENT_RECORD_BOX_BLOCK_ID("invent_record_box_block_id","inventCode","inventName","status","HGPZ005.queryInventCodeBox"),
+
+    /**
+     * 模块：存货档案
      * 用途：存货档案下拉框,带id名称等信息
      * 编写：
      */
@@ -85,6 +99,15 @@ public enum DdynamicEnum {
      */
     INVENT_ALL_BLOCK_ID("invent_all_block_id", "id", "spec", "material", "unit", "length", "width", "thick",
             "coefficient", "HGPZ005.queryComboBoxAll"),
+
+    /**
+     * 模块：存货档案（ALL 不默认状态）
+     * 用途：存货档案下拉框
+     * 编写：
+     */
+    INVENT_ALL_BOX_BLOCK_ID("invent_all_box_block_id", "id", "spec", "material", "unit", "length", "width", "thick",
+            "coefficient","status", "HGPZ005.queryInventBoxAll"),
+
 	/**
 	 * 模块：规格
 	 * 用途：存货档案下拉框
@@ -105,7 +128,7 @@ public enum DdynamicEnum {
      * 用途：仓库类型下拉框
      * 编写：
      */
-    WH_TYPE_BLOCK_ID("wh_type_block_id", "whType", "whTypeName", "HGPZ006.queryComboBox"),
+    WH_TYPE_BLOCK_ID("wh_type_block_id", "whType", "whTypeName","status", "HGPZ006.queryComboBox"),
 
 	/**
 	 * 模块：仓库档案
@@ -114,6 +137,13 @@ public enum DdynamicEnum {
 	 */
 	WH_RECORD_BLOCK_ID("wh_record_block_id", "whCode", "whName", "HGPZ007.queryComboBox"),
 
+    /**
+     * 模块：仓库档案
+     * 用途：仓库档案下拉框 不默认状态
+     * 编写：
+     */
+    WH_CODE_BLOCK_ID("wh_code_block_id", "whCode", "whName","status", "HGPZ007.queryWhCodeBox"),
+
 	/**
 	 * 模块：厂区管理
 	 * 用途：厂区管理下拉框
@@ -374,6 +404,21 @@ public enum DdynamicEnum {
 	}
 
     DdynamicEnum(String blockId, String value, String text, String param1, String param2, String param3, String param4,
+                 String param5, String param6, String param7,String dbSource) {
+        this.blockId = blockId;
+        this.value = value;
+        this.text = text;
+        this.param1 = param1;
+        this.param2 = param2;
+        this.param3 = param3;
+        this.param4 = param4;
+        this.param5 = param5;
+        this.param6 = param6;
+        this.param7 =param7;
+        this.dbSource = dbSource;
+    }
+
+    DdynamicEnum(String blockId, String value, String text, String param1, String param2, String param3, String param4,
                  String param5, String param6,String param7,String param8,String param9,String dbSource) {
         this.blockId = blockId;
         this.value = value;

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW002.java

@@ -42,7 +42,7 @@ public class ServiceHGCW002 extends ServiceBase {
 	@OperationLogAnnotation(operModul = "账期维护",operType = "查询",operDesc = "初始化")
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), null, false);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID), null, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCW002().eiMetadata);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW004.java

@@ -82,6 +82,7 @@ public class ServiceHGCW004 extends ServiceBase {
                 UserVO userVO = HGCWTools.HgCw002.getUserCompany();
                 HGCW004.setCompanyCode(userVO.getUsercode());
                 HGCW004.setCompanyName(userVO.getUsername());
+                HGCW004.setContractName(userVO.getUsername());
                 if (HGCW004.getId() == null || HGCW004.getId() == 0) {
                     this.add(HGCW004);
                 } else {

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW006.java

+package com.baosight.hggp.hg.cw.service;
+
+import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
+import com.baosight.hggp.common.DdynamicEnum;
+import com.baosight.hggp.core.dao.DaoUtils;
+import com.baosight.hggp.hg.constant.HGConstant;
+import com.baosight.hggp.hg.cw.domain.HGCW006;
+import com.baosight.hggp.hg.cw.domain.HGCW003;
+import com.baosight.hggp.hg.cw.domain.HGCW007;
+import com.baosight.hggp.hg.cw.tools.HGCWTools;
+import com.baosight.hggp.hg.cw.vo.UserVO;
+import com.baosight.hggp.util.CommonMethod;
+import com.baosight.hggp.util.DateUtils;
+import com.baosight.hggp.util.LogUtils;
+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.StringUtils;
+import com.baosight.iplat4j.ed.util.SequenceGenerator;
+import org.apache.commons.collections.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author yukang
+ * @date 2024年05月06日 18:22
+ */
+public class ServiceHGCW006 extends ServiceBase {
+	
+	/**
+	 * 画面初始化
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "租赁合同",operType = "查询",operDesc = "初始化")
+	public EiInfo initLoad(EiInfo inInfo) {
+		try {
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID), null, false);
+			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCW006().eiMetadata);
+		} catch (PlatException e) {
+			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+		}
+		return inInfo;
+	}
+	
+	/**
+	 * 查询操作
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "租赁合同",operType = "查询",operDesc = "查询")
+	@Override
+	public EiInfo query(EiInfo inInfo) {
+		try {
+			inInfo = super.query(inInfo, HGCW006.QUERY, new HGCW006());
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询失败");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 新增操作
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "租赁合同",operType = "保存",operDesc = "保存")
+	public EiInfo save(EiInfo inInfo) {
+		try {
+			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+			List<Map> detail1Rows = inInfo.getBlock("detail1").getRows();
+			List<Map> detail2Rows = inInfo.getBlock("detail2").getRows();
+
+			if (CollectionUtils.isNotEmpty(resultRows)) {
+				HGCW006 HGCW006 = new HGCW006();
+				HGCW006.fromMap(resultRows.get(0));
+				if (HGCW006.getId() == null || HGCW006.getId() == 0) {
+					UserVO userVO = HGCWTools.HgCw002.getUserCompany();
+					String contractNumber =userVO.getUsercode() +
+							"5" +
+							SequenceGenerator.getNextSequence(HGConstant.SequenceId.CW_CONTRACT_NO);
+					HGCW006.setCompanyCode(userVO.getUsercode());
+					HGCW006.setCompanyName(userVO.getUsername());
+					HGCW006.setContractNumber(contractNumber);
+					HGCW006.setReviewStatus(0);
+					HGCW006.setLeaseStartDate(DateUtils.formatShort(HGCW006.getLeaseStartDate()));
+					HGCW006.setLeaseEndDate(DateUtils.formatShort(HGCW006.getLeaseEndDate()));
+					HGCW006.setSigningDate(DateUtils.formatShort(HGCW006.getSigningDate()));
+
+					this.add(HGCW006);
+					// 写入其他数据
+					HGCWTools.HgCw007.save(detail1Rows,contractNumber,userVO);
+					HGCWTools.HgCw999.batchUpdate(detail2Rows,HGCW006.getId());
+
+				} else {
+					HGCW006.setLeaseStartDate(DateUtils.formatShort(HGCW006.getLeaseStartDate()));
+					HGCW006.setLeaseEndDate(DateUtils.formatShort(HGCW006.getLeaseEndDate()));
+					HGCW006.setSigningDate(DateUtils.formatShort(HGCW006.getSigningDate()));
+					BigDecimal totalContractPriceExcluding = new BigDecimal(0);
+					BigDecimal totalContractPriceIncluding = new BigDecimal(0);
+					BigDecimal valueAddedTax = new BigDecimal(0);
+					BigDecimal totalQuantity = new BigDecimal(0);
+
+					//计算合同清单金额
+					for (int i = 0; i < detail1Rows.size(); i++) {
+						HGCW007 hgcw007 = new HGCW007();
+						hgcw007.fromMap(detail1Rows.get(i));
+						totalContractPriceExcluding = totalContractPriceExcluding.add(hgcw007.getTotalPrice());
+						totalQuantity = totalQuantity.add(hgcw007.getDeviceNumber());
+					}
+					BigDecimal taxPoints = new BigDecimal(HGCW006.getTaxPoints() / 100);
+					totalContractPriceIncluding = totalContractPriceExcluding.multiply(taxPoints.add(new BigDecimal(1)));
+					valueAddedTax = totalContractPriceIncluding.subtract(totalContractPriceExcluding);
+					DecimalFormat decimalFormat = new DecimalFormat("#.000");
+					HGCW006.setTotalContractPriceExcluding(new BigDecimal(decimalFormat.format(totalContractPriceExcluding)));
+					HGCW006.setTotalContractPriceIncluding(new BigDecimal(decimalFormat.format(totalContractPriceIncluding)));
+					HGCW006.setValueAddedTax(new BigDecimal(decimalFormat.format(valueAddedTax)));
+					HGCW006.setTotalQuantity(totalQuantity);
+					this.modify(HGCW006);
+				}
+			}
+			inInfo = this.query(inInfo);
+			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "保存失败");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 新增操作
+	 *
+	 * @param HGCW006
+	 * @return
+	 */
+	public void add(HGCW006 HGCW006) {
+		DaoUtils.insert("HGCW006.insert", HGCW006);
+	}
+
+	/**
+	 * 修改操作
+	 *
+	 * @param HGCW006
+	 * @return
+	 */
+	public void modify(HGCW006 HGCW006) {
+		DaoUtils.update("HGCW006.update", HGCW006);
+	}
+	
+
+	/**
+	 * 删除操作
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "租赁合同",operType = "删除",operDesc = "删除")
+	public EiInfo delete(EiInfo inInfo) {
+		try {
+			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+			for (int i = 0; i < resultRows.size(); i++) {
+				DaoUtils.update("HGCW006.delete", resultRows.get(i));
+			}
+			inInfo = this.query(inInfo);
+			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据删除成功!");
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "删除失败");
+		}
+		return inInfo;
+	}
+
+	/**
+     * 提交操作
+	 * @param inInfo
+     * @return
+	 */
+	public EiInfo submit(EiInfo inInfo){
+		try {
+			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+			for (int i = 0; i < resultRows.size(); i++) {
+				HGCW006 HGCW006 = new HGCW006();
+				HGCW006.fromMap(resultRows.get(i));
+				HGCW006.setReviewStatus(3);
+				DaoUtils.update("HGCW006.submit", HGCW006);
+			}
+			inInfo = this.query(inInfo);
+			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据提交成功!");
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询失败");
+		}
+		return inInfo;
+	}
+
+}

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW006A.java

+package com.baosight.hggp.hg.cw.service;
+
+import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
+import com.baosight.hggp.common.DdynamicEnum;
+import com.baosight.hggp.hg.cw.domain.HGCW006;
+import com.baosight.hggp.hg.cw.vo.UserVO;
+import com.baosight.hggp.hg.pz.domain.HGPZ002;
+import com.baosight.hggp.hg.pz.domain.HGPZ003;
+import com.baosight.hggp.hg.pz.tools.HGPZTools;
+import com.baosight.hggp.hg.xs.domain.Org;
+import com.baosight.hggp.hg.xs.tools.HGXSTools;
+import com.baosight.hggp.util.CommonMethod;
+import com.baosight.hggp.util.LogUtils;
+import com.baosight.iplat4j.core.ei.EiInfo;
+import com.baosight.iplat4j.core.exception.PlatException;
+import com.baosight.iplat4j.core.service.impl.ServiceBase;
+import org.apache.commons.collections.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author yukang
+ * @date 2024年05月06日 18:22
+ */
+public class ServiceHGCW006A extends ServiceBase {
+	
+	/**
+	 * 画面初始化
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "账期维护",operType = "查询",operDesc = "初始化")
+	public EiInfo initLoad(EiInfo inInfo) {
+		try {
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROJECT_CODE_BOX_BLOCK_ID), null, false);
+			inInfo.addBlock("detail1").addBlockMeta(new HGCW006().eiMetadata);
+			inInfo.addBlock("detail2").addBlockMeta(new HGCW006().eiMetadata);
+		} catch (PlatException e) {
+			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+		}
+		return inInfo;
+	}
+
+
+	/**
+	 * 甲方名称查询
+	 * 合同类别为收入时，乙方为组织机构中的公司，甲方选择客户档案里的客户；数据提交之后需要把客户档案中的客户类别更新为正式客户
+	 * 合同类别为支出时，甲方为组织机构中的公司，乙方选择供应商档案里面的供应商
+	 * @param inInfo
+	 * @return
+	 */
+	public EiInfo partyAQuery(EiInfo inInfo) {
+		try {
+			List<UserVO> userVOList = new ArrayList<>();
+			String contractCategory = inInfo.getString("contractCategory");
+			List<Org> orgList = HGXSTools.XsOrg.queryByUser();
+			if (CollectionUtils.isNotEmpty(orgList)) {
+				Org org = orgList.get(0);
+				if (!org.getOrgType().equals("company")) {
+					//如果不是公司公司，则找到上一级
+					Org org1 = HGXSTools.XsOrg.queryCompany(org.getOrgId());
+					UserVO userVO = new UserVO();
+					userVO.setUsercode(org1.getOrgId());
+					userVO.setUsername(org1.getOrgCname());
+					userVOList.add(userVO);
+				} else {
+					UserVO userVO = new UserVO();
+					userVO.setUsercode(org.getOrgId());
+					userVO.setUsername(org.getOrgCname());
+					userVOList.add(userVO);
+				}
+			}
+			inInfo.addBlock("partyAResult").addRows(userVOList);
+		} catch (PlatException e) {
+			LogUtils.setDetailMsg(inInfo, e, "甲方名称查询失败");
+		}
+		return inInfo;
+	}
+
+}

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW006B.java

+package com.baosight.hggp.hg.cw.service;
+
+import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
+import com.baosight.hggp.common.DdynamicEnum;
+import com.baosight.hggp.hg.cw.domain.HGCW006;
+import com.baosight.hggp.hg.cw.domain.HGCW003;
+import com.baosight.hggp.hg.cw.domain.HGCW007;
+import com.baosight.hggp.hg.cw.domain.HGCW999;
+import com.baosight.hggp.hg.cw.tools.HGCWTools;
+import com.baosight.hggp.util.CommonMethod;
+import com.baosight.hggp.util.LogUtils;
+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 java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author yukang
+ * @date 2024年05月06日 18:22
+ */
+public class ServiceHGCW006B extends ServiceBase {
+	
+	/**
+	 * 画面初始化
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "修改合同",operType = "查询",operDesc = "初始化")
+	public EiInfo initLoad(EiInfo inInfo) {
+		try {
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROJECT_CODE_BOX_BLOCK_ID), null, false);
+			String id = inInfo.getString("id");
+			HGCW006 HGCW006 = HGCWTools.HgCw006.getId(id);
+			inInfo.addBlock(EiConstant.resultBlock).addRow(HGCW006);
+			//获取清单
+			List<HGCW007> hgcw007List = HGCWTools.HgCw007.queryByContractNumber(HGCW006.getContractNumber());
+			inInfo.addBlock("detail1").addRows(hgcw007List);
+			List<HGCW999> hgcw999List = HGCWTools.HgCw999.queryByBiz(HGCW006.getId(),"ZL");
+			inInfo.addBlock("detail2").addRows(hgcw999List);
+		} catch (PlatException e) {
+			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+		}
+		return inInfo;
+	}
+
+}

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW006C.java

+package com.baosight.hggp.hg.cw.service;
+
+import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
+import com.baosight.hggp.hg.cw.domain.HGCW006;
+import com.baosight.hggp.hg.cw.domain.HGCW003;
+import com.baosight.hggp.hg.cw.domain.HGCW007;
+import com.baosight.hggp.hg.cw.domain.HGCW999;
+import com.baosight.hggp.hg.cw.tools.HGCWTools;
+import com.baosight.hggp.util.LogUtils;
+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 java.util.List;
+
+/**
+ * @author yukang
+ * @date 2024年05月06日 18:22
+ */
+public class ServiceHGCW006C extends ServiceBase {
+	
+	/**
+	 * 画面初始化
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "合同详情",operType = "查询",operDesc = "初始化")
+	public EiInfo initLoad(EiInfo inInfo) {
+		try {
+//			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROJECT_CODE_BOX_BLOCK_ID), null, false);
+			String id = inInfo.getString("id");
+			HGCW006 HGCW006 = HGCWTools.HgCw006.getId(id);
+			inInfo.addBlock(EiConstant.resultBlock).addRow(HGCW006);
+			//获取清单
+			List<HGCW007> hgcw007List = HGCWTools.HgCw007.queryByContractNumber(HGCW006.getContractNumber());
+			inInfo.addBlock("detail1").addRows(hgcw007List);
+			List<HGCW999> hgcw999List = HGCWTools.HgCw999.queryByBiz(HGCW006.getId(),"ZL");
+			inInfo.addBlock("detail2").addRows(hgcw999List);
+		} catch (PlatException e) {
+			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+		}
+		return inInfo;
+	}
+
+}

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW007.java

+package com.baosight.hggp.hg.cw.service;
+
+import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
+import com.baosight.hggp.core.dao.DaoUtils;
+import com.baosight.hggp.hg.cw.domain.HGCW007;
+import com.baosight.hggp.hg.cw.tools.HGCWTools;
+import com.baosight.hggp.util.LogUtils;
+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 java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author yukang
+ * @date 2024年05月06日 18:22
+ */
+public class ServiceHGCW007 extends ServiceBase {
+	
+	/**
+	 * 画面初始化
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "合同清单",operType = "查询",operDesc = "初始化")
+	public EiInfo initLoad(EiInfo inInfo) {
+		try {
+			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCW007().eiMetadata);
+		} catch (PlatException e) {
+			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+		}
+		return inInfo;
+	}
+	
+	/**
+	 * 查询操作
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "合同清单",operType = "查询",operDesc = "查询")
+	@Override
+	public EiInfo query(EiInfo inInfo) {
+		try {
+			inInfo = super.query(inInfo, HGCW007.QUERY, new HGCW007());
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询失败");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 新增操作
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "合同清单",operType = "保存",operDesc = "保存")
+	public EiInfo save(EiInfo inInfo) {
+		EiInfo eiInfo = new EiInfo();
+		try {
+			List<Map> resultRows = inInfo.getBlock("detail1").getRows();
+			String contractNumber = "";
+			// 写入数据
+			for (int i = 0; i < resultRows.size(); i++) {
+				HGCW007 HGCW007 = new HGCW007();
+				HGCW007.fromMap(resultRows.get(i));
+				contractNumber = HGCW007.getContractNumber();
+				if (HGCW007.getId() == null || HGCW007.getId() == 0) {
+					this.add(HGCW007);
+				} else {
+					this.modify(HGCW007);
+				}
+			}
+			List<HGCW007> HGCW007List = HGCWTools.HgCw007.queryByContractNumber(contractNumber);
+			eiInfo.addBlock("detail1").addRows(HGCW007List);
+			eiInfo.setStatus(EiConstant.STATUS_DEFAULT);
+			eiInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "保存失败");
+		}
+		return eiInfo;
+	}
+
+	/**
+	 * 新增操作
+	 *
+	 * @param HGCW007
+	 * @return
+	 */
+	public void add(HGCW007 HGCW007) {
+		DaoUtils.insert("HGCW007.insert", HGCW007);
+	}
+
+	/**
+	 * 修改操作
+	 *
+	 * @param HGCW007
+	 * @return
+	 */
+	public void modify(HGCW007 HGCW007) {
+		DaoUtils.update("HGCW007.update", HGCW007);
+	}
+
+	public void deleteEntity(HGCW007 HGCW007) {
+		DaoUtils.update("HGCW007.delete", HGCW007);
+	}
+
+	/**
+	 * 删除操作
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "合同清单",operType = "删除",operDesc = "删除")
+	public EiInfo delete(EiInfo inInfo) {
+		EiInfo eiInfo = new EiInfo();
+		try {
+			List<Map> resultRows = inInfo.getBlock("detail1").getRows();
+			String contractNumber = "";
+			// 写入数据
+			for (int i = 0; i < resultRows.size(); i++) {
+				HGCW007 HGCW007 = new HGCW007();
+				HGCW007.fromMap(resultRows.get(i));
+				contractNumber = HGCW007.getContractNumber();
+				this.deleteEntity(HGCW007);
+			}
+			List<HGCW007> HGCW007List = HGCWTools.HgCw007.queryByContractNumber(contractNumber);
+			eiInfo.addBlock("detail1").addRows(HGCW007List);
+			eiInfo.setStatus(EiConstant.STATUS_DEFAULT);
+			eiInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据删除成功!");
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "删除失败");
+		}
+		return eiInfo;
+	}
+
+
+}

src/main/java/com/baosight/hggp/hg/cw/sql/HGCW007.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!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-05-21 14:15:46
+   		Version :  1.0
+		schema : hggp
+		tableName : HGCW007
+		 ID  BIGINT   NOT NULL   primarykey, 
+		 ACCOUNT_CODE  VARCHAR, 
+		 COMPANY_CODE  VARCHAR, 
+		 COMPANY_NAME  VARCHAR, 
+		 CONTRACT_NUMBER  VARCHAR, 
+		 DEVICE_NAME  VARCHAR, 
+		 DEVICE_NUMBER  DECIMAL, 
+		 UNIT_PRICE  DECIMAL, 
+		 DAY_NUMBER  DECIMAL, 
+		 TOTAL_PRICE  DECIMAL, 
+		 CREATED_BY  VARCHAR   NOT NULL, 
+		 CREATED_NAME  VARCHAR   NOT NULL, 
+		 CREATED_TIME  VARCHAR   NOT NULL, 
+		 UPDATED_BY  VARCHAR   NOT NULL, 
+		 UPDATED_NAME  VARCHAR   NOT NULL, 
+		 UPDATED_TIME  VARCHAR   NOT NULL, 
+		 DEP_CODE  VARCHAR
+	-->
+<sqlMap namespace="HGCW007">
+
+	<sql id="condition">
+		<include refid="HGXSDataAuth.authCondition"/>
+		<isNotEmpty prepend=" AND " property="id">
+			ID = #id#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="accountCode">
+			ACCOUNT_CODE = #accountCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyName">
+			COMPANY_NAME = #companyName#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="contractNumber">
+			CONTRACT_NUMBER = #contractNumber#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="deviceName">
+			DEVICE_NAME = #deviceName#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="deviceNumber">
+			DEVICE_NUMBER = #deviceNumber#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="unitPrice">
+			UNIT_PRICE = #unitPrice#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="dayNumber">
+			DAY_NUMBER = #dayNumber#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="totalPrice">
+			TOTAL_PRICE = #totalPrice#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdBy">
+			CREATED_BY = #createdBy#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdName">
+			CREATED_NAME = #createdName#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdTime">
+			CREATED_TIME = #createdTime#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="updatedBy">
+			UPDATED_BY = #updatedBy#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="updatedName">
+			UPDATED_NAME = #updatedName#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="updatedTime">
+			UPDATED_TIME = #updatedTime#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="depCode">
+			DEP_CODE = #depCode#
+		</isNotEmpty>
+	</sql>
+
+	<select id="query" parameterClass="java.util.HashMap"
+			resultClass="com.baosight.hggp.hg.cw.domain.HGCW007">
+		SELECT
+				ID	as "id",  
+				ACCOUNT_CODE	as "accountCode",  <!-- 企业编码 -->
+				COMPANY_CODE	as "companyCode",  <!-- 公司编码 -->
+				COMPANY_NAME	as "companyName",  <!-- 公司名称 -->
+				CONTRACT_NUMBER	as "contractNumber",  <!-- 合同号 -->
+				DEVICE_NAME	as "deviceName",  <!-- 设备名称 -->
+				DEVICE_NUMBER	as "deviceNumber",  <!-- 数量 -->
+				UNIT_PRICE	as "unitPrice",  <!-- 单价 -->
+				DAY_NUMBER	as "dayNumber",  <!-- 天数 -->
+				TOTAL_PRICE	as "totalPrice",  <!-- 总价 -->
+				CREATED_BY	as "createdBy",  <!-- 记录创建者 -->
+				CREATED_NAME	as "createdName",  <!-- 记录创建名称 -->
+				CREATED_TIME	as "createdTime",  <!-- 记录创建时间 -->
+				UPDATED_BY	as "updatedBy",  <!-- 记录修改者 -->
+				UPDATED_NAME	as "updatedName",  <!-- 记录修改名称 -->
+				UPDATED_TIME	as "updatedTime",  <!-- 记录修改时间 -->
+				DEP_CODE	as "depCode" <!-- 部门编码 -->
+		FROM ${hggpSchema}.HGCW007 WHERE 1=1
+        <include refid="condition" />
+		<dynamic prepend="ORDER BY">
+			<isNotEmpty property="orderBy">
+    		  $orderBy$
+			</isNotEmpty>
+			<isEmpty property="orderBy">
+    		  ID asc
+			</isEmpty>
+		</dynamic>
+
+	</select>
+
+	<select id="count" resultClass="int">
+		SELECT COUNT(*) FROM ${hggpSchema}.HGCW007 WHERE 1=1
+    <include refid="condition" />
+	</select>
+
+	<!--
+		<isNotEmpty prepend=" AND " property="id">
+			ID = #id#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="accountCode">
+			ACCOUNT_CODE = #accountCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyName">
+			COMPANY_NAME = #companyName#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="contractNumber">
+			CONTRACT_NUMBER = #contractNumber#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="deviceName">
+			DEVICE_NAME = #deviceName#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="deviceNumber">
+			DEVICE_NUMBER = #deviceNumber#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="unitPrice">
+			UNIT_PRICE = #unitPrice#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="dayNumber">
+			DAY_NUMBER = #dayNumber#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="totalPrice">
+			TOTAL_PRICE = #totalPrice#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdBy">
+			CREATED_BY = #createdBy#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdName">
+			CREATED_NAME = #createdName#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdTime">
+			CREATED_TIME = #createdTime#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="updatedBy">
+			UPDATED_BY = #updatedBy#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="updatedName">
+			UPDATED_NAME = #updatedName#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="updatedTime">
+			UPDATED_TIME = #updatedTime#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="depCode">
+			DEP_CODE = #depCode#
+		</isNotEmpty>
+	-->
+
+	<insert id="insert">
+		INSERT INTO ${hggpSchema}.HGCW007 (ID,
+										ACCOUNT_CODE,  <!-- 企业编码 -->
+										COMPANY_CODE,  <!-- 公司编码 -->
+										COMPANY_NAME,  <!-- 公司名称 -->
+										CONTRACT_NUMBER,  <!-- 合同号 -->
+										DEVICE_NAME,  <!-- 设备名称 -->
+										DEVICE_NUMBER,  <!-- 数量 -->
+										UNIT_PRICE,  <!-- 单价 -->
+										DAY_NUMBER,  <!-- 天数 -->
+										TOTAL_PRICE,  <!-- 总价 -->
+										CREATED_BY,  <!-- 记录创建者 -->
+										CREATED_NAME,  <!-- 记录创建名称 -->
+										CREATED_TIME,  <!-- 记录创建时间 -->
+										UPDATED_BY,  <!-- 记录修改者 -->
+										UPDATED_NAME,  <!-- 记录修改名称 -->
+										UPDATED_TIME,  <!-- 记录修改时间 -->
+										DEP_CODE  <!-- 部门编码 -->
+										)
+	    VALUES (#id#, #accountCode#, #companyCode#, #companyName#, #contractNumber#, #deviceName#, #deviceNumber#, #unitPrice#, #dayNumber#, #totalPrice#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #depCode#)
+	</insert>
+
+	<delete id="delete">
+		DELETE FROM ${hggpSchema}.HGCW007 WHERE
+			ID = #id#
+	</delete>
+
+	<update id="update">
+		UPDATE ${hggpSchema}.HGCW007
+		SET
+					ACCOUNT_CODE	= #accountCode#,   <!-- 企业编码 -->
+					COMPANY_CODE	= #companyCode#,   <!-- 公司编码 -->
+					COMPANY_NAME	= #companyName#,   <!-- 公司名称 -->
+					CONTRACT_NUMBER	= #contractNumber#,   <!-- 合同号 -->
+					DEVICE_NAME	= #deviceName#,   <!-- 设备名称 -->
+					DEVICE_NUMBER	= #deviceNumber#,   <!-- 数量 -->
+					UNIT_PRICE	= #unitPrice#,   <!-- 单价 -->
+					DAY_NUMBER	= #dayNumber#,   <!-- 天数 -->
+					TOTAL_PRICE	= #totalPrice#,   <!-- 总价 -->
+					CREATED_BY	= #createdBy#,   <!-- 记录创建者 -->
+					CREATED_NAME	= #createdName#,   <!-- 记录创建名称 -->
+					CREATED_TIME	= #createdTime#,   <!-- 记录创建时间 -->
+					UPDATED_BY	= #updatedBy#,   <!-- 记录修改者 -->
+					UPDATED_NAME	= #updatedName#,   <!-- 记录修改名称 -->
+					UPDATED_TIME	= #updatedTime#,   <!-- 记录修改时间 -->
+					DEP_CODE	= #depCode#  <!-- 部门编码 -->
+			WHERE
+			ID = #id#
+	</update>
+
+</sqlMap>

src/main/java/com/baosight/hggp/hg/cw/tools/HGCWTools.java

@@ -3,9 +3,7 @@ package com.baosight.hggp.hg.cw.tools;
 import com.baosight.hggp.core.constant.CommonConstant;
 import com.baosight.hggp.core.dao.DaoBase;
 import com.baosight.hggp.core.dao.DaoUtils;
-import com.baosight.hggp.hg.cw.domain.HGCW002;
-import com.baosight.hggp.hg.cw.domain.HGCW003;
-import com.baosight.hggp.hg.cw.domain.HGCW999;
+import com.baosight.hggp.hg.cw.domain.*;
 import com.baosight.hggp.hg.cw.vo.UserVO;
 import com.baosight.hggp.hg.sc.domain.HGSC001A;
 import com.baosight.hggp.hg.xs.domain.Org;
@@ -76,6 +74,44 @@ public class HGCWTools {
         }
     }
 
+    public static class HgCw006 {
+
+        public static HGCW006 getId(String id) {
+            AssertUtils.isNull(id, "合同ID不能为空！");
+            List<HGCW006> results = DaoBase.getInstance().query(HGCW006.QUERY,new HashMap<String,Object>(){
+                {put("id",id);}
+            });
+            return results.get(0);
+        }
+    }
+
+    public static class HgCw007 {
+        public static void save(List<Map> rows, String contractNumber, UserVO userVO) {
+            AssertUtils.isNull(contractNumber, "合同号不能为空！");
+            rows.forEach(row -> {
+                HGCW007 hgcw007 = new HGCW007();
+                hgcw007.fromMap(row);
+                hgcw007.setCompanyCode(userVO.getUsercode());
+                hgcw007.setCompanyName(userVO.getUsername());
+                hgcw007.setContractNumber(contractNumber);
+                DaoUtils.insert(HGCW007.INSERT, hgcw007);
+            });
+        }
+
+        /**
+         * 根据合同号获取合同清单
+         * @param contractNumber
+         * @return
+         */
+        public static List<HGCW007> queryByContractNumber(String contractNumber) {
+            AssertUtils.isNull(contractNumber, "合同号不能为空！");
+            List<HGCW007> results = DaoBase.getInstance().query(HGCW007.QUERY,new HashMap<String,Object>(){
+                {put("contractNumber",contractNumber);}
+            });
+            return results;
+        }
+    }
+
     public static class HgCw999 {
 
         public static void batchUpdate(List<Map> rows, Long id) {

src/main/java/com/baosight/hggp/hg/pz/service/ServiceHGPZ005.java

@@ -48,7 +48,7 @@ public class ServiceHGPZ005 extends ServiceBase {
 	@OperationLogAnnotation(operModul = "存货档案", operType = "查询", operDesc = "初始化")
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_TYPE_BLOCK_ID), null, false);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_TYPE_BOX_BLOCK_ID), null, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGPZ005().eiMetadata);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
@@ -248,6 +248,24 @@ public class ServiceHGPZ005 extends ServiceBase {
 	}
 
 	/**
+	 * 下拉框 (不默认状态)
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "存货档案",operType = "查询",operDesc = "下拉框（不默认状态）")
+	public EiInfo queryInventCodeBox(EiInfo inInfo) {
+		try {
+			List<DdynamicEnum> list = new ArrayList<>();
+			list.add(DdynamicEnum.INVENT_RECORD_BOX_BLOCK_ID);
+			CommonMethod.initBlock(inInfo, list, EiInfoUtils.getFirstRow(inInfo), false);
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询规格失败");
+		}
+		return inInfo;
+	}
+
+	/**
 	 * 下拉框
 	 *
 	 * @param inInfo
@@ -265,6 +283,24 @@ public class ServiceHGPZ005 extends ServiceBase {
 		return inInfo;
 	}
 
+	/**
+	 * 下拉框
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "存货档案",operType = "查询",operDesc = "下拉框（不默认状态）")
+	public EiInfo queryInventBoxAll(EiInfo inInfo) {
+		try {
+			List<DdynamicEnum> list = new ArrayList<>();
+			list.add(DdynamicEnum.INVENT_ALL_BOX_BLOCK_ID);
+			CommonMethod.initBlock(inInfo, list, EiInfoUtils.getFirstRow(inInfo), false);
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询规格失败");
+		}
+		return inInfo;
+	}
+
 	@OperationLogAnnotation(operModul = "存货档案",operType = "导入",operDesc = "导入操作")
 	public EiInfo importDate(EiInfo inInfo) {
 		try {

src/main/java/com/baosight/hggp/hg/pz/service/ServiceHGPZ007.java

@@ -229,5 +229,23 @@ public class ServiceHGPZ007 extends ServiceBase {
 		}
 		return inInfo;
 	}
+
+	/**
+	 * 下拉框
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "仓库档案",operType = "查询",operDesc = "下拉框不默认状态")
+	public EiInfo queryWhCodeBox(EiInfo inInfo) {
+		try {
+			List<DdynamicEnum> list = new ArrayList<>();
+			list.add(DdynamicEnum.WH_CODE_BLOCK_ID);
+			CommonMethod.initBlock(inInfo, list, EiInfoUtils.getFirstRow(inInfo), false);
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询规格失败");
+		}
+		return inInfo;
+	}
 	
 }

src/main/java/com/baosight/hggp/hg/pz/service/ServiceHGPZ010.java

@@ -45,8 +45,8 @@ public class ServiceHGPZ010 extends ServiceBase {
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_TYPE_BLOCK_ID), null, false);
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), null, false);
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_TYPE_BLOCK_ID), null, false);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_CODE_BLOCK_ID), null, false);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_TYPE_BOX_BLOCK_ID), null, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGPZ010().eiMetadata);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");

src/main/java/com/baosight/hggp/hg/pz/sql/HGPZ004.xml

@@ -221,6 +221,26 @@
 			ID = #id#
 	</update>
 
+	<select id="queryInventTypeBox" parameterClass="java.util.HashMap"
+			resultClass="java.util.HashMap">
+		SELECT DISTINCT
+		INVENT_TYPE as "inventType",
+		INVENT_TYPE_NAME as "inventTypeName",
+		STATUS AS "status"
+		FROM ${hggpSchema}.HGPZ004
+		WHERE DELETE_FLAG = 0
+		<isNotEmpty prepend=" AND " property="accountCode">
+			ACCOUNT_CODE = #accountCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="inventType">
+			INVENT_TYPE = #inventType#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="status">
+			STATUS = #status#
+		</isNotEmpty>
+		ORDER BY INVENT_TYPE
+	</select>
+
 	<select id="queryComboBox" parameterClass="java.util.HashMap"
 			resultClass="java.util.HashMap">
 		SELECT DISTINCT

src/main/java/com/baosight/hggp/hg/pz/sql/HGPZ005.xml

@@ -318,6 +318,26 @@
 		ORDER BY INVENT_CODE
 	</select>
 
+	<select id="queryInventCodeBox" parameterClass="java.util.HashMap"
+			resultClass="java.util.HashMap">
+		SELECT DISTINCT
+		INVENT_CODE as "inventCode",
+		INVENT_NAME as "inventName",
+		STATUS as "status"
+		FROM ${hggpSchema}.HGPZ005
+		WHERE DELETE_FLAG = 0
+		<isNotEmpty prepend=" AND " property="accountCode">
+			ACCOUNT_CODE = #accountCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="inventType">
+			INVENT_TYPE = #inventType#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="status">
+			STATUS = #status#
+		</isNotEmpty>
+		ORDER BY INVENT_CODE
+	</select>
+
 	<select id="queryProductComboBox" parameterClass="java.util.HashMap"
 			resultClass="java.util.HashMap">
 		SELECT DISTINCT
@@ -359,6 +379,23 @@
 		<include refid="condition"/>
 		ORDER BY ID
 	</select>
+	<!---->
+	<select id="queryInventBoxAll" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
+		SELECT DISTINCT
+		ID AS "id",
+		(CASE WHEN SPEC = '' THEN '无规格' ELSE SPEC END) AS "spec",
+		LENGTH AS "length" ,  <!-- 长 -->
+		WIDTH AS "width" ,  <!-- 宽 -->
+		THICK AS "thick" ,  <!-- 厚 -->
+		COEFFICIENT AS "coefficient" ,  <!-- 系数 -->
+		MATERIAL AS "material" ,  <!-- 材质 -->
+		UNIT AS "unit",   <!-- 单位 -->
+		STATUS AS "status"
+		FROM ${hggpSchema}.HGPZ005
+		WHERE DELETE_FLAG = 0
+		<include refid="condition"/>
+		ORDER BY ID
+	</select>
 
     <!-- 规格下拉框(无ID) -->
     <select id="queryComboBoxSpecName" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">

src/main/java/com/baosight/hggp/hg/pz/sql/HGPZ006.xml

@@ -205,16 +205,19 @@
 			resultClass="java.util.HashMap">
 		SELECT DISTINCT
 		WH_TYPE as "whType",
-		WH_TYPE_NAME as "whTypeName"
+		WH_TYPE_NAME as "whTypeName",
+		STATUS as "status"
 		FROM ${hggpSchema}.HGPZ006
 		WHERE DELETE_FLAG = 0
-		AND STATUS=1
 		<isNotEmpty prepend=" AND " property="accountCode">
 			ACCOUNT_CODE = #accountCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="whType">
 			WH_TYPE = #whType#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="status">
+			STATUS = #status#
+		</isNotEmpty>
 		ORDER BY WH_TYPE
 	</select>
 

src/main/java/com/baosight/hggp/hg/pz/sql/HGPZ007.xml

@@ -238,4 +238,24 @@
 		ORDER BY WH_CODE
 	</select>
 
+	<select id="queryWhCodeBox" parameterClass="java.util.HashMap"
+			resultClass="java.util.HashMap">
+		SELECT DISTINCT
+		WH_CODE as "whCode",
+		WH_NAME as "whName",
+		STATUS as "status"
+		FROM ${hggpSchema}.HGPZ007
+		WHERE DELETE_FLAG = 0
+		<isNotEmpty prepend=" AND " property="status">
+			STATUS = #status#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="accountCode">
+			ACCOUNT_CODE = #accountCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="whType">
+			WH_TYPE = #whType#
+		</isNotEmpty>
+		ORDER BY WH_CODE
+	</select>
+
 </sqlMap>

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC006A.java

+package com.baosight.hggp.hg.sc.service;
+
+import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
+import com.baosight.hggp.hg.sc.domain.HGSC005A;
+import com.baosight.hggp.hg.sc.domain.HGSC006A;
+import com.baosight.hggp.util.LogUtils;
+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;
+
+
+/**
+ * @Author wwl
+ * @Date 2024/5/6 19:48
+ */
+public class ServiceHGSC006A extends ServiceBase {
+
+    @OperationLogAnnotation(operModul = "生产订单详情", operType = "查询", operDesc = "初始化页面")
+    public EiInfo initLoad(EiInfo inInfo) {
+        try {
+            String planCode = inInfo.getCellStr(EiConstant.queryBlock,0,HGSC006A.FIELD_order_code);
+            inInfo = super.query(inInfo, HGSC006A.QUERY, new HGSC006A());
+        } catch (PlatException e) {
+            LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+        }
+        return inInfo;
+    }
+
+    @OperationLogAnnotation(operModul = "生产订单详情", operType = "查询", operDesc = "查询")
+    public EiInfo query(EiInfo inInfo) {
+        try {
+            inInfo = super.query(inInfo, HGSC005A.QUERY, new HGSC005A());
+            inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+        } catch (PlatException e) {
+            LogUtils.setDetailMsg(inInfo, e, "查询失败");
+        }
+        return inInfo;
+    }
+
+}
+

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

@@ -40,16 +40,16 @@
 			company_code = #companyCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="companyName">
-			company_name = #companyName#
+			company_name like ('%$companyName$%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="projCode">
 			proj_code = #projCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="projName">
-			proj_name = #projName#
+			proj_name like ('%projName%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="orderCode">
-			order_code = #orderCode#
+			order_code like ('%orderCode%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="assignStatus">
 			assign_status = #assignStatus#

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

@@ -85,7 +85,7 @@
 			proj_code = #projCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="projName">
-			proj_name = #projName#
+			proj_name like ('%projName%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="orderCode">
 			order_code = #orderCode#
@@ -97,7 +97,7 @@
 			product_code = #productCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="productName">
-			product_name = #productName#
+			product_name like ('%productName%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="assignDate">
 			assign_date = #assignDate#

src/main/resources/resources/ibatis/sqlmap-config.xml

@@ -37,6 +37,9 @@
     <sqlMap resource="com/baosight/hggp/hg/cw/sql/HGCW001.xml"/>
     <sqlMap resource="com/baosight/hggp/hg/cw/sql/HGCW002.xml"/>
     <sqlMap resource="com/baosight/hggp/hg/cw/sql/HGCW003.xml"/>
+    <sqlMap resource="com/baosight/hggp/hg/cw/sql/HGCW006.xml"/>
+    <sqlMap resource="com/baosight/hggp/hg/cw/sql/HGCW007.xml"/>
+
 
     <!--配置-->
     <sqlMap resource="com/baosight/hggp/hg/pz/sql/HGPZ005A.xml"/>

src/main/webapp/HG/CW/HGCW002.jsp

@@ -12,7 +12,7 @@
         <div class="row">
             <EF:EFSelect cname="公司名称" blockId="inqu_status" ename="companyCode" row="0" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="factory_record_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
             <EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="3" />
             <EF:EFInput cname="合同号" ename="contractNumber" blockId="inqu_status" row="0" colWidth="3" />

src/main/webapp/HG/CW/HGCW002A.jsp

@@ -120,7 +120,7 @@
         </div>
     </EF:EFRegion>
     <EF:EFRegion id="detail1" title="合同清单">
-        <EF:EFGrid blockId="detail1" autoDraw="override" checkMode="row" isFloat="true">
+        <EF:EFGrid blockId="detail1" autoDraw="override" checkMode="row" isFloat="true" copyToAdd="false">
             <EF:EFColumn ename="rowNo" cname="行号" hidden="true"/>
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
             <EF:EFColumn ename="inventory" cname="清单"  align="center" />

src/main/webapp/HG/CW/HGCW002B.jsp

@@ -122,7 +122,7 @@
         </div>
     </EF:EFRegion>
     <EF:EFRegion id="detail1" title="合同清单">
-        <EF:EFGrid blockId="detail1" autoDraw="override" checkMode="row" isFloat="true">
+        <EF:EFGrid blockId="detail1" autoDraw="override" checkMode="row" isFloat="true" copyToAdd="false">
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
             <EF:EFColumn ename="contractNumber" cname="合同号" hidden="true"/>
             <EF:EFColumn ename="inventory" cname="清单"  align="center" />

src/main/webapp/HG/CW/HGCW004.jsp

@@ -20,7 +20,7 @@
             <EF:EFInput cname="乙方名称" ename="partyB" blockId="inqu_status" row="0" colWidth="3" />
             <EF:EFDateSpan startCname="签订日期(从)" endCname="至" blockId="inqu_status"
                            startName="signingDateFrom" endName="signingDateTo" row="0" role="date"
-                           format="yyyyMMdd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
+                           format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
             </EF:EFDateSpan>
             <EF:EFInput cname="主合同名称" ename="contractName" blockId="inqu_status" row="0" colWidth="3" />
             <EF:EFSelect cname="审批状态" ename="inqu_status-0-reviewStatus" colWidth="3" filter="contains">
@@ -55,7 +55,7 @@
             <EF:EFColumn ename="contractContent" cname="签证事由及内容" width="120" enable="true" readonly="true" align="center" required="true"/>
             <EF:EFColumn ename="totalContractPriceIncluding" cname="含税金额" width="120" enable="true" readonly="true" align="center" required="true"/>
             <EF:EFColumn ename="signingDate" cname="签订日期" width="120" enable="true" readonly="true" align="center" editType="date"
-                         dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
+                         dateFormat="yyyy-MM-dd" parseFormats="['yyyy-MM-dd']" required="true"/>
             <EF:EFComboColumn ename="reviewStatus" cname="审批状态" width="100" align="center" required="true"
                               columnTemplate="#=textField#" itemTemplate="#=textField#" enable="false" >
                 <EF:EFCodeOption codeName="hggp.cw.reviewStatus"/>

src/main/webapp/HG/CW/HGCW006.js

+
+$(function() {
+
+    // 查询
+    $("#QUERY").on("click", function () {
+        query();
+    });
+
+
+    IPLATUI.EFGrid.result = {
+        pageable: {
+            pageSize: 20,
+            pageSizes: [10,20,30,50,100,200],
+        },
+        columns: [{
+            field: "operator",
+            template: function (item) {
+                let template = '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+                    + 'onclick="contractDetailFunc(' + item.id + ')">合同详情</a>';
+                template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+                    + 'onclick="fileDetailFunc(' + item.id + ')">附件详情</a>';
+                return template;
+            }
+        }
+        ],
+        loadComplete: function (e) {
+            $("#BTN_INSERT").on("click",addFunc);
+            $("#BTN_UPDATE").on("click",updateFunc);
+            $("#BTN_SUBMIT").on("click",submitFunc);
+
+        },
+        onSuccess: function (e) {
+            if (e.eiInfo.extAttr.methodName == 'save' || e.eiInfo.extAttr.methodName == 'delete') {
+                query();
+            }
+        },
+    }
+
+
+    window.document.addEventListener("keyup",function (event) {
+        if(event.keyCode === 13){
+            var grid = $("#ef_grid_result").data("kendoGrid");
+            // 回填
+            //grid.addRows(returnRows);
+            grid.closeCell();
+        }
+    })
+});
+
+$(window).load(function () {
+    // 查
+    query();
+});
+
+/**
+ * 查询
+ */
+let query = function () {
+    resultGrid.dataSource.page(1);
+}
+
+/**
+ * 新增
+ */
+function addFunc() {
+    JSColorbox.open({
+        href: "HGCW006A?methodName=initLoad&efParentFormEname=HGCW006",
+        title: "<div style='text-align: center;'>新增合同</div>",
+        width: "90%",
+        height: "90%",
+        callbackName: windowCallback
+    });
+}
+
+/**
+ * 修改
+ */
+function updateFunc() {
+    let rows = resultGrid.getCheckedRows();
+    if (rows.length != 1) {
+        message("请选择一条数据");
+        return;
+    }
+    JSColorbox.open({
+        href: "HGCW006B?methodName=initLoad&id=" + rows[0].id + "&efParentFormEname=HGCW006",
+        title: "<div style='text-align: center;'>修改合同</div>",
+        width: "90%",
+        height: "90%",
+        callbackName: windowCallback
+    });
+}
+
+
+function windowCallback() {
+    // 刷新列表
+    resultGrid.dataSource.page(1);
+    // 关闭弹窗
+    JSColorbox.close();
+}
+
+function contractDetailFunc(id) {
+    JSColorbox.open({
+        href: "HGCW006C?methodName=initLoad&id=" + id + "&efParentFormEname=HGCW006",
+        title: "<div style='text-align: center;'>合同详情</div>",
+        width: "90%",
+        height: "90%",
+        callbackName: windowCallback
+    });
+}
+
+function fileDetailFunc(id) {
+    JSColorbox.open({
+        href: "HGCW999?methodName=initLoad&inqu_status-0-bizType=ZL&inqu_status-0-matId=" + id + "&efParentFormEname=HGCW006",
+        title: "<div style='text-align: center;'>附件清单</div>",
+        width: "80%",
+        height: "80%",
+    });
+}
+
+function submitFunc() {
+    let rows = resultGrid.getCheckedRows();
+    if (rows.length != 1) {
+        message("请选择一条数据");
+        return;
+    }
+    var flag = true;
+    rows.forEach(function (row) {
+        if (row.reviewStatus == "3") {
+            message("勾选的数据中有已经提交的合同！");
+            flag = false;
+        }
+    })
+
+    if (flag) {
+        JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"提交\"操作? ", {
+            ok: function () {
+                var info = new EiInfo();
+                info.addBlock(JSUtils.checkedRows2Block("result"));
+                EiCommunicator.send("HGCW006", "submit", info, {
+                    onSuccess: function (ei) {
+                        if (ei.getStatus() >= 0) {
+                            try {
+                                query();
+                            } catch (e) {
+                                // TODO: handle exception
+                            }
+                            if (ei.getStatus() == 0) {
+                                NotificationUtil(ei, 'warning');
+                            } else {
+                                NotificationUtil(ei);
+                            }
+                        } else {
+                            NotificationUtil(ei, "error");
+                        }
+                    },
+                    onFail: function (ei) {
+                        // 发生异常
+                        NotificationUtil("操作失败，原因[" + ei + "]", "error");
+                    }
+                });
+            }
+        });
+
+    }
+}
+
+

src/main/webapp/HG/CW/HGCW006.jsp

+<!DOCTYPE html>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
+
+<c:set var="ctx" value="${pageContext.request.contextPath}"/>
+<head>
+</head>
+<EF:EFPage title="合同管理">
+
+    <EF:EFRegion id="inqu" title="查询条件">
+        <div class="row">
+            <EF:EFSelect cname="公司名称" blockId="inqu_status" ename="companyCode" row="0" colWidth="3" filter="contains">
+                <EF:EFOption label="全部" value=""/>
+                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+            </EF:EFSelect>
+            <EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="3" />
+            <EF:EFInput cname="合同号" ename="contractNumber" blockId="inqu_status" row="0" colWidth="3" />
+            <EF:EFInput cname="合同名称" ename="contractName" blockId="inqu_status" row="0" colWidth="3" />
+            <EF:EFDateSpan startCname="租赁日期(从)" endCname="至" blockId="inqu_status"
+                           startName="signingDateFrom" endName="signingDateTo" row="0" role="date"
+                           format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
+            </EF:EFDateSpan>
+            <EF:EFInput cname="甲方名称" ename="partyA" blockId="inqu_status" row="0" colWidth="3" />
+            <EF:EFInput cname="乙方名称" ename="partyB" blockId="inqu_status" row="0" colWidth="3" />
+            <EF:EFSelect cname="审批状态" ename="inqu_status-0-reviewStatus" colWidth="3" filter="contains">
+                <EF:EFOption label="全部" value=""/>
+                <EF:EFCodeOption codeName="hggp.cw.reviewStatus"/>
+            </EF:EFSelect>
+        </div>
+    </EF:EFRegion>
+
+    <EF:EFRegion id="result" title="记录集">
+        <EF:EFGrid blockId="result" autoDraw="no" isFloat="true" autoBind="false">
+            <EF:EFColumn ename="id" cname="主键" hidden="true"/>
+            <EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="200" align="center"/>
+            <EF:EFColumn ename="companyName" cname="所属公司" align="center" enable="false"/>
+            <EF:EFColumn ename="projCode" cname="项目编号" align="center" enable="false"/>
+            <EF:EFColumn ename="projName" cname="项目名称" align="center" enable="false"/>
+            <EF:EFColumn ename="signingDate" cname="签订日期" align="center" enable="false"/>
+            <EF:EFColumn ename="contractNumber" cname="合同号" align="center" enable="false"/>
+            <EF:EFColumn ename="contractName" cname="合同名称" align="center" enable="false"/>
+            <EF:EFColumn ename="partyA" cname="甲方名称" align="center" enable="false"/>
+            <EF:EFColumn ename="partyB" cname="乙方名称" align="center" enable="false"/>
+
+            <EF:EFComboColumn ename="contractStatus" cname="合同状态" width="100" align="center" 
+                              columnTemplate="#=textField#" itemTemplate="#=textField#" enable="false" >
+                <EF:EFCodeOption codeName="hggp.cw.contractStatus"/>
+            </EF:EFComboColumn>
+            <EF:EFComboColumn ename="reviewStatus" cname="审批状态" width="100" align="center" 
+                              columnTemplate="#=textField#" itemTemplate="#=textField#" enable="false" >
+                <EF:EFCodeOption codeName="hggp.cw.reviewStatus"/>
+            </EF:EFComboColumn>
+        </EF:EFGrid>
+    </EF:EFRegion>
+</EF:EFPage>
+
+
+<script>
+    var ctx = "${ctx}";
+</script>
+<script src="${ctx}/HG/CW/HGCW006.js"></script>
\ No newline at end of file

src/main/webapp/HG/CW/HGCW006A.js

+$(function() {
+
+    $("#cancel").on("click", function () {
+        cancelFunc();
+    });
+    $("#btn_save").on("click", function () {
+        btnSaveFunc();
+    });
+
+    IPLATUI.EFGrid.detail1 = {
+        pageable: {
+            pageSize: 20,
+            pageSizes: [10,20,30,50,100,200],
+        },
+        columns: [
+        ],
+        loadComplete: function (grid) {
+            grid.dataSource.bind("change", function(e) {
+                if (e.field == "dayNumber") {
+                    var tr,index;
+                    // 获取此model元素信息
+                    var item = e.items[0];
+                    // 计算总金额
+                    var taxPoints = $("#result-0-taxPoints").val() ? $("#result-0-taxPoints").val() / 100 : 0;
+                    var deviceNumber = parseFloat(item.deviceNumber) || 0;
+                    var unitPrice = parseFloat(item.unitPrice) || 0;
+                    var dayNumber = parseFloat(item.dayNumber) || 0;
+                    var totalPrice = deviceNumber * unitPrice * dayNumber;
+                    detail1Grid.setCellValue(item, 'totalPrice', parseFloat(totalPrice));
+                    console.log(grid.dataSource._data);
+                    console.log(detail1Grid.getDataItems());
+                    var allRows = detail1Grid.getDataItems();
+                    var totalPriceExcluding = 0;
+                    var totalPriceIncluding = 0;
+                    var valueAddedTax = 0;
+                    totalPrice = 0;
+                    deviceNumber = 0
+                    allRows.forEach(function (row, index) {
+                        totalPrice += parseFloat(row.totalPrice);
+                        deviceNumber += parseFloat(row.deviceNumber);
+                    });
+                    totalPriceExcluding = totalPrice;
+                    totalPriceIncluding = totalPriceExcluding * (1 + parseFloat(taxPoints));
+                    valueAddedTax = parseFloat(totalPriceIncluding) - parseFloat(totalPriceExcluding);
+                    $("#result-0-totalContractPriceExcluding").val(parseFloat(totalPriceExcluding).toFixed(3))
+                    $("#result-0-totalContractPriceIncluding").val(parseFloat(totalPriceIncluding).toFixed(3))
+                    $("#result-0-valueAddedTax").val(parseFloat(valueAddedTax).toFixed(3))
+                    $("#result-0-totalQuantity").val(parseFloat(deviceNumber).toFixed(3))
+
+                }
+            });
+        },
+        onSave: function (e) {
+            // 阻止默认请求，使用自定义保存
+            e.preventDefault();
+            saveResult1Func();
+        },
+        onDelete: function (e) {
+            // 阻止默认请求，使用自定义删除
+            e.preventDefault();
+            deleteResult1Func();
+        },
+    }
+
+    $("#UPLOAD_FILE").on("click", function () {
+        uploadFileFunc();
+    });
+
+    $("#DELETE_FILE").on("click", function () {
+        deleteFileFunc();
+    });
+    IPLATUI.EFGrid.detail2 = {
+        pageable: {
+            pageSize: 20,
+            pageSizes: [10,20,30,50,100,200],
+        },
+        columns: [
+        ]
+    }
+
+    /**
+     * 下拉框事件
+     * @type {{"result-0-contractType": {select: IPLATUI.EFSelect.result-0-contractType.select}, projCodeBox: {select: IPLATUI.EFSelect.projCodeBox.select}}}
+     */
+    IPLATUI.EFSelect = {
+        "projCodeBox": {
+            // 点击下拉选项时触发
+            select: function (e) { //获取勾选值
+                var dataItem = e.dataItem;
+                console.log(dataItem)
+                var valueField = dataItem['valueField'];
+                var textField = "";
+                if (valueField) {
+                    textField = dataItem['textField'].split("-")[1];
+                    $("#result-0-projCode").val(valueField);
+                    $("#result-0-projName").val(textField);
+                } else {
+                    $("#result-0-projName").val(textField);
+                }
+            }
+        }
+    }
+
+    IPLATUI.EFPopupInput = {
+        "popupInputPartyA": {
+
+            /**
+             * EFGrid 查询时触发的事件，通常在此处，设置查询条件
+             * 注意: 必须返回一个EiInfo，作为初始查询条件
+             * 配置了query时，默认每次打开窗口都会进行一次查询
+             */
+            query: function (e) {
+                console.log("Step" + (++i) + ": ----query----");
+                var info = new EiInfo();
+                return info;
+            },
+            /**
+             * grid中的数据回填时触发的事件
+             * @param e 回填数据事件
+             * e.sender 弹出窗口对象
+             * e.grid 弹出的grid对象
+             * e.model 选中的数据行model
+             */
+            backFill: function (e) {
+                console.log("Step" + (++i) + ": ----backFill----");
+                // 回填数据
+                var model = e.model;
+                // var data = model.toJSON();
+                console.log(model);
+                var partyA = model.usercode + "-" + model.username;
+                $("#result-0-partyA").val(partyA);
+                IPLAT.EFPopupInput.text( $("#popupInputPartyA") , partyA)
+                e.preventDefault(); // 不使用默认的回填逻辑
+            }
+        }
+    };
+
+    window.document.addEventListener("keyup",function (event) {
+        if(event.keyCode === 13){
+            var grid = $("#ef_grid_result").data("kendoGrid");
+            // 回填
+            //grid.addRows(returnRows);
+            grid.closeCell();
+        }
+    })
+});
+
+
+function uploadFileFunc() {
+    JSColorbox.open({
+        href: "HGCW099?methodName=initLoad&inqu_status-0-bizType=ZL",
+        title: "<div style='text-align: center;'>附件上传</div>",
+        width: "60%",
+        height: "50%",
+        callbackName: uploadFileCallback
+    });
+}
+/**
+ * 附件上传回调
+ *
+ * @param docId
+ */
+function uploadFileCallback(data) {
+    let inEiInfo = new EiInfo();
+    inEiInfo.set("result-0-docId", data.docId);
+    inEiInfo.set("result-0-bizType", data.bizType);
+    EiCommunicator.send('HGCW999', 'insert', inEiInfo, {
+        onSuccess(response) {
+            if (response.status === 0) {
+                EiCommunicator.send('HGCW999', 'queryDoc', inEiInfo, {
+                    onSuccess(e) {
+                        console.log(e);
+                        if (e.status === 0) {
+                            let data = e.extAttr.data;
+                            detail2Grid.dataSource.insert();
+                            detail2Grid.setCellValue(0, "rowNo", 0);
+                            detail2Grid.setCellValue(0, "id", data.id);
+                            detail2Grid.setCellValue(0, "docId", data.docId);
+                            detail2Grid.setCellValue(0, "docName", data.docName);
+                            detail2Grid.setCellValue(0, "createdTime", data.createdTime);
+                            detail2Grid.refresh();
+                        } else {
+                            NotificationUtil("执行失败！", "error");
+                        }
+                    },
+                    onFail(errorMessage, status, e) {
+                        NotificationUtil("执行失败！", "error");
+                    }
+                }, {
+                    async: false
+                });
+            } else {
+                NotificationUtil("执行失败！", "error");
+            }
+        },
+        onFail(errorMessage, status, e) {
+            NotificationUtil("执行失败！", "error");
+        }
+    }, {
+        async: false
+    });
+}
+
+function cancelFunc() {
+// 关闭弹窗
+    parent.JSColorbox.setValueCallback();
+}
+
+function btnSaveFunc() {
+    fieldValidation();
+    JSUtils.confirm("确定对数据做\"保存\"操作? ", {
+        ok: function () {
+            JSUtils.submitGrid("detail1,detail2", "HGCW006", "save", {isAlldata:true,onSuccessCallback:parent.windowCallback});
+        }
+    });
+}
+function deleteFileFunc() {
+    let rows = detail2Grid.getCheckedRows();
+    if (rows.length < 1) {
+        message("请选择数据");
+        return;
+    }
+    rows.forEach(function (row) {
+        detail2Grid.removeRows([rows.rowNo]);// 刷新行号
+    })
+    refreshRowNo();
+}
+function deleteResult1Func() {
+    let rows = detail1Grid.getCheckedRows();
+    if (rows.length < 1) {
+        message("请选择数据");
+        return;
+    }
+    rows.forEach(function (row) {
+        detail1Grid.removeRows([rows.rowNo]);// 刷新行号
+    })
+    refreshRowNo();
+}
+
+let refreshRowNo = function () {
+    let allRows = detail1Grid.getDataItems();
+    for (let i = 0; i < allRows.length; i++) {
+        detail1Grid.setCellValue(i, "rowNo", i);
+        detail1Grid.refresh();
+    }
+}
+function fieldValidation() {
+
+}
+$(window).load(function () {
+    refreshRowNo();
+});
+
+

src/main/webapp/HG/CW/HGCW006A.jsp

+<!DOCTYPE html>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
+
+<c:set var="ctx" value="${pageContext.request.contextPath}"/>
+<head>
+</head>
+<EF:EFPage title="新增合同">
+    <EF:EFRegion id="inqu1" title="基本信息">
+        <div class="row">
+            <EF:EFSelect cname="项目编号" ename="projCodeBox" colWidth="4" required="true" filter="contains">
+                <EF:EFOption label="-- 请选择 --" value="" />
+                <EF:EFOptions
+                        blockId="projectCodeBox_block_id" valueField="valueField" textField="textField"/>
+            </EF:EFSelect>
+            <EF:EFInput ename="result-0-projCode" cname="项目编号" type="hidden"/>
+            <EF:EFInput ename="result-0-projName" cname="项目简称" colWidth="4" readonly="true"/>
+            <EF:EFInput ename="result-0-contractNumber" cname="合同号" colWidth="4" readonly="true" />
+        </div>
+        <div class="row">
+            <EF:EFInput ename="result-0-contractName" cname="合同名称" colWidth="4" required="true"/>
+            <EF:EFPopupInput ename="popupInputPartyA" cname="甲方名称" colWidth="4"
+                             serviceName="HGCW006A" methodName="partyAQuery"
+                             resultId="partyAResult"
+                             required="true" save="false" popupType="ServiceGrid"
+                             valueField="username" textField="username"
+                             columnEnames="username,usercode"
+                             columnCnames="名称,编码"
+                             readonly="true"
+                             resizable="true" popupTitle="甲方名称" popupWidth="400">
+            </EF:EFPopupInput>
+            <EF:EFInput ename="result-0-partyA" cname="甲方名称" type="hidden" />
+            <EF:EFInput ename="result-0-partyB" cname="乙方名称" colWidth="4" />
+
+        </div>
+        <div class="row">
+            <EF:EFDatePicker cname="签约日期" ename="result-0-signingDate" colWidth="4"
+                             format="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
+            <EF:EFInput ename="result-0-totalQuantity" cname="总数量" colWidth="4" readonly="true"/>
+            <EF:EFInput ename="result-0-partyAName" cname="甲方联系人姓名" colWidth="4" />
+        </div>
+        <div class="row">
+            <EF:EFInput ename="result-0-partyAPhoneNumber" cname="甲方联系人电话" colWidth="4" />
+            <EF:EFInput ename="result-0-alreadyName" cname="已方联系人姓名" colWidth="4" />
+            <EF:EFInput ename="result-0-alreadyPhoneNumber" cname="已方联系人电话" colWidth="4" />
+        </div>
+        <div class="row">
+            <EF:EFDateSpan startCname="租赁开始/结束日期" endCname="至" required="true" colWidth="8" blockId="result"
+                           startName="leaseStartDate" endName="leaseEndDate" row="0" role="date"
+                           format="yyyy-MM-dd" ratio="4:4" satrtRatio="4:8" endRatio="4:8">
+            </EF:EFDateSpan>
+            <EF:EFSelect cname="合同状态" ename="result-0-contractStatus" colWidth="4" filter="contains">
+                <EF:EFOption label="-- 请选择 --" value=""/>
+                <EF:EFCodeOption codeName="hggp.cw.contractStatus"/>
+            </EF:EFSelect>
+        </div>
+    </EF:EFRegion>
+    <EF:EFRegion id="inqu2" title="承包方式及合同价款">
+        <div class="row">
+            <EF:EFSelect cname="付款方式" ename="result-0-paymentMethod" colWidth="4" filter="contains">
+                <EF:EFOption label="-- 请选择 --" value=""/>
+                <EF:EFCodeOption codeName="hggp.cw.paymentMethod"/>
+            </EF:EFSelect>
+            <EF:EFSelect cname="计价方式" ename="result-0-pricingMethod" colWidth="4" filter="contains">
+                <EF:EFOption label="-- 请选择 --" value=""/>
+                <EF:EFCodeOption codeName="hggp.cw.pricingMethod"/>
+            </EF:EFSelect>
+            <EF:EFSelect cname="税点" ename="result-0-taxPoints" colWidth="4" filter="contains">
+                <EF:EFOption label="-- 请选择 --" value=""/>
+                <EF:EFCodeOption codeName="hggp.cw.taxPoints"/>
+            </EF:EFSelect>
+        </div>
+        <div class="row">
+            <EF:EFInput ename="result-0-totalContractPriceExcluding" cname="合同总价（不含税）" colWidth="4" readonly="true"/>
+            <EF:EFInput ename="result-0-valueAddedTax" cname="增值税" colWidth="4" readonly="true"/>
+            <EF:EFInput ename="result-0-totalContractPriceIncluding" cname="合同总价（含税）" colWidth="4" readonly="true"/>
+        </div>
+    </EF:EFRegion>
+    <EF:EFRegion id="detail1" title="合同清单">
+        <EF:EFGrid blockId="detail1" autoDraw="override" checkMode="row" isFloat="true" copyToAdd="false">
+            <EF:EFColumn ename="rowNo" cname="行号" hidden="true"/>
+            <EF:EFColumn ename="id" cname="主键" hidden="true"/>
+            <EF:EFColumn ename="deviceName" cname="设备名称"  align="center" />
+            <EF:EFColumn ename="deviceNumber" cname="数量"  format="{0:N3}" align="center"/>
+            <EF:EFColumn ename="unitPrice" cname="单价"  format="{0:N3}" align="center"/>
+            <EF:EFColumn ename="dayNumber" cname="天数" format="{0:N3}" align="center"/>
+            <EF:EFColumn ename="totalPrice" cname="总价" enable="false" format="{0:N3}" align="center"/>
+        </EF:EFGrid>
+    </EF:EFRegion>
+    <EF:EFRegion id="detail2" title="附件信息">
+        <EF:EFGrid blockId="detail2" autoDraw="override" checkMode="row" isFloat="true">
+            <EF:EFColumn ename="rowNo" cname="行号" hidden="true"/>
+            <EF:EFColumn ename="id" cname="ID" hidden="true"/>
+            <EF:EFColumn ename="docId" cname="文件ID" enable="false" width="150"/>
+            <EF:EFColumn ename="docName" cname="文件名称" enable="false" width="150"/>
+            <EF:EFColumn ename="createdTime" cname="创建时间" enable="false" width="140" align="center"
+                         parseFormats="['yyyyMMddHHmmss']" editType="datetime" dateFormat="yyyy-MM-dd HH:mm:ss"/>
+        </EF:EFGrid>
+    </EF:EFRegion>
+    <div class="row" style="display:flex;justify-content:center;">
+        <EF:EFButton ename="cancel"  cname="取消" type="button" class="btn-center"/>
+        <EF:EFButton ename="btn_save"  cname="保存" type="button" class="btn-center"/>
+    </div>
+</EF:EFPage>
+
+
+<script>
+    var ctx = "${ctx}";
+</script>
+<script src="${ctx}/HG/CW/HGCW006A.js"></script>
\ No newline at end of file

src/main/webapp/HG/CW/HGCW006B.jsp

+<!DOCTYPE html>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
+
+<c:set var="ctx" value="${pageContext.request.contextPath}"/>
+<head>
+</head>
+<EF:EFPage title="修改合同">
+    <EF:EFRegion id="inqu1" title="基本信息">
+        <div class="row">
+            <EF:EFSelect cname="项目编号" ename="projCodeBox" colWidth="4" required="true" filter="contains">
+                <EF:EFOption label="-- 请选择 --" value="" />
+                <EF:EFOptions
+                        blockId="projectCodeBox_block_id" valueField="valueField" textField="textField"/>
+            </EF:EFSelect>
+            <EF:EFInput ename="result-0-projCode" cname="项目编号" type="hidden"/>
+            <EF:EFInput ename="result-0-projName" cname="项目简称" colWidth="4" readonly="true"/>
+            <EF:EFInput ename="result-0-contractNumber" cname="合同号" colWidth="4" readonly="true" />
+        </div>
+        <div class="row">
+            <EF:EFInput ename="result-0-contractName" cname="合同名称" colWidth="4" required="true"/>
+            <EF:EFPopupInput ename="popupInputPartyA" cname="甲方名称" colWidth="4"
+                             serviceName="HGCW006A" methodName="partyAQuery"
+                             resultId="partyAResult"
+                             required="true" save="false" popupType="ServiceGrid"
+                             valueField="username" textField="username"
+                             columnEnames="username,usercode"
+                             columnCnames="名称,编码"
+                             readonly="true"
+                             resizable="true" popupTitle="甲方名称" popupWidth="400">
+            </EF:EFPopupInput>
+            <EF:EFInput ename="result-0-partyA" cname="甲方名称" type="hidden" />
+            <EF:EFInput ename="result-0-partyB" cname="乙方名称" colWidth="4" />
+
+        </div>
+        <div class="row">
+            <EF:EFDatePicker cname="签约日期" ename="result-0-signingDate" colWidth="4"
+                             format="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
+            <EF:EFInput ename="result-0-totalQuantity" cname="总数量" colWidth="4" readonly="true"/>
+            <EF:EFInput ename="result-0-partyAName" cname="甲方联系人姓名" colWidth="4" />
+        </div>
+        <div class="row">
+            <EF:EFInput ename="result-0-partyAPhoneNumber" cname="甲方联系人电话" colWidth="4" />
+            <EF:EFInput ename="result-0-alreadyName" cname="已方联系人姓名" colWidth="4" />
+            <EF:EFInput ename="result-0-alreadyPhoneNumber" cname="已方联系人电话" colWidth="4" />
+        </div>
+        <div class="row">
+            <EF:EFDateSpan startCname="租赁开始/结束日期" endCname="至" required="true" colWidth="8" blockId="result"
+                           startName="leaseStartDate" endName="leaseEndDate" row="0" role="date"
+                           format="yyyy-MM-dd" ratio="4:4" satrtRatio="4:8" endRatio="4:8">
+            </EF:EFDateSpan>
+            <EF:EFSelect cname="合同状态" ename="result-0-contractStatus" colWidth="4" filter="contains">
+                <EF:EFOption label="-- 请选择 --" value=""/>
+                <EF:EFCodeOption codeName="hggp.cw.contractStatus"/>
+            </EF:EFSelect>
+        </div>
+    </EF:EFRegion>
+    <EF:EFRegion id="inqu2" title="承包方式及合同价款">
+        <div class="row">
+            <EF:EFSelect cname="付款方式" ename="result-0-paymentMethod" colWidth="4" filter="contains">
+                <EF:EFOption label="-- 请选择 --" value=""/>
+                <EF:EFCodeOption codeName="hggp.cw.paymentMethod"/>
+            </EF:EFSelect>
+            <EF:EFSelect cname="计价方式" ename="result-0-pricingMethod" colWidth="4" filter="contains">
+                <EF:EFOption label="-- 请选择 --" value=""/>
+                <EF:EFCodeOption codeName="hggp.cw.pricingMethod"/>
+            </EF:EFSelect>
+            <EF:EFSelect cname="税点" ename="result-0-taxPoints" colWidth="4" filter="contains">
+                <EF:EFOption label="-- 请选择 --" value=""/>
+                <EF:EFCodeOption codeName="hggp.cw.taxPoints"/>
+            </EF:EFSelect>
+        </div>
+        <div class="row">
+            <EF:EFInput ename="result-0-totalContractPriceExcluding" cname="合同总价（不含税）" colWidth="4" readonly="true"/>
+            <EF:EFInput ename="result-0-valueAddedTax" cname="增值税" colWidth="4" readonly="true"/>
+            <EF:EFInput ename="result-0-totalContractPriceIncluding" cname="合同总价（含税）" colWidth="4" readonly="true"/>
+        </div>
+    </EF:EFRegion>
+    <EF:EFRegion id="detail1" title="合同清单">
+        <EF:EFGrid blockId="detail1" autoDraw="override" checkMode="row" isFloat="true" copyToAdd="false">
+            <EF:EFColumn ename="rowNo" cname="行号" hidden="true"/>
+            <EF:EFColumn ename="id" cname="主键" hidden="true"/>
+            <EF:EFColumn ename="deviceName" cname="设备名称"  align="center" />
+            <EF:EFColumn ename="deviceNumber" cname="数量"  format="{0:N3}" align="center"/>
+            <EF:EFColumn ename="unitPrice" cname="单价"  format="{0:N3}" align="center"/>
+            <EF:EFColumn ename="dayNumber" cname="天数" format="{0:N3}" align="center"/>
+            <EF:EFColumn ename="totalPrice" cname="总价" enable="false" format="{0:N3}" align="center"/>
+        </EF:EFGrid>
+    </EF:EFRegion>
+    <EF:EFRegion id="detail2" title="附件信息">
+        <EF:EFGrid blockId="detail2" autoDraw="override" checkMode="row" isFloat="true">
+            <EF:EFColumn ename="rowNo" cname="行号" hidden="true"/>
+            <EF:EFColumn ename="id" cname="ID" hidden="true"/>
+            <EF:EFColumn ename="docId" cname="文件ID" enable="false" width="150"/>
+            <EF:EFColumn ename="docName" cname="文件名称" enable="false" width="150"/>
+            <EF:EFColumn ename="createdTime" cname="创建时间" enable="false" width="140" align="center"
+                         parseFormats="['yyyyMMddHHmmss']" editType="datetime" dateFormat="yyyy-MM-dd HH:mm:ss"/>
+        </EF:EFGrid>
+    </EF:EFRegion>
+    <div class="row" style="display:flex;justify-content:center;">
+        <EF:EFButton ename="cancel"  cname="取消" type="button" class="btn-center"/>
+        <EF:EFButton ename="btn_save"  cname="保存" type="button" class="btn-center"/>
+    </div>
+</EF:EFPage>
+
+
+<script>
+    var ctx = "${ctx}";
+</script>
+<script src="${ctx}/HG/CW/HGCW006B.js"></script>
\ No newline at end of file

src/main/webapp/HG/CW/HGCW006C.js

+
+$(function() {
+
+    IPLATUI.EFGrid.detail1 = {
+        pageable: {
+            pageSize: 20,
+            pageSizes: [10,20,30,50,100,200],
+        },
+        columns: [
+        ]
+
+    }
+
+    IPLATUI.EFGrid.detail2 = {
+        pageable: {
+            pageSize: 20,
+            pageSizes: [10,20,30,50,100,200],
+        },
+        columns: [
+        ]
+    }
+
+});
+

src/main/webapp/HG/CW/HGCW006C.jsp

+<!DOCTYPE html>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
+
+<c:set var="ctx" value="${pageContext.request.contextPath}"/>
+<head>
+</head>
+<EF:EFPage title="合同详情">
+    <EF:EFRegion id="inqu1" title="基本信息">
+        <div class="row">
+            <EF:EFInput ename="result-0-id" cname="id" type="hidden"/>
+            <EF:EFInput ename="result-0-projCode" cname="项目编号" colWidth="4" readonly="true"/>
+            <EF:EFInput ename="result-0-projName" cname="项目简称" colWidth="4" readonly="true"/>
+            <EF:EFInput ename="result-0-contractNumber" cname="合同号" colWidth="4" readonly="true" />
+        </div>
+        <div class="row">
+            <EF:EFInput ename="result-0-contractName" cname="合同名称" colWidth="4" readonly="true"/>
+            <EF:EFInput ename="result-0-partyA" cname="甲方名称" colWidth="4" readonly="true"/>
+            <EF:EFInput ename="result-0-partyB" cname="乙方名称" colWidth="4" readonly="true"/>
+
+        </div>
+        <div class="row">
+            <EF:EFInput ename="result-0-signingDate" cname="签约日期" colWidth="4" readonly="true"/>
+            <EF:EFInput ename="result-0-totalQuantity" cname="总数量" colWidth="4" readonly="true"/>
+            <EF:EFInput ename="result-0-partyAName" cname="甲方联系人姓名" colWidth="4" readonly="true" enable="false"/>
+        </div>
+        <div class="row">
+            <EF:EFInput ename="result-0-partyAPhoneNumber" cname="甲方联系人电话" colWidth="4" readonly="true" enable="false"/>
+            <EF:EFInput ename="result-0-alreadyName" cname="已方联系人姓名" colWidth="4" readonly="true" enable="false"/>
+            <EF:EFInput ename="result-0-alreadyPhoneNumber" cname="已方联系人电话" colWidth="4" readonly="true" enable="false"/>
+        </div>
+        <div class="row">
+            <EF:EFInput ename="result-0-leaseStartDate" cname="租赁开始日期" colWidth="4" readonly="true"/>
+            <EF:EFInput ename="result-0-leaseEndDate" cname="租赁结束日期" colWidth="4" readonly="true"/>
+            <EF:EFSelect cname="合同状态" ename="result-0-contractStatus" colWidth="4" filter="contains" readonly="true" enable="false">
+                <EF:EFOption label="-- 请选择 --" value=""/>
+                <EF:EFCodeOption codeName="hggp.cw.contractStatus"/>
+            </EF:EFSelect>
+        </div>
+    </EF:EFRegion>
+    <EF:EFRegion id="inqu2" title="承包方式及合同价款">
+        <div class="row">
+            <EF:EFSelect cname="付款方式" ename="result-0-paymentMethod" colWidth="4" filter="contains" readonly="true" enable="false">
+                <EF:EFOption label="-- 请选择 --" value=""/>
+                <EF:EFCodeOption codeName="hggp.cw.paymentMethod"/>
+            </EF:EFSelect>
+            <EF:EFSelect cname="计价方式" ename="result-0-pricingMethod" colWidth="4" filter="contains" readonly="true" enable="false">
+                <EF:EFOption label="-- 请选择 --" value=""/>
+                <EF:EFCodeOption codeName="hggp.cw.pricingMethod"/>
+            </EF:EFSelect>
+            <EF:EFSelect cname="税点" ename="result-0-taxPoints" colWidth="4" filter="contains" readonly="true" enable="false">
+                <EF:EFOption label="-- 请选择 --" value=""/>
+                <EF:EFCodeOption codeName="hggp.cw.taxPoints"/>
+            </EF:EFSelect>
+        </div>
+        <div class="row">
+            <EF:EFInput ename="result-0-totalContractPriceExcluding" cname="合同总价（不含税）" colWidth="4" readonly="true" enable="false"/>
+            <EF:EFInput ename="result-0-valueAddedTax" cname="增值税" colWidth="4" readonly="true" enable="false"/>
+            <EF:EFInput ename="result-0-totalContractPriceIncluding" cname="合同总价（含税）" colWidth="4" readonly="true" enable="false"/>
+        </div>
+    </EF:EFRegion>
+    <EF:EFRegion id="detail1" title="合同清单">
+        <EF:EFGrid blockId="detail1" autoDraw="override" checkMode="row" isFloat="true">
+            <EF:EFColumn ename="id" cname="主键" hidden="true"/>
+            <EF:EFColumn ename="deviceName" cname="设备名称"  align="center" enable="false"/>
+            <EF:EFColumn ename="deviceNumber" cname="数量"  format="{0:N3}" align="center" enable="false"/>
+            <EF:EFColumn ename="unitPrice" cname="单价"  format="{0:N3}" align="center" enable="false"/>
+            <EF:EFColumn ename="dayNumber" cname="天数" format="{0:N3}" align="center" enable="false"/>
+            <EF:EFColumn ename="totalPrice" cname="总价" enable="false" format="{0:N3}" align="center"/>
+        </EF:EFGrid>
+    </EF:EFRegion>
+    <EF:EFRegion id="detail2" title="附件信息">
+        <EF:EFGrid blockId="detail2" autoDraw="override" checkMode="row" isFloat="true">
+            <EF:EFColumn ename="id" cname="ID" hidden="true"/>
+                <EF:EFColumn ename="matId" cname="matId" hidden="true"/>
+            <EF:EFColumn ename="docId" cname="文件ID" enable="false" width="150"/>
+            <EF:EFColumn ename="docName" cname="文件名称" enable="false" width="150"/>
+            <EF:EFColumn ename="createdTime" cname="创建时间" enable="false" width="140" align="center"
+                         parseFormats="['yyyyMMddHHmmss']" editType="datetime" dateFormat="yyyy-MM-dd HH:mm:ss"/>
+        </EF:EFGrid>
+    </EF:EFRegion>
+</EF:EFPage>
+
+
+<script>
+    var ctx = "${ctx}";
+</script>
+<script src="${ctx}/HG/CW/HGCW006C.js"></script>
\ No newline at end of file

src/main/webapp/HG/PZ/HGPZ005.js

 $(function() {
 
+	var inventTypeBox = __eiInfo.getBlock("invent_type_box_block_id").getMappedRows();
+
 	// 查询
 	$("#QUERY").on("click", query);
 
@@ -25,6 +27,16 @@ $(function() {
 				return template;
 			}
 		}, {
+			field: "inventType",
+			filter: function (options) {
+				return _.filter(inventTypeBox, function (item) {
+					return item["param1Field"]=="true";
+				})
+			},
+			editor: function (container, options) {
+				this.filter(options);
+			}
+		}, {
 			field: "spec",
 			template: function (options) {
 				return $.trim(options.spec) == "" ? "无规格" : options.spec;

src/main/webapp/HG/PZ/HGPZ005.jsp

@@ -12,7 +12,7 @@
 		<div class="row">
 			<EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains">
 				<EF:EFOption label="全部" value=""/>
-				<EF:EFOptions blockId="invent_type_block_id" textField="textField" valueField="valueField"/>
+				<EF:EFOptions blockId="invent_type_box_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
 			<EF:EFInput cname="存货名称" ename="inventName" blockId="inqu_status" row="0" colWidth="3"/>
 			<EF:EFSelect blockId="inqu_status" row="0" ename="status" cname="状态" colWidth="3" filter="contains">
@@ -28,11 +28,11 @@
 			<EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="160" align="center"/>
 			<EF:EFColumn cname="存货编码" ename="inventCode" width="140" align="center" enable="false"/>
 			<EF:EFComboColumn ename="inventType" cname="存货类型" width="120" align="center" required="true"
-							  blockName="invent_type_block_id" textField="textField" valueField="valueField"
+							  blockName="invent_type_box_block_id" textField="textField" valueField="valueField"
 							  columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="false"
 							  filter="contains">
 			</EF:EFComboColumn>
-			<EF:EFColumn ename="inventName" cname="存货名称" width="80" align="center" required="true"/>
+			<EF:EFColumn ename="inventName" cname="存货名称" width="120" align="center" required="true"/>
 			<EF:EFColumn ename="spec" cname="规格" width="140" align="center" maxLength="50"/>
 			<EF:EFColumn ename="length" cname="长(MM)" width="100" align="right" format="{0:N2}" maxLength="10"/>
 			<EF:EFColumn ename="width" cname="宽(MM)" width="100" align="right" format="{0:N2}" maxLength="10"/>

src/main/webapp/HG/PZ/HGPZ007.js

 $(function() {
 
+	var whTypeBox = __eiInfo.getBlock("wh_type_block_id").getMappedRows();
+
 	// 查询
 	$("#QUERY").on("click", query);
 
@@ -9,6 +11,16 @@ $(function() {
 			pageSizes: [10, 20, 30, 50, 100, 200]
 		},
 		columns: [{
+			field: "whType",
+			filter: function (options) {
+				return _.filter(whTypeBox, function (item) {
+					return item["param1Field"]=="true";
+				})
+			},
+			editor: function (container, options) {
+				this.filter(options);
+			}
+		},{
 			field: "createdName",
 			template: function (options) {
 				return showUserName(options.createdBy, options.createdName);

src/main/webapp/HG/PZ/HGPZ010.js

@@ -3,6 +3,9 @@ let WhNameGlobalData = [];
 let inventAllGlobalData = [];
 $(function() {
 
+	var whTypeBox = __eiInfo.getBlock("wh_type_block_id").getMappedRows();
+	var inventTypeBox = __eiInfo.getBlock("invent_type_box_block_id").getMappedRows();
+
 	// 查询
 	$("#QUERY").on("click", query);
 
@@ -11,100 +14,140 @@ $(function() {
 			pageSize: 20,
 			pageSizes: [10, 20, 30, 50, 100, 200]
 		},
-		columns: [{
-			field: "whCode",
-			template: function (dataItem) {
-				for (let i = 0; i < WhNameGlobalData.length; i++) {
-					if (WhNameGlobalData[i]['valueField'] === dataItem['whCode']) {
-						return WhNameGlobalData[i]['textField'];
+		columns: [
+			{
+				field: "whType",
+				filter: function (options) {
+					return _.filter(whTypeBox, function (item) {
+						return item["param1Field"]=="true";
+					})
+				},
+				editor: function (container, options) {
+					this.filter(options);
+				}
+			}, {
+				field: "whCode",
+				filter: function (options) {
+					return _.filter(WhNameGlobalData, function (item) {
+						return item["param1Field"]=="true";
+					})
+				},
+				template: function (dataItem) {
+					for (let i = 0; i < WhNameGlobalData.length; i++) {
+						if (WhNameGlobalData[i]['valueField'] === dataItem['whCode']) {
+							return WhNameGlobalData[i]['textField'];
+						}
 					}
+					return "";
+				},
+				editor: function (container, options) {
+					let inInfo = new EiInfo();
+					inInfo.set("inqu_status-0-whType", options.model["whType"]);
+					inInfo.set("inqu_status-0-isSplicingSymbol", false);
+					inInfo.set("serviceName", "HGPZ007");
+					inInfo.set("methodName", "queryWhCodeBox");
+					inInfo.set("blockId", "wh_code_block_id");
+					inInfo.set("field", options.field);
+					refreshSelect(container, inInfo);
 				}
-				return "";
-			},
-			editor: function (container, options) {
-				let inInfo = new EiInfo();
-				inInfo.set("inqu_status-0-whType", options.model["whType"]);
-				inInfo.set("inqu_status-0-isSplicingSymbol", false);
-				inInfo.set("serviceName", "HGPZ007");
-				inInfo.set("methodName", "queryComboBox");
-				inInfo.set("blockId", "wh_record_block_id");
-				inInfo.set("field", options.field);
-				refreshSelect(container, inInfo);
-			}
-		},{
-			field: "inventCode",
-			template: function (dataItem) {
-				for (let i = 0; i < InventNameGlobalData.length; i++) {
-					if (InventNameGlobalData[i]['valueField'] === dataItem['inventCode']) {
-						return InventNameGlobalData[i]['textField'];
+			},{
+				field: "inventType",
+				filter: function (options) {
+					return _.filter(inventTypeBox, function (item) {
+						return item["param1Field"]=="true";
+					})
+				},
+				editor: function (container, options) {
+					this.filter(options);
+				}
+			},{
+				field: "inventCode",
+				filter: function (options) {
+					return _.filter(InventNameGlobalData, function (item) {
+						return item["param1Field"]=="true";
+					})
+				},
+				template: function (dataItem) {
+					for (let i = 0; i < InventNameGlobalData.length; i++) {
+						if (InventNameGlobalData[i]['valueField'] === dataItem['inventCode']) {
+							return InventNameGlobalData[i]['textField'];
+						}
 					}
+					return "";
+				},
+				editor: function (container, options) {
+					let inInfo = new EiInfo();
+					inInfo.set("inqu_status-0-inventType", options.model["inventType"]);
+					inInfo.set("inqu_status-0-isSplicingSymbol", false);
+					inInfo.set("serviceName", "HGPZ005");
+					inInfo.set("methodName", "queryComboBox");
+					inInfo.set("blockId", "invent_record_block_id");
+					inInfo.set("field", options.field);
+					refreshSelect(container, inInfo);
 				}
-				return "";
-			},
-			editor: function (container, options) {
-				let inInfo = new EiInfo();
-				inInfo.set("inqu_status-0-inventType", options.model["inventType"]);
-				inInfo.set("inqu_status-0-isSplicingSymbol", false);
-				inInfo.set("serviceName", "HGPZ005");
-				inInfo.set("methodName", "queryComboBox");
-				inInfo.set("blockId", "invent_record_block_id");
-				inInfo.set("field", options.field);
-				refreshSelect(container, inInfo);
-			}
-		},{
-			field: "inventRecordId",
-			template: function (dataItem) {
-				for (let i = 0; i < inventAllGlobalData.length; i++) {
-					if (inventAllGlobalData[i]['valueField'] === dataItem['inventRecordId']) {
-						return inventAllGlobalData[i]['textField'];
+			},{
+				field: "inventRecordId",
+				filter: function (options) {
+					return _.filter(inventAllGlobalData, function (item) {
+						return item["param7Field"]=="true";
+					})
+				},
+				template: function (dataItem) {
+					for (let i = 0; i < inventAllGlobalData.length; i++) {
+						if (inventAllGlobalData[i]['valueField'] === dataItem['inventRecordId']) {
+							return inventAllGlobalData[i]['textField'];
+						}
 					}
+					return "";
+				},
+				editor: function (container, options) {
+					let inInfo = new EiInfo();
+					inInfo.set("inqu_status-0-inventCode", options.model["inventCode"]);
+					inInfo.set("serviceName", "HGPZ005");
+					inInfo.set("methodName", "queryInventBoxAll");
+					inInfo.set("blockId", "invent_all_box_block_id");
+					inInfo.set("field", options.field);
+					refreshSelect(container, inInfo);
 				}
-				return "";
-			},
-			editor: function (container, options) {
-				let inInfo = new EiInfo();
-				inInfo.set("inqu_status-0-inventCode", options.model["inventCode"]);
-				inInfo.set("serviceName", "HGPZ005");
-				inInfo.set("methodName", "queryComboBoxAll");
-				inInfo.set("blockId", "invent_all_block_id");
-				inInfo.set("field", options.field);
-				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'];
+			}, {
+				field: "material",
+				template: function (dataItem) {
+					for (let i = 0; i < inventAllGlobalData.length; i++) {
+						if (inventAllGlobalData[i]['valueField'] === dataItem['inventRecordId']) {
+							return inventAllGlobalData[i]['param1Field'];
+						}
 					}
+					return "";
 				}
-				return "";
-			}
-		}, {
-			field: "unit",
-			template: function (dataItem) {
-				for (let i = 0; i < inventAllGlobalData.length; i++) {
-					if (inventAllGlobalData[i]['valueField'] === dataItem['inventRecordId']) {
-						return inventAllGlobalData[i]['param2Field'];
+			}, {
+				field: "unit",
+				template: function (dataItem) {
+					for (let i = 0; i < inventAllGlobalData.length; i++) {
+						if (inventAllGlobalData[i]['valueField'] === dataItem['inventRecordId']) {
+							return inventAllGlobalData[i]['param2Field'];
+						}
 					}
+					return "";
+				}
+			},{
+				field: "createdName",
+				template: function (options) {
+					return showUserName(options.createdBy, options.createdName);
+				}
+			}, {
+				field: "updatedName",
+				template: function (options) {
+					return showUserName(options.updatedBy, options.updatedName);
 				}
-				return "";
-			}
-		},{
-			field: "createdName",
-			template: function (options) {
-				return showUserName(options.createdBy, options.createdName);
-			}
-		}, {
-			field: "updatedName",
-			template: function (options) {
-				return showUserName(options.updatedBy, options.updatedName);
 			}
-		}],
+		],
 		loadComplete: function (grid) {
 			// 此grid对象
 			grid.dataSource.bind("change", function(e) {
-				if (e.field == "inventRecordId") {
+				if (e.field === "inventCode"){
+					loadChange(grid,e,"inventRecordId");
+				}
+				else if (e.field == "inventRecordId") {
 					var tr,index;
 					// 获取此model元素信息
 					var item = e.items[0];
@@ -160,9 +203,9 @@ let query = function () {
  */
 let initWh = function () {
 	let inInfo = new EiInfo();
-	EiCommunicator.send("HGPZ007", "queryComboBox", inInfo, {
+	EiCommunicator.send("HGPZ007", "queryWhCodeBox", inInfo, {
 		onSuccess: function (ei) {
-			WhNameGlobalData = ei.getBlock("wh_record_block_id").getMappedRows();
+			WhNameGlobalData = ei.getBlock("wh_code_block_id").getMappedRows();
 		},
 		onFail: function (ei) {
 		}
@@ -174,9 +217,9 @@ let initWh = function () {
  */
 let initInvent = function () {
 	let inInfo = new EiInfo();
-	EiCommunicator.send("HGPZ005", "queryComboBox", inInfo, {
+	EiCommunicator.send("HGPZ005", "queryInventCodeBox", inInfo, {
 		onSuccess: function (ei) {
-			InventNameGlobalData = ei.getBlock("invent_record_block_id").getMappedRows();
+			InventNameGlobalData = ei.getBlock("invent_record_box_block_id").getMappedRows();
 		},
 		onFail: function (ei) {
 		}
@@ -190,9 +233,9 @@ let initSpec = function () {
 	let inInfo = new EiInfo();
 	inInfo.set("inqu_status-0-inventTypes", [1, 2]);
 	inInfo.set("inqu_status-0-isSplicingSymbol", false);
-	EiCommunicator.send("HGPZ005", "queryComboBoxAll", inInfo, {
+	EiCommunicator.send("HGPZ005", "queryInventBoxAll", inInfo, {
 		onSuccess: function (ei) {
-			inventAllGlobalData = ei.getBlock("invent_all_block_id").getMappedRows();
+			inventAllGlobalData = ei.getBlock("invent_all_box_block_id").getMappedRows();
 		},
 		onFail: function (ei) {
 		}

src/main/webapp/HG/PZ/HGPZ010.jsp

@@ -10,7 +10,7 @@
 			<EF:EFSelect cname="仓库名称" blockId="inqu_status" ename="whCode" row="0" colWidth="3" filter="contains"
 						 defultValue="">
 				<EF:EFOption label="全部" value=""/>
-				<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
+				<EF:EFOptions blockId="wh_code_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
 			<EF:EFSelect cname="仓库类型" blockId="inqu_status" ename="whType" row="0" colWidth="3" filter="contains"
 						 defultValue="">
@@ -30,7 +30,7 @@
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="whCode" cname="仓库名称" width="120" align="center" required="true" readonly="true"/>
 			<EF:EFComboColumn ename="inventType" cname="存货类型" width="120" align="center" required="true"
-							  blockName="invent_type_block_id" textField="textField" valueField="valueField"
+							  blockName="invent_type_box_block_id" textField="textField" valueField="valueField"
 							  columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="false"
 							  filter="contains">
 			</EF:EFComboColumn>

src/main/webapp/HG/SB/HGSB002.js

@@ -46,8 +46,8 @@ $(function () {
                             if (auditStatus == 0) {
                                 template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
                                     'onclick="updateStatus(' + item.id + ',1)" >审批完成</a>';
-                                template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
-                                    'onclick="updateStatus(' + item.id + ',-1)" >审批未通过</a>';
+                                /*template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
+                                    'onclick="updateStatus(' + item.id + ',-1)" >审批未通过</a>';*/
                             } else if (auditStatus == -1) {
                                 template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
                                     'onclick="updateStatus(' + item.id + ',1)" >审批完成</a>';

src/main/webapp/HG/SC/HGSC006.jsp

@@ -34,7 +34,7 @@
             <EF:EFColumn ename="projCode" cname="项目编码" enable="true" width="120" align="center" readOnly="true"/>
             <EF:EFColumn ename="projName" cname="项目名称" width="120" enable="true" align="center" readOnly="true"/>
             <EF:EFColumn ename="createdTime" cname="生产订单日期" enable="true" width="120" align="center" readOnly="true"/>
-            <EF:EFColumn ename="planCode" cname="生产订单号" enable="true" width="120" align="center" readOnly="true"/>
+            <EF:EFColumn ename="orderCode" cname="生产订单编号" enable="true" width="120" align="center" readOnly="true"/>
             <EF:EFComboColumn ename="assignStatus" cname="派工状态" width="80" align="center" required="true"
                               readonly="true">
                 <EF:EFCodeOption codeName="hggp.assignStatus"/>

src/main/webapp/HG/SC/HGSC006A.js

+$(function () {
+
+    $("#QUERY").on("click", function () {
+        resultGrid.dataSource.page(1);
+    });
+
+
+    IPLATUI.EFGrid.result = {
+        pageable: {
+            pageSize: 20,
+            pageSizes: [10, 20, 50, 70, 100],
+        },
+        columns: [{
+            field: "operator",
+            template: function (item) {
+                let template = '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
+                    'onclick="showTaskInfo(' + item.id + ')" >任务详情</a>';
+                return template;
+            }
+        }],
+        loadComplete: function(grid) {
+        },
+        onSuccess: function (e) {
+            if(e.eiInfo.extAttr.methodName == 'save'||e.eiInfo.extAttr.methodName == 'delete' ){
+                query();
+            }
+        }
+    }
+
+});
+
+function showTaskInfo(orderDetailId) {
+    // JSColorbox.open({
+    //     href: "HGSC007?methodName=initLoad&inqu_status-0-orderDetailId=" + orderDetailId + "&efParentFormEname=HGSC006A",
+    //     title: "<div style='text-align: center;'>生产任务详情</div>",
+    //     width: "90%",
+    //     height: "90%"
+    // });
+}
\ No newline at end of file

src/main/webapp/HG/SC/HGSC006A.jsp

+<!DOCTYPE html>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
+
+<c:set var="ctx" value="${pageContext.request.contextPath}"/>
+
+<script>
+    var ctx = "${ctx}";
+</script>
+<head>
+</head>
+<EF:EFPage title="生产计划详情">
+    <EF:EFRegion id="inqu" title="查询条件">
+        <div class="row">
+            <EF:EFInput ename="inqu_status-0-orderCode" cname="订单编码" type="hidden"/>
+            <EF:EFInput ename="inqu_status-0-productName" cname="产品名称" colWidth="3"/>
+            <EF:EFInput ename="inqu_status-0-projName" cname="项目名称" colWidth="3"/>
+            <EF:EFDatePicker cname="生产订单" ename="inqu_status-0-createdTime"  colWidth="3"
+                             format="yyyy-MM-dd" readonly="false"/>
+            <EF:EFDatePicker cname="派工日期" ename="inqu_status-0-assignDate"  colWidth="3"
+                             format="yyyy-MM-dd" readonly="false"/>
+        </div>
+    </EF:EFRegion>
+    <EF:EFRegion id="result" title="记录集">
+        <EF:EFGrid blockId="result" autoDraw="override" isFloat="true">
+            <EF:EFColumn ename="id" cname="主键" hidden="true"/>
+            <EF:EFColumn ename="operator" cname="操作" locked="true" enable="true" width="100" align="center" />
+            <EF:EFColumn ename="companyName" cname="公司名称" enable="true" width="120" align="center" readOnly="true"/>
+            <EF:EFColumn ename="projName" cname="项目名称" width="120" enable="true" align="center" readOnly="true"/>
+            <EF:EFColumn ename="createdTime" cname="生产订单日期" enable="true" width="120" align="center" readOnly="true"/>
+            <EF:EFColumn ename="orderCode" cname="生产订单编号" enable="true" width="120" align="center" readOnly="true"/>
+            <EF:EFColumn ename="productCode" cname="产品编码" width="120" enable="true" align="center" readOnly="true"/>
+            <EF:EFColumn ename="productName" cname="产品名称" width="120" enable="true" align="center" readOnly="true"/>
+            <EF:EFColumn ename="processName" cname="工序" width="120" enable="true" align="center" readOnly="true"/>
+            <EF:EFColumn ename="planEndDate" cname="计划完工日期" width="120" enable="true" align="center" editType="date"
+                         dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
+            <EF:EFColumn ename="quantity" cname="订单数量" width="120" enable="true" align="center" readOnly="true"/>
+            <EF:EFColumn ename="assignDate" cname="派工日期" width="120" enable="true" align="center" editType="date"
+                         dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
+            <EF:EFColumn ename="assignQuantity" cname="派工数量" width="120" enable="true" align="center" readOnly="true"/>
+            <EF:EFColumn ename="unassignQuantity" cname="待派工数量" width="120" enable="true" align="center" readOnly="true"/>
+        </EF:EFGrid>
+    </EF:EFRegion>
+</EF:EFPage>