Skip to content

H
hp-smart
Commit d88fba5d by liulei
Options

客户档案、供应商档案优化

parent f346785e
Showing with 189 additions and 11 deletions
src/main/java/com/baosight/hpjx/hp/pz/domain/HPPZ002.java
......@@ -35,6 +35,9 @@ public class HPPZ002 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_COMPANY_NAME = "companyName"; /* 公司*/
public static final String FIELD_HEAD_NAME = "headName"; /* 负责人*/
public static final String FIELD_PHONE_NAME = "phoneName"; /* 负责人联系方式*/
public static final String COL_ID = "ID";
public static final String COL_COMPANY_CODE = "COMPANY_CODE"; /* 企业编码 预留*/
......@@ -50,6 +53,9 @@ public class HPPZ002 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_COMPANY_NAME = "COMPANY_NAME"; /* 公司*/
public static final String HEAD_NAME = "HEAD_NAME"; /* 负责人*/
public static final String PHONE_NAME = "PHONE_NAME"; /* 负责人联系方式*/
public static final String QUERY = "HPPZ002.query";
public static final String COUNT = "HPPZ002.count";
......@@ -71,6 +77,9 @@ public class HPPZ002 extends DaoEPBase {
private String updatedBy = " "; /* 更新人*/
private String updatedName = " "; /* 更新人名称*/
private String updatedTime = " "; /* 更新时间*/
private String companyName = " "; /* 公司*/
private String headName = " "; /* 负责人*/
private String phoneName = " "; /* 负责人联系方式*/
/**
* initialize the metadata.
......@@ -135,6 +144,18 @@ public class HPPZ002 extends DaoEPBase {
eiColumn.setDescName("更新时间");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_COMPANY_NAME);
eiColumn.setDescName("公司");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_HEAD_NAME);
eiColumn.setDescName("负责人");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PHONE_NAME);
eiColumn.setDescName("负责人联系方式");
eiMetadata.addMeta(eiColumn);
}
......@@ -369,6 +390,31 @@ public class HPPZ002 extends DaoEPBase {
public void setUpdatedTime(String updatedTime) {
this.updatedTime = updatedTime;
}
public String getCompanyName() {
return companyName;
}
public void setCompanyName(String companyName) {
this.companyName = companyName;
}
public String getHeadName() {
return headName;
}
public void setHeadName(String headName) {
this.headName = headName;
}
public String getPhoneName() {
return phoneName;
}
public void setPhoneName(String phoneName) {
this.phoneName = phoneName;
}
/**
* get the value from Map.
*
......@@ -391,6 +437,9 @@ public class HPPZ002 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));
setCompanyName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_NAME)), companyName));
setHeadName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_HEAD_NAME)), headName));
setPhoneName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PHONE_NAME)), phoneName));
}
/**
......@@ -414,7 +463,9 @@ public class HPPZ002 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_COMPANY_NAME, StringUtils.toString(companyName, eiMetadata.getMeta(FIELD_COMPANY_NAME)));
map.put(FIELD_HEAD_NAME, StringUtils.toString(headName, eiMetadata.getMeta(FIELD_HEAD_NAME)));
map.put(FIELD_PHONE_NAME, StringUtils.toString(phoneName, eiMetadata.getMeta(FIELD_PHONE_NAME)));
return map;
}
}
src/main/java/com/baosight/hpjx/hp/pz/domain/HPPZ003.java
......@@ -37,6 +37,10 @@ public class HPPZ003 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_COMPANY_NAME = "companyName"; /* 公司*/
public static final String FIELD_HEAD_NAME = "headName"; /* 负责人*/
public static final String FIELD_PHONE_NAME = "phoneName"; /* 负责人联系方式*/
public static final String FIELD_PUT_ADDRESS = "putAddress"; /* 收货地址*/
public static final String COL_ID = "ID";
public static final String COL_COMPANY_CODE = "COMPANY_CODE"; /* 企业编码 预留*/
......@@ -52,6 +56,9 @@ public class HPPZ003 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_COMPANY_NAME = "COMPANY_NAME"; /* 公司*/
public static final String HEAD_NAME = "HEAD_NAME"; /* 负责人*/
public static final String PHONE_NAME = "PHONE_NAME"; /* 负责人联系方式*/
public static final String QUERY = "HPPZ003.query";
public static final String COUNT = "HPPZ003.count";
......@@ -73,6 +80,10 @@ public class HPPZ003 extends DaoEPBase {
private String updatedBy = " "; /* 更新人*/
private String updatedName = " "; /* 更新人名称*/
private String updatedTime = " "; /* 更新时间*/
private String companyName = " "; /* 公司*/
private String headName = " "; /* 负责人*/
private String phoneName = " "; /* 负责人联系方式*/
private String putAddress = " "; /* 收货地址*/
/**
* initialize the metadata.
......@@ -137,6 +148,22 @@ public class HPPZ003 extends DaoEPBase {
eiColumn.setDescName("更新时间");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_COMPANY_NAME);
eiColumn.setDescName("公司");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_HEAD_NAME);
eiColumn.setDescName("负责人");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PHONE_NAME);
eiColumn.setDescName("负责人联系方式");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PUT_ADDRESS);
eiColumn.setDescName("收货地址");
eiMetadata.addMeta(eiColumn);
}
......@@ -371,6 +398,39 @@ public class HPPZ003 extends DaoEPBase {
public void setUpdatedTime(String updatedTime) {
this.updatedTime = updatedTime;
}
public String getCompanyName() {
return companyName;
}
public void setCompanyName(String companyName) {
this.companyName = companyName;
}
public String getHeadName() {
return headName;
}
public void setHeadName(String headName) {
this.headName = headName;
}
public String getPhoneName() {
return phoneName;
}
public void setPhoneName(String phoneName) {
this.phoneName = phoneName;
}
public String getPutAddress() {
return putAddress;
}
public void setPutAddress(String putAddress) {
this.putAddress = putAddress;
}
/**
* get the value from Map.
*
......@@ -393,6 +453,10 @@ public class HPPZ003 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));
setCompanyName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_NAME)), companyName));
setHeadName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_HEAD_NAME)), headName));
setPhoneName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PHONE_NAME)), phoneName));
setPutAddress(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PUT_ADDRESS)), putAddress));
}
/**
......@@ -416,6 +480,10 @@ public class HPPZ003 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_COMPANY_NAME, StringUtils.toString(companyName, eiMetadata.getMeta(FIELD_COMPANY_NAME)));
map.put(FIELD_HEAD_NAME, StringUtils.toString(headName, eiMetadata.getMeta(FIELD_HEAD_NAME)));
map.put(FIELD_PHONE_NAME, StringUtils.toString(phoneName, eiMetadata.getMeta(FIELD_PHONE_NAME)));
map.put(FIELD_PUT_ADDRESS, StringUtils.toString(putAddress, eiMetadata.getMeta(FIELD_PUT_ADDRESS)));
return map;
}
......
src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ002.xml
......@@ -16,7 +16,10 @@
CREATED_TIME as "createdTime", <!-- 创建时间 -->
UPDATED_BY as "updatedBy", <!-- 更新人 -->
UPDATED_NAME as "updatedName", <!-- 更新人名称 -->
UPDATED_TIME as "updatedTime" <!-- 更新时间 -->
UPDATED_TIME as "updatedTime", <!-- 更新时间 -->
COMPANY_NAME as "companyName", <!--公司 -->
HEAD_NAME as "headName", <!--负责人-->
PHONE_NAME as "phoneName" <!--负责人联系方式-->
</sql>
<sql id="condition">
......@@ -45,6 +48,15 @@
<isNotEmpty prepend=" AND " property="status">
STATUS = #status#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="companyName">
COMPANY_NAME LIKE CONCAT('%', #companyName#, '%')
</isNotEmpty>
<isNotEmpty prepend=" AND " property="headName">
HEAD_NAME LIKE CONCAT('%', #headName#, '%')
</isNotEmpty>
<isNotEmpty prepend=" AND " property="phoneName">
PHONE_NAME = #phoneName#
</isNotEmpty>
</sql>
<sql id="order">
......@@ -83,10 +95,14 @@
STATUS, <!-- 状态 0禁用 1启用 -->
CREATED_BY, <!-- 创建人 -->
CREATED_NAME, <!-- 创建人名称 -->
CREATED_TIME <!-- 创建时间 -->
CREATED_TIME, <!-- 创建时间 -->
COMPANY_NAME,
HEAD_NAME,
PHONE_NAME
) VALUES (
#companyCode#, #depCode#, #custType#, #custCode#, #custName#, #address#,
#status#, #createdBy#, #createdName#, #createdTime#
#status#, #createdBy#, #createdName#, #createdTime# , #companyName# , #headName#
, #phoneName#
)
</insert>
......@@ -104,7 +120,10 @@
STATUS = #status#, <!-- 状态 0禁用 1启用 -->
UPDATED_BY = #updatedBy#, <!-- 更新人 -->
UPDATED_NAME = #updatedName#, <!-- 更新人名称 -->
UPDATED_TIME = #updatedTime# <!-- 更新时间 -->
UPDATED_TIME = #updatedTime#, <!-- 更新时间 -->
COMPANY_NAME = #companyName#,
HEAD_NAME = #headName#,
PHONE_NAME = #phoneName#
WHERE ID = #id#
</update>
......
src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ003.xml
......@@ -16,7 +16,11 @@
CREATED_TIME as "createdTime", <!-- 创建时间 -->
UPDATED_BY as "updatedBy", <!-- 更新人 -->
UPDATED_NAME as "updatedName", <!-- 更新人名称 -->
UPDATED_TIME as "updatedTime" <!-- 更新时间 -->
UPDATED_TIME as "updatedTime", <!-- 更新时间 -->
COMPANY_NAME as "companyName", <!--公司 -->
HEAD_NAME as "headName", <!--负责人-->
PHONE_NAME as "phoneName", <!--负责人联系方式-->
PUT_ADDRESS as "putAddress" <!--收货地址-->
</sql>
<sql id="condition">
......@@ -45,6 +49,18 @@
<isNotEmpty prepend=" AND " property="status">
STATUS = #status#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="companyName">
COMPANY_NAME LIKE CONCAT('%', #companyName#, '%')
</isNotEmpty>
<isNotEmpty prepend=" AND " property="headName">
HEAD_NAME LIKE CONCAT('%', #headName#, '%')
</isNotEmpty>
<isNotEmpty prepend=" AND " property="phoneName">
PHONE_NAME = #phoneName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="putAddress">
PUT_ADDRESS = #putAddress#
</isNotEmpty>
</sql>
<sql id="order">
......@@ -82,10 +98,15 @@
STATUS, <!-- 状态 0未启用 1启用 -->
CREATED_BY, <!-- 创建人 -->
CREATED_NAME, <!-- 创建人名称 -->
CREATED_TIME <!-- 创建时间 -->
CREATED_TIME, <!-- 创建时间 -->
COMPANY_NAME,
HEAD_NAME,
PHONE_NAME,
PUT_ADDRESS
) VALUES (
#companyCode#, #depCode#, #custType#, #custCode#, #custName#, #address#,
#status#, #createdBy#, #createdName#, #createdTime#
#status#, #createdBy#, #createdName#, #createdTime# , #companyName# , #headName#
, #phoneName# , #putAddress#
)
</insert>
......@@ -103,7 +124,11 @@
STATUS = #status#, <!-- 状态 0未启用 1启用 -->
UPDATED_BY = #updatedBy#, <!-- 更新人 -->
UPDATED_NAME = #updatedName#, <!-- 更新人名称 -->
UPDATED_TIME = #updatedTime# <!-- 更新时间 -->
UPDATED_TIME = #updatedTime#, <!-- 更新时间 -->
COMPANY_NAME = #companyName#,
HEAD_NAME = #headName#,
PHONE_NAME = #phoneName#,
PUT_ADDRESS = #putAddress#
WHERE ID = #id#
</update>
......
src/main/webapp/HP/PZ/HPPZ002.jsp
......@@ -13,6 +13,10 @@
<EF:EFCodeOption codeName="hpjx.hppz.companyType"/>
</EF:EFSelect>
<EF:EFInput ename="inqu_status-0-custName" cname="供应商名称" colWidth="3" readonly="false"/>
<EF:EFInput ename="inqu_status-0-companyName" cname="公司" colWidth="3" readonly="false"/>
<EF:EFInput ename="inqu_status-0-headName" cname="负责人" colWidth="3" readonly="false"/>
</div>
<div class="row">
<EF:EFSelect ename="inqu_status-0-status" cname="状态" colWidth="3">
<EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hpjx.hpjx.status"/>
......@@ -28,6 +32,9 @@
<EF:EFCodeOption codeName="hpjx.hppz.companyType"/>
</EF:EFComboColumn>
<EF:EFColumn ename="custName" cname="供应商名称" width="100" required="true"/>
<EF:EFColumn ename="companyName" cname="公司" width="100" required="true"/>
<EF:EFColumn ename="headName" cname="负责人" width="100" required="true"/>
<EF:EFColumn ename="phoneName" cname="负责人联系方式" width="100" required="true"/>
<EF:EFColumn ename="address" cname="地址" width="120" required="true"/>
<EF:EFComboColumn ename="status" cname="状态" align="center" width="100" required="true">
<EF:EFCodeOption codeName="hpjx.hpjx.status"/>
......
src/main/webapp/HP/PZ/HPPZ003.jsp
......@@ -12,11 +12,15 @@
<EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hpjx.hppz.companyType"/>
</EF:EFSelect>
<EF:EFInput ename="inqu_status-0-companyName" cname="公司" colWidth="3" readonly="false"/>
<EF:EFInput ename="inqu_status-0-headName" cname="负责人" colWidth="3" readonly="false"/>
<EF:EFSelect ename="inqu_status-0-status" cname="状态" colWidth="3">
<EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hpjx.hpjx.status"/>
</EF:EFSelect>
</div>
</EF:EFRegion>
<EF:EFRegion id="result" title="记录集">
......@@ -27,7 +31,11 @@
<EF:EFCodeOption codeName="hpjx.hppz.companyType"/>
</EF:EFComboColumn>
<EF:EFColumn ename="custName" cname="客户名称" width="120" align="center" required="true"/>
<EF:EFColumn ename="companyName" cname="公司" width="100" required="true"/>
<EF:EFColumn ename="headName" cname="负责人" width="100" required="true"/>
<EF:EFColumn ename="phoneName" cname="负责人联系方式" width="100" required="true"/>
<EF:EFColumn ename="address" cname="地址" width="150" align="center" required="true"/>
<EF:EFColumn ename="phoneName" cname="负责人联系方式" width="100" required="true"/>
<EF:EFComboColumn ename="status" cname="状态" width="100" align="center" required="true">
<EF:EFCodeOption codeName="hpjx.hpjx.status"/>
</EF:EFComboColumn>
......
src/main/webapp/HP/SC/HPSC005C.jsp
......@@ -51,8 +51,8 @@
<EF:EFInput ename="detail-0-actualCompletionTotalWt" cname="完成重量" colWidth="4" readonly="true"/>
</div>
<div class="row">
<EF:EFInput ename="detail-0-planCompletionDate" cname="计划完成日期" colWidth="4" readonly="true"/>
<EF:EFInput ename="detail-0-actualCompletionDate" cname="实际完成时间" colWidth="4" readonly="true"/>
<EF:EFInput ename="detail-0-planCompletionDate" cname="计划完成日期" editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="4" readonly="true"/>
<EF:EFInput ename="detail-0-actualCompletionDate" cname="实际完成时间" editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="4" readonly="true"/>
</div>
</EF:EFRegion>
</EF:EFPage>
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