Skip to content

H
hp-smart
Commit a0b7c179 by wancheng
Options

项目档案概况,报工优化

parent 9ad8048c
Showing with 141 additions and 5 deletions
src/main/java/com/baosight/hpjx/hp/mt/sql/HPMT002.xml
...@@ -362,16 +362,19 @@ ...@@ -362,16 +362,19 @@
</select> </select>
<select id="pmStatusList" resultClass="java.util.HashMap"> <select id="pmStatusList" resultClass="java.util.HashMap">
select a.* select a.*,b.PROJ_STATUS,c.PARENT_ID
from hpjx.t_hpsc001 a from hpjx.t_hpsc001 a
left join left join
(select A.COMPANY_CODE,A.PROJ_CODE ,sum(ifnull(A.NUM,0)) as JHNUM,sum(ifnull(A.ACTUAL_COMPLETION_NUM,0)) as CKNUM,sum(ifnull(B.AMOUNT,0)) as RKNUM, (select A.COMPANY_CODE,A.PROJ_CODE ,sum(ifnull(A.NUM,0)) as JHNUM,sum(ifnull(A.ACTUAL_COMPLETION_NUM,0)) as RKNUM,sum(ifnull(B.AMOUNT,0)) as CKNUM,
case when sum(ifnull(A.NUM,0)) <![CDATA[ <> ]]> sum(ifnull(A.ACTUAL_COMPLETION_NUM,0)) and sum(ifnull(A.NUM,0)) <![CDATA[ <> ]]> sum(ifnull(B.AMOUNT,0)) then 1 case when sum(ifnull(A.NUM,0)) <![CDATA[ <> ]]> sum(ifnull(A.ACTUAL_COMPLETION_NUM,0)) and sum(ifnull(A.NUM,0)) <![CDATA[ <> ]]> sum(ifnull(B.AMOUNT,0)) then 1
when sum(ifnull(A.NUM,0)) = sum(ifnull(A.ACTUAL_COMPLETION_NUM,0)) and sum(ifnull(A.NUM,0)) <![CDATA[ <> ]]> sum(ifnull(B.AMOUNT,0)) then 2 when sum(ifnull(A.NUM,0)) = sum(ifnull(A.ACTUAL_COMPLETION_NUM,0)) and sum(ifnull(A.NUM,0)) <![CDATA[ <> ]]> sum(ifnull(B.AMOUNT,0)) then 2
when sum(ifnull(A.NUM,0)) = sum(ifnull(A.ACTUAL_COMPLETION_NUM,0)) and sum(ifnull(A.NUM,0)) = sum(ifnull(B.AMOUNT,0)) then 3 else 0 end as PROJ_STATUS when sum(ifnull(A.NUM,0)) = sum(ifnull(A.ACTUAL_COMPLETION_NUM,0)) and sum(ifnull(A.NUM,0)) = sum(ifnull(B.AMOUNT,0)) then 3 else 0 end as PROJ_STATUS
from hpjx.T_HPSC004 a from hpjx.T_HPSC004 a
left join hpjx.T_HPKC004 b on a.PROJ_CODE = b.PROJ_CODE and a.PRDT_CODE = b.SUB_INVENT_CODE left join hpjx.T_HPKC004 b on a.PROJ_CODE = b.PROJ_CODE and a.PRDT_CODE = b.SUB_INVENT_CODE
group by COMPANY_CODE,PROJ_CODE) b on a.COMPANY_CODE = b.COMPANY_CODE and a.PROJ_CODE = b.PROJ_CODE group by COMPANY_CODE,PROJ_CODE) b on a.COMPANY_CODE = b.COMPANY_CODE and a.PROJ_CODE = b.PROJ_CODE
left join ( select COMPANY_CODE,PROJ_CODE,PARENT_ID
from hpjx.T_HPSC002 where PARENT_ID NOT IN ('root') AND DEL_STATUS = 0 and PRDT_TYPE = 4
group by COMPANY_CODE,PROJ_CODE,PARENT_ID) c on a.COMPANY_CODE = c.COMPANY_CODE and a.PROJ_CODE = c.PROJ_CODE
WHERE 1=1 WHERE 1=1
<isNotEmpty prepend=" AND " property="companyCode"> <isNotEmpty prepend=" AND " property="companyCode">
a.COMPANY_CODE = #companyCode# a.COMPANY_CODE = #companyCode#
......
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC002.java
...@@ -63,6 +63,10 @@ public class HPSC002 extends DaoEPBase { ...@@ -63,6 +63,10 @@ public class HPSC002 extends DaoEPBase {
public static final String FIELD_DELIVERY_DATE = "deliveryDate"; public static final String FIELD_DELIVERY_DATE = "deliveryDate";
public static final String FIELD_LV = "lv"; /* 树的层级*/ public static final String FIELD_LV = "lv"; /* 树的层级*/
public static final String FIELD_CKNUM = "cknum"; /* 树的层级*/
public static final String FIELD_RKNUM = "rknum"; /* 树的层级*/
public static final String COL_ID = "ID"; public static final String COL_ID = "ID";
public static final String COL_COMPANY_CODE = "COMPANY_CODE"; /* 企业编码 预留*/ public static final String COL_COMPANY_CODE = "COMPANY_CODE"; /* 企业编码 预留*/
...@@ -104,7 +108,7 @@ public class HPSC002 extends DaoEPBase { ...@@ -104,7 +108,7 @@ public class HPSC002 extends DaoEPBase {
public static final String COL_PGSTATUS = "PGSTATUS"; /* 派工状态*/ public static final String COL_PGSTATUS = "PGSTATUS"; /* 派工状态*/
public static final String COL_LV = "LV"; /* 树的层级*/ public static final String COL_LV = "LV"; /* 树的层级*/
public static final String COL_DELIVERY_DATE = "DELIVERY_DATE"; public static final String COL_DELIVERY_DATE = "DELIVERY_DATE";
public static final String APPQUERY = "HPSC002.appQuery";
public static final String QUERY = "HPSC002.query"; public static final String QUERY = "HPSC002.query";
public static final String COUNT = "HPSC002.count"; public static final String COUNT = "HPSC002.count";
public static final String INSERT = "HPSC002.insert"; public static final String INSERT = "HPSC002.insert";
...@@ -160,7 +164,9 @@ public class HPSC002 extends DaoEPBase { ...@@ -160,7 +164,9 @@ public class HPSC002 extends DaoEPBase {
private String pgStatus = " "; /* 派工状态*/ private String pgStatus = " "; /* 派工状态*/
private Integer lv; /* 树的层级*/ private Integer lv; /* 树的层级*/
private String deliveryDate = " "; private String deliveryDate = " ";
private Integer cknum ;/* 出库数量*/
private Integer rknum;/* 出库数量*/
/** /**
* initialize the metadata. * initialize the metadata.
*/ */
...@@ -341,6 +347,14 @@ public class HPSC002 extends DaoEPBase { ...@@ -341,6 +347,14 @@ public class HPSC002 extends DaoEPBase {
eiColumn = new EiColumn(FIELD_DELIVERY_DATE); eiColumn = new EiColumn(FIELD_DELIVERY_DATE);
eiColumn.setDescName("交货状态"); eiColumn.setDescName("交货状态");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CKNUM);
eiColumn.setDescName("出库数量");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_RKNUM);
eiColumn.setDescName("入库数量");
eiMetadata.addMeta(eiColumn);
} }
/** /**
...@@ -969,6 +983,40 @@ public class HPSC002 extends DaoEPBase { ...@@ -969,6 +983,40 @@ public class HPSC002 extends DaoEPBase {
} }
/** /**
* get the rknum - 入库数量.
* @return the rknum
*/
public Integer getRknum() {
return this.rknum;
}
/**
* set the rknum - 入库数量.
*
* @param rknum - 入库数量
*/
public void setRknum(Integer rknum) {
this.rknum = rknum;
}
/**
* get the cknum - 出库数量.
* @return the cknum
*/
public Integer getCknum() {
return this.cknum;
}
/**
* set the cknum - 出库数量.
*
* @param cknum - 出库数量
*/
public void setCknum(Integer cknum) {
this.cknum = cknum;
}
/**
* get the value from Map. * get the value from Map.
* *
* @param map - source data map * @param map - source data map
...@@ -1014,6 +1062,8 @@ public class HPSC002 extends DaoEPBase { ...@@ -1014,6 +1062,8 @@ public class HPSC002 extends DaoEPBase {
setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime)); setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime));
setRemark(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REMARK)), remark)); setRemark(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REMARK)), remark));
setLv(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_LV)), lv)); setLv(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_LV)), lv));
setCknum(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_CKNUM)), cknum));
setRknum(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_RKNUM)), rknum));
setPgStatus(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PGSTATUS)), pgStatus)); setPgStatus(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PGSTATUS)), pgStatus));
setDeliveryDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DELIVERY_DATE)), deliveryDate)); setDeliveryDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DELIVERY_DATE)), deliveryDate));
} }
...@@ -1062,6 +1112,8 @@ public class HPSC002 extends DaoEPBase { ...@@ -1062,6 +1112,8 @@ public class HPSC002 extends DaoEPBase {
map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME))); map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME)));
map.put(FIELD_REMARK, StringUtils.toString(remark, eiMetadata.getMeta(FIELD_REMARK))); map.put(FIELD_REMARK, StringUtils.toString(remark, eiMetadata.getMeta(FIELD_REMARK)));
map.put(FIELD_LV, StringUtils.toString(lv, eiMetadata.getMeta(FIELD_LV))); map.put(FIELD_LV, StringUtils.toString(lv, eiMetadata.getMeta(FIELD_LV)));
map.put(FIELD_CKNUM, StringUtils.toString(cknum, eiMetadata.getMeta(FIELD_CKNUM)));
map.put(FIELD_RKNUM, StringUtils.toString(rknum, eiMetadata.getMeta(FIELD_RKNUM)));
map.put(FIELD_PGSTATUS, StringUtils.toString(pgStatus, eiMetadata.getMeta(FIELD_PGSTATUS))); map.put(FIELD_PGSTATUS, StringUtils.toString(pgStatus, eiMetadata.getMeta(FIELD_PGSTATUS)));
map.put(FIELD_DELIVERY_DATE,StringUtils.toString(deliveryDate,eiMetadata.getMeta(FIELD_DELIVERY_DATE))); map.put(FIELD_DELIVERY_DATE,StringUtils.toString(deliveryDate,eiMetadata.getMeta(FIELD_DELIVERY_DATE)));
return map; return map;
......
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC010A.java
...@@ -34,6 +34,8 @@ public class HPSC010A extends DaoEPBase { ...@@ -34,6 +34,8 @@ public class HPSC010A extends DaoEPBase {
public static final String FIELD_PRDT_NAME = "prdtName"; /* 产品名称*/ public static final String FIELD_PRDT_NAME = "prdtName"; /* 产品名称*/
public static final String FIELD_WEIGHT = "weight"; /* 产量*/ public static final String FIELD_WEIGHT = "weight"; /* 产量*/
public static final String FIELD_WEIGHT_JH = "weightJh"; /* 加焊产量*/ public static final String FIELD_WEIGHT_JH = "weightJh"; /* 加焊产量*/
public static final String FIELD_GROUP_USER_COUNT = "groupUserCount"; /* 组人数*/
public static final String FIELD_PARENT_ID = "parentId"; /* 父级ID*/ public static final String FIELD_PARENT_ID = "parentId"; /* 父级ID*/
public static final String FIELD_DELETE_FLAG = "deleteFlag"; /* 是否删除0:否1.是*/ public static final String FIELD_DELETE_FLAG = "deleteFlag"; /* 是否删除0:否1.是*/
public static final String FIELD_CREATED_BY = "createdBy"; /* 创建人*/ public static final String FIELD_CREATED_BY = "createdBy"; /* 创建人*/
...@@ -55,6 +57,9 @@ public class HPSC010A extends DaoEPBase { ...@@ -55,6 +57,9 @@ public class HPSC010A extends DaoEPBase {
public static final String COL_PRDT_NAME = "PRDT_NAME"; /* 产品名称*/ public static final String COL_PRDT_NAME = "PRDT_NAME"; /* 产品名称*/
public static final String COL_WEIGHT = "WEIGHT"; /* 产量*/ public static final String COL_WEIGHT = "WEIGHT"; /* 产量*/
public static final String COL_WEIGHT_JH = "WEIGHT_JH"; /* 加焊产量*/ public static final String COL_WEIGHT_JH = "WEIGHT_JH"; /* 加焊产量*/
public static final String COL_GROUP_USER_COUNT = "GROUP_USER_COUNT"; /* 组人数*/
public static final String COL_PARENT_ID = "PARENT_ID"; /* 父级ID*/ public static final String COL_PARENT_ID = "PARENT_ID"; /* 父级ID*/
public static final String COL_DELETE_FLAG = "DELETE_FLAG"; /* 是否删除0:否1.是*/ 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_BY = "CREATED_BY"; /* 创建人*/
...@@ -86,6 +91,8 @@ public class HPSC010A extends DaoEPBase { ...@@ -86,6 +91,8 @@ public class HPSC010A extends DaoEPBase {
private String prdtName = " "; /* 产品名称*/ private String prdtName = " "; /* 产品名称*/
private BigDecimal weight = new BigDecimal("0"); /* 产量*/ private BigDecimal weight = new BigDecimal("0"); /* 产量*/
private BigDecimal weightJh = new BigDecimal("0"); /* 加焊产量*/ private BigDecimal weightJh = new BigDecimal("0"); /* 加焊产量*/
private Integer groupUserCount = 0; /* 组用工人数*/
private Integer rowNo = 0; private Integer rowNo = 0;
private Long parentId = new Long(0); /* 父级ID*/ private Long parentId = new Long(0); /* 父级ID*/
private Integer deleteFlag; /* 是否删除0:否1.是*/ private Integer deleteFlag; /* 是否删除0:否1.是*/
...@@ -157,6 +164,10 @@ public class HPSC010A extends DaoEPBase { ...@@ -157,6 +164,10 @@ public class HPSC010A extends DaoEPBase {
eiColumn.setDescName("加焊产量"); eiColumn.setDescName("加焊产量");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_GROUP_USER_COUNT);
eiColumn.setDescName("组人数");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PARENT_ID); eiColumn = new EiColumn(FIELD_PARENT_ID);
eiColumn.setDescName("父级ID"); eiColumn.setDescName("父级ID");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
...@@ -391,6 +402,25 @@ public class HPSC010A extends DaoEPBase { ...@@ -391,6 +402,25 @@ public class HPSC010A extends DaoEPBase {
public void setWeightJh(BigDecimal weightJh) { public void setWeightJh(BigDecimal weightJh) {
this.weightJh = weightJh; this.weightJh = weightJh;
} }
/**
* get the groupUserCount - 组人数.
* @return the groupUserCount
*/
public Integer getGroupUserCount() {
return this.groupUserCount;
}
/**
* set the groupUserCount - 组人数.
*
* @param groupUserCount - 组人数
*/
public void setGroupUserCount(Integer groupUserCount) {
this.groupUserCount = groupUserCount;
}
/** /**
* get the parentId - 父级ID. * get the parentId - 父级ID.
* @return the parentId * @return the parentId
...@@ -548,6 +578,7 @@ public class HPSC010A extends DaoEPBase { ...@@ -548,6 +578,7 @@ public class HPSC010A extends DaoEPBase {
setPrdtName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRDT_NAME)), prdtName)); setPrdtName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRDT_NAME)), prdtName));
setWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_WEIGHT)), weight)); setWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_WEIGHT)), weight));
setWeightJh(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_WEIGHT_JH)), weightJh)); setWeightJh(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_WEIGHT_JH)), weightJh));
setGroupUserCount(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_GROUP_USER_COUNT)), groupUserCount));
setParentId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_PARENT_ID)), parentId)); setParentId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_PARENT_ID)), parentId));
setDeleteFlag(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_DELETE_FLAG)), deleteFlag)); setDeleteFlag(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_DELETE_FLAG)), deleteFlag));
setCreatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_BY)), createdBy)); setCreatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_BY)), createdBy));
...@@ -577,6 +608,9 @@ public class HPSC010A extends DaoEPBase { ...@@ -577,6 +608,9 @@ public class HPSC010A extends DaoEPBase {
map.put(FIELD_PRDT_NAME, StringUtils.toString(prdtName, eiMetadata.getMeta(FIELD_PRDT_NAME))); 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_WEIGHT, StringUtils.toString(weight, eiMetadata.getMeta(FIELD_WEIGHT)));
map.put(FIELD_WEIGHT_JH, StringUtils.toString(weightJh, eiMetadata.getMeta(FIELD_WEIGHT_JH))); map.put(FIELD_WEIGHT_JH, StringUtils.toString(weightJh, eiMetadata.getMeta(FIELD_WEIGHT_JH)));
map.put(FIELD_GROUP_USER_COUNT, StringUtils.toString(groupUserCount, eiMetadata.getMeta(FIELD_GROUP_USER_COUNT)));
map.put(FIELD_PARENT_ID, StringUtils.toString(parentId, eiMetadata.getMeta(FIELD_PARENT_ID))); map.put(FIELD_PARENT_ID, StringUtils.toString(parentId, eiMetadata.getMeta(FIELD_PARENT_ID)));
map.put(FIELD_DELETE_FLAG, StringUtils.toString(deleteFlag, eiMetadata.getMeta(FIELD_DELETE_FLAG))); 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_BY, StringUtils.toString(createdBy, eiMetadata.getMeta(FIELD_CREATED_BY)));
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC002.java
...@@ -78,6 +78,19 @@ public class ServiceHPSC002 extends ServiceBase { ...@@ -78,6 +78,19 @@ public class ServiceHPSC002 extends ServiceBase {
return inInfo; return inInfo;
} }
/**
* 查询操作.
*/
@OperationLogAnnotation(operModul = "物料清单",operType = "app查询",operDesc = "app查询")
public EiInfo appQuery(EiInfo inInfo) {
try {
inInfo = super.query(inInfo, HPSC002.APPQUERY, new HPSC002());
} catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "查询失败");
}
return inInfo;
}
@OperationLogAnnotation(operModul = "物料清单",operType = "查询",operDesc = "查询明细detail") @OperationLogAnnotation(operModul = "物料清单",operType = "查询",operDesc = "查询明细detail")
public EiInfo queryDetail(EiInfo inInfo){ public EiInfo queryDetail(EiInfo inInfo){
//添加返回到前台的块，块名和前台的对应 //添加返回到前台的块，块名和前台的对应
......
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002.xml
...@@ -191,10 +191,31 @@ ...@@ -191,10 +191,31 @@
</sql> </sql>
<select id="query" parameterClass="java.util.HashMap" resultClass="com.baosight.hpjx.hp.sc.domain.HPSC002"> <select id="query" parameterClass="java.util.HashMap" resultClass="com.baosight.hpjx.hp.sc.domain.HPSC002">
SELECT
<include refid="column1"/>
FROM hpjx.t_hpsc002 A
LEFT JOIN hpjx.t_hpsc005 B on A.ID = B.MAT_ID
WHERE 1=1
AND PARENT_ID NOT IN ('root')
AND DEL_STATUS = 0
<include refid="condition1"/>
<include refid="order"/>
</select>
<select id="appQuery" parameterClass="java.util.HashMap" resultClass="com.baosight.hpjx.hp.sc.domain.HPSC002">
SELECT SELECT
<include refid="column1"/> <include refid="column1"/>
,ifnull(C.CKNUM,0) as cknum,ifnull(C.RKNUM,0) as rknum
FROM hpjx.t_hpsc002 A FROM hpjx.t_hpsc002 A
LEFT JOIN hpjx.t_hpsc005 B on A.ID = B.MAT_ID LEFT JOIN hpjx.t_hpsc005 B on A.ID = B.MAT_ID
LEFT JOIN (select A.COMPANY_CODE,A.PROJ_CODE,A.PRDT_CODE,A.PARENT_PRDT_NAME,sum(ifnull(A.NUM,0)) as JHNUM,sum(ifnull(A.ACTUAL_COMPLETION_NUM,0)) as RKNUM,sum(ifnull(B.AMOUNT,0)) as CKNUM,
case when sum(ifnull(A.NUM,0)) <![CDATA[ <> ]]> sum(ifnull(A.ACTUAL_COMPLETION_NUM,0)) and sum(ifnull(A.NUM,0)) <![CDATA[ <> ]]> sum(ifnull(B.AMOUNT,0)) then 1
when sum(ifnull(A.NUM,0)) = sum(ifnull(A.ACTUAL_COMPLETION_NUM,0)) and sum(ifnull(A.NUM,0)) <![CDATA[ <> ]]> sum(ifnull(B.AMOUNT,0)) then 2
when sum(ifnull(A.NUM,0)) = sum(ifnull(A.ACTUAL_COMPLETION_NUM,0)) and sum(ifnull(A.NUM,0)) = sum(ifnull(B.AMOUNT,0)) then 3 else 0 end as PROJ_STATUS
from hpjx.T_HPSC004 a
left join hpjx.T_HPKC004 b on a.PROJ_CODE = b.PROJ_CODE and a.PRDT_CODE = b.SUB_INVENT_CODE
group by A.COMPANY_CODE,A.PROJ_CODE,A.PRDT_CODE,A.PARENT_PRDT_NAME) C on A.COMPANY_CODE = C.COMPANY_CODE and A.PROJ_CODE = C.PROJ_CODE
and A.PARENT_PRDT_NAME = C.PARENT_PRDT_NAME and A.PRDT_CODE = C.PRDT_CODE
WHERE 1=1 WHERE 1=1
AND PARENT_ID NOT IN ('root') AND PARENT_ID NOT IN ('root')
AND DEL_STATUS = 0 AND DEL_STATUS = 0
......
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC010A.xml
...@@ -115,6 +115,7 @@ ...@@ -115,6 +115,7 @@
PRDT_NAME as "prdtName", <!-- 产品名称 --> PRDT_NAME as "prdtName", <!-- 产品名称 -->
WEIGHT as "weight", <!-- 产量 --> WEIGHT as "weight", <!-- 产量 -->
WEIGHT_JH as "weightJh", WEIGHT_JH as "weightJh",
GROUP_USER_COUNT as "groupUserCount",
PARENT_ID as "parentId", <!-- 备注 --> PARENT_ID as "parentId", <!-- 备注 -->
DELETE_FLAG as "deleteFlag", <!-- 是否删除0:否1.是 --> DELETE_FLAG as "deleteFlag", <!-- 是否删除0:否1.是 -->
CREATED_BY as "createdBy", <!-- 创建人 --> CREATED_BY as "createdBy", <!-- 创建人 -->
...@@ -154,6 +155,7 @@ ...@@ -154,6 +155,7 @@
PRDT_NAME as "prdtName", <!-- 产品名称 --> PRDT_NAME as "prdtName", <!-- 产品名称 -->
WEIGHT as "weight", <!-- 产量 --> WEIGHT as "weight", <!-- 产量 -->
WEIGHT_JH as "weightJh", WEIGHT_JH as "weightJh",
GROUP_USER_COUNT as "groupUserCount",
PARENT_ID as "parentId", <!-- 备注 --> PARENT_ID as "parentId", <!-- 备注 -->
DELETE_FLAG as "deleteFlag", <!-- 是否删除0:否1.是 --> DELETE_FLAG as "deleteFlag", <!-- 是否删除0:否1.是 -->
CREATED_BY as "createdBy", <!-- 创建人 --> CREATED_BY as "createdBy", <!-- 创建人 -->
...@@ -193,6 +195,7 @@ ...@@ -193,6 +195,7 @@
PRDT_NAME as "prdtName", <!-- 产品名称 --> PRDT_NAME as "prdtName", <!-- 产品名称 -->
WEIGHT as "weight", <!-- 产量 --> WEIGHT as "weight", <!-- 产量 -->
WEIGHT_JH as "weightJh", WEIGHT_JH as "weightJh",
GROUP_USER_COUNT as "groupUserCount",
PARENT_ID as "parentId", <!-- 备注 --> PARENT_ID as "parentId", <!-- 备注 -->
DELETE_FLAG as "deleteFlag", <!-- 是否删除0:否1.是 --> DELETE_FLAG as "deleteFlag", <!-- 是否删除0:否1.是 -->
CREATED_BY as "createdBy", <!-- 创建人 --> CREATED_BY as "createdBy", <!-- 创建人 -->
...@@ -292,6 +295,7 @@ ...@@ -292,6 +295,7 @@
PRDT_NAME, <!-- 产品名称 --> PRDT_NAME, <!-- 产品名称 -->
WEIGHT, <!-- 产量 --> WEIGHT, <!-- 产量 -->
WEIGHT_JH, WEIGHT_JH,
GROUP_USER_COUNT ,
PARENT_ID, <!-- 备注 --> PARENT_ID, <!-- 备注 -->
DELETE_FLAG, <!-- 是否删除0:否1.是 --> DELETE_FLAG, <!-- 是否删除0:否1.是 -->
CREATED_BY, <!-- 创建人 --> CREATED_BY, <!-- 创建人 -->
...@@ -301,7 +305,7 @@ ...@@ -301,7 +305,7 @@
UPDATED_TIME, <!-- 修改人名称 --> UPDATED_TIME, <!-- 修改人名称 -->
UPDATED_NAME <!-- 修改时间 --> UPDATED_NAME <!-- 修改时间 -->
) )
VALUES (#id#, #companyCode#, #depCode#, #registerDate#, #factoryCode#, #groupCode#, #userId#, #groupType#, #prdtCode#, #prdtName#, #weight#, #weightJh#, #parentId#, #deleteFlag#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedTime#, #updatedName#) VALUES (#id#, #companyCode#, #depCode#, #registerDate#, #factoryCode#, #groupCode#, #userId#, #groupType#, #prdtCode#, #prdtName#, #weight#, #weightJh#, #groupUserCount#,#parentId#, #deleteFlag#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedTime#, #updatedName#)
</insert> </insert>
<delete id="delete"> <delete id="delete">
...@@ -343,6 +347,7 @@ ...@@ -343,6 +347,7 @@
PRDT_NAME = #prdtName#, <!-- 产品名称 --> PRDT_NAME = #prdtName#, <!-- 产品名称 -->
WEIGHT = #weight#, <!-- 产量 --> WEIGHT = #weight#, <!-- 产量 -->
WEIGHT_JH = #weightJh#, WEIGHT_JH = #weightJh#,
GROUP_USER_COUNT = #groupUserCount#,
PARENT_ID = #parentId#, <!-- 备注 --> PARENT_ID = #parentId#, <!-- 备注 -->
DELETE_FLAG = #deleteFlag#, <!-- 是否删除0:否1.是 --> DELETE_FLAG = #deleteFlag#, <!-- 是否删除0:否1.是 -->
CREATED_BY = #createdBy#, <!-- 创建人 --> CREATED_BY = #createdBy#, <!-- 创建人 -->
......
src/main/webapp/HP/SC/HPSC010A.jsp
...@@ -78,6 +78,7 @@ ...@@ -78,6 +78,7 @@
data-regex="/^-?[0-9]{1,16}([.][0-9]{1,3})?$/" maxLength="20" required="true" data-regex="/^-?[0-9]{1,16}([.][0-9]{1,3})?$/" maxLength="20" required="true"
data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！" data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"
/> />
<EF:EFColumn ename="groupUserCount" cname="组用工数" maxLength="15" displayType="0" format="{0:N0}" enable="false" align="right"/>
<%--<EF:EFColumn ename="remark" cname="备注" enable="true" width="200" align="center"/>--%> <%--<EF:EFColumn ename="remark" cname="备注" enable="true" width="200" align="center"/>--%>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
......
src/main/webapp/HP/SC/HPSC096.js
...@@ -136,6 +136,12 @@ $(function (){ ...@@ -136,6 +136,12 @@ $(function (){
flag = false; flag = false;
return false; return false;
} }
let groupUserCount= item.get("groupUserCount");
if(!isPositiveInteger(groupUserCount)){
message("选中的生产组第"+(index+1)+"行\"组用工数\"，必须为正整数!");
flag = false;
return false;
}
}); });
if(flag) { if(flag) {
JSUtils.confirm("确定对数据做\"保存\"操作? ", { JSUtils.confirm("确定对数据做\"保存\"操作? ", {
......
src/main/webapp/HP/SC/HPSC096.jsp
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
data-regex="/^-?[0-9]{1,16}([.][0-9]{1,3})?$/" maxLength="20" data-regex="/^-?[0-9]{1,16}([.][0-9]{1,3})?$/" maxLength="20"
data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！" data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"
/> />
<EF:EFColumn ename="groupUserCount" cname="组用工数" maxLength="15" displayType="0" format="{0:N0}" align="right"/>
<EF:EFComboColumn ename="groupType" cname="生产类型" <EF:EFComboColumn ename="groupType" cname="生产类型"
columnTemplate="#=textField#" itemTemplate="#=textField#" columnTemplate="#=textField#" itemTemplate="#=textField#"
textField="textField" valueField="valueField" hidden="true" textField="textField" valueField="valueField" hidden="true"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment