Skip to content

H
hg-smart
Commit 582ecd3b by liuyang
Options

1.项目立项添加销售计划单号

parent 70be0a03
Showing with 63 additions and 10 deletions
src/main/java/com/baosight/hggp/common/DdynamicEnum.java
......@@ -405,6 +405,13 @@ public enum DdynamicEnum {
*/
ITEM_CODE_BLOCK_ID("itemCode_block_id","itemCode","itemName","itemModel","itemType","itemUnit","invQty","whCode","whName","HGBG001.queryItemCodeBox"),
/**
* 模块：销售管理
* 用途：销售计划单号下拉框
* 编写：ly
*/
PLAN_SALES_CODE_BLOCK_ID("planSalesCode_block_id","planSalesCode","planSalesCode","HGPZ018.queryPlanSalesCode"),
;
......
src/main/java/com/baosight/hggp/hg/sc/domain/HGSC001.java
......@@ -53,6 +53,7 @@ public class HGSC001 extends DaoEPBase {
public static final String FIELD_end_date = "endDate"; /* 完工日期*/
public static final String FIELD_project_source = "projectSource"; /* 项目来源*/
public static final String FIELD_branch_unit = "branchUnit"; /*分子单位*/
public static final String FIELD_PLAN_SALES_CODE = "planSalesCode"; /* 销售计划单号*/
public static final String COL_id = "id";
public static final String COL_account_code = "account_code"; /* 帐套*/
......@@ -122,6 +123,7 @@ public class HGSC001 extends DaoEPBase {
private String endDate = " "; /* 完工日期*/
private String projectSource = " "; /* 项目来源*/
private String branchUnit = " "; /*分支单位*/
private String planSalesCode = " "; /* 销售计划单号*/
/**
* initialize the metadata.
......@@ -254,7 +256,9 @@ public class HGSC001 extends DaoEPBase {
eiColumn.setDescName("分支单位");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PLAN_SALES_CODE);
eiColumn.setDescName("销售计划单号");
eiMetadata.addMeta(eiColumn);
}
/**
......@@ -753,6 +757,14 @@ public class HGSC001 extends DaoEPBase {
this.branchUnit = branchUnit;
}
public String getPlanSalesCode() {
return planSalesCode;
}
public void setPlanSalesCode(String planSalesCode) {
this.planSalesCode = planSalesCode;
}
/**
* get the value from Map.
*
......@@ -792,6 +804,7 @@ public class HGSC001 extends DaoEPBase {
setEndDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_end_date)), endDate));
setProjectSource(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_project_source)), projectSource));
setBranchUnit(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_branch_unit)), branchUnit));
setPlanSalesCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PLAN_SALES_CODE)), planSalesCode));
}
/**
......@@ -832,6 +845,7 @@ public class HGSC001 extends DaoEPBase {
map.put(FIELD_end_date, StringUtils.toString(endDate, eiMetadata.getMeta(FIELD_end_date)));
map.put(FIELD_project_source, StringUtils.toString(projectSource, eiMetadata.getMeta(FIELD_project_source)));
map.put(FIELD_branch_unit, StringUtils.toString(branchUnit, eiMetadata.getMeta(FIELD_branch_unit)));
map.put(FIELD_PLAN_SALES_CODE, StringUtils.toString(planSalesCode, eiMetadata.getMeta(FIELD_PLAN_SALES_CODE)));
return map;
}
......
src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC001.java
......@@ -50,7 +50,7 @@ public class ServiceHGSC001 extends ServiceBase {
// inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGSC001().eiMetadata);
Map map = new HashMap();
map.put(HGSC001.FIELD_account_code, UserSessionUtils.getAccountCode());
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROJ_TYPE_BLOCK_ID,DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID), map,false);
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROJ_TYPE_BLOCK_ID,DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID,DdynamicEnum.PLAN_SALES_CODE_BLOCK_ID), map,false);
} catch (PlatException e) {
LogUtils.setDetailMsg(inInfo, e, "初始化失败");
}
......
src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC001C.java
......@@ -40,7 +40,7 @@ public class ServiceHGSC001C extends ServiceBase {
inInfo.addBlock(CommonConstant.Field.DETAIL).addBlockMeta(new HGSC001A().eiMetadata);
Map map = new HashMap();
map.put(HGSC001.FIELD_account_code, UserSessionUtils.getAccountCode());
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROJ_TYPE_BLOCK_ID), map,false);
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROJ_TYPE_BLOCK_ID,DdynamicEnum.PLAN_SALES_CODE_BLOCK_ID), map,false);
EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
EiInfoUtils.addBlock(inInfo,"userAll", HGXSTools.XsUser.listAll(UserSessionUtils.getAccountCode()), User.class);
Map map1 = new HashMap<>();
......
src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC001D.java
......@@ -42,7 +42,7 @@ public class ServiceHGSC001D extends ServiceBase {
EiInfoUtils.addBlock(inInfo,CommonConstant.Field.DETAIL, hgsc001AList, HGSC001A.class);
Map map = new HashMap();
map.put(HGSC001.FIELD_account_code, UserSessionUtils.getAccountCode());
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROJ_TYPE_BLOCK_ID), map,false);
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROJ_TYPE_BLOCK_ID,DdynamicEnum.PLAN_SALES_CODE_BLOCK_ID), map,false);
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID), map,false);
EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
EiInfoUtils.addBlock(inInfo,"depByCompany", UserSessionUtils.getDepByCompany((String) resultMap.get(HGSC001.FIELD_company_code)), Dept.class);
......
src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC001U.java
......@@ -41,7 +41,7 @@ public class ServiceHGSC001U extends ServiceBase {
EiInfoUtils.addBlock(inInfo,CommonConstant.Field.DETAIL, hgsc001AList, HGSC001A.class);
Map map = new HashMap();
map.put(HGSC001.FIELD_account_code, UserSessionUtils.getAccountCode());
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROJ_TYPE_BLOCK_ID), map,false);
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROJ_TYPE_BLOCK_ID,DdynamicEnum.PLAN_SALES_CODE_BLOCK_ID), map,false);
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID), map,false);
EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
EiInfoUtils.addBlock(inInfo,"depByCompany", UserSessionUtils.getDepByCompany((String) resultMap.get(HGSC001.FIELD_company_code)), Dept.class);
......
src/main/java/com/baosight/hggp/hg/sc/sql/HGSC001.xml
......@@ -33,7 +33,8 @@
start_date as "startDate", <!-- 开工日期 -->
end_date as "endDate", <!-- 完工日期 -->
project_source as "projectSource", <!-- 项目来源 -->
branch_unit as "branchUnit" <!-- 分公司 -->
branch_unit as "branchUnit", <!-- 分公司 -->
PLAN_SALES_CODE as "planSalesCode"
</sql>
<sql id="condition">
......@@ -122,6 +123,9 @@
<isNotEmpty prepend=" AND " property="branchUnit">
branch_unit = #branchUnit#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="planSalesCode">
PLAN_SALES_CODE = #planSalesCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="custCodes">
(subcontract_code in <iterate close=")" open="(" conjunction="," property="custCodes">#custCodes[]#</iterate>
or genral_contract_code in <iterate close=")" open="(" conjunction="," property="custCodes">#custCodes[]#</iterate>)
......@@ -208,6 +212,9 @@
<isNotEmpty prepend=" AND " property="branchUnit">
A.branch_unit = #branchUnit#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="planSalesCode">
A.PLAN_SALES_CODE = #planSalesCode#
</isNotEmpty>
</sql>
<sql id="customCondition">
......@@ -280,13 +287,14 @@
updated_time, <!-- 更新时间 -->
contract_no, <!-- 合同号 -->
project_source,
branch_unit
branch_unit,
PLAN_SALES_CODE
)
VALUES (#id#, #companyCode#, #companyName#, #depCode#, #depName#, #subcontractCode#, #subcontractName#,
#genralContractCode#, #genralContractName#, #partyPmName#, #partyPmHpone#, #contractName#, #contractWorkTxt#,
#projCode#, #projName#, #projType#, #projStatus#, #approvalStatus#, #permissStartDate#, #startDate#, #endDate#,
#accountCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#,
#contractNo#, #projectSource#, #branchUnit#)
#contractNo#, #projectSource#, #branchUnit#, #planSalesCode#)
<selectKey resultClass="long" keyProperty="id">
SELECT MAX(ID) AS "id" FROM ${hggpSchema}.HGSC001
</selectKey>
......@@ -329,7 +337,8 @@
updated_by = #updatedBy#, <!-- 更新人 -->
updated_name = #updatedName#, <!-- 修改人名称 -->
updated_time = #updatedTime#, <!-- 更新时间 -->
branch_unit = #branchUnit#
branch_unit = #branchUnit#,
PLAN_SALES_CODE = #planSalesCode#
WHERE id = #id#
</update>
......@@ -466,7 +475,8 @@
A.permiss_start_date as "permissStartDate", <!-- 准许开工日期 -->
A.start_date as "startDate", <!-- 开工日期 -->
A.end_date as "endDate", <!-- 完工日期 -->
E.CUST_TYPE_NAME as "branchUnit" <!-- 分公司 -->
E.CUST_TYPE_NAME as "branchUnit", <!-- 分公司 -->
A.PLAN_SALES_CODE as "planSalesCode"
FROM ${hggpSchema}.HGSC001 A
LEFT JOIN ${hggpSchema}.HGPZ001 E ON A.BRANCH_UNIT = E.CUST_TYPE
LEFT JOIN ${hggpSchema}.HGPZ008 B ON A.proj_type = B.NAT_CODE
......
src/main/webapp/HG/SC/HGSC001.jsp
......@@ -47,6 +47,11 @@
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="customer_record_block_id" valueField="valueField" textField="textField"/>
</EF:EFSelect>
<EF:EFSelect ename="inqu_status-0-planSalesCode" cname="销售计划单号" colWidth="3" required="false" filter="contains"
textField="textField" valueField="valueField">
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="planSalesCode_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
</div>
<div class="row" id="more">
<EF:EFDatePicker blockId="inqu_status" row="0" ename="permissStartDate" cname="准许开工日期"
......@@ -63,6 +68,8 @@
<EF:EFColumn ename="id" cname="主键" hidden="true"/>
<EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="100" align="center"
sort="false"/>
<EF:EFColumn ename="planSalesCode" cname="销售计划单号" enable="false" width="120" align="center"
hidden="${fn:contains(requestScope.dynamicColumnAlias, '#planSalesCode#')? false: true}"/>
<EF:EFColumn ename="companyName" cname="公司名称" enable="false" width="120" align="center"
hidden="${fn:contains(requestScope.dynamicColumnAlias, '#companyName#')? false: true}"/>
<EF:EFColumn ename="projCode" cname="项目编码" enable="false" width="120" align="center"
......
src/main/webapp/HG/SC/HGSC001C.jsp
......@@ -17,6 +17,11 @@
textField="textField" valueField="valueField">
<EF:EFOptions blockId="customer1_record_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
<EF:EFSelect ename="result-0-planSalesCode" cname="销售计划单号" colWidth="4" filter="contains"
textField="textField" valueField="valueField">
<EF:EFOption label="-- 请选择 --" value="" />
<EF:EFOptions blockId="planSalesCode_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
<%--<EF:EFInput ename="result-0-depName" cname="部门名称" type="hidden"/>
<EF:EFCascadeSelect cascadeFrom="result-0-companyCode" cname="部门" ename="result-0-depCode" type="hidden"
colWidth="4" required="true" filter="contains" defaultValue=""
......
src/main/webapp/HG/SC/HGSC001D.jsp
......@@ -13,6 +13,11 @@
<EF:EFOption label="-- 请选择 --" value="" />
<EF:EFOptions blockId="roleCompany" valueField="companyCode" textField="companyName"/>
</EF:EFSelect>
<EF:EFSelect ename="result-0-planSalesCode" cname="销售计划单号" colWidth="4" filter="contains"
textField="textField" valueField="valueField">
<EF:EFOption label="-- 请选择 --" value="" />
<EF:EFOptions blockId="planSalesCode_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
<%--<EF:EFInput ename="result-0-depName" cname="部门名称" type="hidden"/>
<EF:EFCascadeSelect cascadeFrom="result-0-companyCode" cname="部门" ename="result-0-depCode"
colWidth="4" required="true" filter="contains" defaultValue=""
......
src/main/webapp/HG/SC/HGSC001U.jsp
......@@ -26,6 +26,11 @@
textField="textField" valueField="valueField">
<EF:EFOptions blockId="customer1_record_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
<EF:EFSelect ename="result-0-planSalesCode" cname="销售计划单号" colWidth="4" filter="contains"
textField="textField" valueField="valueField">
<EF:EFOption label="-- 请选择 --" value="" />
<EF:EFOptions blockId="planSalesCode_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
</div>
<div class="row">
<EF:EFInput ename="result-0-subcontractName" cname="乙方" colWidth="4" required="true" readonly="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