Skip to content

H
hp-smart
Commit fa1e81c1 by 宋祥
Options

1.库存盘点规格存储ID

parent 60682ab7
Showing with 100 additions and 102 deletions
src/main/java/com/baosight/hpjx/common/CompanyTypeEnum.java
...@@ -40,12 +40,12 @@ public enum CompanyTypeEnum { ...@@ -40,12 +40,12 @@ public enum CompanyTypeEnum {
EiBlock block = new EiBlock("company_type_block_id"); EiBlock block = new EiBlock("company_type_block_id");
List<Map<String,Object>> rows = new ArrayList<Map<String,Object>>(){{ List<Map<String,Object>> rows = new ArrayList<Map<String,Object>>(){{
add(new HashMap<String,Object>(){{ add(new HashMap<String,Object>(){{
put(HPConstants.TEXT_FIELD,GQ.code); put(HPConstants.TEXT_FIELD,GQ.value);
put(HPConstants.VALUE_FIELD,GQ.value); put(HPConstants.VALUE_FIELD,GQ.code);
}}); }});
add(new HashMap<String,Object>(){{ add(new HashMap<String,Object>(){{
put(HPConstants.TEXT_FIELD,MY.code); put(HPConstants.TEXT_FIELD,MY.value);
put(HPConstants.VALUE_FIELD,MY.value); put(HPConstants.VALUE_FIELD,MY.code);
}}); }});
}}; }};
block.setRows(rows); block.setRows(rows);
......
src/main/java/com/baosight/hpjx/common/DdynamicEnum.java
...@@ -37,26 +37,18 @@ public enum DdynamicEnum { ...@@ -37,26 +37,18 @@ public enum DdynamicEnum {
INVENT_NAME_BLOCK_ID("invent_name_block_id","inventCode","inventName","HPPZ004.queryComboBox"), INVENT_NAME_BLOCK_ID("invent_name_block_id","inventCode","inventName","HPPZ004.queryComboBox"),
/** /**
* 模块：存货档案 * 模块：存货档案（存货名称）
* 用途：存货档案下拉框
* 编写：wwl
*/
INVENT_RECORD_BLOCK_ID("invent_record_block_id","id","inventName","HPPZ006.queryComboBox"),
/**
* 模块：存货档案
* 用途：存货档案下拉框 * 用途：存货档案下拉框
* 编写：jhs * 编写：jhs
*/ */
MATERIAL_RECORD_BLOCK_ID("material_record_block_id","inventCode","inventName","HPPZ006.queryMaterialComboBox"), MATERIAL_RECORD_BLOCK_ID("material_record_block_id","inventCode","inventName","HPPZ006.queryMaterialComboBox"),
/** /**
* 模块：存货档案 * 模块：存货档案（规格）
* 用途：存货档案下拉框 * 用途：存货档案下拉框
* 编写：wwl * 编写：wwl
*/ */
INVENT_SPEC_BLOCK_ID("invent_spec_block_id","spec","spec","HPPZ006.queryComboBoxSpec"), INVENT_SPEC_BLOCK_ID("invent_spec_block_id", "id", "spec", "HPPZ006.queryComboBoxSpec"),
/** /**
* 模块：仓库档案 * 模块：仓库档案
......
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC005.java
...@@ -150,6 +150,8 @@ public class ServiceHPKC005 extends ServiceBase { ...@@ -150,6 +150,8 @@ public class ServiceHPKC005 extends ServiceBase {
HPConstant.SequenceId.STATISTICAL_NUMBER)); HPConstant.SequenceId.STATISTICAL_NUMBER));
DaoUtils.insert(HPKC005.INSERT, fKc005); DaoUtils.insert(HPKC005.INSERT, fKc005);
} }
inInfo = this.query(inInfo);
inInfo.setStatus(EiConstant.STATUS_DEFAULT);
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据新增成功!"); inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据新增成功!");
} catch (Exception e) { } catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "新增失败"); LogUtils.setDetailMsg(inInfo, e, "新增失败");
......
src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC005.xml
...@@ -5,14 +5,15 @@ ...@@ -5,14 +5,15 @@
<sql id="column"> <sql id="column">
ID as "id", ID as "id",
COMPANY_CODE as "companyCode", <!-- 企业编码 预留 --> COMPANY_CODE as "companyCode", <!-- 企业编码 预留 -->
DEP_CODE as "depCode", <!-- 部门编码 预留 -->
RECEIPT_DATE as "receiptDate", <!-- 单据日期 --> RECEIPT_DATE as "receiptDate", <!-- 单据日期 -->
STATISTICAL_NUMBER as "statisticalNumber", <!-- 盘点单号 --> STATISTICAL_NUMBER as "statisticalNumber", <!-- 盘点单号 -->
WH_CODE as "whCode", <!-- 仓库编码 --> WH_CODE as "whCode", <!-- 仓库编码 -->
WH_NAME as "whName", <!-- 仓库名称 --> WH_NAME as "whName", <!-- 仓库名称 -->
INVENT_TYPE as "inventType", <!-- 物料类型 --> INVENT_TYPE as "inventType", <!-- 存货类型 -->
INVENT_CODE as "inventCode", <!-- 物料编码 --> INVENT_CODE as "inventCode", <!-- 存货编码 -->
INVENT_NAME as "inventName", <!-- 物料名称 --> INVENT_NAME as "inventName", <!-- 存货名称 -->
SPEC as "spec", <!-- 规格 --> INVENT_RECORD_ID as "inventRecordId", <!-- 存货档案ID -->
BOOK_AMOUNT as "bookAmount", <!-- 账面数量 --> BOOK_AMOUNT as "bookAmount", <!-- 账面数量 -->
BOOK_WEIGHT as "bookWeight", <!-- 账面重量 --> BOOK_WEIGHT as "bookWeight", <!-- 账面重量 -->
ENTITY_AMOUNT as "entityAmount", <!-- 实物数量 --> ENTITY_AMOUNT as "entityAmount", <!-- 实物数量 -->
...@@ -20,12 +21,13 @@ ...@@ -20,12 +21,13 @@
DIFF_AMOUNT as "diffAmount", <!-- 差异数量 --> DIFF_AMOUNT as "diffAmount", <!-- 差异数量 -->
DIFF_WEIGHT as "diffWeight", <!-- 差异重量 --> DIFF_WEIGHT as "diffWeight", <!-- 差异重量 -->
STATUS as "status", <!-- 单据状态 0待审核 1已审核 --> STATUS as "status", <!-- 单据状态 0待审核 1已审核 -->
NOTES as "notes", <!-- 备注 --> REMARK as "remark", <!-- 备注 -->
CREATED_BY as "createdBy", <!-- 创建人 --> CREATED_BY as "createdBy", <!-- 创建人 -->
CREATED_NAME as "createdName", <!-- 创建人名称 -->
CREATED_TIME as "createdTime", <!-- 创建时间 --> CREATED_TIME as "createdTime", <!-- 创建时间 -->
UPDATED_BY as "updatedBy", <!-- 更新人 --> UPDATED_BY as "updatedBy", <!-- 更新人 -->
UPDATED_TIME as "updatedTime", <!-- 更新时间 --> UPDATED_NAME as "updatedName", <!-- 更新人名称 -->
DEP_CODE as "depCode" <!-- 部门编码 --> UPDATED_TIME as "updatedTime" <!-- 更新时间 -->
</sql> </sql>
<sql id="condition"> <sql id="condition">
...@@ -117,32 +119,30 @@ ...@@ -117,32 +119,30 @@
<insert id="insert"> <insert id="insert">
INSERT INTO hpjx.T_HPKC005 ( INSERT INTO hpjx.T_HPKC005 (
COMPANY_CODE, <!-- 企业编码 预留 --> COMPANY_CODE, <!-- 企业编码 预留 -->
DEP_CODE, <!-- 部门编码 预留 -->
RECEIPT_DATE, <!-- 单据日期 --> RECEIPT_DATE, <!-- 单据日期 -->
STATISTICAL_NUMBER, <!-- 盘点单号 --> STATISTICAL_NUMBER, <!-- 盘点单号 -->
WH_CODE, <!-- 仓库编码 --> WH_CODE, <!-- 仓库编码 -->
WH_NAME, <!-- 仓库名称 --> WH_NAME, <!-- 仓库名称 -->
INVENT_TYPE, <!-- 物料类型 --> INVENT_TYPE, <!-- 存货类型 -->
INVENT_CODE, <!-- 物料编码 --> INVENT_CODE, <!-- 存货编码 -->
INVENT_NAME, <!-- 物料名称 --> INVENT_NAME, <!-- 存货名称 -->
SPEC, <!-- 规格 --> INVENT_RECORD_ID, <!-- 存货档案ID -->
BOOK_AMOUNT, <!-- 账面数量 --> BOOK_AMOUNT, <!-- 账面数量 -->
BOOK_WEIGHT, <!-- 账面重量 --> BOOK_WEIGHT, <!-- 账面重量 -->
ENTITY_AMOUNT, <!-- 实物数量 --> ENTITY_AMOUNT, <!-- 实物数量 -->
ENTITY_WEIGHT, <!-- 实物重量 --> ENTITY_WEIGHT, <!-- 实物重量 -->
DIFF_AMOUNT, <!-- 差异数量 --> DIFF_AMOUNT, <!-- 差异数量 -->
DIFF_WEIGHT, <!-- 差异重量 --> DIFF_WEIGHT, <!-- 差异重量 -->
STATUS, <!-- 单据状态 0待审核 1已审核 --> REMARK, <!-- 备注 -->
NOTES, <!-- 备注 -->
CREATED_BY, <!-- 创建人 --> CREATED_BY, <!-- 创建人 -->
CREATED_TIME, <!-- 创建时间 --> CREATED_NAME, <!-- 创建人名称 -->
UPDATED_BY, <!-- 更新人 --> CREATED_TIME <!-- 创建时间 -->
UPDATED_TIME, <!-- 更新时间 -->
DEP_CODE <!-- 部门编码 -->
) VALUES ( ) VALUES (
#companyCode#, #receiptDate#, #statisticalNumber#, #whCode#, #whName#, #inventType#, #companyCode#, #depCode#, #receiptDate#, #statisticalNumber#, #whCode#, #whName#,
#inventCode#, #inventName#, #spec#, #bookAmount#, #bookWeight#, #entityAmount#, #entityWeight#, #inventType#, #inventCode#, #inventName#, #inventRecordId#, #bookAmount#,
#diffAmount#, #diffWeight#, 0, #notes#, #createdBy#, #createdTime#, #updatedBy#, #bookWeight#, #entityAmount#, #entityWeight#, #diffAmount#, #diffWeight#,
#updatedTime#, #depCode# #remark#, #createdBy#, #createdName#, #createdTime#
) )
</insert> </insert>
...@@ -153,20 +153,22 @@ ...@@ -153,20 +153,22 @@
<update id="update"> <update id="update">
UPDATE hpjx.T_HPKC005 UPDATE hpjx.T_HPKC005
SET SET
RECEIPT_DATE = #receiptDate#, <!-- 单据日期 -->
WH_CODE = #whCode#, <!-- 仓库编码 --> WH_CODE = #whCode#, <!-- 仓库编码 -->
WH_NAME = #whName#, <!-- 仓库名称 --> WH_NAME = #whName#, <!-- 仓库名称 -->
INVENT_TYPE = #inventType#, <!-- 物料类型 --> INVENT_TYPE = #inventType#, <!-- 存货类型 -->
INVENT_CODE = #inventCode#, <!-- 物料编码 --> INVENT_CODE = #inventCode#, <!-- 存货编码 -->
INVENT_NAME = #inventName#, <!-- 物料名称 --> INVENT_NAME = #inventName#, <!-- 存货名称 -->
SPEC = #spec#, <!-- 规格 --> INVENT_RECORD_ID = #inventRecordId#, <!-- 存货档案ID -->
BOOK_AMOUNT = #bookAmount#, <!-- 账面数量 --> BOOK_AMOUNT = #bookAmount#, <!-- 账面数量 -->
BOOK_WEIGHT = #bookWeight#, <!-- 账面重量 --> BOOK_WEIGHT = #bookWeight#, <!-- 账面重量 -->
ENTITY_AMOUNT = #entityAmount#, <!-- 实物数量 --> ENTITY_AMOUNT = #entityAmount#, <!-- 实物数量 -->
ENTITY_WEIGHT = #entityWeight#, <!-- 实物重量 --> ENTITY_WEIGHT = #entityWeight#, <!-- 实物重量 -->
DIFF_AMOUNT = #diffAmount#, <!-- 差异数量 --> DIFF_AMOUNT = #diffAmount#, <!-- 差异数量 -->
DIFF_WEIGHT = #diffWeight#, <!-- 差异重量 --> DIFF_WEIGHT = #diffWeight#, <!-- 差异重量 -->
NOTES = #notes#, <!-- 备注 --> REMARK = #remark#, <!-- 备注 -->
UPDATED_BY = #updatedBy#, <!-- 更新人 --> UPDATED_BY = #updatedBy#, <!-- 更新人 -->
UPDATED_NAME = #updatedName#, <!-- 更新人名称 -->
UPDATED_TIME = #updatedTime# <!-- 更新时间 --> UPDATED_TIME = #updatedTime# <!-- 更新时间 -->
WHERE ID = #id# WHERE ID = #id#
</update> </update>
......
src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ006.java
...@@ -15,7 +15,11 @@ import com.baosight.iplat4j.core.ei.EiInfo; ...@@ -15,7 +15,11 @@ import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.exception.PlatException; import com.baosight.iplat4j.core.exception.PlatException;
import com.baosight.iplat4j.core.service.impl.ServiceBase; import com.baosight.iplat4j.core.service.impl.ServiceBase;
import java.util.*; import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** /**
* @author:songx * @author:songx
...@@ -152,23 +156,19 @@ public class ServiceHPPZ006 extends ServiceBase { ...@@ -152,23 +156,19 @@ public class ServiceHPPZ006 extends ServiceBase {
try { try {
List<DdynamicEnum> list = new ArrayList<>(); List<DdynamicEnum> list = new ArrayList<>();
list.add(DdynamicEnum.INVENT_SPEC_BLOCK_ID); list.add(DdynamicEnum.INVENT_SPEC_BLOCK_ID);
CommonMethod.initBlock(inInfo, list, EiInfoUtils.getFirstRow(inInfo), false); CommonMethod.initBlock(inInfo, list, EiInfoUtils.getFirstRow(inInfo));
} catch (Exception e) { } catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "查询规格失败"); LogUtils.setDetailMsg(inInfo, e, "查询规格失败");
} }
return inInfo; return inInfo;
} }
/**
public EiInfo queryComboBox(EiInfo eiInfo) { * 存货名称
Map map = new HashMap(); *
map.put("inventType", eiInfo.getString("inventType")); * @param eiInfo
List<DdynamicEnum> list = new ArrayList<>(); * @return
list.add(DdynamicEnum.INVENT_RECORD_BLOCK_ID); */
CommonMethod.initBlock(eiInfo, list, map);
return eiInfo;
}
public EiInfo queryMaterialComboBox(EiInfo eiInfo) { public EiInfo queryMaterialComboBox(EiInfo eiInfo) {
Map map = new HashMap(); Map map = new HashMap();
map.put("inventType", eiInfo.getString("inventType")); map.put("inventType", eiInfo.getString("inventType"));
......
src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ006.xml
...@@ -154,7 +154,8 @@ ...@@ -154,7 +154,8 @@
<!-- 规格下拉框 --> <!-- 规格下拉框 -->
<select id="queryComboBoxSpec" parameterClass="java.util.HashMap" resultClass="java.util.HashMap"> <select id="queryComboBoxSpec" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
SELECT DISTINCT SELECT DISTINCT
SPEC AS "spec" ID AS "id",
(CASE WHEN SPEC = '' THEN '无规格' ELSE SPEC END) AS "spec"
FROM hpjx.t_hppz006 WHERE STATUS=1 FROM hpjx.t_hppz006 WHERE STATUS=1
<isNotEmpty prepend=" AND " property="companyCode"> <isNotEmpty prepend=" AND " property="companyCode">
COMPANY_CODE = #companyCode# COMPANY_CODE = #companyCode#
......
src/main/webapp/HP/KC/HPKC005.js
...@@ -50,10 +50,10 @@ $(function() { ...@@ -50,10 +50,10 @@ $(function() {
}); });
} }
}, { }, {
field: "spec", field: "inventRecordId",
template: function (dataItem) { template: function (dataItem) {
for (let i = 0; i < specGlobalData.length; i++) { for (let i = 0; i < specGlobalData.length; i++) {
if (specGlobalData[i]['valueField'] === dataItem['spec']) { if (specGlobalData[i]['valueField'] === dataItem['inventRecordId']) {
return specGlobalData[i]['textField']; return specGlobalData[i]['textField'];
} }
} }
......
src/main/webapp/HP/KC/HPKC005.jsp
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<EF:EFColumn ename="id" cname="内码" hidden="true"/> <EF:EFColumn ename="id" cname="内码" hidden="true"/>
<EF:EFColumn ename="statisticalNumber" cname="盘点单号" enable="false" width="130" algin="center"/> <EF:EFColumn ename="statisticalNumber" cname="盘点单号" enable="false" width="130" algin="center"/>
<EF:EFColumn ename="receiptDate" cname="单据日期" editType="date" dateFormat="yyyy-MM-dd" <EF:EFColumn ename="receiptDate" cname="单据日期" editType="date" dateFormat="yyyy-MM-dd"
parseFormats="['yyyyMMdd']" width="90" align="center"/> parseFormats="['yyyyMMdd']" width="90" align="center" required="true"/>
<%--<EF:EFComboColumn ename="status" cname="单据状态" enable="false" width="100" readonly="true" <%--<EF:EFComboColumn ename="status" cname="单据状态" enable="false" width="100" readonly="true"
textField="textField" valueField="valueField" align="center"> textField="textField" valueField="valueField" align="center">
<EF:EFOption label="0-待审核" value="0"></EF:EFOption> <EF:EFOption label="0-待审核" value="0"></EF:EFOption>
...@@ -41,21 +41,22 @@ ...@@ -41,21 +41,22 @@
<EF:EFComboColumn ename="whCode" cname="仓库编码" width="120" columnTemplate="#=textField#" <EF:EFComboColumn ename="whCode" cname="仓库编码" width="120" columnTemplate="#=textField#"
itemTemplate="#=textField#" blockName="wh_record_block_id" itemTemplate="#=textField#" blockName="wh_record_block_id"
textField="textField" valueField="valueField" textField="textField" valueField="valueField"
align="center" filter="contains"> align="center" filter="contains" required="true">
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFComboColumn ename="inventType" cname="存货类型" width="100" align="center"> <EF:EFComboColumn ename="inventType" cname="存货类型" width="100" align="center" required="true"
columnTemplate="#=valueField#-#=textField#" itemTemplate="#=valueField#-#=textField#">
<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/> <EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="inventCode" cname="存货名称" width="120" align="center"/> <EF:EFColumn ename="inventCode" cname="存货名称" width="120" align="center" required="true"/>
<EF:EFColumn ename="spec" cname="规格" width="120" align="center"/> <EF:EFColumn ename="inventRecordId" cname="规格" width="120" align="center"/>
<EF:EFColumn ename="bookAmount" cname="账面数量" format="{0:N3}" maxLength="20" width="90" align="right" <EF:EFColumn ename="bookAmount" cname="账面数量" format="{0:N3}" maxLength="20" width="90" align="right"
sumType="all"/> sumType="all" required="true"/>
<EF:EFColumn ename="bookWeight" cname="账面重量" format="{0:N3}" maxLength="20" width="90" align="right" <EF:EFColumn ename="bookWeight" cname="账面重量" format="{0:N3}" maxLength="20" width="90" align="right"
sumType="all"/> sumType="all" required="true"/>
<EF:EFColumn ename="entityAmount" cname="实物数量" format="{0:N3}" maxLength="20" width="100" align="right" <EF:EFColumn ename="entityAmount" cname="实物数量" format="{0:N3}" maxLength="20" width="100" align="right"
sumType="all"/> sumType="all" required="true"/>
<EF:EFColumn ename="entityWeight" cname="实物重量" format="{0:N3}" maxLength="20" width="100" align="right" <EF:EFColumn ename="entityWeight" cname="实物重量" format="{0:N3}" maxLength="20" width="100" align="right"
sumType="all"/> sumType="all" required="true"/>
<EF:EFColumn ename="diffAmount" cname="差异数量" enable="false" format="{0:N3}" maxLength="20" width="100" <EF:EFColumn ename="diffAmount" cname="差异数量" enable="false" format="{0:N3}" maxLength="20" width="100"
align="right" sumType="all"/> align="right" sumType="all"/>
<EF:EFColumn ename="diffWeight" cname="差异重量" enable="false" format="{0:N3}" maxLength="20" width="100" <EF:EFColumn ename="diffWeight" cname="差异重量" enable="false" format="{0:N3}" maxLength="20" width="100"
......
src/main/webapp/HP/PZ/HPPZ003.jsp
...@@ -27,12 +27,14 @@ ...@@ -27,12 +27,14 @@
<EF:EFColumn ename="id" cname="主键" hidden="true"/> <EF:EFColumn ename="id" cname="主键" hidden="true"/>
<EF:EFColumn ename="custCode" cname="客户编码" enable="false" width="100" align="center"/> <EF:EFColumn ename="custCode" cname="客户编码" enable="false" width="100" align="center"/>
<EF:EFComboColumn ename="custType" cname="客户类型" width="100" align="center" <EF:EFComboColumn ename="custType" cname="客户类型" width="100" align="center"
blockName="company_type_block_id" itemTemplate="#=textField#-#=valueField#" blockName="company_type_block_id" textField="textField" valueField="valueField"
textField="valueField" valueField="textField" required="true"> columnTemplate="#=valueField#-#=textField#" itemTemplate="#=valueField#-#=textField#"
required="true">
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="custName" cname="客户名称" width="120" align="center" required="true"/> <EF:EFColumn ename="custName" cname="客户名称" width="120" align="center" required="true"/>
<EF:EFColumn ename="address" cname="地址" width="150" align="center" required="true"/> <EF:EFColumn ename="address" cname="地址" width="150" align="center" required="true"/>
<EF:EFComboColumn ename="status" cname="状态" align="center" width="100" required="true"> <EF:EFComboColumn ename="status" cname="状态" width="100" align="center" required="true"
columnTemplate="#=valueField#-#=textField#" itemTemplate="#=valueField#-#=textField#">
<EF:EFCodeOption codeName="hpjx.hpjx.status"/> <EF:EFCodeOption codeName="hpjx.hpjx.status"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="createdName" cname="创建人名称" enable="false" width="100" align="center"/> <EF:EFColumn ename="createdName" cname="创建人名称" enable="false" width="100" align="center"/>
......
src/main/webapp/HP/PZ/HPPZ004.jsp
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
<EF:EFPage title="存货类型"> <EF:EFPage title="存货类型">
<EF:EFRegion id="inqu" title="查询条件"> <EF:EFRegion id="inqu" title="查询条件">
<div class="row"> <div class="row">
<EF:EFInput cname="存货名称" ename="inventName" blockId="inqu_status" row="0" colWidth="3"/> <EF:EFInput cname="存货名称" ename="inqu_status-0-inventName" colWidth="3"/>
<EF:EFSelect cname="存货类型" ename="inventType" blockId="inqu_status" row="0" colWidth="3" filter="contains" <EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3"
defaultValue=""> template="#=valueField#-#=textField#" valueTemplate="#=valueField#-#=textField#">
<EF:EFOption label="请选择" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/> <EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
</EF:EFSelect> </EF:EFSelect>
<EF:EFSelect cname="状态" ename="inqu_status-0-status" colWidth="3" <EF:EFSelect cname="状态" ename="inqu_status-0-status" colWidth="3"
...@@ -27,10 +27,12 @@ ...@@ -27,10 +27,12 @@
<EF:EFColumn ename="id" cname="内码" hidden="true"/> <EF:EFColumn ename="id" cname="内码" hidden="true"/>
<EF:EFColumn ename="inventCode" cname="存货编码" enable="false" width="100" align="center"/> <EF:EFColumn ename="inventCode" cname="存货编码" enable="false" width="100" align="center"/>
<EF:EFColumn ename="inventName" cname="存货名称" width="120" required="true"/> <EF:EFColumn ename="inventName" cname="存货名称" width="120" required="true"/>
<EF:EFComboColumn ename="inventType" cname="存货类型" width="90" align="center"> <EF:EFComboColumn ename="inventType" cname="存货类型" width="90" align="center" required="true"
columnTemplate="#=valueField#-#=textField#" itemTemplate="#=valueField#-#=textField#">
<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/> <EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFComboColumn ename="status" cname="状态" align="center" width="100" required="true"> <EF:EFComboColumn ename="status" cname="状态" align="center" width="100" required="true"
columnTemplate="#=valueField#-#=textField#" itemTemplate="#=valueField#-#=textField#">
<EF:EFCodeOption codeName="hpjx.hpjx.status"/> <EF:EFCodeOption codeName="hpjx.hpjx.status"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="createdName" cname="创建人名称" enable="false" width="100" align="center"/> <EF:EFColumn ename="createdName" cname="创建人名称" enable="false" width="100" align="center"/>
......
src/main/webapp/HP/PZ/HPPZ006.jsp
...@@ -8,16 +8,17 @@ ...@@ -8,16 +8,17 @@
<EF:EFPage title="存货档案"> <EF:EFPage title="存货档案">
<EF:EFRegion id="inqu" title="查询条件"> <EF:EFRegion id="inqu" title="查询条件">
<div class="row"> <div class="row">
<EF:EFSelect cname="存货类型" ename="inventType" blockId="inqu_status" row="0" colWidth="3" filter="contains" <EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3"
defaultValue=""> valueTemplate="#=valueField#-#=textField#" template="#=valueField#-#=textField#">
<EF:EFOption label="请选择" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/> <EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
</EF:EFSelect> </EF:EFSelect>
<EF:EFSelect cname="存货名称" ename="inqu_status-0-inventCode" colWidth="3" filter="contains"> <EF:EFSelect cname="存货名称" ename="inqu_status-0-inventCode" colWidth="3" filter="contains">
<EF:EFOption label="--全部--" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/> <EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect> </EF:EFSelect>
<EF:EFSelect cname="状态" ename="inqu_status-0-status" colWidth="3"> <EF:EFSelect cname="状态" ename="inqu_status-0-status" colWidth="3" valueTemplate="#=valueField#-#=textField#"
template="#=valueField#-#=textField#">
<EF:EFOption label="全部" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hpjx.hpjx.status"/> <EF:EFCodeOption codeName="hpjx.hpjx.status"/>
</EF:EFSelect> </EF:EFSelect>
...@@ -27,23 +28,21 @@ ...@@ -27,23 +28,21 @@
<EF:EFRegion id="result" title="明细信息"> <EF:EFRegion id="result" title="明细信息">
<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row"> <EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
<EF:EFColumn ename="id" cname="内码" hidden="true"/> <EF:EFColumn ename="id" cname="内码" hidden="true"/>
<EF:EFComboColumn ename="inventType" cname="存货类型" width="120" align="center"> <EF:EFComboColumn ename="inventType" cname="存货类型" width="120" align="center"
columnTemplate="#=valueField#-#=textField#" itemTemplate="#=valueField#-#=textField#">
<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/> <EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="inventCode" cname="存货名称" width="120" align="center"/> <EF:EFColumn ename="inventCode" cname="存货名称" width="120" align="center"/>
<EF:EFColumn ename="spec" cname="规格" width="120" align="center" maxLength="50" <EF:EFColumn ename="spec" cname="规格" width="120" align="center" maxLength="50"/>
required="true"/> <EF:EFColumn ename="length" cname="长" width="100" align="right" format="{0:N2}" maxLength="10"/>
<EF:EFColumn ename="length" cname="长" width="100" align="right" format="{0:N2}" maxLength="10" <EF:EFColumn ename="wide" cname="宽" width="100" align="right" format="{0:N2}" maxLength="10"/>
required="true"/> <EF:EFColumn ename="thick" cname="厚" width="100" align="right" format="{0:N2}" maxLength="10"/>
<EF:EFColumn ename="wide" cname="宽" width="100" align="right" format="{0:N2}" maxLength="10"
required="true"/>
<EF:EFColumn ename="thick" cname="厚" width="100" align="right" format="{0:N2}" maxLength="10"
required="true"/>
<EF:EFColumn ename="material" cname="材质" width="100" align="center" required="true"/> <EF:EFColumn ename="material" cname="材质" width="100" align="center" required="true"/>
<EF:EFColumn ename="coefficient" cname="系数" width="100" align="right" format="{0:N2}" maxLength="10" <EF:EFColumn ename="coefficient" cname="系数" width="100" align="right" format="{0:N2}" maxLength="10"
required="true"/> required="true"/>
<EF:EFColumn ename="unit" cname="单位" width="100" align="center" required="true"/> <EF:EFColumn ename="unit" cname="单位" width="100" align="center" required="true"/>
<EF:EFComboColumn ename="status" cname="状态" align="center" width="100" required="true"> <EF:EFComboColumn ename="status" cname="状态" align="center" width="100" required="true"
columnTemplate="#=valueField#-#=textField#" itemTemplate="#=valueField#-#=textField#">
<EF:EFCodeOption codeName="hpjx.hpjx.status"/> <EF:EFCodeOption codeName="hpjx.hpjx.status"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="createdName" cname="创建人名称" enable="false" width="100" align="center"/> <EF:EFColumn ename="createdName" cname="创建人名称" enable="false" width="100" align="center"/>
......
src/main/webapp/HP/PZ/HPPZ007.jsp
...@@ -6,15 +6,16 @@ ...@@ -6,15 +6,16 @@
<c:set var="ctx" value="${pageContext.request.contextPath}"/> <c:set var="ctx" value="${pageContext.request.contextPath}"/>
<EF:EFPage title="仓库档案"> <EF:EFPage title="仓库档案">
<EF:EFRegion id="inqu" title="查询条件"> <EF:EFRegion id="inqu" title="查询条件">
<div class="row"> <div class="row">
<EF:EFInput cname="仓库名称:" blockId="inqu_status" ename="whName" row="0" colWidth="3"/> <EF:EFInput cname="仓库名称:" blockId="inqu_status" ename="whName" row="0" colWidth="3"/>
<EF:EFSelect cname="仓库类型:" blockId="inqu_status" ename="whType" row="0" colWidth="3"> <EF:EFSelect cname="仓库类型:" blockId="inqu_status" ename="whType" row="0" colWidth="3"
valueTemplate="#=valueField#-#=textField#" template="#=valueField#-#=textField#">
<EF:EFOption label="全部" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hpjx.hppz.whType"/> <EF:EFCodeOption codeName="hpjx.hppz.whType"/>
</EF:EFSelect> </EF:EFSelect>
<EF:EFSelect cname="状态:" blockId="inqu_status" ename="status" row="0" colWidth="3"> <EF:EFSelect cname="状态:" blockId="inqu_status" ename="status" row="0" colWidth="3"
valueTemplate="#=valueField#-#=textField#" template="#=valueField#-#=textField#">
<EF:EFOption label="全部" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hpjx.hpjx.status"/> <EF:EFCodeOption codeName="hpjx.hpjx.status"/>
</EF:EFSelect> </EF:EFSelect>
...@@ -26,11 +27,13 @@ ...@@ -26,11 +27,13 @@
<EF:EFColumn ename="id" cname="主键" hidden="true"/> <EF:EFColumn ename="id" cname="主键" hidden="true"/>
<EF:EFColumn ename="whCode" cname="仓库编码" enable="false" width="120" align="center"/> <EF:EFColumn ename="whCode" cname="仓库编码" enable="false" width="120" align="center"/>
<EF:EFColumn ename="whName" cname="仓库名称" width="120" align="center" required="true"/> <EF:EFColumn ename="whName" cname="仓库名称" width="120" align="center" required="true"/>
<EF:EFComboColumn ename="whType" cname="仓库类型" width="120" align="center" required="true"> <EF:EFComboColumn ename="whType" cname="仓库类型" width="120" align="center" required="true"
columnTemplate="#=valueField#-#=textField#" itemTemplate="#=valueField#-#=textField#">
<EF:EFCodeOption codeName="hpjx.hppz.whType"/> <EF:EFCodeOption codeName="hpjx.hppz.whType"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="princ" cname="负责人" width="120" align="center" required="true"/> <EF:EFColumn ename="princ" cname="负责人" width="120" align="center" required="true"/>
<EF:EFComboColumn ename="status" cname="状态" align="center" width="100" required="true"> <EF:EFComboColumn ename="status" cname="状态" width="100" align="center" required="true"
columnTemplate="#=valueField#-#=textField#" itemTemplate="#=valueField#-#=textField#">
<EF:EFCodeOption codeName="hpjx.hpjx.status"/> <EF:EFCodeOption codeName="hpjx.hpjx.status"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="createdName" cname="创建人名称" enable="false" width="100" align="center"/> <EF:EFColumn ename="createdName" cname="创建人名称" enable="false" width="100" align="center"/>
...@@ -42,9 +45,3 @@ ...@@ -42,9 +45,3 @@
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
</EF:EFPage> </EF:EFPage>
<script>
var ctx = "${ctx}";
</script>
<script src="${ctx}/HP/PZ/HPPZ007.js"></script>
src/main/webapp/HP/ZL/HPZL001.jsp
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<EF:EFColumn ename="id" cname="内码" hidden="true"/> <EF:EFColumn ename="id" cname="内码" hidden="true"/>
<EF:EFColumn ename="chkBillno" cname="检查单号" enable="false" width="130" align="center"/> <EF:EFColumn ename="chkBillno" cname="检查单号" enable="false" width="130" align="center"/>
<EF:EFColumn ename="receiptDate" cname="单据日期" width="120" align="center" editType="date" <EF:EFColumn ename="receiptDate" cname="单据日期" width="120" align="center" editType="date"
dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/> dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
<EF:EFComboColumn ename="itemCode" cname="项目名称" width="140" columnTemplate="#=textField#" <EF:EFComboColumn ename="itemCode" cname="项目名称" width="140" columnTemplate="#=textField#"
itemTemplate="#=textField#" blockName="proj_record_block_id" itemTemplate="#=textField#" blockName="proj_record_block_id"
textField="textField" valueField="valueField" maxLength="20" textField="textField" valueField="valueField" maxLength="20"
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<EF:EFColumn ename="notes" cname="质量问题描述" width="100" readonly="false"/> <EF:EFColumn ename="notes" cname="质量问题描述" width="100" readonly="false"/>
<EF:EFColumn ename="princ" cname="检查人" width="100" readonly="true"/> <EF:EFColumn ename="princ" cname="检查人" width="100" readonly="true"/>
<EF:EFComboColumn ename="status" cname="状态" enable="false" align="center" textField="textField" <EF:EFComboColumn ename="status" cname="状态" enable="false" align="center" textField="textField"
valueField="valueField" width="100" required="true" optionLabel=" "> valueField="valueField" width="100" optionLabel=" ">
<EF:EFOption label="--请选择--" value=""></EF:EFOption> <EF:EFOption label="--请选择--" value=""></EF:EFOption>
<EF:EFOption label="审核" value="1"></EF:EFOption> <EF:EFOption label="审核" value="1"></EF:EFOption>
<EF:EFOption label="未审核" value="0"></EF:EFOption> <EF:EFOption label="未审核" value="0"></EF:EFOption>
......
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