2024-09-04 生产任务增加已报工、未报工字段，报完工就显示数据

src/main/java/com/baosight/hggp/hg/sc/constant/HgScSqlConstant.java

@@ -21,4 +21,10 @@ public class HgScSqlConstant {
 		// 修改项目名称
 		public static final String UPDATE_PROJ_NAME = "HGSC001.updateProjName";
 	}
+
+	public static class HgSc007 {
+
+		//app 查询生产任务
+		public static final String QUERY_APP = "HGSC007.queryApp";
+	}
 }

src/main/java/com/baosight/hggp/hg/sc/domain/HGSC007.java

@@ -66,6 +66,9 @@ public class HGSC007 extends DaoEPBase {
 	public static final String FIELD_updated_time = "updatedTime";    		/* 更新时间*/
 	public static final String FIELD_spec = "spec";    		/* 规格*/
 	public static final String FIELD_length = "length";    		/* 长*/
+	public static final String FIELD_IS_COMPLTE = "isComplete";
+	public static final String FIELD_TASK_QUANTITY = "taskQuantity";
+	public static final String FIELD_UN_TASK_QUANTITY = "unTaskQuantity";
 
 
 	public static final String COL_id = "id";
@@ -165,6 +168,9 @@ public class HGSC007 extends DaoEPBase {
 	private String updatedTime = " ";		/* 更新时间*/
 	private String spec = " ";		/* 规格*/
 	private BigDecimal length = new BigDecimal("0");		/* 长*/
+	private Integer isComplete = new Integer(0); /* 是否完工 0-未报工 1-部分报工 2-已报工*/
+	private BigDecimal taskQuantity = new BigDecimal("0");
+	private BigDecimal unTaskQuantity = new BigDecimal("0");
 
 
 	/**
@@ -361,6 +367,18 @@ public class HGSC007 extends DaoEPBase {
 		eiColumn.setDescName("长");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_IS_COMPLTE);
+		eiColumn.setDescName("报工状态");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_TASK_QUANTITY);
+		eiColumn.setDescName("报工数量");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_UN_TASK_QUANTITY);
+		eiColumn.setDescName("待报工数量");
+		eiMetadata.addMeta(eiColumn);
+
 	}
 
 	/**
@@ -1043,6 +1061,30 @@ public class HGSC007 extends DaoEPBase {
 		this.length = length;
 	}
 
+	public Integer getIsComplete() {
+		return isComplete;
+	}
+
+	public void setIsComplete(Integer isComplete) {
+		this.isComplete = isComplete;
+	}
+
+	public BigDecimal getTaskQuantity() {
+		return taskQuantity;
+	}
+
+	public void setTaskQuantity(BigDecimal taskQuantity) {
+		this.taskQuantity = taskQuantity;
+	}
+
+	public BigDecimal getUnTaskQuantity() {
+		return unTaskQuantity;
+	}
+
+	public void setUnTaskQuantity(BigDecimal unTaskQuantity) {
+		this.unTaskQuantity = unTaskQuantity;
+	}
+
 	/**
 	 * get the value from Map.
 	 *
@@ -1094,6 +1136,9 @@ public class HGSC007 extends DaoEPBase {
 		setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_updated_time)), updatedTime));
 		setSpec(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_spec)), spec));
 		setLength(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_length)), length));
+		setIsComplete(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_IS_COMPLTE)), isComplete));
+		setTaskQuantity(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_TASK_QUANTITY)), taskQuantity));
+		setUnTaskQuantity(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_UN_TASK_QUANTITY)), unTaskQuantity));
 
 	}
 
@@ -1147,6 +1192,9 @@ public class HGSC007 extends DaoEPBase {
 		map.put(FIELD_updated_time, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_updated_time)));
 		map.put(FIELD_spec, StringUtils.toString(spec, eiMetadata.getMeta(FIELD_spec)));
 		map.put(FIELD_length, StringUtils.toString(length, eiMetadata.getMeta(FIELD_length)));
+		map.put(FIELD_IS_COMPLTE, StringUtils.toString(isComplete, eiMetadata.getMeta(FIELD_IS_COMPLTE)));
+		map.put(FIELD_TASK_QUANTITY, StringUtils.toString(taskQuantity, eiMetadata.getMeta(FIELD_TASK_QUANTITY)));
+		map.put(FIELD_UN_TASK_QUANTITY, StringUtils.toString(unTaskQuantity, eiMetadata.getMeta(FIELD_UN_TASK_QUANTITY)));
 
 		return map;
 	}

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

@@ -7,6 +7,7 @@ import com.baosight.hggp.core.enums.OrgTypeEnum;
 import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.constant.HGSqlConstant;
 import com.baosight.hggp.hg.sb.tools.HGSBTools;
+import com.baosight.hggp.hg.sc.constant.HgScSqlConstant;
 import com.baosight.hggp.hg.sc.domain.HGSC007;
 import com.baosight.hggp.hg.sc.util.HgScUtils;
 import com.baosight.hggp.hg.xs.domain.Company;
@@ -272,4 +273,20 @@ public class ServiceHGSC007 extends ServiceEPBase {
 		return inInfo;
 	}
 
+	@OperationLogAnnotation(operModul = "生产任务", operType = "APP查询", operDesc = "APP查询")
+	public EiInfo queryApp(EiInfo inInfo) {
+		try {
+			Map queryMap = EiInfoUtils.getFirstRow(inInfo);
+			String creatTime = MapUtils.getString(queryMap, HGSC007.FIELD_created_time);
+			if (StringUtils.isNotBlank(creatTime)) {
+				queryMap.put(HGSC007.FIELD_created_time, StringUtil.removeHorizontalLine(creatTime));
+			}
+			// 仅查询自己所在组的任务  added by songx at 20240820
+			HgScUtils.HgSc007.setOrgCondition(queryMap);
+			inInfo = super.query(inInfo, HgScSqlConstant.HgSc007.QUERY_APP, new HGSC007());
+		} catch (PlatException e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询失败");
+		}
+		return inInfo;
+	}
 }