2024-04-08 报工管理功能调整

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

@@ -345,6 +345,13 @@ public enum DdynamicEnum {
     APP_MAP_BLOCK_PRODTASKNO("app_map_block_prodtaskno","prodTaskNo","prodorderNo","HPMT002.queryProdTaskNo"),
 
     /**
+     * 模块：组管理
+     * 用途：组管理下拉框
+     * 编写：songx
+     */
+    GROUP_RECORD1_BLOCK_ID("group_record_block_id","orgId","orgCname","HPSC010.queryGroupComboBox"),
+
+    /**
      * 模块：工人管理
      * 用途：工人管理下拉框
      * 编写：wwl

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

@@ -68,6 +68,9 @@ public class HPSC008 extends DaoEPBase {
 	public static final String UPDATE = "HPSC008.update";
 	public static final String DELETE = "HPSC008.delete";
 	public static final String DELETE_FLAG = "HPSC008.deleteFlag";
+	public static final String DELETE_REMARK = "HPSC008.deleteRemark";
+	public static final String QUERY_DETAIL = "HPSC008.queryDetail";
+	public static final String QUERY_RESULT = "HPSC008.queryResult";
 
 	private Long id = new Long(0);	/* ID*/
 	private String companyCode = " ";		/* 企业编码 预留*/

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

+package com.baosight.hpjx.hp.sc.domain;
+
+import com.baosight.iplat4j.core.util.NumberUtils;
+import java.math.BigDecimal;
+import com.baosight.iplat4j.core.ei.EiColumn;
+import com.baosight.iplat4j.core.data.DaoEPBase;
+import java.util.HashMap;
+import java.util.Map;
+import com.baosight.iplat4j.core.util.StringUtils;
+
+/**
+ * Project: <br>
+ * Title:THpsc008.java <br>
+ * Description: <br>
+ *
+ * Copyrigth:Baosight Software LTD.co Copyright (c) 2019. <br>
+ *
+ * @version 1.0
+ * @history 2024-04-03 11:12:26 create
+ */
+public class HPSC010 extends DaoEPBase {
+
+	private static final long serialVersionUID = 1L;
+
+	public static final String FIELD_ID = "id";    		/* ID*/
+	public static final String FIELD_COMPANY_CODE = "companyCode";    		/* 企业编码*/
+	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
+	public static final String FIELD_CREATED_BY = "createdBy";    		/* 创建人*/
+	public static final String FIELD_CREATED_NAME = "createdName";    		/* 创建名称*/
+	public static final String FIELD_CREATED_TIME = "createdTime";    		/* 创建时间*/
+	public static final String FIELD_UPDATED_BY = "updatedBy";    		/* 修改人*/
+	public static final String FIELD_UPDATED_NAME = "updatedName";    		/* 修改名称*/
+	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 修改时间*/
+	public static final String FIELD_DELETE_FLAG = "deleteFlag";    		/* 是否删除 0-否1-是*/
+	public static final String FIELD_REGISTER_DATE = "registerDate";    		/* 登记日期*/
+	public static final String FIELD_FACTORY_CODE = "factoryCode";    		/* 工厂代码*/
+	public static final String FIELD_WEIGHT = "weight";    		/* 产量*/
+	public static final String FIELD_USER_COUNT = "userCount";    		/* 用工人数*/
+
+	public static final String COL_ID = "ID";    		/* ID*/
+	public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码*/
+	public static final String COL_DEP_CODE = "DEP_CODE";    		/* 部门编码*/
+	public static final String COL_CREATED_BY = "CREATED_BY";    		/* 创建人*/
+	public static final String COL_CREATED_NAME = "CREATED_NAME";    		/* 创建名称*/
+	public static final String COL_CREATED_TIME = "CREATED_TIME";    		/* 创建时间*/
+	public static final String COL_UPDATED_BY = "UPDATED_BY";    		/* 修改人*/
+	public static final String COL_UPDATED_NAME = "UPDATED_NAME";    		/* 修改名称*/
+	public static final String COL_UPDATED_TIME = "UPDATED_TIME";    		/* 修改时间*/
+	public static final String COL_DELETE_FLAG = "DELETE_FLAG";    		/* 是否删除 0-否1-是*/
+	public static final String COL_REGISTER_DATE = "REGISTER_DATE";    		/* 登记日期*/
+	public static final String COL_FACTORY_CODE = "FACTORY_CODE";    		/* 工厂代码*/
+	public static final String COL_WEIGHT = "WEIGHT";    		/* 产量*/
+	public static final String COL_USER_COUNT = "USER_COUNT";    		/* 用工人数*/
+
+	public static final String QUERY = "HPSC010.query";
+	public static final String COUNT = "HPSC010.count";
+	public static final String INSERT = "HPSC010.insert";
+	public static final String UPDATE = "HPSC010.update";
+	public static final String DELETE = "HPSC010.delete";
+	public static final String DELETE_FLAG = "HPSC010.deleteFlag";
+	public static final String QUERY_MAX = "HPSC010.queryMax";
+
+	private Long id = new Long(0);	/* ID*/
+	private String companyCode = " ";		/* 企业编码*/
+	private String depCode = " ";		/* 部门编码*/
+	private String createdBy = " ";		/* 创建人*/
+	private String createdName = " ";		/* 创建名称*/
+	private String createdTime = " ";		/* 创建时间*/
+	private String updatedBy = " ";		/* 修改人*/
+	private String updatedName = " ";		/* 修改名称*/
+	private String updatedTime = " ";		/* 修改时间*/
+	private Integer deleteFlag;	/* 是否删除 0-否1-是*/
+	private String registerDate = " ";		/* 登记日期*/
+	private String factoryCode = " ";		/* 工厂代码*/
+	private BigDecimal weight = new BigDecimal("0");		/* 产量*/
+	private Long userCount = new Long(0);		/* 用工人数*/
+
+	/**
+	 * initialize the metadata.
+	 */
+	public void initMetaData() {
+		EiColumn eiColumn;
+
+		eiColumn = new EiColumn(FIELD_ID);
+		eiColumn.setPrimaryKey(true);
+		eiColumn.setDescName("ID");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_COMPANY_CODE);
+		eiColumn.setDescName("企业编码");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_DEP_CODE);
+		eiColumn.setDescName("部门编码");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_CREATED_BY);
+		eiColumn.setDescName("创建人");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_CREATED_NAME);
+		eiColumn.setDescName("创建名称");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_CREATED_TIME);
+		eiColumn.setDescName("创建时间");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_UPDATED_BY);
+		eiColumn.setDescName("修改人");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_UPDATED_NAME);
+		eiColumn.setDescName("修改名称");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_UPDATED_TIME);
+		eiColumn.setDescName("修改时间");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_DELETE_FLAG);
+		eiColumn.setDescName("是否删除 0-否1-是");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_REGISTER_DATE);
+		eiColumn.setDescName("登记日期");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_FACTORY_CODE);
+		eiColumn.setDescName("工厂代码");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_WEIGHT);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(2);
+		eiColumn.setFieldLength(18);
+		eiColumn.setDescName("产量");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_USER_COUNT);
+		eiColumn.setDescName("用工人数");
+		eiMetadata.addMeta(eiColumn);
+
+
+	}
+
+	/**
+	 * the constructor.
+	 */
+	public HPSC010() {
+		initMetaData();
+	}
+
+	/**
+	 * get the id - ID.
+	 * @return the id
+	 */
+	public Long getId() {
+		return this.id;
+	}
+
+	/**
+	 * set the id - ID.
+	 *
+	 * @param id - ID
+	 */
+	public void setId(Long id) {
+		this.id = id;
+	}
+	/**
+	 * get the companyCode - 企业编码.
+	 * @return the companyCode
+	 */
+	public String getCompanyCode() {
+		return this.companyCode;
+	}
+
+	/**
+	 * set the companyCode - 企业编码.
+	 *
+	 * @param companyCode - 企业编码
+	 */
+	public void setCompanyCode(String companyCode) {
+		this.companyCode = companyCode;
+	}
+	/**
+	 * get the depCode - 部门编码.
+	 * @return the depCode
+	 */
+	public String getDepCode() {
+		return this.depCode;
+	}
+
+	/**
+	 * set the depCode - 部门编码.
+	 *
+	 * @param depCode - 部门编码
+	 */
+	public void setDepCode(String depCode) {
+		this.depCode = depCode;
+	}
+	/**
+	 * get the createdBy - 创建人.
+	 * @return the createdBy
+	 */
+	public String getCreatedBy() {
+		return this.createdBy;
+	}
+
+	/**
+	 * set the createdBy - 创建人.
+	 *
+	 * @param createdBy - 创建人
+	 */
+	public void setCreatedBy(String createdBy) {
+		this.createdBy = createdBy;
+	}
+	/**
+	 * get the createdName - 创建名称.
+	 * @return the createdName
+	 */
+	public String getCreatedName() {
+		return this.createdName;
+	}
+
+	/**
+	 * set the createdName - 创建名称.
+	 *
+	 * @param createdName - 创建名称
+	 */
+	public void setCreatedName(String createdName) {
+		this.createdName = createdName;
+	}
+	/**
+	 * get the createdTime - 创建时间.
+	 * @return the createdTime
+	 */
+	public String getCreatedTime() {
+		return this.createdTime;
+	}
+
+	/**
+	 * set the createdTime - 创建时间.
+	 *
+	 * @param createdTime - 创建时间
+	 */
+	public void setCreatedTime(String createdTime) {
+		this.createdTime = createdTime;
+	}
+	/**
+	 * get the updatedBy - 修改人.
+	 * @return the updatedBy
+	 */
+	public String getUpdatedBy() {
+		return this.updatedBy;
+	}
+
+	/**
+	 * set the updatedBy - 修改人.
+	 *
+	 * @param updatedBy - 修改人
+	 */
+	public void setUpdatedBy(String updatedBy) {
+		this.updatedBy = updatedBy;
+	}
+	/**
+	 * get the updatedName - 修改名称.
+	 * @return the updatedName
+	 */
+	public String getUpdatedName() {
+		return this.updatedName;
+	}
+
+	/**
+	 * set the updatedName - 修改名称.
+	 *
+	 * @param updatedName - 修改名称
+	 */
+	public void setUpdatedName(String updatedName) {
+		this.updatedName = updatedName;
+	}
+	/**
+	 * get the updatedTime - 修改时间.
+	 * @return the updatedTime
+	 */
+	public String getUpdatedTime() {
+		return this.updatedTime;
+	}
+
+	/**
+	 * set the updatedTime - 修改时间.
+	 *
+	 * @param updatedTime - 修改时间
+	 */
+	public void setUpdatedTime(String updatedTime) {
+		this.updatedTime = updatedTime;
+	}
+	/**
+	 * get the deleteFlag - 是否删除 0-否1-是.
+	 * @return the deleteFlag
+	 */
+	public Integer getDeleteFlag() {
+		return this.deleteFlag;
+	}
+
+	/**
+	 * set the deleteFlag - 是否删除 0-否1-是.
+	 *
+	 * @param deleteFlag - 是否删除 0-否1-是
+	 */
+	public void setDeleteFlag(Integer deleteFlag) {
+		this.deleteFlag = deleteFlag;
+	}
+	/**
+	 * get the registerDate - 登记日期.
+	 * @return the registerDate
+	 */
+	public String getRegisterDate() {
+		return this.registerDate;
+	}
+
+	/**
+	 * set the registerDate - 登记日期.
+	 *
+	 * @param registerDate - 登记日期
+	 */
+	public void setRegisterDate(String registerDate) {
+		this.registerDate = registerDate;
+	}
+	/**
+	 * get the factoryCode - 工厂代码.
+	 * @return the factoryCode
+	 */
+	public String getFactoryCode() {
+		return this.factoryCode;
+	}
+
+	/**
+	 * set the factoryCode - 工厂代码.
+	 *
+	 * @param factoryCode - 工厂代码
+	 */
+	public void setFactoryCode(String factoryCode) {
+		this.factoryCode = factoryCode;
+	}
+	/**
+	 * get the weight - 产量.
+	 * @return the weight
+	 */
+	public BigDecimal getWeight() {
+		return this.weight;
+	}
+
+	/**
+	 * set the weight - 产量.
+	 *
+	 * @param weight - 产量
+	 */
+	public void setWeight(BigDecimal weight) {
+		this.weight = weight;
+	}
+	/**
+	 * get the userCount - 用工人数.
+	 * @return the userCount
+	 */
+	public Long getUserCount() {
+		return this.userCount;
+	}
+
+	/**
+	 * set the userCount - 用工人数.
+	 *
+	 * @param userCount - 用工人数
+	 */
+	public void setUserCount(Long userCount) {
+		this.userCount = userCount;
+	}
+	/**
+	 * get the value from Map.
+	 *
+	 * @param map - source data map
+	 */
+	@Override
+	public void fromMap(Map map) {
+
+		setId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_ID)), id));
+		setCompanyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_CODE)), companyCode));
+		setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
+		setCreatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_BY)), createdBy));
+		setCreatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_NAME)), createdName));
+		setCreatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_TIME)), createdTime));
+		setUpdatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_BY)), updatedBy));
+		setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_NAME)), updatedName));
+		setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime));
+		setDeleteFlag(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_DELETE_FLAG)), deleteFlag));
+		setRegisterDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REGISTER_DATE)), registerDate));
+		setFactoryCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_CODE)), factoryCode));
+		setWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_WEIGHT)), weight));
+		setUserCount(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_USER_COUNT)), userCount));
+	}
+
+	/**
+	 * set the value to Map.
+	 */
+	@Override
+	public Map toMap() {
+
+		Map map = new HashMap();
+		map.put(FIELD_ID, StringUtils.toString(id, eiMetadata.getMeta(FIELD_ID)));
+		map.put(FIELD_COMPANY_CODE, StringUtils.toString(companyCode, eiMetadata.getMeta(FIELD_COMPANY_CODE)));
+		map.put(FIELD_DEP_CODE, StringUtils.toString(depCode, eiMetadata.getMeta(FIELD_DEP_CODE)));
+		map.put(FIELD_CREATED_BY, StringUtils.toString(createdBy, eiMetadata.getMeta(FIELD_CREATED_BY)));
+		map.put(FIELD_CREATED_NAME, StringUtils.toString(createdName, eiMetadata.getMeta(FIELD_CREATED_NAME)));
+		map.put(FIELD_CREATED_TIME, StringUtils.toString(createdTime, eiMetadata.getMeta(FIELD_CREATED_TIME)));
+		map.put(FIELD_UPDATED_BY, StringUtils.toString(updatedBy, eiMetadata.getMeta(FIELD_UPDATED_BY)));
+		map.put(FIELD_UPDATED_NAME, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_UPDATED_NAME)));
+		map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME)));
+		map.put(FIELD_DELETE_FLAG, StringUtils.toString(deleteFlag, eiMetadata.getMeta(FIELD_DELETE_FLAG)));
+		map.put(FIELD_REGISTER_DATE, StringUtils.toString(registerDate, eiMetadata.getMeta(FIELD_REGISTER_DATE)));
+		map.put(FIELD_FACTORY_CODE, StringUtils.toString(factoryCode, eiMetadata.getMeta(FIELD_FACTORY_CODE)));
+		map.put(FIELD_WEIGHT, StringUtils.toString(weight, eiMetadata.getMeta(FIELD_WEIGHT)));
+		map.put(FIELD_USER_COUNT, StringUtils.toString(userCount, eiMetadata.getMeta(FIELD_USER_COUNT)));
+
+		return map;
+	}
+}

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

+package com.baosight.hpjx.hp.sc.domain;
+
+import com.baosight.iplat4j.core.data.DaoEPBase;
+import com.baosight.iplat4j.core.ei.EiColumn;
+import com.baosight.iplat4j.core.util.NumberUtils;
+import com.baosight.iplat4j.core.util.StringUtils;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author LiuYang
+ * @version 1.0 2024/4/6
+ */
+public class HPSC096 extends DaoEPBase {
+
+    public static final String FIELD_ID = "id";    		/* ID*/
+    public static final String FIELD_COMPANY_CODE = "companyCode";    		/* 企业编码 预留*/
+    public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码 预留*/
+    public static final String FIELD_REGISTER_DATE = "registerDate";    		/* 登记日期*/
+    public static final String FIELD_FACTORY_CODE = "factoryCode";    		/* 工厂代码*/
+    public static final String FIELD_GROUP_CODE = "groupCode";    		/* 生产组代码*/
+    public static final String FIELD_GROUP_TYPE = "groupType";    		/* 生产类型*/
+    public static final String FIELD_ORG_TYPE = "orgType";    		/* 组织类型*/
+    public static final String FIELD_PRDT_CODE = "prdtCode";    		/* 产品代码*/
+    public static final String FIELD_PRDT_NAME = "prdtName";    		/* 产品名称*/
+    public static final String FIELD_WEIGHT = "weight";    		/* 产量*/
+    public static final String FIELD_DELETE_FLAG = "deleteFlag";    		/* 是否删除0:否1.是*/
+    public static final String FIELD_CREATED_BY = "createdBy";    		/* 创建人*/
+    public static final String FIELD_CREATED_NAME = "createdName";    		/* 创建人名称*/
+    public static final String FIELD_CREATED_TIME = "createdTime";    		/* 创建时间*/
+    public static final String FIELD_UPDATED_BY = "updatedBy";    		/* 修改人*/
+    public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 修改人名称*/
+    public static final String FIELD_UPDATED_NAME = "updatedName";    		/* 修改时间*/
+
+    public static final String COL_ID = "ID";    		/* ID*/
+    public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码 预留*/
+    public static final String COL_DEP_CODE = "DEP_CODE";    		/* 部门编码 预留*/
+    public static final String COL_REGISTER_DATE = "REGISTER_DATE";    		/* 登记日期*/
+    public static final String COL_FACTORY_CODE = "FACTORY_CODE";    		/* 工厂代码*/
+    public static final String COL_GROUP_CODE = "GROUP_CODE";    		/* 生产组代码*/
+    public static final String COL_GROUP_TYPE = "GROUP_TYPE";    		/* 生产类型*/
+    public static final String COL_DELETE_FLAG = "DELETE_FLAG";    		/* 是否删除0:否1.是*/
+    public static final String COL_CREATED_BY = "CREATED_BY";    		/* 创建人*/
+    public static final String COL_CREATED_NAME = "CREATED_NAME";    		/* 创建人名称*/
+    public static final String COL_CREATED_TIME = "CREATED_TIME";    		/* 创建时间*/
+    public static final String COL_UPDATED_BY = "UPDATED_BY";    		/* 修改人*/
+    public static final String COL_UPDATED_TIME = "UPDATED_TIME";    		/* 修改人名称*/
+    public static final String COL_UPDATED_NAME = "UPDATED_NAME";    		/* 修改时间*/
+
+    public static final String QUERY = "HPSC010.query";
+    public static final String INSERT = "HPSC010.insert";
+    public static final String UPDATE = "HPSC010.update";
+    public static final String QUERY_FACTORY_CODE = "HPSC010.queryFactoryCode";
+    public static final String QUERY_PRODUCTION_TYPE = "HPSC010.queryProductionType";
+
+    private Long id = new Long(0);	/* ID*/
+    private String companyCode = " ";		/* 企业编码 预留*/
+    private String depCode = " ";		/* 部门编码 预留*/
+    private String registerDate = " ";		/* 登记日期*/
+    private String factoryCode = " ";		/* 工厂代码*/
+    private String groupCode = " ";		/* 生产组代码*/
+    private String groupType = " ";		/* 生产类型*/
+    private String prdtCode = " ";		/* 产品代码*/
+    private String prdtName = " ";		/* 产品名称*/
+    private BigDecimal weight = new BigDecimal("0");		/* 产量*/
+    private String remark = " ";		/* 备注*/
+    private Integer deleteFlag;	/* 是否删除0:否1.是*/
+    private String createdBy = " ";		/* 创建人*/
+    private String createdName = " ";		/* 创建人名称*/
+    private String createdTime = " ";		/* 创建时间*/
+    private String updatedBy = " ";		/* 修改人*/
+    private String updatedTime = " ";		/* 修改人名称*/
+    private String updatedName = " ";		/* 修改时间*/
+
+    /**
+     * initialize the metadata.
+     */
+    public void initMetaData() {
+        EiColumn eiColumn;
+
+        eiColumn = new EiColumn(FIELD_ID);
+        eiColumn.setPrimaryKey(true);
+        eiColumn.setDescName("ID");
+        eiMetadata.addMeta(eiColumn);
+
+        eiColumn = new EiColumn(FIELD_COMPANY_CODE);
+        eiColumn.setDescName("企业编码 预留");
+        eiMetadata.addMeta(eiColumn);
+
+        eiColumn = new EiColumn(FIELD_DEP_CODE);
+        eiColumn.setDescName("部门编码 预留");
+        eiMetadata.addMeta(eiColumn);
+
+        eiColumn = new EiColumn(FIELD_REGISTER_DATE);
+        eiColumn.setDescName("登记日期");
+        eiMetadata.addMeta(eiColumn);
+
+        eiColumn = new EiColumn(FIELD_FACTORY_CODE);
+        eiColumn.setDescName("工厂代码");
+        eiMetadata.addMeta(eiColumn);
+
+        eiColumn = new EiColumn(FIELD_GROUP_CODE);
+        eiColumn.setDescName("生产组代码");
+        eiMetadata.addMeta(eiColumn);
+
+        eiColumn = new EiColumn(FIELD_GROUP_TYPE);
+        eiColumn.setDescName("生产类型");
+        eiMetadata.addMeta(eiColumn);
+
+        eiColumn = new EiColumn(FIELD_PRDT_CODE);
+        eiColumn.setDescName("产品代码");
+        eiMetadata.addMeta(eiColumn);
+
+        eiColumn = new EiColumn(FIELD_PRDT_NAME);
+        eiColumn.setDescName("产品名称");
+        eiMetadata.addMeta(eiColumn);
+
+        eiColumn = new EiColumn(FIELD_WEIGHT);
+        eiColumn.setType("N");
+        eiColumn.setScaleLength(3);
+        eiColumn.setFieldLength(20);
+        eiColumn.setDescName("产量");
+        eiMetadata.addMeta(eiColumn);
+
+        eiColumn = new EiColumn(FIELD_DELETE_FLAG);
+        eiColumn.setDescName("是否删除0:否1.是");
+        eiMetadata.addMeta(eiColumn);
+
+        eiColumn = new EiColumn(FIELD_CREATED_BY);
+        eiColumn.setDescName("创建人");
+        eiMetadata.addMeta(eiColumn);
+
+        eiColumn = new EiColumn(FIELD_CREATED_NAME);
+        eiColumn.setDescName("创建人名称");
+        eiMetadata.addMeta(eiColumn);
+
+        eiColumn = new EiColumn(FIELD_CREATED_TIME);
+        eiColumn.setDescName("创建时间");
+        eiMetadata.addMeta(eiColumn);
+
+        eiColumn = new EiColumn(FIELD_UPDATED_BY);
+        eiColumn.setDescName("修改人");
+        eiMetadata.addMeta(eiColumn);
+
+        eiColumn = new EiColumn(FIELD_UPDATED_TIME);
+        eiColumn.setDescName("修改人名称");
+        eiMetadata.addMeta(eiColumn);
+
+        eiColumn = new EiColumn(FIELD_UPDATED_NAME);
+        eiColumn.setDescName("修改时间");
+        eiMetadata.addMeta(eiColumn);
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCompanyCode() {
+        return companyCode;
+    }
+
+    public void setCompanyCode(String companyCode) {
+        this.companyCode = companyCode;
+    }
+
+    public String getDepCode() {
+        return depCode;
+    }
+
+    public void setDepCode(String depCode) {
+        this.depCode = depCode;
+    }
+
+    public String getRegisterDate() {
+        return registerDate;
+    }
+
+    public void setRegisterDate(String registerDate) {
+        this.registerDate = registerDate;
+    }
+
+    public String getFactoryCode() {
+        return factoryCode;
+    }
+
+    public void setFactoryCode(String factoryCode) {
+        this.factoryCode = factoryCode;
+    }
+
+    public String getGroupCode() {
+        return groupCode;
+    }
+
+    public void setGroupCode(String groupCode) {
+        this.groupCode = groupCode;
+    }
+
+    public String getGroupType() {
+        return groupType;
+    }
+
+    public void setGroupType(String groupType) {
+        this.groupType = groupType;
+    }
+
+    public String getPrdtCode() {
+        return prdtCode;
+    }
+
+    public void setPrdtCode(String prdtCode) {
+        this.prdtCode = prdtCode;
+    }
+
+    public String getPrdtName() {
+        return prdtName;
+    }
+
+    public void setPrdtName(String prdtName) {
+        this.prdtName = prdtName;
+    }
+
+    public BigDecimal getWeight() {
+        return weight;
+    }
+
+    public void setWeight(BigDecimal weight) {
+        this.weight = weight;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public String getCreatedName() {
+        return createdName;
+    }
+
+    public void setCreatedName(String createdName) {
+        this.createdName = createdName;
+    }
+
+    public String getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setCreatedTime(String createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    public String getUpdatedBy() {
+        return updatedBy;
+    }
+
+    public void setUpdatedBy(String updatedBy) {
+        this.updatedBy = updatedBy;
+    }
+
+    public String getUpdatedTime() {
+        return updatedTime;
+    }
+
+    public void setUpdatedTime(String updatedTime) {
+        this.updatedTime = updatedTime;
+    }
+
+    public String getUpdatedName() {
+        return updatedName;
+    }
+
+    public void setUpdatedName(String updatedName) {
+        this.updatedName = updatedName;
+    }
+
+    @Override
+    public void fromMap(Map map) {
+
+        setId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_ID)), id));
+        setCompanyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_CODE)), companyCode));
+        setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
+        setRegisterDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REGISTER_DATE)), registerDate));
+        setFactoryCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_CODE)), factoryCode));
+        setGroupCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_GROUP_CODE)), groupCode));
+        setGroupType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_GROUP_TYPE)), groupType));
+        setPrdtCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRDT_CODE)), prdtCode));
+        setPrdtName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRDT_NAME)), prdtName));
+        setWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_WEIGHT)), weight));
+        setDeleteFlag(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_DELETE_FLAG)), deleteFlag));
+        setCreatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_BY)), createdBy));
+        setCreatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_NAME)), createdName));
+        setCreatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_TIME)), createdTime));
+        setUpdatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_BY)), updatedBy));
+        setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime));
+        setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_NAME)), updatedName));
+    }
+
+    /**
+     * set the value to Map.
+     */
+    @Override
+    public Map toMap() {
+
+        Map map = new HashMap();
+        map.put(FIELD_ID, StringUtils.toString(id, eiMetadata.getMeta(FIELD_ID)));
+        map.put(FIELD_COMPANY_CODE, StringUtils.toString(companyCode, eiMetadata.getMeta(FIELD_COMPANY_CODE)));
+        map.put(FIELD_DEP_CODE, StringUtils.toString(depCode, eiMetadata.getMeta(FIELD_DEP_CODE)));
+        map.put(FIELD_REGISTER_DATE, StringUtils.toString(registerDate, eiMetadata.getMeta(FIELD_REGISTER_DATE)));
+        map.put(FIELD_FACTORY_CODE, StringUtils.toString(factoryCode, eiMetadata.getMeta(FIELD_FACTORY_CODE)));
+        map.put(FIELD_GROUP_CODE, StringUtils.toString(groupCode, eiMetadata.getMeta(FIELD_GROUP_CODE)));
+        map.put(FIELD_GROUP_TYPE, StringUtils.toString(groupType, eiMetadata.getMeta(FIELD_GROUP_TYPE)));
+        map.put(FIELD_PRDT_CODE, StringUtils.toString(prdtCode, eiMetadata.getMeta(FIELD_PRDT_CODE)));
+        map.put(FIELD_PRDT_NAME, StringUtils.toString(prdtName, eiMetadata.getMeta(FIELD_PRDT_NAME)));
+        map.put(FIELD_WEIGHT, StringUtils.toString(weight, eiMetadata.getMeta(FIELD_WEIGHT)));
+        map.put(FIELD_DELETE_FLAG, StringUtils.toString(deleteFlag, eiMetadata.getMeta(FIELD_DELETE_FLAG)));
+        map.put(FIELD_CREATED_BY, StringUtils.toString(createdBy, eiMetadata.getMeta(FIELD_CREATED_BY)));
+        map.put(FIELD_CREATED_NAME, StringUtils.toString(createdName, eiMetadata.getMeta(FIELD_CREATED_NAME)));
+        map.put(FIELD_CREATED_TIME, StringUtils.toString(createdTime, eiMetadata.getMeta(FIELD_CREATED_TIME)));
+        map.put(FIELD_UPDATED_BY, StringUtils.toString(updatedBy, eiMetadata.getMeta(FIELD_UPDATED_BY)));
+        map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME)));
+        map.put(FIELD_UPDATED_NAME, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_UPDATED_NAME)));
+
+        return map;
+    }
+}

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

+package com.baosight.hpjx.hp.sc.service;
+
+import com.baosight.hpjx.common.DdynamicEnum;
+import com.baosight.hpjx.core.constant.CommonConstant;
+import com.baosight.hpjx.core.dao.DaoUtils;
+import com.baosight.hpjx.hp.sc.domain.HPSC008;
+import com.baosight.hpjx.hp.sc.domain.HPSC009;
+import com.baosight.hpjx.hp.sc.domain.HPSC010;
+import com.baosight.hpjx.util.CommonMethod;
+import com.baosight.hpjx.util.ErrorCodeUtils;
+import com.baosight.hpjx.util.contants.ACConstants;
+import com.baosight.iplat4j.core.ei.EiBlock;
+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.resource.I18nMessages;
+import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author LiuYang
+ * @version 1.0 2024/4/3
+ */
+public class ServiceHPSC010 extends ServiceEPBase {
+
+    @Override
+    public EiInfo initLoad(EiInfo inInfo) {
+        inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPSC009.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
+        final EiInfo outEiInfo = super.query(inInfo, HPSC010.QUERY, new HPSC010().eiMetadata);
+        CommonMethod.initBlock(outEiInfo,
+                Arrays.asList(DdynamicEnum.FACTORY_CODE_BLOCK_ID), new HashMap<String,Object>());
+        return outEiInfo;
+    }
+
+    @Override
+    public EiInfo query(EiInfo inInfo) {
+        return super.query(inInfo,HPSC010.QUERY,new HPSC010());
+    }
+
+    @Override
+    public EiInfo delete(EiInfo inInfo) {
+        int i = 0;
+        try {
+            HPSC010 hpxs010 = new HPSC010();
+            EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
+            for (i = 0; i < eiBlock.getRowCount(); i++) {
+                Map<?, ?> map = eiBlock.getRow(i);
+                hpxs010.fromMap(map);
+                hpxs010.setDeleteFlag(CommonConstant.YesNo.YES_1);
+                this.delRows(hpxs010.getId().toString());
+                DaoUtils.update(HPSC010.DELETE_FLAG, hpxs010.toMap());
+            }
+            inInfo.setStatus(EiConstant.STATUS_SUCCESS);
+            inInfo.setMsgByKey("ep.1000", new String[]{String.valueOf(i), I18nMessages.getText("label.delete", "删除")});
+        } catch (PlatException e) {
+            e.printStackTrace();
+            inInfo.setStatus(EiConstant.STATUS_FAILURE);
+            ErrorCodeUtils.handleDeleteException(inInfo,i,e);
+            logError("删除失败", e.getMessage());
+            return inInfo;
+        }
+        return inInfo;
+    }
+
+    @Override
+    public EiInfo update(EiInfo inInfo) {
+        int i = 0;
+        try {
+            HPSC010 hpxs010 = new HPSC010();
+            EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
+            for (i = 0; i < eiBlock.getRowCount(); i++) {
+                Map<?, ?> map = eiBlock.getRow(i);
+                hpxs010.fromMap(map);
+                hpxs010.setDeleteFlag(CommonConstant.YesNo.NO_0);
+                DaoUtils.update(HPSC010.UPDATE, hpxs010);
+            }
+            inInfo.setStatus(EiConstant.STATUS_SUCCESS);
+            inInfo.setMsgByKey("ep.1000", new String[]{String.valueOf(i), I18nMessages.getText("label.update", "修改")});
+        } catch (PlatException e) {
+            e.printStackTrace();
+            inInfo.setStatus(EiConstant.STATUS_FAILURE);
+            ErrorCodeUtils.handleUpdateException(inInfo,i,e);
+            logError("修改失败", e.getMessage());
+            return inInfo;
+        }
+        return inInfo;
+    }
+
+    @Override
+    public EiInfo insert(EiInfo inInfo) {
+        int i = 0;
+        try {
+            HPSC010 hpxs010 = new HPSC010();
+            EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
+            List<Map> list = eiBlock.getRows();
+            list.addAll(inInfo.getBlock(CommonConstant.Field.DETAIL).getRows());
+            double weight = 0;
+            for (i = 0; i < list.size(); i++) {
+                Map<?, ?> map = list.get(i);
+                BigDecimal bigDecimal = new BigDecimal(map.get(HPSC008.FIELD_WEIGHT).toString());
+                weight = weight+bigDecimal.doubleValue();
+            }
+            hpxs010.fromMap(eiBlock.getRow(0));
+            hpxs010.setDeleteFlag(CommonConstant.YesNo.NO_0);
+            hpxs010.setWeight(BigDecimal.valueOf(weight));
+            hpxs010.setUserCount(Long.valueOf(inInfo.getCellStr(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPSC010.FIELD_USER_COUNT)));
+            DaoUtils.insert(HPSC010.INSERT, hpxs010);
+            inInfo.setStatus(EiConstant.STATUS_SUCCESS);
+            inInfo.setMsgByKey("ep.1000", new String[]{String.valueOf(i), I18nMessages.getText("label.insert", "新增")});
+        } catch (PlatException e) {
+            e.printStackTrace();
+            inInfo.setStatus(EiConstant.STATUS_FAILURE);
+            ErrorCodeUtils.handleInsertException(inInfo,i,e);
+            logError("新增失败", e.getMessage());
+            return inInfo;
+        }
+        return inInfo;
+    }
+
+    public void delRows(String id){
+        HPSC008 hpxs001 = new HPSC008();
+        hpxs001.setRemark(id);
+        hpxs001.setDeleteFlag(CommonConstant.YesNo.YES_1);
+        DaoUtils.update(HPSC008.DELETE_REMARK, hpxs001.toMap());
+    }
+}
\ No newline at end of file

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

+package com.baosight.hpjx.hp.sc.service;
+
+import com.baosight.hpjx.common.DdynamicEnum;
+import com.baosight.hpjx.core.constant.CommonConstant;
+import com.baosight.hpjx.core.security.UserSessionUtils;
+import com.baosight.hpjx.hp.sc.domain.HPSC008;
+import com.baosight.hpjx.util.CommonMethod;
+import com.baosight.hpjx.util.StringUtil;
+import com.baosight.hpjx.util.contants.ACConstants;
+import com.baosight.iplat4j.core.ei.EiBlock;
+import com.baosight.iplat4j.core.ei.EiConstant;
+import com.baosight.iplat4j.core.ei.EiInfo;
+import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
+
+import java.util.Arrays;
+import java.util.HashMap;
+
+/**
+ * @author LiuYang
+ * @version 1.0 2024/4/7
+ */
+public class ServiceHPSC010A extends ServiceEPBase {
+
+    @Override
+    public EiInfo initLoad(EiInfo inInfo) {
+        inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPSC008.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
+        final EiInfo outEiInfo = super.query(inInfo, HPSC008.QUERY_RESULT, new HPSC008());
+        EiInfo detailEiInfo = super.query(inInfo, HPSC008.QUERY_DETAIL, new HPSC008());
+        EiBlock detailBlock = new EiBlock(CommonConstant.Field.DETAIL);
+        detailBlock.setBlockMeta(new HPSC008().eiMetadata);
+        detailBlock.setRows(detailEiInfo.getBlock(EiConstant.resultBlock).getRows());
+        outEiInfo.setBlock(detailBlock);
+        CommonMethod.initBlock(outEiInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), null, false);
+        CommonMethod.initBlock(outEiInfo, Arrays.asList(DdynamicEnum.GROUP_RECORD1_BLOCK_ID), null, false);
+        //拼接名称 包含逻辑删除数据
+        return outEiInfo;
+    }
+
+    @Override
+    public EiInfo query(EiInfo inInfo) {
+        EiBlock block = inInfo.getBlock(EiConstant.queryBlock);
+        String startDate = block.getCellStr(ACConstants.ROW_CODE_0,"createdDateFrom");
+        String endDate = block.getCellStr(ACConstants.ROW_CODE_0,"createdDateTo");
+        if (!endDate.isEmpty()) {
+            inInfo.setCell(EiConstant.queryBlock,ACConstants.ROW_CODE_0,"createdDateTo", StringUtil.removeHorizontalLine(endDate));
+        }
+        if (!startDate.isEmpty()) {
+            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,"createdDateFrom",StringUtil.removeHorizontalLine(startDate));
+        }
+        inInfo.setCell(EiConstant.queryBlock,ACConstants.ROW_CODE_0,HPSC008.FIELD_DELETE_FLAG,CommonConstant.YesNo.NO_0);
+        return super.query(inInfo, HPSC008.QUERY,new HPSC008());
+    }
+}

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

+package com.baosight.hpjx.hp.sc.service;
+
+import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
+import com.baosight.hpjx.common.DdynamicEnum;
+import com.baosight.hpjx.core.constant.CommonConstant;
+import com.baosight.hpjx.core.dao.DaoUtils;
+import com.baosight.hpjx.core.security.UserSessionUtils;
+import com.baosight.hpjx.hp.sc.domain.HPSC008;
+import com.baosight.hpjx.hp.sc.domain.HPSC010;
+import com.baosight.hpjx.hp.sc.domain.HPSC096;
+import com.baosight.hpjx.hp.sc.domain.HPSC098;
+import com.baosight.hpjx.util.CommonMethod;
+import com.baosight.hpjx.util.ErrorCodeUtils;
+import com.baosight.hpjx.util.contants.ACConstants;
+import com.baosight.iplat4j.core.ei.EiBlock;
+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.resource.I18nMessages;
+import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
+import com.baosight.iplat4j.core.web.threadlocal.UserSession;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+/**
+ * @author LiuYang
+ * @version 1.0 2024/4/3
+ */
+public class ServiceHPSC096 extends ServiceEPBase {
+
+    @OperationLogAnnotation(operModul = "报工管理",operType = "查询",operDesc = "初始化")
+    @Override
+    public EiInfo initLoad(EiInfo inInfo) {
+        String methodType = inInfo.getString("inqu_status-0-methodType"); //操作类型
+        List<Map> listFactoryCode;
+        if ("update".equals(methodType)) {
+            String id = inInfo.getString("inqu_status-0-id");
+            listFactoryCode = this.dao.query(HPSC008.QUERY,new HashMap<String,Object>(){{
+                put(HPSC008.FIELD_REMARK,id);
+            }},EiConstant.defaultOffset,100);
+            EiInfo eiInfo = super.query(inInfo,HPSC010.QUERY,new HPSC010());
+            if (eiInfo.getBlock(EiConstant.resultBlock).getRows().size() >0) {
+                inInfo.setCell(EiConstant.queryBlock,ACConstants.ROW_CODE_0,HPSC010.FIELD_USER_COUNT,
+                        eiInfo.getCellStr(EiConstant.resultBlock,ACConstants.ROW_CODE_0,HPSC010.FIELD_USER_COUNT));
+            }
+
+            inInfo.addBlock(EiConstant.resultBlock).setRows(listFactoryCode);
+        }else {
+            List<Map> listResult = new ArrayList<>();
+            List<Map> listdetail = new ArrayList<>();
+            String loginName = UserSession.getLoginName();
+            Map queryMap = new HashMap();
+            queryMap.put("loginName", loginName);
+            listFactoryCode = this.dao.query(HPSC096.QUERY_FACTORY_CODE,queryMap,EiConstant.defaultOffset,100);
+            List<Map> listProducTionType = this.dao.query(HPSC096.QUERY_PRODUCTION_TYPE,new HashMap<>());
+            int rowNo = 0;
+            int detrowNo = 0;
+            for (int i = 0; i < listFactoryCode.size(); i++) {
+                if ("prodGroup".equals(listFactoryCode.get(i).get(HPSC096.FIELD_ORG_TYPE))) {
+                    for (Map map : listProducTionType) {
+                        rowNo++;
+                        Map result = new HashMap();
+                        result.putAll(listFactoryCode.get(i));
+                        result.put(HPSC096.FIELD_GROUP_TYPE, map.get(HPSC096.FIELD_GROUP_TYPE));
+                        result.put("rowNo",rowNo);
+                        //listFactoryCode.get(i).put(HPSC096.FIELD_GROUP_TYPE,listProducTionType.get(j).get(HPSC096.FIELD_GROUP_TYPE));
+                        listResult.add(result);
+                    }
+                }else {
+                    Map detailMap = new HashMap();
+                    detailMap.putAll(listFactoryCode.get(i));
+                    detailMap.put("rowNo",detrowNo);
+                    listdetail.add(detailMap);
+                    detrowNo++;
+                }
+            }
+            inInfo.addBlock(EiConstant.resultBlock).setRows(listResult);
+            inInfo.addBlock(CommonConstant.Field.DETAIL).setRows(listdetail);
+        }
+        inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPSC096().eiMetadata);
+        inInfo.addBlock(CommonConstant.Field.DETAIL).addBlockMeta(new HPSC096().eiMetadata);
+        inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,"methodType",methodType);
+        CommonMethod.initBlock(inInfo,
+                Arrays.asList(DdynamicEnum.GROUP_RECORD1_BLOCK_ID,DdynamicEnum.FACTORY_CODE_BLOCK_ID),
+                new HashMap<String,Object>(){{
+                    put(HPSC008.FIELD_COMPANY_CODE, UserSessionUtils.getCompanyCode());
+                }}
+        );
+        return inInfo;
+    }
+
+    @Override
+    public EiInfo query(EiInfo inInfo) {
+        return super.query(inInfo);
+    }
+
+    @OperationLogAnnotation(operModul = "报工管理",operType = "修改",operDesc = "修改操作")
+    @Override
+    public EiInfo update(EiInfo inInfo) {
+        int i = 0;
+        try {
+            HPSC008 hpxs002 = new HPSC008();
+            EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
+            for (i = 0; i < eiBlock.getRowCount(); i++) {
+                Map<?, ?> map = eiBlock.getRow(i);
+                hpxs002.fromMap(map);
+                hpxs002.setDeleteFlag(CommonConstant.YesNo.NO_0);
+                DaoUtils.update(HPSC008.UPDATE, hpxs002);
+            }
+            inInfo.setStatus(EiConstant.STATUS_SUCCESS);
+            inInfo.setMsgByKey("ep.1000", new String[]{String.valueOf(i), I18nMessages.getText("label.update", "修改")});
+        } catch (PlatException e) {
+            e.printStackTrace();
+            inInfo.setStatus(EiConstant.STATUS_FAILURE);
+            ErrorCodeUtils.handleUpdateException(inInfo,i,e);
+            logError("修改失败", e.getMessage());
+            return inInfo;
+        }
+        return inInfo;
+    }
+
+    @OperationLogAnnotation(operModul = "报工管理",operType = "新增",operDesc = "新增操作")
+    @Override
+    public EiInfo insert(EiInfo inInfo) {
+        int i = 0;
+        try {
+            EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
+            Map queryMap = new HashMap();
+            queryMap.put(HPSC010.FIELD_REGISTER_DATE,eiBlock.getCellStr(ACConstants.ROW_CODE_0,HPSC010.FIELD_REGISTER_DATE));
+            queryMap.put(HPSC010.FIELD_FACTORY_CODE,eiBlock.getCellStr(ACConstants.ROW_CODE_0,HPSC010.FIELD_FACTORY_CODE));
+            List<Map> list = this.dao.query(HPSC010.QUERY_MAX,queryMap);
+
+            List<Map> listResult = eiBlock.getRows();
+            listResult.addAll(inInfo.getBlock(CommonConstant.Field.DETAIL).getRows());
+            HPSC008 hpxs008 = new HPSC008();
+            for (i = 0; i < listResult.size(); i++) {
+                Map<?, ?> map = listResult.get(i);
+                hpxs008.fromMap(map);
+                hpxs008.setDeleteFlag(CommonConstant.YesNo.NO_0);
+                for (Map map1:list) {
+                    hpxs008.setRemark(map1.get(HPSC010.FIELD_ID).toString());
+                }
+                DaoUtils.insert(HPSC008.INSERT, hpxs008);
+            }
+            inInfo.setStatus(EiConstant.STATUS_SUCCESS);
+            inInfo.setMsgByKey("ep.1000", new String[]{String.valueOf(i), I18nMessages.getText("label.insert", "新增")});
+        } catch (PlatException e) {
+            e.printStackTrace();
+            ErrorCodeUtils.handleInsertException(inInfo,i,e);
+            logError("新增失败", e.getMessage());
+            return inInfo;
+        }
+        return inInfo;
+    }
+}

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

@@ -110,6 +110,76 @@
 
 	</select>
 
+	<select id="queryResult" parameterClass="java.util.HashMap"
+			resultClass="com.baosight.hpjx.hp.sc.domain.HPSC008">
+		SELECT
+		ID	as "id",  <!-- ID -->
+		COMPANY_CODE	as "companyCode",  <!-- 企业编码 预留 -->
+		DEP_CODE	as "depCode",  <!-- 部门编码 预留 -->
+		REGISTER_DATE	as "registerDate",  <!-- 登记日期 -->
+		FACTORY_CODE	as "factoryCode",  <!-- 工厂代码 -->
+		GROUP_CODE	as "groupCode",  <!-- 生产组代码 -->
+		USER_ID	as "userId",  <!-- 员工代码 -->
+		GROUP_TYPE	as "groupType",  <!-- 生产类型 -->
+		PRDT_CODE	as "prdtCode",  <!-- 产品代码 -->
+		PRDT_NAME	as "prdtName",  <!-- 产品名称 -->
+		WEIGHT	as "weight",  <!-- 产量 -->
+		REMARK	as "remark",  <!-- 备注 -->
+		DELETE_FLAG	as "deleteFlag",  <!-- 是否删除0:否1.是 -->
+		CREATED_BY	as "createdBy",  <!-- 创建人 -->
+		CREATED_NAME	as "createdName",  <!-- 创建人名称 -->
+		CREATED_TIME	as "createdTime",  <!-- 创建时间 -->
+		UPDATED_BY	as "updatedBy",  <!-- 修改人 -->
+		UPDATED_TIME	as "updatedTime",  <!-- 修改人名称 -->
+		UPDATED_NAME	as "updatedName" <!-- 修改时间 -->
+		FROM ${hpjxSchema}.T_HPXS001 WHERE 1=1 and GROUP_TYPE in ('1','2')
+		<include refid="condition" />
+		<dynamic prepend="ORDER BY">
+			<isNotEmpty property="orderBy">
+				$orderBy$
+			</isNotEmpty>
+			<isEmpty property="orderBy">
+				CREATED_TIME desc
+			</isEmpty>
+		</dynamic>
+
+	</select>
+
+	<select id="queryDetail" parameterClass="java.util.HashMap"
+			resultClass="java.util.HashMap">
+		SELECT
+		ID	as "id",  <!-- ID -->
+		COMPANY_CODE	as "companyCode",  <!-- 企业编码 预留 -->
+		DEP_CODE	as "depCode",  <!-- 部门编码 预留 -->
+		REGISTER_DATE	as "registerDate",  <!-- 登记日期 -->
+		FACTORY_CODE	as "factoryCode",  <!-- 工厂代码 -->
+		GROUP_CODE	as "groupCode",  <!-- 生产组代码 -->
+		USER_ID	as "userId",  <!-- 员工代码 -->
+		GROUP_TYPE	as "groupType",  <!-- 生产类型 -->
+		PRDT_CODE	as "prdtCode",  <!-- 产品代码 -->
+		PRDT_NAME	as "prdtName",  <!-- 产品名称 -->
+		WEIGHT	as "weight",  <!-- 产量 -->
+		REMARK	as "remark",  <!-- 备注 -->
+		DELETE_FLAG	as "deleteFlag",  <!-- 是否删除0:否1.是 -->
+		CREATED_BY	as "createdBy",  <!-- 创建人 -->
+		CREATED_NAME	as "createdName",  <!-- 创建人名称 -->
+		CREATED_TIME	as "createdTime",  <!-- 创建时间 -->
+		UPDATED_BY	as "updatedBy",  <!-- 修改人 -->
+		UPDATED_TIME	as "updatedTime",  <!-- 修改人名称 -->
+		UPDATED_NAME	as "updatedName" <!-- 修改时间 -->
+		FROM ${hpjxSchema}.T_HPXS001 WHERE 1=1 and GROUP_TYPE not in ('1','2')
+		<include refid="condition" />
+		<dynamic prepend="ORDER BY">
+			<isNotEmpty property="orderBy">
+				$orderBy$
+			</isNotEmpty>
+			<isEmpty property="orderBy">
+				CREATED_TIME desc
+			</isEmpty>
+		</dynamic>
+
+	</select>
+
 	<select id="count" resultClass="int">
 		SELECT COUNT(*) FROM ${hpjxSchema}.T_HPXS001 WHERE 1=1
 		<include refid="condition" />
@@ -226,6 +296,22 @@
 		</isNotEmpty>
 	</update>
 
+	<update id="deleteRemark">
+		UPDATE ${hpjxSchema}.T_HPXS001
+		SET
+		DELETE_FLAG	= #deleteFlag#,   <!-- 是否删除0:否1.是 -->
+		UPDATED_BY	= #updatedBy#,   <!-- 修改人 -->
+		UPDATED_TIME	= #updatedTime#,   <!-- 修改人名称 -->
+		UPDATED_NAME	= #updatedName#  <!-- 修改时间 -->
+		WHERE REMARK = #remark#
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="depCode">
+			DEP_CODE = #depCode#
+		</isNotEmpty>
+	</update>
+
 	<update id="update">
 		UPDATE ${hpjxSchema}.T_HPXS001
 		SET

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC010.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-04-03 11:12:26
+   		Version :  1.0
+		schema : hpjx
+		tableName : T_HPSC008
+		 ID  BIGINT   NOT NULL   primarykey, 
+		 COMPANY_CODE  VARCHAR, 
+		 DEP_CODE  VARCHAR, 
+		 CREATED_BY  VARCHAR, 
+		 CREATED_NAME  VARCHAR, 
+		 CREATED_TIME  VARCHAR, 
+		 UPDATED_BY  VARCHAR, 
+		 UPDATED_NAME  VARCHAR, 
+		 UPDATED_TIME  VARCHAR, 
+		 DELETE_FLAG  TINYINT, 
+		 REGISTER_DATE  VARCHAR, 
+		 FACTORY_CODE  VARCHAR, 
+		 WEIGHT  DECIMAL, 
+		 USER_COUNT  BIGINT
+	-->
+<sqlMap namespace="HPSC010">
+
+	<sql id="authCondition">
+		<isNotEmpty prepend=" AND " property="depCode">
+			DEP_CODE = #depCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="depCodes">
+			DEP_CODE IN <iterate close=")" open="(" conjunction="," property="depCodes">#depCodes[]#</iterate>
+		</isNotEmpty>
+	</sql>
+
+	<sql id="condition">
+		<isNotEmpty prepend=" AND " property="id">
+			ID = #id#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+		<!--<isNotEmpty prepend=" AND " property="depCode">
+			DEP_CODE = #depCode#
+		</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="deleteFlag">
+			DELETE_FLAG = #deleteFlag#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="registerDate">
+			REGISTER_DATE = #registerDate#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="factoryCode">
+			FACTORY_CODE = #factoryCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="weight">
+			WEIGHT = #weight#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="userCount">
+			USER_COUNT = #userCount#
+		</isNotEmpty>
+	</sql>
+
+	<select id="query" parameterClass="java.util.HashMap"
+			resultClass="com.baosight.hpjx.hp.sc.domain.HPSC010">
+		SELECT
+			ID	as "id",  <!-- ID -->
+			COMPANY_CODE	as "companyCode",  <!-- 企业编码 -->
+			DEP_CODE	as "depCode",  <!-- 部门编码 -->
+			CREATED_BY	as "createdBy",  <!-- 创建人 -->
+			CREATED_NAME	as "createdName",  <!-- 创建名称 -->
+			CREATED_TIME	as "createdTime",  <!-- 创建时间 -->
+			UPDATED_BY	as "updatedBy",  <!-- 修改人 -->
+			UPDATED_NAME	as "updatedName",  <!-- 修改名称 -->
+			UPDATED_TIME	as "updatedTime",  <!-- 修改时间 -->
+			DELETE_FLAG	as "deleteFlag",  <!-- 是否删除 0-否1-是 -->
+			REGISTER_DATE	as "registerDate",  <!-- 登记日期 -->
+			FACTORY_CODE	as "factoryCode",  <!-- 工厂代码 -->
+			WEIGHT	as "weight",  <!-- 产量 -->
+			USER_COUNT	as "userCount" <!-- 用工人数 -->
+		FROM ${hpjxSchema}.T_HPSC008 WHERE 1=1
+		<include refid="authCondition" />
+        <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 ${hpjxSchema}.T_HPSC008 WHERE 1=1
+		<include refid="authCondition" />
+    	<include refid="condition" />
+	</select>
+
+	<!--
+		<isNotEmpty prepend=" AND " property="id">
+			ID = #id#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="depCode">
+			DEP_CODE = #depCode#
+		</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="deleteFlag">
+			DELETE_FLAG = #deleteFlag#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="registerDate">
+			REGISTER_DATE = #registerDate#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="factoryCode">
+			FACTORY_CODE = #factoryCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="weight">
+			WEIGHT = #weight#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="userCount">
+			USER_COUNT = #userCount#
+		</isNotEmpty>
+	-->
+
+	<insert id="insert">
+		INSERT INTO ${hpjxSchema}.T_HPSC008 (
+			COMPANY_CODE,  <!-- 企业编码 -->
+			DEP_CODE,  <!-- 部门编码 -->
+			CREATED_BY,  <!-- 创建人 -->
+			CREATED_NAME,  <!-- 创建名称 -->
+			CREATED_TIME,  <!-- 创建时间 -->
+			UPDATED_BY,  <!-- 修改人 -->
+			UPDATED_NAME,  <!-- 修改名称 -->
+			UPDATED_TIME,  <!-- 修改时间 -->
+			DELETE_FLAG,  <!-- 是否删除 0-否1-是 -->
+			REGISTER_DATE,  <!-- 登记日期 -->
+			FACTORY_CODE,  <!-- 工厂代码 -->
+			WEIGHT,  <!-- 产量 -->
+			USER_COUNT  <!-- 用工人数 -->
+		)
+	    VALUES (#companyCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #registerDate#, #factoryCode#, #weight#, #userCount#)
+	</insert>
+
+	<delete id="delete">
+		DELETE FROM ${hpjxSchema}.T_HPSC008 WHERE
+			ID = #id#
+	</delete>
+
+	<!--逻辑删除-->
+	<update id="deleteFlag">
+		UPDATE ${hpjxSchema}.T_HPSC008
+		SET
+		DELETE_FLAG	= #deleteFlag#,   <!-- 是否删除0:否1.是 -->
+		UPDATED_BY	= #updatedBy#,   <!-- 修改人 -->
+		UPDATED_TIME	= #updatedTime#,   <!-- 修改人名称 -->
+		UPDATED_NAME	= #updatedName#  <!-- 修改时间 -->
+		WHERE
+		ID = #id#
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="depCode">
+			DEP_CODE = #depCode#
+		</isNotEmpty>
+	</update>
+
+	<update id="update">
+		UPDATE ${hpjxSchema}.T_HPSC008
+		SET
+			COMPANY_CODE	= #companyCode#,   <!-- 企业编码 -->
+			DEP_CODE	= #depCode#,   <!-- 部门编码 -->
+			CREATED_BY	= #createdBy#,   <!-- 创建人 -->
+			CREATED_NAME	= #createdName#,   <!-- 创建名称 -->
+			CREATED_TIME	= #createdTime#,   <!-- 创建时间 -->
+			UPDATED_BY	= #updatedBy#,   <!-- 修改人 -->
+			UPDATED_NAME	= #updatedName#,   <!-- 修改名称 -->
+			UPDATED_TIME	= #updatedTime#,   <!-- 修改时间 -->
+			DELETE_FLAG	= #deleteFlag#,   <!-- 是否删除 0-否1-是 -->
+			REGISTER_DATE	= #registerDate#,   <!-- 登记日期 -->
+			FACTORY_CODE	= #factoryCode#,   <!-- 工厂代码 -->
+			WEIGHT	= #weight#,   <!-- 产量 -->
+			USER_COUNT	= #userCount#  <!-- 用工人数 -->
+		WHERE
+			ID = #id#
+	</update>
+
+	<!--查询工厂班组-->
+	<select id="queryFactoryCode" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
+		SELECT
+			DATE_FORMAT(NOW(), '%Y%m%d') as "registerDate",
+			ORG_ENAME AS "groupCode",
+			ORG_TYPE AS "orgType",
+			FACTORY_CODE as "factoryCode"
+		FROM iplat.txsog01
+		WHERE IS_DELETED = '0' AND ORG_TYPE != 'synGroup'
+			<isNotEmpty prepend=" AND " property="companyCode">
+				COMPANY_CODE = #companyCode#
+			</isNotEmpty>
+			<isNotEmpty prepend=" AND " property="loginName">
+				PARENT_ORG_ID IN (
+				SELECT FACTORY_CODE FROM iplat.txsog01
+				WHERE IS_DELETED = '0'
+				and COMPANY_CODE = #companyCode#
+				and ORG_ID in (
+					select ORG_ID from iplat.txsog02 T2
+					INNER JOIN iplat.xs_user xu ON t2.USER_ID = xu.USER_ID
+					where xu.LOGIN_NAME = #loginName#
+					)
+				)
+			</isNotEmpty>
+		<dynamic prepend="ORDER BY">
+			<isNotEmpty property="orderBy">
+				$orderBy$
+			</isNotEmpty>
+			<isEmpty property="orderBy">
+				SORT_INDEX asc
+			</isEmpty>
+		</dynamic>
+	</select>
+
+	<select id="queryProductionType" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
+		select
+			ITEM_CODE as "groupType"
+		FROM
+			iplat.tedcm01
+		where STATUS = '1' and CODESET_CODE = 'hpjx.hpjx.productionType'
+		<isNotEmpty prepend=" AND " property="itemCode">
+			$itemCode$
+		</isNotEmpty>
+	</select>
+
+	<!-- 查询子集组信息，包括生产组和下料组(递归) -->
+	<select id="queryGroupComboBox" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
+		SELECT
+		T2.LEVEL AS "level", T3.ORG_ID AS "orgId", T3.ORG_CNAME AS "orgCname",
+		T3.FACTORY_CODE AS "factoryCode", T5.FACTORY_NAME AS "factoryName"
+		FROM (
+		SELECT
+		@CODES AS CODES,
+		(SELECT @CODES:=GROUP_CONCAT(ORG_ID)
+		FROM ${platSchema}.TXSOG01
+		WHERE FIND_IN_SET(PARENT_ORG_ID, @CODES)
+		AND COMPANY_CODE = #companyCode#
+		AND IS_DELETED = 0
+		) AS T1,
+		@LEVEL:=@LEVEL+1 AS LEVEL
+		FROM ${platSchema}.TXSOG01,
+		<isNotEmpty property="parentOrgId">
+			(SELECT @CODES:=#parentOrgId#, @LEVEL:= 0) T4
+		</isNotEmpty>
+		<isEmpty property="parentOrgId">
+			(SELECT @CODES:='root', @LEVEL:= 0) T4
+		</isEmpty>
+		WHERE @CODES IS NOT NULL
+		) T2,
+		${platSchema}.TXSOG01 T3
+		LEFT JOIN ${platSchema}.TXSOG01 T5 ON T3.FACTORY_CODE = T5.ORG_ID
+		WHERE 1=1
+		AND FIND_IN_SET(T3.ORG_ID, T2.CODES)
+		AND T3.ORG_TYPE IN ('prodGroup', 'cutGroup')
+		<isNotEmpty prepend=" AND " property="orgType">
+			T3.ORG_TYPE = #orgType#
+		</isNotEmpty>
+		ORDER BY T2.LEVEL, T3.ORG_ID
+	</select>
+
+	<select id="queryMax" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
+		SELECT
+		ID	as "id",  <!-- ID -->
+		COMPANY_CODE	as "companyCode",  <!-- 企业编码 -->
+		DEP_CODE	as "depCode",  <!-- 部门编码 -->
+		CREATED_BY	as "createdBy",  <!-- 创建人 -->
+		CREATED_NAME	as "createdName",  <!-- 创建名称 -->
+		MAX(CREATED_TIME)	as "createdTime",  <!-- 创建时间 -->
+		UPDATED_BY	as "updatedBy",  <!-- 修改人 -->
+		UPDATED_NAME	as "updatedName",  <!-- 修改名称 -->
+		UPDATED_TIME	as "updatedTime",  <!-- 修改时间 -->
+		DELETE_FLAG	as "deleteFlag",  <!-- 是否删除 0-否1-是 -->
+		REGISTER_DATE	as "registerDate",  <!-- 登记日期 -->
+		FACTORY_CODE	as "factoryCode",  <!-- 工厂代码 -->
+		WEIGHT	as "weight",  <!-- 产量 -->
+		USER_COUNT	as "userCount" <!-- 用工人数 -->
+		FROM ${hpjxSchema}.T_HPSC008 WHERE 1=1
+		<include refid="authCondition" />
+		<isNotEmpty prepend=" AND " property="companyCode">
+			CREATED_TIME IN (
+			select MAX(CREATED_TIME)
+			from hpjx.T_HPSC008
+			where 1=1
+			<isNotEmpty prepend=" AND " property="companyCode">
+				COMPANY_CODE = #companyCode#
+			</isNotEmpty>
+			<isNotEmpty prepend=" AND " property="registerDate">
+				REGISTER_DATE = #registerDate#
+			</isNotEmpty>
+			<isNotEmpty prepend=" AND " property="factoryCode">
+				FACTORY_CODE = #factoryCode#
+			</isNotEmpty>
+			)
+		</isNotEmpty>
+		<include refid="condition" />
+		<dynamic prepend="ORDER BY">
+			<isNotEmpty property="orderBy">
+				$orderBy$
+			</isNotEmpty>
+			<isEmpty property="orderBy">
+				ID desc
+			</isEmpty>
+		</dynamic>
+	</select>
+
+</sqlMap>
\ No newline at end of file

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

+$(function () {
+    var factoryCodes = __eiInfo.getBlock("factory_code_block_id").getMappedRows();
+
+    $(".row").children().attr("class", "col-md-3");
+
+    $("#QUERY").on("click", query);
+
+    IPLATUI.EFGrid = {
+        "result": {
+            copyToAdd:false,
+            pageable: {
+                pageSize: 10,
+                pageSizes: [10, 20, 30, 50, 100, 200],
+            },
+            columns: [{
+                field: "operator",
+                title: "操作",
+                template: function (item) {
+                    let auditStatus = item.status;
+                    let template = '';
+                    template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+                        + 'onclick="showGroupDetail(\'' + item.id + '\')"  >任务详情</a>';
+                    return template;
+                }
+            },{
+                field: "registerDate",
+                attributes: {
+                    class: "i-input-readonly"
+                },
+                defaultValue: function () {
+                    return currShortDate();
+                }
+            },{
+                field: "factoryCode",
+                title: "工厂",
+                template: function (dataItem) {
+                    for (let i = 0; i < factoryCodes.length; i++) {
+                        if (factoryCodes[i]['valueField'] === dataItem['factoryCode']) {
+                            return factoryCodes[i]['textField'];
+                        }
+                    }
+                    return dataItem["factoryCode"];
+                }
+            }],
+            loadComplete: function(grid) {
+                // 此 grid 对象
+                // 处理父子级联动,通过监听 change 事件，判断父级节点是否发生变化
+                grid.dataSource.bind("change", function(e) {
+                    // 判断父级节点是否发生变化
+                    if (e.field == "factoryCode") {
+                        loadChange(grid,e,"groupCode");
+                    }
+                });
+            },
+            afterEdit:function (e) {},
+            onAdd: function (e) {
+                e.preventDefault();
+                addWindowOpen(null);
+            },
+            onSave: function (e) {
+                // 阻止默认请求，使用自定义保存
+                //e.preventDefault();
+                //let btnNode = $(this);
+                //禁用按钮
+                //btnNode.attr("disabled", true);
+                //saveResult(btnNode);
+            },
+            onSuccess: function (e) {
+                if (e.eiInfo.extAttr.methodName == 'update' || e.eiInfo.extAttr.methodName == 'insert') {
+                    query();
+                }
+            },
+            onRowClick: function (e) {
+                /*if (e.event.target.innerText!="任务详情"){
+                    updateWindowOpen(e.model.id)
+                }*/
+            },
+        }
+    }
+
+    $("#insert").on("click",function (e) {
+        addWindowOpen(null);
+    })
+
+    //工厂类型下拉联动
+    $('input[name="inqu_status-0-factoryCode"]').change(function () {
+        var inInfo=new EiInfo();
+        var factoryCode=$("#inqu_status-0-factoryCode").val();
+        inInfo.set("factoryCode",factoryCode);
+        inInfo.set("groupType","prodGroup");
+        EiCommunicator.send("HPSC008", "queryFactoryCode", inInfo, {
+            onSuccess: function (ei) {
+                var input=$("#inqu_status-0-groupCode");
+                let dataEdition=ei.getBlock("group_code_block_id").getMappedRows();
+                input.kendoDropDownList({
+                    valuePrimitive: true,
+                    dataTextField: "textField",
+                    dataValueField: "valueField",
+                    optionLabel:"请选择",
+                    dataSource: dataEdition,
+                    template: "#=textField#"
+                });
+            }, onFail: function (ei) {
+            }
+        }, {async: false});
+    });
+    //生产组下拉联动
+    $('input[name="inqu_status-0-groupCode"]').change(function () {
+        var inInfo=new EiInfo();
+        var factoryCode=$("#inqu_status-0-factoryCode").val();
+        inInfo.set("factoryCode",factoryCode);
+        var groupCode=$("#inqu_status-0-groupCode").val();
+        inInfo.set("groupCode",groupCode);
+        inInfo.set("groupType","prodGroup");
+        EiCommunicator.send("HPSC008", "queryGroupCode", inInfo, {
+            onSuccess: function (ei) {
+                var input=$("#inqu_status-0-userId");
+                let dataEdition=ei.getBlock("user_id_block_id").getMappedRows();
+                input.kendoDropDownList({
+                    valuePrimitive: true,
+                    dataTextField: "textField",
+                    dataValueField: "valueField",
+                    optionLabel:"请选择",
+                    dataSource: dataEdition,
+                    template: "#=textField#"
+                });
+            }, onFail: function (ei) {
+            }
+        }, {async: false});
+    });
+});
+
+function showUploadFile(id) {
+    JSColorbox.open({
+        href: "HPSC002B?methodName=initLoad&inqu_status-0-bizType=WL&inqu_status-0-id=" + id,
+        title: "<div style='text-align: center;'>附件清单</div>",
+        width: "80%",
+        height: "80%",
+    });
+}
+function check(id, auditStatus,planInfoNo) {
+    const inEiInfo = new EiInfo();
+    inEiInfo.set("id", id);
+    inEiInfo.set("planInfoNo",planInfoNo);
+    //先判断本身是否填写
+    EiCommunicator.send('HPSC003', 'getInfo', inEiInfo, {
+            onSuccess(ei) {
+                var model=ei.get("model");
+                if(!(model.planCompletionDate).trim()) {
+                    NotificationUtil("提交失败！原因：基本信息中计划完成日期未填写", "error");
+                    return;
+                } else {
+                    //提交
+                    //提交前先判断明细信息中的计划开始和计划结束时间是否都已经填写，只有填写了之后才能进行提交
+                    if (auditStatus == 1) {
+                        EiCommunicator.send('HPSC004', 'inspectDetail', inEiInfo, {
+                                onSuccess(ei) {
+                                    var list=ei.get("list");
+                                    if(list) {
+                                        var count = list[0];
+                                        if (count > 0) {
+                                            NotificationUtil("提交失败！原因：明细信息中有未填写的计划开始时间或计划结束时间", "error");
+                                        } else {
+                                            EiCommunicator.send('HPSC004','queryDetail',inEiInfo,{
+                                                onSuccess(ei){
+                                                    var rows = ei.blocks.detail.rows;
+                                                    var res = check_time(model,rows);
+                                                    if (!res){
+                                                        NotificationUtil("计划结束时间应该大于计划开始时间！", "error");
+                                                    }
+                                                    else {
+                                                        // 提交通过，生成
+                                                        EiCommunicator.send('HPSC003', 'submitPlan', inEiInfo, {
+                                                                onSuccess(response) {
+                                                                    NotificationUtil(response.msg);
+                                                                    resultGrid.dataSource.page(1);
+                                                                },
+                                                                onFail(errorMessage, status, e) {
+                                                                    NotificationUtil("执行失败！", "error");
+                                                                }
+                                                            },
+                                                            {
+                                                                async: false
+                                                            }
+                                                        );
+                                                    }
+
+
+                                                }
+                                            })
+
+                                        }
+                                    } else {
+                                        NotificationUtil("提交失败！未找到明细信息", "error");
+                                    }
+                                },
+                                onFail(errorMessage, status, e) {
+                                    NotificationUtil("执行失败！", "error");
+                                }
+                            },
+                            {
+                                async: false
+                            }
+                        );
+                    } else {
+                        // 撤回
+
+                    }
+                }
+            },
+            onFail(errorMessage, status, e) {
+                NotificationUtil("执行失败！", "error");
+            }
+        },
+        {
+            async: false
+        }
+    );
+
+
+}
+
+let query = function () {
+    resultGrid.dataSource.page(1);
+}
+
+function check_time(model,rows){
+    for (var i=0;i<rows.length;i++){
+        if (model.planInfoNo == rows[i][5]) {
+            var start_time = rows[i][22];
+            var end_time = rows[i][23];
+
+            if (end_time < start_time) {
+
+                return false;
+            }
+        }
+    }
+    return true;
+}
+/**
+ * 保存汇总
+ */
+function saveResult(btn) {
+    let rows = resultGrid.getCheckedRows();
+    if (rows.length < 1) {
+        message("请选择数据");
+        return;
+    }
+    let flag = true;
+    $.each(rows, function(index, item) {
+        let planCompletionDate= item.get("planCompletionDate");
+        if(isBlank(planCompletionDate)){
+            message("选中的第"+(index+1)+"行\"计划结束时间\"，不能为空!");
+            flag = false;
+            return false;
+        }
+    });
+    if(flag) {
+        JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
+            ok: function () {
+                JSUtils.submitGridsData("result", "HPSC003", "update", true);
+                //释放禁用按钮
+                btn.attr("disabled", false);
+            }
+        });
+    }
+}
+/**
+ * 保存明细
+ */
+function saveDetail(btn) {
+    let rows = detailGrid.getCheckedRows();
+    if (rows.length < 1) {
+        message("请选择数据");
+        return;
+    }
+    let flag = true;
+    $.each(rows, function(index, item) {
+        let planCommentDate= item.get("planCommentDate");
+        let planCompletionDate= item.get("planCompletionDate");
+        if(isBlank(planCommentDate)){
+            message("选中的第"+(index+1)+"行\"计划开始时间\"，不能为空!");
+            flag = false;
+            return false;
+        }
+        if(isBlank(planCompletionDate)){
+            message("选中的第"+(index+1)+"行\"计划结束时间\"，不能为空!");
+            flag = false;
+            return false;
+        }
+        let startT = new Date(planCommentDate).getTime();
+        let endT = new Date(planCompletionDate).getTime();
+        if (startT > endT) {
+            message("选中的第"+(index+1)+"行\"计划开始时间\"不能大于\"计划结束时间\"！");
+            flag = false;
+            return false;
+        }
+    });
+    if(flag) {
+        JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
+            ok: function () {
+                JSUtils.submitGridsData("detail", "HPSC003", "updatePlanDetail", true);
+                //释放禁用按钮
+                btn.attr("disabled", false);
+            }
+        });
+    }
+}
+
+function loadChange(grid,e,field) {
+    var cell_label = field,that = grid;
+    // locked 表示是否为固定列
+    var locked = that.isCellLocked(cell_label);
+    // tr 表示 locked 和非 locked 的行,index 表示此行的第几列
+    var tr,index;
+    // 获取此 model 元素信息
+    var item = e.items[0];
+    var _uid = item.uid;
+    if (locked) {
+        tr = $(".k-grid-content-locked tr[data-uid="+ _uid +"]");
+        index = $("th[data-field='"+cell_label+"']").data("index");
+    } else {
+        tr = $(".k-grid-content tr[data-uid="+ _uid +"]");
+        index = parseInt($("th[data-field='"+cell_label+"']").data("index")) - that.lockedHeader.find("th").length;
+    }
+    // 获取子 cell(td)
+    var td = tr.children("td:eq("+index+")");
+    // 触发 td.click 事件，
+    td.trigger("click");
+}
+
+/**
+ * 任务详情
+ *
+ * @param let
+ */
+function showGroupDetail(id) {
+    window.open("HPSC010A?methodName=initLoad&inqu_status-0-remark=" + id)
+}
+
+function addWindowOpen(id) {
+    JSColorbox.open({
+        href: "HPSC096?methodName=initLoad&inqu_status-0-methodType=insert&inqu_status-0-id=" + id,
+        title: "<div style='text-align: center;'>新增</div>",
+        width: "80%",
+        height: "80%",
+        callbackName: windowOpenCallback
+    });
+}
+
+function updateWindowOpen(id) {
+    JSColorbox.open({
+        href: "HPSC096?methodName=initLoad&inqu_status-0-methodType=update&inqu_status-0-id=" + id,
+        title: "<div style='text-align: center;'>修改</div>",
+        width: "60%",
+        height: "50%",
+        callbackName: windowOpenCallback
+    });
+}
+
+/**
+ * 回调
+ *
+ * @param docId
+ */
+function windowOpenCallback(docId) {
+    console.log("关闭回调")
+    resultGrid.dataSource.page(1);
+}
\ No newline at end of file

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

+<%--
+  Created by IntelliJ IDEA.
+  User: 1
+  Date: 2024/4/3
+  Time: 14:04
+  To change this template use File | Settings | File Templates.
+--%>
+<!DOCTYPE html>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ 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}"/>
+
+<EF:EFPage  title="报工管理">
+    <EF:EFRegion id="inqu" title="查询条件">
+        <div class="row">
+            <EF:EFSelect cname="工厂" ename="factoryCode" blockId="inqu_status" row="0" colWidth="3"
+                         filter="contains" defultValue="">
+                <EF:EFOption label="全部" value=""/>
+                <EF:EFOptions blockId="factory_code_block_id" textField="textField" valueField="valueField"/>
+            </EF:EFSelect>
+            <EF:EFDateSpan startCname="登记日期" endCname="至" blockId="inqu_status"
+                           startName="createdDateFrom" endName="createdDateTo" row="0" role="date"
+                           format="yyyy-MM-dd" satrtRatio="4:8" endRatio="4:8">
+            </EF:EFDateSpan>
+        </div>
+    </EF:EFRegion>
+
+    <EF:EFRegion id="result" title="明细信息">
+        <EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="single">
+            <EF:EFColumn ename="id" primaryKey="true" cname="内码" hidden="true"/>
+            <EF:EFColumn ename="companyCode" cname="企业编码" hidden="true"/>
+            <EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="120" align="center"/>
+            <EF:EFColumn ename="registerDate" cname="登记日期" width="160" align="center" editType="date" readonly="true"
+                         dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
+            <EF:EFComboColumn ename="factoryCode" cname="工厂" blockName="factory_code_block_id"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#"
+                              textField="textField" valueField="valueField"
+                              maxLength="16" readonly="true" width="120" required="true"
+                              align="center" filter="contains" sort="true">
+            </EF:EFComboColumn>
+            <EF:EFColumn ename="weight" cname="产量" width="120" enable="false" format="{0:N2}" editType="text"
+                         displayType="0.000" sort="true" align="right"
+                         data-regex="/^-?[0-9]{1,16}([.][0-9]{1,2})?$/" maxLength="20" required="true"
+                         data-errorprompt="请输入数字，该值最大可设置17位整数和2位小数！"
+            />
+            <EF:EFColumn ename="userCount" cname="用工人数" width="120" enable="true" format="{0:N0}" editType="text"
+                         displayType="0" sort="true" align="right"
+                         data-regex="/^-?[0-9]{1,16}([.][0-9]{1,3})?$/" maxLength="20" required="true"
+                         data-errorprompt="请输入数字，该值最大可设置17位整数！"
+            />
+        </EF:EFGrid>
+    </EF:EFRegion>
+</EF:EFPage>
\ No newline at end of file

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

+$(function () {
+    //var factoryCodes = __eiInfo.getBlock("factory_code_block_id").getMappedRows();
+    //var groupCodes = __eiInfo.getBlock("group_code1_block_id").getMappedRows();
+    //var userIds = __eiInfo.getBlock("user_id1_block_id").getMappedRows();
+    //var factoryCode = __eiInfo.getBlock("factory_code1_block_id").getMappedRows();
+    //var groupName = __eiInfo.getBlock("group_name_block_id").getMappedRows();
+    //var userName = __eiInfo.getBlock("user_name_block_id").getMappedRows();
+
+    $(".row").children().attr("class", "col-md-3");
+
+    $("#QUERY").on("click", query);
+
+    IPLATUI.EFGrid = {
+        "result": {
+            pageable: {
+                pageSize: 20,
+                pageSizes: [20, 30, 50, 100, 200],
+            },
+            columns: [/*{
+                field: "operator",
+                template: function (item) {
+                    console.log(item)
+                    let auditStatus = item.status;
+                    let template = '';
+                    if (item.matId != null) {
+                        template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+                            + 'onclick="showUploadFile(' + item.matId + ')"  >附件清单</a>';
+                    }
+                    if (auditStatus == 0) {
+                        template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;" '
+                            +
+                            'onclick="check(' + item.id + ',1, \'' + item.planInfoNo + '\')" >提交</a>';
+                    }
+                    /!*else {
+                        template += '<a hidden="hidden" style="cursor: pointer;display: inline-flex;justify-content: center;" ' +
+                            'onclick="check(' + item.id + ',0)" >撤回</a>';
+                    }*!/
+                    return template;
+                }
+            },*/{
+                field: "registerDate",
+                attributes: {
+                    class: "i-input-readonly"
+                },
+                defaultValue: function () {
+                    return currShortDate();
+                }
+            }],
+            loadComplete: function(grid) {
+                // 此 grid 对象
+                // 处理父子级联动,通过监听 change 事件，判断父级节点是否发生变化
+                grid.dataSource.bind("change", function(e) {
+                    // 判断父级节点是否发生变化
+                    if (e.field == "factoryCode") {
+                        loadChange(grid,e,"groupCode");
+                    } else if (e.field == "groupCode") {
+                        if (e.items[0].factoryCode.length===0){
+                            loadChange(grid,e,"factoryCode");
+                        }
+                        loadChange(grid,e,"userId");
+                    }else if (e.field == "userId"){
+                        if (e.items[0].groupCode.length===0){
+                            loadChange(grid,e,"groupCode");
+                        }
+                        if (e.items[0].factoryCode.length===0){
+                            loadChange(grid,e,"factoryCode");
+                        }
+                    }
+                });
+            },
+            afterEdit:function (e) {
+                if (e.field === "groupCode" && e.model["factoryCode"].length === 0){
+                    for (let i = 0; i < groupName.length; i++) {
+                        if (e.model[e.field] === groupName[i]["valueField"]){
+                            e.model["factoryCode"]=groupName[i]["param1Field"]
+                            break;
+                        }
+                    }
+                }else if (e.field === "userId" && e.model["groupCode"].length === 0){
+                    for (let i = 0; i < userName.length; i++) {
+                        if (e.model[e.field] === userName[i]["valueField"]){
+                            //e.model["factoryCode"]=userName[i]["param1Field"]
+                            e.model["groupCode"]=userName[i]["param2Field"]
+                            break;
+                        }
+                    }
+                }
+            },
+            onAdd: function (e) {
+                //e.sender.dataSource.options.fields[4].values = factoryCode;
+                //e.sender.dataSource.options.fields[5].values = groupCode
+                //e.sender.dataSource.options.fields[6].values = userId;
+                // 动态设置默认邮箱
+                /*$.each(e.items, function(index, item){
+
+                    item['prdtName'] = "demo"+ index + "@baosight.com";
+                });*/
+            },
+            onSave: function (e) {
+                // 阻止默认请求，使用自定义保存
+                //e.preventDefault();
+                //let btnNode = $(this);
+                //禁用按钮
+                //btnNode.attr("disabled", true);
+                //saveResult(btnNode);
+            },
+            onSuccess: function (e) {
+                if (e.eiInfo.extAttr.methodName == 'update' || e.eiInfo.extAttr.methodName == 'insert') {
+                    query();
+                }
+            },
+            onRowClick: function (e) {
+                /*var block = detailGrid.getEiBlock();
+                if (block != null) {
+                    block.setRows([]);
+                    detailGrid.setEiBlock(block);
+                }
+                var info = new EiInfo()
+                var parentId = e.model['planInfoNo'];
+                info.set("parentId", parentId);
+                EiCommunicator.send("HPSC004", "queryDetail", info, {
+                    onSuccess: function (ei) {//返回结果集
+                        detailGrid.setEiInfo(ei);
+                    }, onFail: function (ei) {
+                    }
+                }, {async: false});*/
+            },
+        },
+        "detail":{
+            pageable:false,
+            exportGrid:false,
+            toolbarConfig:{
+                hidden: false,
+            },
+            columns: [],
+        }
+    }
+
+    //工厂类型下拉联动
+    $('input[name="inqu_status-0-factoryCode"]').change(function () {
+        var inInfo=new EiInfo();
+        var factoryCode=$("#inqu_status-0-factoryCode").val();
+        inInfo.set("factoryCode",factoryCode);
+        inInfo.set("groupType","prodGroup");
+        EiCommunicator.send("HPSC008", "queryFactoryCode", inInfo, {
+            onSuccess: function (ei) {
+                var input=$("#inqu_status-0-groupCode");
+                let dataEdition=ei.getBlock("group_code_block_id").getMappedRows();
+                input.kendoDropDownList({
+                    valuePrimitive: true,
+                    dataTextField: "textField",
+                    dataValueField: "valueField",
+                    optionLabel:"请选择",
+                    dataSource: dataEdition,
+                    template: "#=textField#"
+                });
+            }, onFail: function (ei) {
+            }
+        }, {async: false});
+    });
+    //生产组下拉联动
+    $('input[name="inqu_status-0-groupCode"]').change(function () {
+        var inInfo=new EiInfo();
+        var factoryCode=$("#inqu_status-0-factoryCode").val();
+        inInfo.set("factoryCode",factoryCode);
+        var groupCode=$("#inqu_status-0-groupCode").val();
+        inInfo.set("groupCode",groupCode);
+        inInfo.set("groupType","prodGroup");
+        EiCommunicator.send("HPSC008", "queryGroupCode", inInfo, {
+            onSuccess: function (ei) {
+                var input=$("#inqu_status-0-userId");
+                let dataEdition=ei.getBlock("user_id_block_id").getMappedRows();
+                input.kendoDropDownList({
+                    valuePrimitive: true,
+                    dataTextField: "textField",
+                    dataValueField: "valueField",
+                    optionLabel:"请选择",
+                    dataSource: dataEdition,
+                    template: "#=textField#"
+                });
+            }, onFail: function (ei) {
+            }
+        }, {async: false});
+    });
+});
+
+function showUploadFile(id) {
+    JSColorbox.open({
+        href: "HPSC002B?methodName=initLoad&inqu_status-0-bizType=WL&inqu_status-0-id=" + id,
+        title: "<div style='text-align: center;'>附件清单</div>",
+        width: "80%",
+        height: "80%",
+    });
+}
+function check(id, auditStatus,planInfoNo) {
+    const inEiInfo = new EiInfo();
+    inEiInfo.set("id", id);
+    inEiInfo.set("planInfoNo",planInfoNo);
+    //先判断本身是否填写
+    EiCommunicator.send('HPSC003', 'getInfo', inEiInfo, {
+            onSuccess(ei) {
+                var model=ei.get("model");
+                if(!(model.planCompletionDate).trim()) {
+                    NotificationUtil("提交失败！原因：基本信息中计划完成日期未填写", "error");
+                    return;
+                } else {
+                    //提交
+                    //提交前先判断明细信息中的计划开始和计划结束时间是否都已经填写，只有填写了之后才能进行提交
+                    if (auditStatus == 1) {
+                        EiCommunicator.send('HPSC004', 'inspectDetail', inEiInfo, {
+                                onSuccess(ei) {
+                                    var list=ei.get("list");
+                                    if(list) {
+                                        var count = list[0];
+                                        if (count > 0) {
+                                            NotificationUtil("提交失败！原因：明细信息中有未填写的计划开始时间或计划结束时间", "error");
+                                        } else {
+                                            EiCommunicator.send('HPSC004','queryDetail',inEiInfo,{
+                                                onSuccess(ei){
+                                                    var rows = ei.blocks.detail.rows;
+                                                    var res = check_time(model,rows);
+                                                    if (!res){
+                                                        NotificationUtil("计划结束时间应该大于计划开始时间！", "error");
+                                                    }
+                                                    else {
+                                                        // 提交通过，生成
+                                                        EiCommunicator.send('HPSC003', 'submitPlan', inEiInfo, {
+                                                                onSuccess(response) {
+                                                                    NotificationUtil(response.msg);
+                                                                    resultGrid.dataSource.page(1);
+                                                                },
+                                                                onFail(errorMessage, status, e) {
+                                                                    NotificationUtil("执行失败！", "error");
+                                                                }
+                                                            },
+                                                            {
+                                                                async: false
+                                                            }
+                                                        );
+                                                    }
+
+
+                                                }
+                                            })
+
+                                        }
+                                    } else {
+                                        NotificationUtil("提交失败！未找到明细信息", "error");
+                                    }
+                                },
+                                onFail(errorMessage, status, e) {
+                                    NotificationUtil("执行失败！", "error");
+                                }
+                            },
+                            {
+                                async: false
+                            }
+                        );
+                    } else {
+                        // 撤回
+
+                    }
+                }
+            },
+            onFail(errorMessage, status, e) {
+                NotificationUtil("执行失败！", "error");
+            }
+        },
+        {
+            async: false
+        }
+    );
+
+
+}
+
+let query = function () {
+    resultGrid.dataSource.page(1);
+}
+
+function check_time(model,rows){
+    for (var i=0;i<rows.length;i++){
+        if (model.planInfoNo == rows[i][5]) {
+            var start_time = rows[i][22];
+            var end_time = rows[i][23];
+
+            if (end_time < start_time) {
+
+                return false;
+            }
+        }
+    }
+    return true;
+}
+
+
+/**
+ * 保存汇总
+ */
+function saveResult(btn) {
+    let rows = resultGrid.getCheckedRows();
+    if (rows.length < 1) {
+        message("请选择数据");
+        return;
+    }
+    let flag = true;
+    $.each(rows, function(index, item) {
+        let planCompletionDate= item.get("planCompletionDate");
+        if(isBlank(planCompletionDate)){
+            message("选中的第"+(index+1)+"行\"计划结束时间\"，不能为空!");
+            flag = false;
+            return false;
+        }
+    });
+    if(flag) {
+        JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
+            ok: function () {
+                JSUtils.submitGridsData("result", "HPSC003", "update", true);
+                //释放禁用按钮
+                btn.attr("disabled", false);
+            }
+        });
+    }
+}
+
+
+/**
+ * 保存明细
+ */
+function saveDetail(btn) {
+    let rows = detailGrid.getCheckedRows();
+    if (rows.length < 1) {
+        message("请选择数据");
+        return;
+    }
+    let flag = true;
+    $.each(rows, function(index, item) {
+        let planCommentDate= item.get("planCommentDate");
+        let planCompletionDate= item.get("planCompletionDate");
+        if(isBlank(planCommentDate)){
+            message("选中的第"+(index+1)+"行\"计划开始时间\"，不能为空!");
+            flag = false;
+            return false;
+        }
+        if(isBlank(planCompletionDate)){
+            message("选中的第"+(index+1)+"行\"计划结束时间\"，不能为空!");
+            flag = false;
+            return false;
+        }
+        let startT = new Date(planCommentDate).getTime();
+        let endT = new Date(planCompletionDate).getTime();
+        if (startT > endT) {
+            message("选中的第"+(index+1)+"行\"计划开始时间\"不能大于\"计划结束时间\"！");
+            flag = false;
+            return false;
+        }
+    });
+    if(flag) {
+        JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
+            ok: function () {
+                JSUtils.submitGridsData("detail", "HPSC003", "updatePlanDetail", true);
+                //释放禁用按钮
+                btn.attr("disabled", false);
+            }
+        });
+    }
+}
+
+function loadChange(grid,e,field) {
+    var cell_label = field,that = grid;
+    // locked 表示是否为固定列
+    var locked = that.isCellLocked(cell_label);
+    // tr 表示 locked 和非 locked 的行,index 表示此行的第几列
+    var tr,index;
+    // 获取此 model 元素信息
+    var item = e.items[0];
+    var _uid = item.uid;
+    if (locked) {
+        tr = $(".k-grid-content-locked tr[data-uid="+ _uid +"]");
+        index = $("th[data-field='"+cell_label+"']").data("index");
+    } else {
+        tr = $(".k-grid-content tr[data-uid="+ _uid +"]");
+        index = parseInt($("th[data-field='"+cell_label+"']").data("index")) - that.lockedHeader.find("th").length;
+    }
+    // 获取子 cell(td)
+    var td = tr.children("td:eq("+index+")");
+    // 触发 td.click 事件，
+    td.trigger("click");
+}
\ No newline at end of file

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

+<%--
+  Created by IntelliJ IDEA.
+  User: 1
+  Date: 2024/3/7
+  Time: 11:20
+  To change this template use File | Settings | File Templates.
+--%>
+<!DOCTYPE html>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ 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}"/>
+
+<EF:EFPage  title="报工管理">
+    <%--<EF:EFRegion id="inqu" title="查询条件">
+        <div class="row">
+            <EF:EFSelect cname="工厂" ename="factoryCode" blockId="inqu_status" row="0" colWidth="3"
+                         filter="contains" defultValue="">
+                <EF:EFOption label="全部" value=""/>
+                <EF:EFOptions blockId="factory_code_block_id" textField="textField" valueField="valueField"/>
+            </EF:EFSelect>
+            <EF:EFSelect cname="生产组" ename="groupCode" blockId="inqu_status" row="0" colWidth="3"
+                         filter="contains" defultValue="">
+                <EF:EFOption label="全部" value=""/>
+                <EF:EFOptions blockId="group_code_block_id" textField="textField" valueField="valueField"/>
+            </EF:EFSelect>
+            <EF:EFSelect cname="员工" ename="userId" blockId="inqu_status" row="0" colWidth="3"
+                         filter="contains" defultValue="">
+                <EF:EFOption label="全部" value=""/>
+                <EF:EFOptions blockId="user_id_block_id" textField="textField" valueField="valueField"/>
+            </EF:EFSelect>
+            <EF:EFInput cname="产品" blockId="inqu_status" ename="prdtName" row="0" colWidth="3"/>
+            <EF:EFDateSpan startCname="登记日期" endCname="至" blockId="inqu_status"
+                           startName="createdDateFrom" endName="createdDateTo" row="0" role="date"
+                           format="yyyy-MM-dd" satrtRatio="4:8" endRatio="4:8">
+            </EF:EFDateSpan>
+                &lt;%&ndash;<EF:EFSelect cname="是否删除" ename="deleteFlag" blockId="inqu_status" row="0" colWidth="3" defaultValue="0">
+                    <EF:EFOption label="全部" value=""/>
+                    <EF:EFCodeOption codeName="hpjx.hpjx.deleteFlag"/>
+                </EF:EFSelect>&ndash;%&gt;
+        </div>
+    </EF:EFRegion>--%>
+
+    <EF:EFRegion id="result" title="明细信息">
+        <EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
+            <EF:EFColumn ename="id" primaryKey="true" cname="内码" hidden="true"/>
+            <EF:EFColumn ename="companyCode" cname="企业编码" hidden="true"/>
+            <EF:EFColumn ename="registerDate" cname="登记日期" width="160" align="center" editType="date" readonly="true"
+                         dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
+            <EF:EFComboColumn ename="factoryCode" cname="工厂" blockName="factory_record_block_id"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#"
+                              textField="textField" valueField="valueField"
+                              maxLength="16" readonly="true" width="120" required="true"
+                              align="center" filter="contains" sort="true">
+            </EF:EFComboColumn>
+            <EF:EFComboColumn ename="groupCode" cname="生产组" blockName="group_record_block_id"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#"
+                              textField="textField" valueField="valueField"
+                              maxLength="16" readonly="true" width="120" required="true"
+                              align="center" filter="contains" sort="true">
+            </EF:EFComboColumn>
+            <EF:EFComboColumn ename="groupType" cname="生产类型"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#"
+                              textField="textField" valueField="valueField"
+                              maxLength="16" readonly="true" width="80" required="true"
+                              align="center" filter="contains" sort="true">
+                <EF:EFCodeOption codeName="hpjx.hpjx.productionType" />
+            </EF:EFComboColumn>
+            <EF:EFColumn ename="prdtName" cname="产品" enable="false" width="160" align="center" required="true"/>
+            <EF:EFColumn ename="weight" cname="产量（T）" width="120" enable="false" format="{0:N3}" editType="text"
+                         displayType="0.000" sort="true" align="right"
+                         data-regex="/^-?[0-9]{1,16}([.][0-9]{1,3})?$/" maxLength="20" required="true"
+                         data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"
+            />
+            <%--<EF:EFColumn ename="remark" cname="备注" enable="true" width="200" align="center"/>--%>
+        </EF:EFGrid>
+        <EF:EFGrid blockId="detail" autoDraw="override" toolbarConfig="{hidden:'all'}" isFloat="true" checkMode="row">
+            <EF:EFColumn ename="id" primaryKey="true" cname="内码" hidden="true"/>
+            <EF:EFColumn ename="companyCode" cname="企业编码" hidden="true"/>
+            <EF:EFColumn ename="registerDate" cname="登记日期" width="160" align="center" editType="date" readonly="true"
+                         dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
+            <EF:EFComboColumn ename="factoryCode" cname="工厂" blockName="factory_record_block_id"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#"
+                              textField="textField" valueField="valueField"
+                              maxLength="16" readonly="true" width="120" required="true"
+                              align="center" filter="contains" sort="true">
+            </EF:EFComboColumn>
+            <EF:EFComboColumn ename="groupCode" cname="下料组" blockName="group_record_block_id"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#"
+                              textField="textField" valueField="valueField"
+                              maxLength="16" readonly="true" width="120" required="true"
+                              align="center" filter="contains" sort="true">
+            </EF:EFComboColumn>
+            <EF:EFComboColumn ename="groupType" cname="下料类型"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#"
+                              textField="textField" valueField="valueField"
+                              maxLength="16" readonly="true" width="80" required="true"
+                              align="center" filter="contains" sort="true">
+                <EF:EFCodeOption codeName="hpjx.hpjx.productionType" />
+            </EF:EFComboColumn>
+            <EF:EFColumn ename="prdtName" cname="产品" enable="false" width="160" align="center" required="true"/>
+            <EF:EFColumn ename="weight" cname="产量（T）" width="120" enable="false" format="{0:N3}" editType="text"
+                         displayType="0.000" sort="true" align="right"
+                         data-regex="/^-?[0-9]{1,16}([.][0-9]{1,3})?$/" maxLength="20" required="true"
+                         data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"
+            />
+        </EF:EFGrid>
+    </EF:EFRegion>
+
+
+</EF:EFPage>

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

+$(function (){
+    var queryBlock = __eiInfo.getBlock("inqu_status").getMappedRows();
+    //$(".row").children().attr("class", "col-md-3");
+
+    IPLATUI.EFGrid = {
+        "result": {
+            pageable:false,
+            exportGrid:false,
+            /*pageable: {
+                pageSize: 10,
+                pageSizes: [10, 20, 30, 50, 100, 200],
+            },*/
+            columns: [{
+                field: "operator",
+                title: "操作",
+                template: function (item) {
+                    let template = '';
+                    template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+                        + 'onclick="deleteRow(' + item.rowNo + ')"  >删除</a>';
+                    return template
+                }
+            },{
+                field: "registerDate",
+                attributes: {
+                    class: "i-input-readonly"
+                },
+                defaultValue: function () {
+                    return currShortDate();
+                }
+            }],
+            loadComplete: function(grid) {
+                // 此 grid 对象
+                if (queryBlock[0]["userCount"] !== undefined || queryBlock[0]["userCount"] != null){
+                    $("#inqu_status-0-userCount").val(queryBlock[0]["userCount"]);
+                }else {
+                    $("#inqu_status-0-userCount").val(0);
+                }
+            },
+            onSave: function (e) {
+                // 阻止默认请求，使用自定义保存
+                e.preventDefault();
+                let btnNode = $(this);
+                //禁用按钮
+                btnNode.attr("disabled", true);
+                saveResult(btnNode);
+            },
+            onSuccess: function (e) {
+                if (e.eiInfo.extAttr.methodName == 'update' || e.eiInfo.extAttr.methodName == 'insert') {
+                    query();
+                }
+            },
+        },
+        "detail":{
+            pageable:false,
+            exportGrid:false,
+            toolbarConfig:{
+                hidden: false,
+            },
+            columns: [{
+                field: "operator",
+                title: "操作",
+                template: function (item) {
+                    let template = '';
+                    template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+                        + 'onclick="detailDeleteRow(' + item.rowNo + ')"  >删除</a>';
+                    return template
+                }
+            },{
+                field: "registerDate",
+                attributes: {
+                    class: "i-input-readonly"
+                },
+                defaultValue: function () {
+                    return currShortDate();
+                }
+            }],
+        }
+    }
+
+})
+
+/**
+ * 保存汇总
+ */
+function saveResult(btn) {
+    let rows = resultGrid.getCheckedRows();
+    if (rows.length < 1) {
+        message("请选择数据");
+        return;
+    }
+    let methodType = $("#inqu_status-0-methodType").val();
+    let flag = true;
+    $.each(rows, function(index, item) {
+        let prdtName= item.get("prdtName");
+        if(isBlank(prdtName)){
+            message("选中的第"+(index+1)+"行\"产品\"，不能为空!");
+            flag = false;
+            return false;
+        }
+        let weight= item.get("weight");
+        if(isBlank(weight)){
+            message("选中的第"+(index+1)+"行\"产量（T）\"，不能为空!");
+            flag = false;
+            return false;
+        }
+    });
+    if(flag) {
+        JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
+            ok: function () {
+                var info = new EiInfo();
+                info.set("inqu_status-0-userCount",$("#inqu_status-0-userCount").val());
+                info.addBlock(JSUtils.checkedRows2Block("result"));
+                info.addBlock(JSUtils.checkedRows2Block("detail"))
+                EiCommunicator.send("HPSC010", methodType, info, {
+                    onSuccess: function (ei) {
+                        if (ei.getStatus() >= 0) {
+                            try {
+                                EiCommunicator.send("HPSC096", methodType, info, {
+                                    onSuccess: function (ei) {
+                                        parent.JSColorbox.setValueCallback(ei);
+                                        parent.JSColorbox.close();
+                                    },
+                                    onFail: function (ei) {
+                                        // 发生异常
+                                        NotificationUtil("操作失败，原因[" + ei + "]", "error");
+                                    }
+                                })
+                            } 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");
+                    }
+                });
+                //JSUtils.submitGridsData("result", "HPSC096", methodType, true);
+                //释放禁用按钮
+                btn.attr("disabled", false);
+            }
+        });
+    }
+}
+
+function deleteRow(rowNo) {
+    resultGrid.removeRows([rowNo]);// 刷新行号
+    refreshRowNo();
+}
+
+let refreshRowNo = function () {
+    let allRows = resultGrid.getDataItems();
+    for (let i = 0; i < allRows.length; i++) {
+        resultGrid.setCellValue(i, "rowNo", i);
+        resultGrid.refresh();
+    }
+}
+
+function detailDeleteRow(rowNo) {
+    //detailGrid.removeRows([rowNo]);// 刷新行号
+    detailRefreshRowNo(rowNo);
+}
+
+let detailRefreshRowNo = function (rowNo) {
+    let allRows = detailGrid.getDataItems();
+    for (let i = 0; i < allRows.length; i++) {
+        if (allRows[i].rowNo == rowNo){
+            detailGrid.removeRows(allRows[i]);
+        }else {
+            detailGrid.setCellValue(i, "rowNo", i);
+            detailGrid.refresh();
+        }
+    }
+}
\ No newline at end of file

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

+<%--
+  Created by IntelliJ IDEA.
+  User: 1
+  Date: 2024/4/3
+  Time: 15:03
+  To change this template use File | Settings | File Templates.
+--%>
+<!DOCTYPE html>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ 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}"/>
+
+<EF:EFPage  title="报工管理">
+    <EF:EFRegion id="result" title="明细信息">
+        <EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
+            <EF:EFColumn ename="rowNo" cname="行号" hidden="true"/>
+            <EF:EFColumn ename="remark" cname="上级ID" hidden="true"/>
+            <EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="120" align="center"/>
+            <EF:EFColumn ename="registerDate" cname="登记日期" width="160" align="center" editType="date" readonly="true"
+                         dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
+            <EF:EFComboColumn ename="factoryCode" cname="工厂" blockName="factory_code_block_id"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#"
+                              textField="textField" valueField="valueField"
+                              maxLength="16" readonly="true" width="120" required="true"
+                              align="center" filter="contains" sort="true">
+            </EF:EFComboColumn>
+            <EF:EFComboColumn ename="groupCode" cname="生产组" blockName="group_record_block_id"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#"
+                              textField="textField" valueField="valueField"
+                              maxLength="16" readonly="true" width="120" required="true"
+                              align="center" filter="contains" sort="true">
+            </EF:EFComboColumn>
+            <EF:EFComboColumn ename="groupType" cname="生产类型"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#"
+                              textField="textField" valueField="valueField"
+                              maxLength="16" readonly="true" width="80" required="true"
+                              align="center" filter="contains" sort="true">
+                <EF:EFCodeOption codeName="hpjx.hpjx.productionType" />
+            </EF:EFComboColumn>
+            <EF:EFColumn ename="prdtName" cname="产品" enable="true" width="160" align="center"/>
+            <EF:EFColumn ename="weight" cname="产量（T）" width="120" enable="true" format="{0:N3}" editType="text"
+                         displayType="0.000" sort="true" align="right"
+                         data-regex="/^-?[0-9]{1,16}([.][0-9]{1,3})?$/" maxLength="20"
+                         data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"
+            />
+        </EF:EFGrid>
+        <EF:EFGrid blockId="detail" autoDraw="override" toolbarConfig="{hidden:'all'}" isFloat="true" checkMode="row">
+            <EF:EFColumn ename="rowNo" cname="行号" hidden="true"/>
+            <EF:EFColumn ename="remark" cname="上级ID" hidden="true"/>
+            <EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="120" align="center"/>
+            <EF:EFColumn ename="registerDate" cname="登记日期" width="160" align="center" editType="date" readonly="true"
+                         dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
+            <EF:EFComboColumn ename="factoryCode" cname="工厂" blockName="factory_code_block_id"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#"
+                              textField="textField" valueField="valueField"
+                              maxLength="16" readonly="true" width="120" required="true"
+                              align="center" filter="contains" sort="true">
+            </EF:EFComboColumn>
+            <EF:EFComboColumn ename="groupCode" cname="下料组" blockName="group_record_block_id"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#"
+                              textField="textField" valueField="valueField"
+                              maxLength="16" readonly="true" width="120" required="true"
+                              align="center" filter="contains" sort="true">
+            </EF:EFComboColumn>
+            <EF:EFComboColumn ename="groupType" cname="下料类型"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#"
+                              textField="textField" valueField="valueField"
+                              maxLength="16" readonly="true" width="80" required="true"
+                              align="center" filter="contains" sort="true">
+                <EF:EFCodeOption codeName="hpjx.hpjx.productionType" />
+            </EF:EFComboColumn>
+            <EF:EFColumn ename="prdtName" cname="产品" enable="true" width="160" align="center"/>
+            <EF:EFColumn ename="weight" cname="产量（T）" width="120" enable="true" format="{0:N3}" editType="text"
+                         displayType="0.000" sort="true" align="right"
+                         data-regex="/^-?[0-9]{1,16}([.][0-9]{1,3})?$/" maxLength="20"
+                         data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"
+            />
+        </EF:EFGrid>
+        <EF:EFRegion id="inqu">
+            <div class="row">
+                <EF:EFInput cname="用工总人数" blockId="inqu_status" ename="userCount" row="0" type="number" colWidth="5" value="0"/>
+                <EF:EFInput cname="" blockId="inqu_status" ename="methodType" row="0" colWidth="3" hidden="true"/>
+            </div>
+        </EF:EFRegion>
+    </EF:EFRegion>
+</EF:EFPage>
\ No newline at end of file