Skip to content

H
hp-smart
Commit e44ca0d3 by 971729
Options

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

parents 8a08bf2b 5c145c43
Showing with 800 additions and 200 deletions
src/main/java/com/baosight/hpjx/hp/kc/domain/HPKC001.java
......@@ -33,8 +33,8 @@ public class HPKC001 extends DaoEPBase {
public static final String FIELD_UPDATED_BY = "updatedBy"; /* 更新人*/
public static final String FIELD_UPDATED_NAME = "updatedName"; /* 更新人名称*/
public static final String FIELD_UPDATED_TIME = "updatedTime"; /* 更新时间*/
public static final String FIELD_PURCHASE_CODE = "purchaseCode"; /* 采购单号*/
public static final String FIELD_OLD_PURCHASE_CODE = "oldPurchaseCode"; /* 原采购单号*/
public static final String FIELD_PURCHASE_NO = "purchaseNo"; /* 采购单号*/
public static final String FIELD_OLD_PURCHASE_NO = "oldPurchaseNo"; /* 原采购单号*/
public static final String FIELD_RECEIPT_DATE = "receiptDate"; /* 单据日期*/
public static final String FIELD_WH_CODE = "whCode"; /* 仓库编码*/
public static final String FIELD_WH_NAME = "whName"; /* 仓库名称*/
......@@ -56,7 +56,7 @@ public class HPKC001 extends DaoEPBase {
public static final String COL_UPDATED_BY = "UPDATED_BY"; /* 更新人*/
public static final String COL_UPDATED_NAME = "UPDATED_NAME"; /* 更新人名称*/
public static final String COL_UPDATED_TIME = "UPDATED_TIME"; /* 更新时间*/
public static final String COL_OLD_PURCHASE_CODE = "OLD_PURCHASE_CODE"; /* 原采购单号*/
public static final String COL_OLD_PURCHASE_NO = "OLD_PURCHASE_NO"; /* 原采购单号*/
public static final String COL_RECEIPT_DATE = "RECEIPT_DATE"; /* 单据日期*/
public static final String COL_WH_CODE = "WH_CODE"; /* 仓库编码*/
public static final String COL_WH_NAME = "WH_NAME"; /* 仓库名称*/
......@@ -69,11 +69,11 @@ public class HPKC001 extends DaoEPBase {
public static final String COL_REMARKS = "REMARKS"; /* 备注*/
public static final String COL_DELETE_FLAG = "DELETE_FLAG"; /* 是否删除0.否1.是*/
public static final String QUERY = "t_hpkc001.query";
public static final String COUNT = "t_hpkc001.count";
public static final String INSERT = "t_hpkc001.insert";
public static final String UPDATE = "t_hpkc001.update";
public static final String DELETE = "t_hpkc001.delete";
public static final String QUERY = "HPKC001.query";
public static final String COUNT = "HPKC001.count";
public static final String INSERT = "HPKC001.insert";
public static final String UPDATE = "HPKC001.update";
public static final String DELETE = "HPKC001.delete";
private Long id = null; /* 主键id*/
private String companyCode = " "; /* 企业编码 预留*/
......@@ -84,8 +84,8 @@ public class HPKC001 extends DaoEPBase {
private String updatedBy = " "; /* 更新人*/
private String updatedName = " "; /* 更新人名称*/
private String updatedTime ; /* 更新时间*/
private String purchaseCode = " "; /* 采购单号*/
private String oldPurchaseCode = " "; /* 原采购单号*/
private String purchaseNo = " "; /* 采购单号*/
private String oldPurchaseNo = " "; /* 原采购单号*/
private String receiptDate ; /* 单据日期*/
private String whCode = " "; /* 仓库编码*/
private String whName = " "; /* 仓库名称*/
......@@ -141,11 +141,11 @@ public class HPKC001 extends DaoEPBase {
eiColumn.setDescName("更新时间");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PURCHASE_CODE);
eiColumn = new EiColumn(FIELD_PURCHASE_NO);
eiColumn.setDescName("采购单号");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_OLD_PURCHASE_CODE);
eiColumn = new EiColumn(FIELD_OLD_PURCHASE_NO);
eiColumn.setDescName("原采购单号");
eiMetadata.addMeta(eiColumn);
......@@ -354,36 +354,36 @@ public class HPKC001 extends DaoEPBase {
this.updatedTime = updatedTime;
}
/**
* get the purchaseCode - 采购单号.
* @return the purchaseCode
* get the purchaseNo - 采购单号.
* @return the purchaseNo
*/
public String getPurchaseCode() {
return this.purchaseCode;
public String getPurchaseNo() {
return this.purchaseNo;
}
/**
* set the purchaseCode - 采购单号.
* set the purchaseNo - 采购单号.
*
* @param purchaseCode - 采购单号
* @param purchaseNo - 采购单号
*/
public void setPurchaseCode(String purchaseCode) {
this.purchaseCode = purchaseCode;
public void setPurchaseNo(String purchaseNo) {
this.purchaseNo = purchaseNo;
}
/**
* set the oldPurchaseCode - 原采购单号.
* set the oldPurchaseNo - 原采购单号.
*
* @param oldPurchaseCode - 原采购单号
* @param oldPurchaseNo - 原采购单号
*/
public void setOldPurchaseCode(String oldPurchaseCode) {
this.oldPurchaseCode = oldPurchaseCode;
public void setOldPurchaseNo(String oldPurchaseNo) {
this.oldPurchaseNo = oldPurchaseNo;
}
/**
* get the oldPurchaseCode - 原采购单号.
* @return the oldPurchaseCode
* get the oldPurchaseNo - 原采购单号.
* @return the oldPurchaseNo
*/
public String getOldPurchaseCode() {
return this.oldPurchaseCode;
public String getOldPurchaseNo() {
return this.oldPurchaseNo;
}
/**
......@@ -579,8 +579,8 @@ public class HPKC001 extends DaoEPBase {
setUpdatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_BY)), updatedBy));
setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_NAME)), updatedName));
setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime));
setPurchaseCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PURCHASE_CODE)), purchaseCode));
setOldPurchaseCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_OLD_PURCHASE_CODE)), oldPurchaseCode));
setPurchaseNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PURCHASE_NO)), purchaseNo));
setOldPurchaseNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_OLD_PURCHASE_NO)), oldPurchaseNo));
setReceiptDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_RECEIPT_DATE)), receiptDate));
setWhCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_WH_CODE)), whCode));
setWhName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_WH_NAME)), whName));
......@@ -610,8 +610,8 @@ public class HPKC001 extends DaoEPBase {
map.put(FIELD_UPDATED_BY, StringUtils.toString(updatedBy, eiMetadata.getMeta(FIELD_UPDATED_BY)));
map.put(FIELD_UPDATED_NAME, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_UPDATED_NAME)));
map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME)));
map.put(FIELD_PURCHASE_CODE, StringUtils.toString(purchaseCode, eiMetadata.getMeta(FIELD_PURCHASE_CODE)));
map.put(FIELD_OLD_PURCHASE_CODE, StringUtils.toString(oldPurchaseCode, eiMetadata.getMeta(FIELD_OLD_PURCHASE_CODE)));
map.put(FIELD_PURCHASE_NO, StringUtils.toString(purchaseNo, eiMetadata.getMeta(FIELD_PURCHASE_NO)));
map.put(FIELD_OLD_PURCHASE_NO, StringUtils.toString(oldPurchaseNo, eiMetadata.getMeta(FIELD_OLD_PURCHASE_NO)));
map.put(FIELD_RECEIPT_DATE, StringUtils.toString(receiptDate, eiMetadata.getMeta(FIELD_RECEIPT_DATE)));
map.put(FIELD_WH_CODE, StringUtils.toString(whCode, eiMetadata.getMeta(FIELD_WH_CODE)));
map.put(FIELD_WH_NAME, StringUtils.toString(whName, eiMetadata.getMeta(FIELD_WH_NAME)));
......
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC001.java
......@@ -42,6 +42,7 @@ public class ServiceHPKC001 extends ServiceBase {
queryMap.put("inventTypes", DEFAULT_INVENT_CODE);
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), queryMap);
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), queryMap);
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), queryMap);
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_ALL_BLOCK_ID), queryMap, false);
inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC001().eiMetadata);
} catch (PlatException e) {
......@@ -92,7 +93,7 @@ public class ServiceHPKC001 extends ServiceBase {
// 设置基础信息
this.setBaseInfo(fKc001);
// 生成入库单号
fKc001.setPurchaseCode(SequenceGenerator.getNextSequence(HPConstant.SequenceId.HPKC001_NUMBER));
fKc001.setPurchaseNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.HPKC001_NUMBER));
DaoUtils.insert(HPKC001.INSERT, fKc001);
// 修改库存
HPKCTools.updateStock(fKc001.getWhCode(), fKc001.getInventRecordId(), fKc001.getAmount(),
......@@ -131,7 +132,7 @@ public class ServiceHPKC001 extends ServiceBase {
this.setBaseInfo(fKc001);
DaoUtils.update(HPKC001.UPDATE, fKc001);
// 计算差异数量与重量
HPKC001 dbKc001 = mapKc001.get(fKc001.getPurchaseCode());
HPKC001 dbKc001 = mapKc001.get(fKc001.getPurchaseNo());
BigDecimal diffAmount = fKc001.getAmount().subtract(dbKc001.getAmount());
BigDecimal diffWeight = fKc001.getWeight().subtract(dbKc001.getWeight());
// 修改库存
......@@ -197,12 +198,12 @@ public class ServiceHPKC001 extends ServiceBase {
fKc001.fromMap(resultRows.get(i));
DaoUtils.update(HPKC001.DELETE, fKc001);
// 生成红冲记录
HPKC001 dbKc001 = mapKc001.get(fKc001.getPurchaseCode());
HPKC001 dbKc001 = mapKc001.get(fKc001.getPurchaseNo());
HPKC001 newKc006 = BeanUtils.copy(dbKc001, HPKC001.class);
newKc006.setPurchaseCode(SequenceGenerator.getNextSequence(HPConstant.SequenceId.OTHER_ENTER_NO));
newKc006.setPurchaseNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.OTHER_ENTER_NO));
newKc006.setAmount(newKc006.getAmount().negate());
newKc006.setWeight(newKc006.getWeight().negate());
newKc006.setOldPurchaseCode(newKc006.getPurchaseCode());
newKc006.setOldPurchaseNo(newKc006.getPurchaseNo());
newKc006.setDeleteFlag(CommonConstant.YesNo.YES_1);
DaoUtils.insert(HPKC001.INSERT, newKc006);
// 修改库存
......
src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC001.xml
......@@ -12,8 +12,8 @@
UPDATED_BY as "updatedBy", <!-- 更新人 -->
UPDATED_NAME as "updatedName", <!-- 更新人名称 -->
UPDATED_TIME as "updatedTime", <!-- 更新时间 -->
PURCHASE_CODE as "purchaseCode", <!-- 采购单号 -->
OLD_PURCHASE_CODE as "oldPurchaseCode", <!-- 原采购单号 -->
PURCHASE_NO as "purchaseNo", <!-- 采购单号 -->
OLD_PURCHASE_NO as "oldPurchaseNo", <!-- 原采购单号 -->
RECEIPT_DATE as "receiptDate", <!-- 单据日期 -->
WH_CODE as "whCode", <!-- 仓库编码 -->
WH_NAME as "whName", <!-- 仓库名称 -->
......@@ -55,8 +55,8 @@
<isNotEmpty prepend=" AND " property="updatedTime">
UPDATED_TIME = #updatedTime#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="purchaseCode">
PURCHASE_CODE = #purchaseCode#
<isNotEmpty prepend=" AND " property="purchaseNo">
PURCHASE_NO = #purchaseNo#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="receiptDate">
RECEIPT_DATE = #receiptDate#
......@@ -91,8 +91,8 @@
<isNotEmpty prepend=" AND " property="deleteFlag">
DELETE_FLAG = #deleteFlag#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="oldPurchaseCode">
OLD_PURCHASE_CODE = #oldPurchaseCode#
<isNotEmpty prepend=" AND " property="oldPurchaseNo">
OLD_PURCHASE_NO = #oldPurchaseNo#
</isNotEmpty>
</sql>
......@@ -123,8 +123,8 @@
CREATED_BY, <!-- 创建人 -->
CREATED_NAME, <!-- 创建人名称 -->
CREATED_TIME, <!-- 创建时间 -->
PURCHASE_CODE, <!-- 采购单号 -->
OLD_PURCHASE_CODE, <!-- 原采购单号 -->
PURCHASE_NO, <!-- 采购单号 -->
OLD_PURCHASE_NO, <!-- 原采购单号 -->
RECEIPT_DATE, <!-- 单据日期 -->
WH_CODE, <!-- 仓库编码 -->
WH_NAME, <!-- 仓库名称 -->
......@@ -138,7 +138,7 @@
DELETE_FLAG <!-- 是否删除0.否1.是 -->
) VALUES (
#companyCode#, #depCode#, #createdBy#, #createdName#, #createdTime#,
#oldPurchaseCode#,#purchaseCode#, #receiptDate#, #whCode#, #whName#, #inventType#,
#oldPurchaseNo#,#purchaseNo#, #receiptDate#, #whCode#, #whName#, #inventType#,
#inventCode#, #inventName#, #inventRecordId#, #amount#, #weight#,
#remarks#, #deleteFlag#
)
......
src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC005.xml
......@@ -34,7 +34,6 @@
</sql>
<sql id="condition">
AND DELETE_FLAG = 0
<isNotEmpty prepend=" AND " property="id">
ID = #id#
</isNotEmpty>
......@@ -83,6 +82,9 @@
<isNotEmpty prepend=" AND " property="depCode">
DEP_CODE = #depCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="deleteFlag">
DELETE_FLAG = #deleteFlag#
</isNotEmpty>
</sql>
<sql id="customCondition">
......@@ -97,6 +99,12 @@
INVENT_RECORD_ID IN (SELECT ID FROM ${hpjxSchema}.T_HPPZ006 WHERE SPEC = #spec#)
</isNotEqual>
</isNotEmpty>
<isNotEmpty prepend=" AND " property="createdDateFrom">
A.CREATED_TIME &gt;= CONCAT(REPLACE(#createdDateFrom#, '-', ''), '000000')
</isNotEmpty>
<isNotEmpty prepend=" AND " property="createdDateTo">
A.CREATED_TIME &lt;= CONCAT(REPLACE(#createdDateTo#, '-', ''), '235959')
</isNotEmpty>
</sql>
<sql id="order">
......
src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC006.xml
......@@ -28,7 +28,6 @@
</sql>
<sql id="condition">
AND DELETE_FLAG = 0
<isNotEmpty prepend=" AND " property="id">
ID = #id#
</isNotEmpty>
......@@ -62,6 +61,9 @@
<isNotEmpty prepend=" AND " property="inventRecordId">
INVENT_RECORD_ID = #inventRecordId#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="deleteFlag">
DELETE_FLAG = #deleteFlag#
</isNotEmpty>
</sql>
<sql id="customCondition">
......@@ -79,6 +81,12 @@
INVENT_RECORD_ID IN (SELECT ID FROM ${hpjxSchema}.T_HPPZ006 WHERE SPEC = #spec#)
</isNotEqual>
</isNotEmpty>
<isNotEmpty prepend=" AND " property="createdDateFrom">
A.CREATED_TIME &gt;= CONCAT(REPLACE(#createdDateFrom#, '-', ''), '000000')
</isNotEmpty>
<isNotEmpty prepend=" AND " property="createdDateTo">
A.CREATED_TIME &lt;= CONCAT(REPLACE(#createdDateTo#, '-', ''), '235959')
</isNotEmpty>
</sql>
<sql id="order">
......
src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC007.xml
......@@ -29,7 +29,6 @@
</sql>
<sql id="condition">
AND DELETE_FLAG = 0
<isNotEmpty prepend=" AND " property="id">
ID = #id#
</isNotEmpty>
......@@ -63,6 +62,9 @@
<isNotEmpty prepend=" AND " property="oldOuterNo">
OLD_OUTER_NO = #oldOuterNo#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="deleteFlag">
DELETE_FLAG = #deleteFlag#
</isNotEmpty>
</sql>
<sql id="customCondition">
......@@ -77,6 +79,12 @@
INVENT_RECORD_ID IN (SELECT ID FROM ${hpjxSchema}.T_HPPZ006 WHERE SPEC = #spec#)
</isNotEqual>
</isNotEmpty>
<isNotEmpty prepend=" AND " property="createdDateFrom">
A.CREATED_TIME &gt;= CONCAT(REPLACE(#createdDateFrom#, '-', ''), '000000')
</isNotEmpty>
<isNotEmpty prepend=" AND " property="createdDateTo">
A.CREATED_TIME &lt;= CONCAT(REPLACE(#createdDateTo#, '-', ''), '235959')
</isNotEmpty>
</sql>
<sql id="order">
......
src/main/java/com/baosight/hpjx/hp/kc/tools/HPKCTools.java
......@@ -106,7 +106,7 @@ public class HPKCTools {
if (CollectionUtils.isEmpty(results)) {
return null;
}
return results.stream().collect(Collectors.toMap(HPKC001::getPurchaseCode, item -> item));
return results.stream().collect(Collectors.toMap(HPKC001::getPurchaseNo, item -> item));
}
/**
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC001.java
......@@ -2,6 +2,7 @@ package com.baosight.hpjx.hp.sc.service;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.core.security.UserSessionUtils;
import com.baosight.hpjx.hp.constant.HPConstant;
import com.baosight.hpjx.util.CommonMethod;
import com.baosight.hpjx.util.LogUtils;
......@@ -12,6 +13,7 @@ import com.baosight.iplat4j.core.exception.PlatException;
import com.baosight.iplat4j.core.service.impl.ServiceBase;
import com.baosight.iplat4j.core.service.soa.XLocalManager;
import com.baosight.hpjx.hp.sc.domain.HPSC001;
import com.baosight.iplat4j.core.web.threadlocal.UserSession;
import com.baosight.iplat4j.ed.util.SequenceGenerator;
import java.text.SimpleDateFormat;
......@@ -28,7 +30,9 @@ public class ServiceHPSC001 extends ServiceBase {
*/
public EiInfo initLoad(EiInfo inInfo) {
try {
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), null);
Map map = new HashMap();
map.put("companyCode", UserSessionUtils.getCompanyCode());
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), map);
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID), null);
inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPSC001().eiMetadata);
} catch (PlatException e) {
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC002.java
......@@ -368,23 +368,23 @@ public class ServiceHPSC002 extends ServiceBase {
//生产计划详情
Map queryMap = new HashMap();
queryMap.put("id", id);
List rows = this.dao.query("HPSC002.queryTreeNodeByParentPrtdCode", queryMap);
List<HPSC002> rows = this.dao.query("HPSC002.queryEntityByParentPrtdCode", queryMap);
for (int i = 0; i < rows.size(); i++) {
Map domain = (Map)rows.get(i);
HPSC002 HPSC002 = rows.get(i);
HPSC004 HPSC004 = new HPSC004();
HPSC004.setCompanyCode("");
HPSC004.setDeptCode("");
HPSC004.setProjCode(StringUtils.toString(domain.get("projCode")));
HPSC004.setProjName(StringUtils.toString(domain.get("projName")));
HPSC004.setProjCode(HPSC002.getProjCode());
HPSC004.setProjName(HPSC002.getProjName());
HPSC004.setParentPrdtCode(StringUtils.toString(ent.getId()));
HPSC004.setParentPrdtName(StringUtils.toString(domain.get("parentPrdtName")));
HPSC004.setPrdtType(NumberUtils.toInteger(domain.get("prdtType")));
HPSC004.setPrdtCode(StringUtils.toString(domain.get("prdtCode")));
HPSC004.setPrdtName(StringUtils.toString(domain.get("prdtName")));
HPSC004.setNum(NumberUtils.toBigDecimal(domain.get("num")));
HPSC004.setUnitWt(NumberUtils.toBigDecimal(domain.get("unitWt")));
HPSC004.setFilePath1(StringUtils.toString(domain.get("id")));
HPSC004.setParentPrdtName(HPSC002.getParentPrdtName());
HPSC004.setPrdtType(HPSC002.getPrdtType());
HPSC004.setPrdtCode(HPSC002.getPrdtCode());
HPSC004.setPrdtName(HPSC002.getPrdtName());
HPSC004.setNum(HPSC002.getNum());
HPSC004.setUnitWt(HPSC002.getUnitWt());
HPSC004.setFilePath1(HPSC002.getId().toString());
HPSC004.setPlanCommentDate("");
HPSC004.setPlanCompletionDate("");
HPSC004.setActualCompletionNum(NumberUtils.toBigDecimal(0.00));
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC003.java
......@@ -210,11 +210,7 @@ public class ServiceHPSC003 extends ServiceBase {
HPSC005.setStatus(0);
HPSC005.setCreatedBy(UserSession.getUserId());
HPSC005.setCreatedTime(sdf.format(new Date()));
HPSC005.setFilePath1(HPSC004.getFilePath1());
HPSC005.setFilePath2(HPSC004.getFilePath2());
HPSC005.setFilePath3(HPSC004.getFilePath3());
HPSC005.setFilePath4(HPSC004.getFilePath4());
HPSC005.setFilePath5(HPSC004.getFilePath5());
HPSC005.setFilePath1(HPSC004.getId().toString());
this.dao.insert("HPSC005.insert", HPSC005.toMap());
HPSC004.setProductionOrderNo(SCDD);
......
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC001.xml
......@@ -62,6 +62,9 @@
<isNotEmpty prepend=" AND " property="materialStatus">
MATERIAL_STATUS = #materialStatus#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="companyCode">
COMPANY_CODE = #companyCode#
</isNotEmpty>
<dynamic prepend="ORDER BY">
<isEmpty property="orderBy">
CREATED_TIME desc
......
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002.xml
......@@ -350,6 +350,42 @@
FROM hpjx.t_hpsc002 WHERE PARENT_PRDT_CODE = #id#
</select>
<select id="queryEntityByParentPrtdCode" parameterClass="java.util.HashMap"
resultClass="com.baosight.hpjx.hp.sc.domain.HPSC002">
SELECT
ID as "id",
COMPANY_CODE as "companyCode", <!-- 企业编码 预留 -->
DEPT_CODE as "deptCode", <!-- 部门编码 预留 -->
PROJ_CODE as "projCode", <!-- 项目编码 -->
PROJ_NAME as "projName", <!-- 项目名称 -->
PARENT_PRDT_CODE as "parentPrdtCode", <!-- 父节点-产品编码 -->
PARENT_PRDT_NAME as "parentPrdtName", <!-- 父节点-产品名称 -->
TYPE as "type", <!-- 类别 -->
LEAF as "leaf", <!-- 是否有叶子节点 -->
SORT as "sort", <!-- 排序字段 -->
ICON as "icon", <!-- 图片地址 -->
PRDT_TYPE as "prdtType",
PRDT_CODE as "prdtCode", <!-- 产品编码 -->
PRDT_NAME as "prdtName", <!-- 产品名称 -->
NUM as "num", <!-- 数量 -->
UNIT_WT as "unitWt", <!-- 单重 -->
TOTAL_WT as "totalWt", <!-- 总重 -->
FILE_PATH1 as "filePath1", <!-- 文件地址1 -->
FILE_PATH2 as "filePath2", <!-- 文件地址2 -->
FILE_PATH3 as "filePath3", <!-- 文件地址3 -->
FILE_PATH4 as "filePath4", <!-- 文件地址4 -->
FILE_PATH5 as "filePath5", <!-- 文件地址5 -->
STATUS as "status", <!-- 状态 0-未审核，1-已审核 -->
DEL_STATUS as "delStatus", <!-- 状态 1未删除，0已删除 -->
CREATED_BY as "createdBy", <!-- 创建人 -->
CREATED_TIME as "createdTime", <!-- 创建时间 -->
UPDATED_BY as "updatedBy", <!-- 更新人 -->
UPDATED_TIME as "updatedTime", <!-- 更新时间 -->
REMARK as "remark" <!-- 备注 -->
FROM hpjx.t_hpsc002 WHERE PARENT_PRDT_CODE = #id#
</select>
<update id="updateTreeNodeLeaf">
UPDATE hpjx.t_hpsc002 SET LEAF = #leaf# WHERE ID = #id#
</update>
......
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002B.xml
......@@ -76,7 +76,7 @@
<select id="query" resultClass="com.baosight.hpjx.hp.sc.domain.HPSC002B">
SELECT
<include refid="column"/>
FROM ${hpjxSchema}.T_HPSC002B A, ${platSchema}.TEUDM02 B
FROM ${hpjxSchema}.T_HPSC002A A, ${platSchema}.TEUDM02 B
WHERE 1=1
AND A.DOC_ID = B.DOC_ID
<include refid="condition"/>
......@@ -85,14 +85,14 @@
</select>
<select id="count" resultClass="int">
SELECT COUNT(*) FROM ${hpjxSchema}.T_HPSC002B A, ${platSchema}.TEUDM02 B
SELECT COUNT(*) FROM ${hpjxSchema}.T_HPSC002A A, ${platSchema}.TEUDM02 B
WHERE 1=1
<include refid="condition"/>
<include refid="customCondition"/>
</select>
<insert id="insert">
INSERT INTO ${hpjxSchema}.T_HPSC002B (
INSERT INTO ${hpjxSchema}.T_HPSC002A (
COMPANY_CODE, <!-- 企业编码 预留 -->
DEPT_CODE, <!-- 部门编码 预留 -->
MAT_ID, <!-- 物料ID -->
......@@ -107,7 +107,7 @@
</insert>
<delete id="delete">
DELETE FROM ${hpjxSchema}.T_HPSC002B WHERE ID = #id#
DELETE FROM ${hpjxSchema}.T_HPSC002A WHERE ID = #id#
</delete>
</sqlMap>
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC004.xml
......@@ -415,6 +415,7 @@
LEAF as "leaf", <!-- 是否有叶子节点 -->
SORT as "sort", <!-- 排序字段 -->
ICON as "icon", <!-- 图片地址 -->
PRDT_TYPE as "prdtType",
PRDT_CODE as "prdtCode", <!-- 产品编码 -->
PRDT_NAME as "prdtName", <!-- 产品名称 -->
NUM as "num", <!-- 数量 -->
......
src/main/resources/application.properties
......@@ -32,9 +32,11 @@ customerName=\u6B66\u6C49\u5B9D\u4FE1\u5927\u6570\u636E\u4E8B\u4E1A\u90E8
enterpriseName=\u6B66\u6C49\u5B9D\u4FE1\u5927\u6570\u636E\u4E8B\u4E1A\u90E8
datasource.type=dbcp
jdbc.driverClassName=com.mysql.jdbc.Driver
#jdbc.url=jdbc:mysql://127.0.0.1:3306/iplat?useSSL=false&useUnicode=true&characterEncoding=utf-8
jdbc.url=jdbc:mysql://10.24.1.94:3306/iplat?useSSL=false&useUnicode=true&characterEncoding=utf-8
jdbc.username=root
jdbc.password=fnvu~aKs9LTDYUxe
#jdbc.password=root
jdbc.maxActive=20
jdbc.validationQuery=SELECT 1 FROM ${platSchema}.TEDFA00
......
src/main/resources/quartz.properties
......@@ -27,7 +27,10 @@ org.quartz.jobStore.isClustered = true
org.quartz.jobStore.clusterCheckinInterval = 20000
org.quartz.dataSource.appDS.driver = com.mysql.jdbc.Driver
org.quartz.dataSource.appDS.URL = jdbc:mysql://10.24.1.94:3306/iplat?useSSL=false&useUnicode=true&characterEncoding=utf-8
#org.quartz.dataSource.appDS.URL = jdbc:mysql://127.0.0.1:3306/iplat?useSSL=false&useUnicode=true&characterEncoding=utf-8
org.quartz.dataSource.appDS.user = root
#org.quartz.dataSource.appDS.password =root
org.quartz.dataSource.appDS.password =fnvu~aKs9LTDYUxe
org.quartz.dataSource.appDS.maxConnections = 30
......
src/main/webapp/HP/KC/HPKC001.js
......@@ -21,7 +21,7 @@ $(function() {
},
editor: function (container, options) {
let inInfo = new EiInfo();
inInfo.set("inqu_status-0-inventTypes", [1, 2, 5]);
inInfo.set("inqu_status-0-inventTypes", [1, 2]);
inInfo.set("inqu_status-0-whType", options.model["inventType"]);
inInfo.set("serviceName", "HPPZ007");
inInfo.set("methodName", "queryComboBox");
......@@ -41,7 +41,7 @@ $(function() {
},
editor: function (container, options) {
let inInfo = new EiInfo();
inInfo.set("inqu_status-0-inventTypes", [1, 2, 5]);
inInfo.set("inqu_status-0-inventTypes", [1, 2]);
inInfo.set("inqu_status-0-inventType", options.model["inventType"]);
inInfo.set("serviceName", "HPPZ006");
inInfo.set("methodName", "queryMaterialComboBox");
......@@ -50,7 +50,7 @@ $(function() {
refreshSelect(container, inInfo);
}
}, {
field: "spe",
field: "inventRecordId",
template: function (dataItem) {
for (let i = 0; i < inventAllGlobalData.length; i++) {
if (inventAllGlobalData[i]['valueField'] === dataItem['inventRecordId']) {
......@@ -61,7 +61,7 @@ $(function() {
},
editor: function (container, options) {
let inInfo = new EiInfo();
inInfo.set("inqu_status-0-inventTypes", [1, 2, 5]);
inInfo.set("inqu_status-0-inventTypes", [1, 2]);
inInfo.set("inqu_status-0-inventCode", options.model["inventCode"]);
inInfo.set("serviceName", "HPPZ006");
inInfo.set("methodName", "queryComboBoxSpec");
......@@ -81,6 +81,20 @@ $(function() {
}
}],
loadComplete: function (grid) {
// 此grid对象
grid.dataSource.bind("change", function(e) {
if (e.field == "inventRecordId") {
var tr,index;
// 获取此model元素信息
var item = e.items[0];
for (let i = 0; i < inventAllGlobalData.length; i++) {
if (inventAllGlobalData[i]['valueField'] === item.inventRecordId) {
resultGrid.setCellValue(item, 'material', inventAllGlobalData[i]['param1Field'])
resultGrid.setCellValue(item, 'unit', inventAllGlobalData[i]['param2Field'])
}
}
}
});
}
}
}
......@@ -98,7 +112,7 @@ $(function() {
$(window).load(function () {
// 仓库名称
let inInfo = new EiInfo();
inInfo.set("inqu_status-0-inventTypes", [1, 2, 5]);
inInfo.set("inqu_status-0-inventTypes", [1, 2]);
EiCommunicator.send("HPPZ007", "queryComboBox", inInfo, {
onSuccess: function (ei) {
whNameGlobalData = ei.getBlock("wh_record_block_id").getMappedRows();
......
src/main/webapp/HP/KC/HPKC001.jsp
......@@ -11,7 +11,7 @@
<div class="row">
<EF:EFDatePicker cname="单据日期" ename="inqu_status-0-receiptDate" colWidth="3"
role="date" format="yyyy-MM-dd" readonly="true"/>
<EF:EFInput cname="采购单号" ename="inqu_status-0-chpurchaseCodeeckNo" colWidth="3"/>
<EF:EFInput cname="采购单号" ename="inqu_status-0-chpurchaseNoeckNo" colWidth="3"/>
<EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains">
<EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
......@@ -36,7 +36,7 @@
<EF:EFRegion id="result" title="明细信息">
<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
<EF:EFColumn ename="id" cname="内码" hidden="true"/>
<EF:EFColumn ename="purchaseCode" cname="采购单号" enable="false" width="140" align="center"/>
<EF:EFColumn ename="purchaseNo" cname="采购单号" enable="false" width="140" align="center"/>
<EF:EFColumn ename="receiptDate" cname="单据日期" width="90" align="center" editType="date"
dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
<EF:EFComboColumn ename="inventType" cname="存货类型" width="100" align="center" required="true">
......@@ -44,9 +44,9 @@
</EF:EFComboColumn>
<EF:EFColumn ename="whCode" cname="仓库名称" width="120" align="center" required="true" readonly="true"/>
<EF:EFColumn ename="inventCode" cname="存货名称" width="120" align="center" required="true" readonly="true"/>
<EF:EFColumn ename="spec" cname="规格" width="120" align="center"/>
<EF:EFColumn ename="material" cname="材质" width="120" align="center"/>
<EF:EFColumn ename="unit" cname="单位" width="120" align="center"/>
<EF:EFColumn ename="inventRecordId" cname="规格" width="120" align="center"/>
<EF:EFColumn ename="material" cname="材质" width="120" align="center" enable="false"/>
<EF:EFColumn ename="unit" cname="单位" width="120" align="center" enable="false"/>
<EF:EFColumn ename="amount" cname="数量" format="{0:N3}" maxLength="20" width="90" align="right"/>
<EF:EFColumn ename="weight" cname="重量" format="{0:N3}" maxLength="20" width="90" align="right"/>
<EF:EFColumn ename="remark" cname="备注" width="150" readonly="true"/>
......
src/main/webapp/HP/KC/HPKC005.jsp
......@@ -29,6 +29,14 @@
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="spec_name_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" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
</EF:EFDateSpan>
<EF:EFSelect cname="是否删除" ename="inqu_status-0-deleteFlag" colWidth="3" defaultValue="0">
<EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hpjx.hpjx.deleteFlag"/>
</EF:EFSelect>
</div>
</EF:EFRegion>
......@@ -58,7 +66,7 @@
align="right" sumType="all" readonly="true"/>
<EF:EFColumn ename="remark" cname="备注" width="150" readonly="true"/>
<EF:EFColumn ename="createdName" cname="创建人" enable="false" width="100" align="center"/>
<EF:EFColumn ename="createdTime" cname="创建时刻" enable="false" width="140" align="center"
<EF:EFColumn ename="createdTime" cname="创建日期" enable="false" width="140" align="center"
editType="datetime" parseFormats="['yyyyMMddHHmmss']"/>
</EF:EFGrid>
<p class="text-info"><span style='color: red;'>注：差异数量=实物数量-账面数量；差异重量=实物重量-账面重量 </span></p>
......
src/main/webapp/HP/KC/HPKC005A.jsp
......@@ -8,8 +8,6 @@
<EF:EFPage title="库存查询">
<EF:EFRegion id="inqu" title="查询区域" type="query">
<div class="row">
<EF:EFDatePicker cname="单据日期" ename="inqu_status-0-receiptDate" colWidth="3"
role="date" format="yyyy-MM-dd" readonly="true"/>
<EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains">
<EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
......@@ -22,8 +20,6 @@
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
</div>
<div class="row">
<EF:EFSelect ename="inqu_status-0-spec" cname="规格" colWidth="3" filter="contains">
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="spec_name_block_id" textField="textField" valueField="valueField"/>
......
src/main/webapp/HP/KC/HPKC006.jsp
......@@ -29,6 +29,16 @@
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="spec_name_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" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
</EF:EFDateSpan>
</div>
<div class="row">
<EF:EFSelect cname="是否删除" ename="inqu_status-0-deleteFlag" colWidth="3" defaultValue="0">
<EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hpjx.hpjx.deleteFlag"/>
</EF:EFSelect>
</div>
</EF:EFRegion>
......@@ -50,8 +60,8 @@
<EF:EFColumn ename="weight" cname="重量" format="{0:N3}" maxLength="20" width="100" align="right"
sumType="all" required="true" readonly="true"/>
<EF:EFColumn ename="remark" cname="备注" width="150" maxLength="255" readonly="true"/>
<EF:EFColumn ename="createdBy" cname="创建人" enable="false" width="100" align="center"/>
<EF:EFColumn ename="createdTime" cname="创建时刻" enable="false" width="140" align="center"
<EF:EFColumn ename="createdName" cname="创建人" enable="false" width="100" align="center"/>
<EF:EFColumn ename="createdTime" cname="创建日期" enable="false" width="140" align="center"
editType="datetime" parseFormats="['yyyyMMddHHmmss']"/>
</EF:EFGrid>
</EF:EFRegion>
......
src/main/webapp/HP/KC/HPKC007.jsp
......@@ -29,6 +29,16 @@
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="spec_name_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" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
</EF:EFDateSpan>
</div>
<div class="row">
<EF:EFSelect cname="是否删除" ename="inqu_status-0-deleteFlag" colWidth="3" defaultValue="0">
<EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hpjx.hpjx.deleteFlag"/>
</EF:EFSelect>
</div>
</EF:EFRegion>
......@@ -59,7 +69,7 @@
align="right" sumType="all" required="true"/>
<EF:EFColumn ename="remark" cname="备注" enable="false" width="150"/>
<EF:EFColumn ename="createdName" cname="创建人" enable="false" width="100" align="center"/>
<EF:EFColumn ename="createdTime" cname="创建时刻" enable="false" width="140" align="center"
<EF:EFColumn ename="createdTime" cname="创建日期" enable="false" width="140" align="center"
editType="datetime" parseFormats="['yyyyMMddHHmmss']"/>
</EF:EFGrid>
</EF:EFRegion>
......
src/main/webapp/HP/KC/HPKC007A.jsp
......@@ -8,8 +8,6 @@
<EF:EFPage title="库存查询">
<EF:EFRegion id="inqu" title="查询区域" type="query">
<div class="row">
<EF:EFDatePicker cname="单据日期" ename="inqu_status-0-receiptDate" colWidth="3"
role="date" format="yyyy-MM-dd" readonly="true"/>
<EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains">
<EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('1', '2', '5')"/>
......@@ -22,8 +20,6 @@
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
</div>
<div class="row">
<EF:EFSelect ename="inqu_status-0-spec" cname="规格" colWidth="3" filter="contains">
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="spec_name_block_id" textField="textField" valueField="valueField"/>
......
src/main/webapp/HP/PZ/HPPZ009.jsp
......@@ -17,15 +17,15 @@
<EF:EFGrid blockId="result" autoDraw="override" checkMode="row">
<EF:EFColumn ename="id" cname="主键" hidden="true"/>
<EF:EFColumn cname="企业编码" ename="companyCode" enable="false" width="120" align="center"/>
<EF:EFColumn cname="企业名称" ename="companyName" width="140" editType="textarea" required="true"/>
<EF:EFColumn cname="企业名称" ename="companyName" width="140" required="true"/>
<EF:EFComboColumn cname="是否启用" ename="validFlag" width="80" align="center" required="true">
<EF:EFCodeOption codeName="hpjx.hppz.validFlag"/>
</EF:EFComboColumn>
<EF:EFColumn cname="备注" ename="remark" width="150" editType="textarea"/>
<EF:EFColumn cname="创建人名称" ename="createdName" enable="false" align="center"/>
<EF:EFColumn cname="创建人" ename="createdName" enable="false" align="center"/>
<EF:EFColumn cname="创建时间" ename="createdTime" enable="false" width="140" align="center"
editType="datetime" parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"/>
<EF:EFColumn cname="修改人名称" ename="updatedName" enable="false" align="center"/>
<EF:EFColumn cname="修改人" ename="updatedName" enable="false" align="center"/>
<EF:EFColumn cname="修改时间" ename="updatedTime" enable="false" width="140" align="center"
editType="datetime" parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"/>
</EF:EFGrid>
......
src/main/webapp/HP/SC/HPSC002A.js
......@@ -5,7 +5,7 @@ $(function () {
field: "operator",
template: function (item) {
let template = '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+ 'href="' + IPLATUI.CONTEXT_PATH + '/EU/DM/EUDM06.jsp?docId=' + item.filePath
+ 'href="' + IPLATUI.CONTEXT_PATH + '/EU/DM/EUDM06.jsp?docId=' + item.docId
+ '" >附件下载</a>';
return template;
}
......@@ -15,33 +15,6 @@ $(function () {
}
};
// 关闭事件
IPLATUI.EFWindow = {
"uploadFile": {
close: function (e) {
let $iframe = uploadFileWindow.element.children("iframe");
let iframejQuery = $iframe[0].contentWindow.$; // 子窗口中的jQuery对象
let uploadFile = iframejQuery("#fileDocId").val();
if (isBlank(uploadFile)) {
return;
}
let inEiInfo = new EiInfo();
inEiInfo.set("result-0-matId", $("#inqu_status-0-matId").val());
inEiInfo.set("result-0-docId", uploadFile);
EiCommunicator.send('HPSC002A', 'insert', inEiInfo, {
onSuccess(response) {
resultGrid.dataSource.page(1);
},
onFail(errorMessage, status, e) {
NotificationUtil("执行失败！", "error");
}
}, {
async: false
});
}
}
};
$("#ef_form_head").hide();
// 查询
......@@ -72,9 +45,37 @@ var query = function (e) {
/**
* 文件上传
*
* @param id
*/
function uploadFile() {
uploadFileWindow.open().center();
function uploadFile(id) {
JSColorbox.open({
href: "HPSC099?methodName=initLoad",
title: "<div style='text-align: center;'>附件上传</div>",
width: "60%",
height: "70%",
callbackName: uploadFileCallback
});
}
/**
* 附件上传回调
*
* @param docId
*/
function uploadFileCallback(docId) {
let inEiInfo = new EiInfo();
inEiInfo.set("result-0-matId", $("#inqu_status-0-matId").val());
inEiInfo.set("result-0-docId", docId);
EiCommunicator.send('HPSC002A', 'insert', inEiInfo, {
onSuccess(response) {
resultGrid.dataSource.page(1);
},
onFail(errorMessage, status, e) {
NotificationUtil("执行失败！", "error");
}
}, {
async: false
});
}
/**
......
src/main/webapp/HP/SC/HPSC002A.jsp
......@@ -28,8 +28,4 @@
<EF:EFColumn ename="operator" cname="操作" enable="false" width="200" align="center"/>
</EF:EFGrid>
</EF:EFRegion>
<%-- EEDM8010页面加载时，不会加载EEDM6000 (lazyload="true") --%>
<EF:EFWindow id="uploadFile" url="${ctx}/web/HPSC099" lazyload="true" refresh="true">
</EF:EFWindow>
</EF:EFPage>
src/main/webapp/HP/SC/HPSC003.js
......@@ -109,11 +109,9 @@ $(function () {
template: function (item) {
let filePath1 = item.filePath1;
let template = '';
if (filePath1 === ' ') {
template = '';
} else {
template = '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
'href="'+ctx+'/EU/DM/EUDM06.jsp?docId=' + filePath1 + '" >下载</a>';
if (filePath1) {
template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+ 'onclick="showUploadFile(' + filePath1 + ')" >附件清单</a>';
}
return template
}
......@@ -124,6 +122,15 @@ $(function () {
}
});
function showUploadFile(id) {
JSColorbox.open({
href: "HPSC002B?methodName=initLoad&inqu_status-0-id=" + id,
title: "<div style='text-align: center;'>附件清单</div>",
width: "80%",
height: "80%",
});
}
function check(id, auditStatus) {
const inEiInfo = new EiInfo();
inEiInfo.set("id", id);
......
src/main/webapp/HP/SC/HPSC003.jsp
......@@ -35,7 +35,9 @@
<EF:EFColumn enable="false" ename="projCode" cname="项目号" readonly="true"/>
<EF:EFColumn enable="false" ename="projName" cname="项目名称" readonly="true"/>
<EF:EFColumn enable="false" ename="planInfoNo" cname="生产计划单号" readonly="true"/>
<EF:EFColumn enable="false" ename="prdtType" cname="产品类型" readonly="true"/>
<EF:EFComboColumn ename="prdtType" cname="产品类型" width="90" align="center" enable="false">
<EF:EFCodeOption codeName="hpjx.hpkc.inventType" />
</EF:EFComboColumn>
<EF:EFColumn enable="false" ename="prdtCode" cname="产品编码" readonly="true"/>
<EF:EFColumn enable="false" ename="prdtName" cname="产品名称" readonly="true"/>
<EF:EFColumn ename="planCompletionDate" cname="计划完成日期" editType="date" dateFormat="yyyy/MM/dd" width="150"
......@@ -53,8 +55,10 @@
<EF:EFRegion id="detail" title="明细信息">
<EF:EFGrid blockId="detail" autoDraw="no">
<EF:EFColumn ename="id" cname="主键" hidden="true"/>
<EF:EFColumn enable="false" ename="prdtType" cname="部件类型" readonly="true"/>
<EF:EFColumn enable="false" ename="prdtCode" required='true' cname="部件编码"/>
<EF:EFComboColumn ename="prdtType" cname="部件类型" width="90" align="center" readonly="true">
<EF:EFCodeOption codeName="hpjx.hpkc.inventType" />
</EF:EFComboColumn>
<EF:EFColumn enable="false" ename="prdtCode" cname="部件编码"/>
<EF:EFColumn enable="false" ename="prdtName" readonly="true" cname="部件名称"/>
<EF:EFComboColumn enable="false" ename="delStatus" cname="状态">
<EF:EFOption label="已删除" value="0"/>
......@@ -62,9 +66,9 @@
</EF:EFComboColumn>
<EF:EFColumn enable="false" ename="num" readonly="true" cname="计划数量"/>
<EF:EFColumn enable="false" ename="unitWt" readonly="true" cname="计划重量"/>
<EF:EFColumn ename="planCommentDate" cname="计划开始时间" editType="date" dateFormat="yyyy/MM/dd" width="150"
<EF:EFColumn ename="planCommentDate" required='true' cname="计划开始时间" editType="date" dateFormat="yyyy/MM/dd" width="150"
/>
<EF:EFColumn ename="planCompletionDate" cname="计划结束时间" editType="date" dateFormat="yyyy/MM/dd" width="150"
<EF:EFColumn ename="planCompletionDate" required='true' cname="计划结束时间" editType="date" dateFormat="yyyy/MM/dd" width="150"
/>
<EF:EFColumn ename="actualCompletionDate" cname="实际完成时间" editType="date" dateFormat="yyyy/MM/dd" width="150"
enable="false"/>
......
src/main/webapp/HP/SC/HPSC005.js
......@@ -46,11 +46,9 @@ $(function () {
template: function (item) {
let filePath1 = item.filePath1;
let template = '';
if (filePath1 === ' ') {
template = '';
} else {
template = '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
'href="'+ctx+'/EU/DM/EUDM06.jsp?docId=' + filePath1 + '" >下载</a>';
if (filePath1) {
template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+ 'onclick="showUploadFile(' + filePath1 + ')" >附件清单</a>';
}
return template
}
......@@ -58,7 +56,14 @@ $(function () {
],
}
});
function showUploadFile(id) {
JSColorbox.open({
href: "HPSC002B?methodName=initLoad&inqu_status-0-id=" + id,
title: "<div style='text-align: center;'>附件清单</div>",
width: "80%",
height: "80%",
});
}
let assignCallback = function (orgId) {
var info = new EiInfo()
info.set("ids",ids.join(','));
......
src/main/webapp/HP/SC/HPSC099.js
......@@ -4,10 +4,18 @@ $(function () {
IPLATUI.EFUpload = {
uploadFile: {
success: function(e) {
$("#fileDocId").val(e.response.docId);
let docId = e.response.docId;
if (isBlank(docId)) {
return;
}
$("#fileDocId").val(docId);
NotificationUtil("附件上传成功");
console.log($("#fileDocId").val())
try {
parent.JSColorbox.setValueCallback(docId);
} catch (e){
}
},
}
};
});
\ No newline at end of file
});
src/main/webapp/HP/SC/HPSC099.jsp
......@@ -4,16 +4,10 @@
<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
<c:set var="ctx" value="${pageContext.request.contextPath}"/>
<head>
<%-- <link rel="stylesheet" href="${ctx}/css/simulatedOperation.css"/>--%>
</head>
<EF:EFPage title="附件上传">
<EF:EFRegion id="result">
<EF:EFUpload blockId="result" ename="uploadFile" docTag="hk_file11" path="A"/>
</EF:EFRegion>
<EF:EFInput ename="fileDocId" cname="" hidden="true"/>
</EF:EFPage>
<script>
var ctx = "${ctx}";
</script>
<script src="${ctx}/HP/SC/HPSC099.js"></script>
\ No newline at end of file
src/main/webapp/HP/ZL/HPZL001.js
let rowId;
$(function() {
// 查询
......@@ -43,33 +42,6 @@ $(function() {
}]
}
};
// 关闭事件
IPLATUI.EFWindow = {
"uploadFile": {
close: function (e) {
let $iframe = uploadFileWindow.element.children("iframe");
let iframejQuery = $iframe[0].contentWindow.$; // 子窗口中的jQuery对象
let uploadFile = iframejQuery("#fileDocId").val();
if (isBlank(uploadFile)) {
return;
}
let inEiInfo = new EiInfo();
inEiInfo.set("result-0-id", rowId);
inEiInfo.set("result-0-affix", uploadFile);
EiCommunicator.send('HPZL001', 'bindDocIdById', inEiInfo, {
onSuccess(response) {
resultGrid.dataSource.page(1);
},
onFail(errorMessage, status, e) {
NotificationUtil("执行失败！", "error");
}
}, {
async: false
});
},
}
};
});
/**
......@@ -78,8 +50,29 @@ $(function() {
* @param id
*/
function openUploadFile(id) {
uploadFileWindow.open().center();
rowId = id;
JSColorbox.open({
href: "HPSC099?methodName=initLoad",
title: "<div style='text-align: center;'>附件上传</div>",
width: "60%",
height: "70%",
callbackName: function (docId) {
let inEiInfo = new EiInfo();
inEiInfo.set("result-0-id", id);
inEiInfo.set("result-0-affix", docId);
EiCommunicator.send('HPZL001', 'bindDocIdById', inEiInfo, {
onSuccess(response) {
resultGrid.dataSource.page(1);
// 关闭弹窗
JSColorbox.close();
},
onFail(errorMessage, status, e) {
NotificationUtil("执行失败！", "error");
}
}, {
async: false
});
}
});
}
/**
......
src/main/webapp/HP/ZL/HPZL001.jsp
......@@ -60,7 +60,4 @@
hidden="true"/>
</EF:EFGrid>
</EF:EFRegion>
<%-- EEDM8010页面加载时，不会加载EEDM6000 (lazyload="true") --%>
<EF:EFWindow id="uploadFile" url="${ctx}/web/HPSC099" lazyload="true" refresh="true">
</EF:EFWindow>
</EF:EFPage>
src/main/webapp/XS/XS30.jsp
......@@ -16,7 +16,7 @@
<span class="my-text" id="my-text1">用户管理</span>
</button>
<button id="my-button-2" class="my-button" onclick="switchWindow(1)">
<span class="my-text" id="my-text2">用户组管理</span>
<span class="my-text" id="my-text2">角色管理</span>
</button>
</div>
......
src/main/webapp/XS/XS3001.jsp
......@@ -109,7 +109,7 @@
<div class="col-md-12" style="padding-left: 0;padding-right: 0">
<EF:EFTab id="authInfo" showClose="false">
<div title="所属用户组">
<div title="所属角色">
<EF:EFInput blockId="inqu_status" row="0" ename="userIdForParentGroups" cname="登录账号"
type="hidden"/>
<EF:EFGrid blockId="result1" queryMethod="queryUserParentGroups" autoDraw="no" autoBind="false">
......
src/main/webapp/XS/XS3002.js 0 → 100644
$(function () {
setTimeout(() => {
refreshQuery();
}, 500)
IPLATUI.EFGrid = {
"result": {
pageable: {
pageSize: 20
},
loadComplete: function () {
$('#QUERY').on('click', () => {
refreshQuery();
})
},
onRowClick: function (e) {
getSelectedModel(e)
flashUser(e)
},
onCheckRow: function (e) {
if (e.checked) {
getSelectedModel(e)
flashUser(e)
}
},
toolbarConfig: {
hidden: false
},
},
"resultB": {
pageable: {
pageSize: 20
},
exportGrid: false,
loadComplete: function (grid) {
/**
* 给用户组添加用户，打开弹窗
*/
$('#USERWINDOW').on('click', () => {
if (resultGrid?.getCheckedRows()?.length > 1 || (resultGrid?.getCheckedRows()?.length === 0 && resultGrid.getSelectedData().length !== 1)) {
IPLAT.alert("请在用户组信息中勾选需要添加的1个用户组");
return
}
if (resultGrid?.getCheckedRows()?.length === 1 && resultGrid?.getCheckedRows()[0].id !== lastUserGroupId) {
IPLAT.alert("请确保最后选择的用户组与勾选用户组相同");
return
}
queryUserOutOfUserGroup() && $("#insertUser").data("kendoWindow").open()
})
/**
* 用户组删除用户
*/
$('#DELETEUSER').on('click', () => {
if (resultGrid?.getCheckedRows()?.length > 1 || (resultGrid?.getCheckedRows()?.length === 0 && resultGrid.getSelectedData().length !== 1)) {
IPLAT.alert("请在用户组信息中勾选需要添加的1个用户组");
return
}
if (resultGrid?.getCheckedRows()?.length === 1 && resultGrid?.getCheckedRows()[0].id !== lastUserGroupId) {
IPLAT.alert("请确保最后选择的用户组与勾选用户组相同");
return
}
const parent = resultGrid.getRows(lastSelectedRow)[0];
const users = grid.getCheckedRows();
if (users?.length > 0) {
const okFunc = () => {
var eiInfo = new EiInfo();
var block = new EiBlock("result");
block.getBlockMeta().addMeta(new EiColumn("memberId"));
block.getBlockMeta().addMeta(new EiColumn("memberName"));
block.getBlockMeta().addMeta(new EiColumn("parentId"));
block.getBlockMeta().addMeta(new EiColumn("parentName"));
block.getBlockMeta().addMeta(new EiColumn("memberType"));
const parentId = parent.groupId;
const parentName = parent.groupCname;
const merberType = "USER";
for (let i = 0; i < users.length; i++) {
let user = users[i];
block.setCell(i, "memberId", user.get("userId"));
block.setCell(i, "memberName", user.get("userName"));
block.setCell(i, "parentId", parentId);
block.setCell(i, "parentName", parentName);
block.setCell(i, "memberType", merberType);
}
eiInfo.addBlock(block);
EiCommunicator.send("XS03", "delete", eiInfo, {
onSuccess: function (ei) {
if (-1 == ei.getStatus()) {
IPLAT.alert(ei.getMsg());
} else {
IPLAT.alert(ei.getMsg());
grid.dataSource.page(1);
}
}, onFail: function (ei) {
IPLAT.alert(ei.getMsg());
}
});
}
IPLAT.confirm({
message: '<b>确定删除勾选的用户吗？</b> \n\n <i style="font-size: 12px">注：请优先通知管理员。</i>',
okFn: okFunc,
cancelFn: function (e) {
}
});
} else {
IPLAT.alert("请在用户信息中勾选执行删除的用户")
}
})
},
toolbarConfig: {
add: false,
hidden: false
},
},
"resultC": {
exportGrid: false,
loadComplete: function (grid) {
/**
* 添加用户
*/
$("#ADDUSER").on("click", () => {
const users = grid.getCheckedRows();
if (users?.length > 0) {
const eiInfo = new EiInfo();
const block = new EiBlock("result");
block.getBlockMeta().addMeta(new EiColumn("memberId"));
block.getBlockMeta().addMeta(new EiColumn("memberName"));
block.getBlockMeta().addMeta(new EiColumn("parentId"));
block.getBlockMeta().addMeta(new EiColumn("parentName"));
block.getBlockMeta().addMeta(new EiColumn("memberType"));
const parent = resultGrid.getRows(lastSelectedRow)[0]
const parentId = parent.groupId;
const parentName = parent.groupCname;
const merberType = "USER";
for (let i = 0; i < users.length; i++) {
let user = users[i]
block.setCell(i, "memberId", user.get("userId"));
block.setCell(i, "memberName", user.get("userName"));
block.setCell(i, "parentId", parentId);
block.setCell(i, "parentName", parentName);
block.setCell(i, "memberType", merberType);
}
eiInfo.addBlock(block);
EiCommunicator.send("XS03", "insert", eiInfo, {
onSuccess: function (ei) {
if (-1 == ei.getStatus()) {
IPLAT.alert(ei.getMsg());
} else {
IPLAT.alert(ei.getMsg());
resultBGrid.dataSource.page(1);
}
}, onFail: function (ei) {
IPLAT.alert(ei.getMsg());
}
});
$("#insertUser").data("kendoWindow").close()
} else {
IPLAT.alert("请在用户信息中勾选需要添加的用户");
}
})
$("#QUERY_C").on("click", () => {
queryUserOutOfUserGroup()
})
},
toolbarConfig: {
add: false,
hidden: false
},
},
}
$("#resourceTab").addClass("i-fit-height");
$("#splitter").kendoSplitter({
panes: [
{size: "40%", min: "30%", max: "70%", collapsible: true},
{},
{collapsible: true}
]
});
// 当 EFRegion 的 fitHeight="true" 时，需要为 splitter 中的 k-splitbar 加上 class="i-fit-height"。
$("#splitter").find(".k-splitbar").addClass("i-fit-height");
//加下面的延迟是为了处理 OT数据管理门户下多界面同时刷新 界面展示不全的问题
var interval01 = setInterval(splitterInterval, 200);
function splitterInterval() {
if (document.getElementById("splitter").getElementsByClassName("k-splitbar").length !== 1) {
$("#splitter").kendoSplitter({
panes: [
{size: "40%", min: "30%", max: "70%", collapsible: true},
{},
{collapsible: true}
]
});
} else {
clearInterval(interval01);
}
}
});
function refreshQuery() {
resultGrid.dataSource.page(1);
}
const flashUser = (userGroup) => {
var item = userGroup.model;
$("#inqu_statusB-0-parentName").val(item.groupEname);
$("#inqu_statusB-0-parentId").val(item.groupId);
lastUserGroupId = item.groupId;
resultBGrid.dataSource.page(1);
}
/**
* 查询用户组中不包含的用户
*/
const queryUserOutOfUserGroup = () => {
$("#inqu_status-0-parentId").val(resultGrid.getRows(lastSelectedRow)[0].groupId)
resultCGrid.dataSource.page(1);
return true
}
/**
* 获取最后被点击/勾选的行信息
* @param e
*/
const getSelectedModel = (e) => {
lastUserGroupId = e.model.id;
lastSelectedRow = e.row;
}
let lastUserGroupId = '';// 最后被点击/勾选的用户组id
let lastSelectedRow = null;// 最后被点击/勾选的用户组行index
window.onload = ()=>{
const themeStr = document.body.className
/**
* 重设表格高度
*/
const resetGridHeight = () => {
const orgHeight = $("#usergrouptable")[0].offsetHeight;
if (orgHeight) {
if (~themeStr.indexOf("large")) {
$("#ef_grid_result").css("height", `72vh`)
$("#ef_grid_resultB").css("height", `84vh`)
} else {
$("#ef_grid_result").css("height", `80vh`)
$("#ef_grid_resultB").css("height", `88vh`)
}
$("#XS3002").css("padding","8px 16px 8px")
return
}
setTimeout(() => {
resetGridHeight()
}, 200)
}
resetGridHeight()
}
\ No newline at end of file
src/main/webapp/XS/XS3002.jsp 0 → 100644
<!DOCTYPE html>
<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
<c:set var="ctx" value="${pageContext.request.contextPath}"/>
<EF:EFPage>
<div id="splitter" class="i-fit-height">
<div id="left-pane" class="i-fit-height">
<div class="col-md-12" style="padding-left: 0;padding-right: 8px">
<EF:EFRegion id="userGroupTable" title="角色信息" fitHeight="true">
<%-- <EF:EFRegion id="inqu" title="用户组查询" type="query" efRegionShowClear="true" efRegionSave="true"--%>
<%-- style="padding-left:0;padding-right:0">--%>
<div class="row" id="inquRegion">
<EF:EFInput ename="inqu_status-0-groupEname" cname="角色英文名" placeholder="请输入角色英文名"
colWidth="6"/>
<EF:EFInput ename="inqu_status-0-groupCname" cname="角色中文名" placeholder="请输入角色中文名"
colWidth="6"/>
</div>
<hr>
<%-- </EF:EFRegion>--%>
<%-- <EF:EFRegion id="userGroupTable" title="用户组信息" fitHeight="true">--%>
<EF:EFGrid blockId="result" autoDraw="no" personal="true" autoBind="true">
<EF:EFColumn ename="groupId" cname="用户群组ID" readonly="false" hidden="true" primaryKey="true"/>
<EF:EFColumn ename="groupEname" cname="角色英文名" style="text-align:left;" readonly="true"
required="true" data-regex="/^[@_a-zA-Z0-9]{1,32}$/"
data-errorprompt="对不起,用户组英文名只能是32位英文字母或数字字符或下划线或@符"/>
<EF:EFColumn ename="groupCname" cname="角色中文名" required="true" style="text-align:left;"/>
<EF:EFColumn ename="manageGroupEname" cname="管辖组英文名" style="text-align:left;" hidden="true"/>
<EF:EFColumn ename="manageGroupCname" cname="管辖组中文名" style="text-align:left;" readonly="true"
hidden="true"/>
<EF:EFComboColumn ename="groupType" cname="群组类型" valueField="valueField" textField="textField"
defaultValue="NORMAL" columnTemplate="#=textField#" align="center"
required="true"
hidden="true">
<EF:EFCodeOption codeName="iplat.xs.userGroup"/>
</EF:EFComboColumn>
<EF:EFColumn ename="sortIndex" cname="排序" style="text-align:right;" hidden="true"/>
<EF:EFColumn ename="recCreator" cname="创建人" enable="false" style="text-align:left;"
hidden="true"/>
<EF:EFColumn ename="recCreateTime" cname="创建时间" enable="false" editType="datetime"
parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"
dateFormat="yyyy-MM-dd HH:mm:ss" displayType="datetime" style="text-align:right;"
hidden="true"/>
<EF:EFColumn ename="recRevisor" cname="修改人" enable="false" style="text-align:left;"
hidden="true"/>
<EF:EFColumn ename="recReviseTime" cname="修改时间" enable="false" editType="datetime"
parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"
dateFormat="yyyy-MM-dd HH:mm:ss" displayType="datetime" style="text-align:right;"
hidden="true"/>
<EF:EFColumn ename="archiveFlag" cname="归档标记" style="text-align:right;" hidden="true"/>
</EF:EFGrid>
</EF:EFRegion>
</div>
</div>
<div id="right-pane" class="i-fit-height">
<div class="col-md-12" style="padding-left: 0;padding-right: 0">
<EF:EFRegion id="inquB" title="用户查询" type="query" efRegionShowClear="true" efRegionSave="true"
style="display:none">
<div class="row">
<div style="display: none">
<EF:EFInput type="hidden" cname="父节点ID" ename="parentId" row="0" blockId="inqu_statusB"
name="inqu_statusB-0-parentId" value=""/>
<EF:EFInput type="hidden" cname="父节点名称" ename="parentName" row="0" blockId="inqu_statusB"
name="inqu_statusB-0-parentName" value=""/>
</div>
</div>
</EF:EFRegion>
<EF:EFRegion id="user" title="用户信息" fitHeight="true">
<EF:EFGrid blockId="resultB" autoDraw="no" autoBind="false" queryMethod="queryUserByGroup">
<EF:EFColumn ename="loginName" cname="登录账号" readonly="true" style="text-align:left;"/>
<EF:EFColumn ename="userName" cname="用户姓名" style="text-align:left;" readonly="true"/>
<EF:EFComboColumn ename="gender" cname="性别" valueField="valueField" textField="textField"
columnTemplate="#=textField#" align="center" readonly="true">
<EF:EFCodeOption codeName="xservices.xs.sex"/>
</EF:EFComboColumn>
<EF:EFColumn ename="mobile" style="text-align:right;" cname="手机" data-rules="mobile_phone"
readonly="true"/>
<EF:EFColumn ename="email" cname="邮箱" data-rules="email" style="text-align:left;"
readonly="true"/>
<EF:EFColumn ename="userId" cname="用户ID" readonly="false" primaryKey="true" hidden="true"/>
<EF:EFColumn ename="password" cname="用户密码" hidden="true" readonly="true"/>
<EF:EFComboColumn ename="status" cname="状态" style="text-align:center;" hidden="true"
readonly="true">
<EF:EFCodeOption codeName="xservices.xs.userStatus" textField="label" valueField="value"/>
</EF:EFComboColumn>
<EF:EFComboColumn ename="isLocked" cname="是否锁定" style="text-align:center;" hidden="true"
readonly="true">
<EF:EFCodeOption codeName="xservices.xs.userIsLocked" textField="label" valueField="value"/>
</EF:EFComboColumn>
<EF:EFComboColumn ename="status" cname="用户状态" style="text-align:center;" hidden="true"
readonly="true">
<EF:EFCodeOption codeName="xservices.xs.userStatus" textField="label" valueField="value"/>
</EF:EFComboColumn>
<EF:EFComboColumn ename="userType" cname="用户类别" style="text-align:center;" hidden="true"
readonly="true">
<EF:EFCodeOption codeName="xservices.xs.userType" textField="label" valueField="value"/>
</EF:EFComboColumn>
<EF:EFColumn ename="accountExpireDate" style="text-align:right;" cname="账号过期时间" editType="date"
displayType="date" parseFormats="['yyyyMMdd','yyyy-MM-dd']" dateFormat="yyyy-MM-dd"
hidden="true" readonly="true"/>
<EF:EFColumn ename="pwdExpireDate" style="text-align:right;" cname="密码过期时间" editType="date"
displayType="date" parseFormats="['yyyyMMdd','yyyy-MM-dd']" dateFormat="yyyy-MM-dd"
readonly="true" hidden="true"/>
<EF:EFColumn ename="recCreator" cname="创建人" enable="false" style="text-align:left;"
hidden="true"
readonly="true"/>
<EF:EFColumn ename="recCreateTime" style="text-align:right;" cname="创建时间" editType="datetime"
parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"
dateFormat="yyyy-MM-dd HH:mm:ss"
displayType="datetime" readonly="true" hidden="true"/>
<EF:EFColumn ename="recRevisor" cname="修改人" enable="false" style="text-align:left;"
hidden="true"
readonly="true"/>
<EF:EFColumn ename="recReviseTime" style="text-align:right;" cname="修改时间" editType="datetime"
parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"
dateFormat="yyyy-MM-dd HH:mm:ss"
displayType="datetime" readonly="true" hidden="true"/>
<EF:EFColumn ename="pwdReviseDate" cname="密码修改时间" readonly="true" editType="datetime"
parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']" displayType="datetime"
enable="false" hidden="true"
style="text-align:right;"/>
<EF:EFColumn ename="pwdRevisor" cname="密码修改人" enable="false" style="text-align:left;"
hidden="true"
readonly="true"/>
<EF:EFColumn ename="archiveFlag" cname="归档标记" style="text-align:right;" hidden="true"
readonly="true"/>
</EF:EFGrid>
</EF:EFRegion>
<EF:EFWindow id="insertUser" top="100px" left="280px" width="58%" height="75%">
<EF:EFRegion id="inquC" title="查询条件" type="query" efRegionShowClear="true" efRegionSave="true">
<div class="row">
<EF:EFInput ename="inqu_status-0-loginName" cname="登录账号" placeholder="请输入登录账号"
colWidth="6"/>
<EF:EFInput ename="inqu_status-0-userName" cname="用户姓名" placeholder="请输入用户姓名" colWidth="6"/>
<div class="col-xs-9" style="text-align: right" id="inqu_inside"></div>
</div>
<EF:EFInput type="hidden" cname="父节点ID" ename="parentId" row="0" blockId="inqu_status"
name="inqu_status-0-parentId" value=""/>
</EF:EFRegion>
<EF:EFRegion id="resultC" title="用户信息">
<EF:EFGrid blockId="resultC" autoDraw="no" autoBind="false"
queryMethod="queryUserOutOfUserGroup">
<EF:EFColumn ename="loginName" cname="登录账号" readonly="true" style="text-align:left;"/>
<EF:EFColumn ename="userName" cname="用户姓名" style="text-align:left;" readonly="true"/>
<EF:EFComboColumn ename="gender" cname="性别" valueField="valueField" textField="textField"
columnTemplate="#=textField#" align="center" readonly="true">
<EF:EFCodeOption codeName="xservices.xs.sex"/>
</EF:EFComboColumn>
<EF:EFColumn ename="mobile" style="text-align:right;" cname="手机" data-rules="mobile_phone"
readonly="true"/>
<EF:EFColumn ename="email" cname="邮箱" data-rules="email" style="text-align:left;"
readonly="true"/>
<EF:EFColumn ename="userId" cname="用户ID" readonly="false" primaryKey="true" hidden="true"/>
<EF:EFColumn ename="password" cname="用户密码" hidden="true" readonly="true"/>
<EF:EFComboColumn ename="status" cname="状态" style="text-align:center;" hidden="true"
readonly="true">
<EF:EFCodeOption codeName="xservices.xs.userStatus" textField="label"
valueField="value"/>
</EF:EFComboColumn>
<EF:EFComboColumn ename="isLocked" cname="是否锁定" style="text-align:center;" hidden="true"
readonly="true">
<EF:EFCodeOption codeName="xservices.xs.userIsLocked" textField="label"
valueField="value"/>
</EF:EFComboColumn>
<EF:EFComboColumn ename="status" cname="用户状态" style="text-align:center;" hidden="true"
readonly="true">
<EF:EFCodeOption codeName="xservices.xs.userStatus" textField="label"
valueField="value"/>
</EF:EFComboColumn>
<EF:EFComboColumn ename="userType" cname="用户类别" style="text-align:center;" hidden="true"
readonly="true">
<EF:EFCodeOption codeName="xservices.xs.userType" textField="label" valueField="value"/>
</EF:EFComboColumn>
<EF:EFColumn ename="accountExpireDate" style="text-align:right;" cname="账号过期时间"
editType="date"
displayType="date" parseFormats="['yyyyMMdd','yyyy-MM-dd']"
dateFormat="yyyy-MM-dd"
hidden="true" readonly="true"/>
<EF:EFColumn ename="pwdExpireDate" style="text-align:right;" cname="密码过期时间" editType="date"
displayType="date" parseFormats="['yyyyMMdd','yyyy-MM-dd']"
dateFormat="yyyy-MM-dd"
readonly="true" hidden="true"/>
<EF:EFColumn ename="recCreator" cname="创建人" enable="false" style="text-align:left;"
hidden="true"
readonly="true"/>
<EF:EFColumn ename="recCreateTime" style="text-align:right;" cname="创建时间"
editType="datetime"
parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"
dateFormat="yyyy-MM-dd HH:mm:ss"
displayType="datetime" readonly="true" hidden="true"/>
<EF:EFColumn ename="recRevisor" cname="修改人" enable="false" style="text-align:left;"
hidden="true"
readonly="true"/>
<EF:EFColumn ename="recReviseTime" style="text-align:right;" cname="修改时间"
editType="datetime"
parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"
dateFormat="yyyy-MM-dd HH:mm:ss"
displayType="datetime" readonly="true" hidden="true"/>
<EF:EFColumn ename="pwdReviseDate" cname="密码修改时间" readonly="true" editType="datetime"
parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']" displayType="datetime"
enable="false" hidden="true"
style="text-align:right;"/>
<EF:EFColumn ename="pwdRevisor" cname="密码修改人" enable="false" style="text-align:left;"
hidden="true"
readonly="true"/>
<EF:EFColumn ename="archiveFlag" cname="归档标记" style="text-align:right;" hidden="true"
readonly="true"/>
</EF:EFGrid>
</EF:EFRegion>
</EF:EFWindow>
</div>
</div>
</div>
</EF:EFPage>
src/main/webapp/XS/XS32.jsp
......@@ -13,7 +13,7 @@
<div class="my-head">
<div id="my-front">
<button id="my-button-1" class="my-button" onclick="switchWindow(1)">
<span class="my-text" id="my-text1">用户组授权</span>
<span class="my-text" id="my-text1">角色授权</span>
</button>
<%--<button id="my-button-2" class="my-button" onclick="switchWindow(2)">
<span class="my-text" id="my-text2">资源授权</span>
......
src/main/webapp/XS/XS3201.jsp
......@@ -28,13 +28,13 @@
<div id="splitter" class="i-fit-height">
<div id="left-pane" class="i-fit-height">
<div class="col-md-12" style="padding-left: 0;padding-right: 8px">
<EF:EFRegion id="inqu" title="用户组信息" style="padding-left:0;padding-right:0" fitHeight="true">
<EF:EFRegion id="inqu" title="角色信息" style="padding-left:0;padding-right:0" fitHeight="true">
<%-- <EF:EFRegion id="inqu" title="用户组查询" type="query" efRegionShowClear="true" efRegionSave="true"--%>
<%-- style="padding-left:0;padding-right:0">--%>
<div class="row" id="inquRegion">
<EF:EFInput ename="inqu_status-0-groupEname" cname="用户组英文名" placeholder="请输入用户组英文名"
<EF:EFInput ename="inqu_status-0-groupEname" cname="角色英文名" placeholder="请输入角色英文名"
colWidth="6"/>
<EF:EFInput ename="inqu_status-0-groupCname" cname="用户组中文名" placeholder="请输入用户组中文名"
<EF:EFInput ename="inqu_status-0-groupCname" cname="角色中文名" placeholder="请输入角色中文名"
colWidth="6"/>
</div>
<hr>
......@@ -44,10 +44,10 @@
<EF:EFGrid blockId="result" autoDraw="no" serviceName="XS02" personal="true" checkMode="single">
<EF:EFColumn ename="groupId" cname="用户群组ID" readonly="false" hidden="true"
primaryKey="true"/>
<EF:EFColumn ename="groupEname" cname="用户组英文名" style="text-align:left;" readonly="true"
<EF:EFColumn ename="groupEname" cname="角色英文名" style="text-align:left;" readonly="true"
data-regex="/^[@_a-zA-Z0-9]{1,32}$/"
data-errorprompt="对不起,用户组英文名只能是32位英文字母或数字字符或下划线或@符"/>
<EF:EFColumn ename="groupCname" cname="用户组中文名" style="text-align:left;" readonly="true"/>
data-errorprompt="对不起,角色英文名只能是32位英文字母或数字字符或下划线或@符"/>
<EF:EFColumn ename="groupCname" cname="角色中文名" style="text-align:left;" readonly="true"/>
<EF:EFColumn ename="manageGroupEname" cname="管辖组英文名" style="text-align:left;"
hidden="true"/>
<EF:EFColumn ename="manageGroupCname" cname="管辖组中文名" style="text-align:left;"
......@@ -92,7 +92,7 @@
</EF:EFRegion>
<hr style="margin-top: 4px">
<div class="i-region-header" style="padding-left: 8px; display: flex;">
<span>用户组成员</span>
<span>角色成员</span>
</div>
<%-- <EF:EFRegion id="userTable" title="用户组成员" style="overflow-y:auto">--%>
<EF:EFGrid blockId="resultB" autoDraw="false" autoBind="false" serviceName="XS3002"
......
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