Skip to content

H
hp-smart
Commit e8da80e2 by yukang
Options

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

parents cb73e8cb 65235f80
Showing with 231 additions and 130 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,25 @@ public enum DdynamicEnum { ...@@ -37,26 +37,25 @@ 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 * 编写：jhs
*/ */
INVENT_RECORD_BLOCK_ID("invent_record_block_id","id","inventName","HPPZ006.queryComboBox"), MATERIAL_RECORD_BLOCK_ID("material_record_block_id","inventCode","inventName","HPPZ006.queryMaterialComboBox"),
/** /**
* 模块：存货档案 * 模块：存货档案（规格）
* 用途：存货档案下拉框 * 用途：存货档案下拉框
* 编写：jhs * 编写：wwl
*/ */
MATERIAL_RECORD_BLOCK_ID("material_record_block_id","inventCode","inventName","HPPZ006.queryMaterialComboBox"), INVENT_SPEC_BLOCK_ID("invent_spec_block_id", "id", "spec", "HPPZ006.queryComboBoxSpec"),
/** /**
* 模块：存货档案 * 模块：存货档案（规格）
* 用途：存货档案下拉框 * 用途：存货档案下拉框
* 编写：wwl * 编写：wwl
*/ */
INVENT_SPEC_BLOCK_ID("invent_spec_block_id","spec","spec","HPPZ006.queryComboBoxSpec"), SPEC_NAME_BLOCK_ID("spec_name_block_id", "spec", "spec", "HPPZ006.queryComboBoxSpecName"),
/** /**
* 模块：仓库档案 * 模块：仓库档案
......
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC005.java
...@@ -42,7 +42,9 @@ public class ServiceHPKC005 extends ServiceBase { ...@@ -42,7 +42,9 @@ public class ServiceHPKC005 extends ServiceBase {
outInfo.getBlock(EiConstant.resultBlock).getRows().clear(); outInfo.getBlock(EiConstant.resultBlock).getRows().clear();
CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), null); CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), null);
CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.WH_RECORD_QUERY_BLOCK_ID), null); CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.WH_RECORD_QUERY_BLOCK_ID), null);
CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.MATERIAL_RECORD_BLOCK_ID), null);
CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.INVENT_SPEC_BLOCK_ID), null); CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.INVENT_SPEC_BLOCK_ID), null);
CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), null, false);
return outInfo; return outInfo;
} }
...@@ -150,6 +152,8 @@ public class ServiceHPKC005 extends ServiceBase { ...@@ -150,6 +152,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">
...@@ -79,11 +81,18 @@ ...@@ -79,11 +81,18 @@
</isNotEmpty> </isNotEmpty>
</sql> </sql>
<select id="query" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC005"> <sql id="customCondition">
SELECT <include refid="column"/> <isNotEmpty prepend=" AND " property="spec">
FROM hpjx.T_HPKC005 <isEqual property="spec" compareValue="无规格">
WHERE 1=1 INVENT_RECORD_ID IN (SELECT ID FROM ${hpjxSchema}.T_HPPZ006 WHERE SPEC = '')
<include refid="condition"/> </isEqual>
<isNotEqual property="spec" compareValue="无规格">
INVENT_RECORD_ID IN (SELECT ID FROM ${hpjxSchema}.T_HPPZ006 WHERE SPEC = #spec#)
</isNotEqual>
</isNotEmpty>
</sql>
<sql id="order">
<dynamic prepend="ORDER BY"> <dynamic prepend="ORDER BY">
<isNotEmpty property="orderBy"> <isNotEmpty property="orderBy">
$orderBy$ $orderBy$
...@@ -92,12 +101,22 @@ ...@@ -92,12 +101,22 @@
ID DESC ID DESC
</isEmpty> </isEmpty>
</dynamic> </dynamic>
</sql>
<select id="query" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC005">
SELECT <include refid="column"/>
FROM hpjx.T_HPKC005
WHERE 1=1
<include refid="condition"/>
<include refid="customCondition"/>
<include refid="order"/>
</select> </select>
<select id="count" resultClass="int"> <select id="count" resultClass="int">
SELECT COUNT(*) FROM hpjx.T_HPKC005 SELECT COUNT(*) FROM hpjx.T_HPKC005
WHERE 1=1 WHERE 1=1
<include refid="condition"/> <include refid="condition"/>
<include refid="customCondition"/>
</select> </select>
<!-- 查询统计 --> <!-- 查询统计 -->
...@@ -112,37 +131,36 @@ ...@@ -112,37 +131,36 @@
FROM ${hpjxSchema}.T_HPKC005 FROM ${hpjxSchema}.T_HPKC005
WHERE 1=1 WHERE 1=1
<include refid="condition"/> <include refid="condition"/>
<include refid="customCondition"/>
</select> </select>
<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 +171,22 @@ ...@@ -153,20 +171,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/ServiceHPPZ004.java
...@@ -6,6 +6,8 @@ import com.baosight.hpjx.core.dao.DaoUtils; ...@@ -6,6 +6,8 @@ import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.constant.HPConstant; import com.baosight.hpjx.hp.constant.HPConstant;
import com.baosight.hpjx.hp.pz.domain.HPPZ003; import com.baosight.hpjx.hp.pz.domain.HPPZ003;
import com.baosight.hpjx.hp.pz.domain.HPPZ004; import com.baosight.hpjx.hp.pz.domain.HPPZ004;
import com.baosight.hpjx.hp.pz.domain.HPPZ006;
import com.baosight.hpjx.util.AssertUtils;
import com.baosight.hpjx.util.CommonMethod; import com.baosight.hpjx.util.CommonMethod;
import com.baosight.hpjx.util.LogUtils; import com.baosight.hpjx.util.LogUtils;
import com.baosight.iplat4j.core.ei.EiConstant; import com.baosight.iplat4j.core.ei.EiConstant;
...@@ -117,6 +119,14 @@ public class ServiceHPPZ004 extends ServiceBase { ...@@ -117,6 +119,14 @@ public class ServiceHPPZ004 extends ServiceBase {
try { try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows(); List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
for (int i = 0; i < resultRows.size(); i++) { for (int i = 0; i < resultRows.size(); i++) {
HPPZ004 fPz004 = new HPPZ004();
fPz004.fromMap(resultRows.get(i));
// 校验是否已经配置规格信息
Map paramMap = new HashMap();
paramMap.put("inventCode", fPz004.getInventCode());
List<HPPZ006> dbPz006 = dao.query(HPPZ006.QUERY, paramMap);
AssertUtils.isNotEmpty(dbPz006, String.format("存货编码[%s]已存在档案信息，请先删除对应档案",
fPz004.getInventCode()));
DaoUtils.update(HPPZ004.DELETE, resultRows.get(i)); DaoUtils.update(HPPZ004.DELETE, resultRows.get(i));
} }
inInfo = this.query(inInfo); inInfo = this.query(inInfo);
......
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
...@@ -159,16 +163,12 @@ public class ServiceHPPZ006 extends ServiceBase { ...@@ -159,16 +163,12 @@ public class ServiceHPPZ006 extends ServiceBase {
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/HPPZ002.xml
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
</sql> </sql>
<sql id="condition"> <sql id="condition">
AND DELETE_FLAG = 0
<isNotEmpty prepend=" AND " property="id"> <isNotEmpty prepend=" AND " property="id">
ID = #id# ID = #id#
</isNotEmpty> </isNotEmpty>
...@@ -89,8 +90,9 @@ ...@@ -89,8 +90,9 @@
) )
</insert> </insert>
<!-- 逻辑删除 -->
<delete id="delete"> <delete id="delete">
DELETE FROM hpjx.t_hppz002 WHERE ID = #id# UPDATE hpjx.T_HPPZ002 SET DELETE_FLAG = 1 WHERE ID = #id#
</delete> </delete>
<update id="update"> <update id="update">
...@@ -113,7 +115,9 @@ ...@@ -113,7 +115,9 @@
SELECT DISTINCT SELECT DISTINCT
CUST_CODE as "custCode", CUST_CODE as "custCode",
CUST_NAME as "custName" CUST_NAME as "custName"
FROM hpjx.t_hppz002 WHERE STATUS=1 FROM hpjx.t_hppz002
WHERE DELETE_FLAG = 0
AND STATUS=1
<isNotEmpty prepend=" AND " property="companyCode"> <isNotEmpty prepend=" AND " property="companyCode">
COMPANY_CODE = #companyCode# COMPANY_CODE = #companyCode#
</isNotEmpty> </isNotEmpty>
......
src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ003.xml
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
</sql> </sql>
<sql id="condition"> <sql id="condition">
AND DELETE_FLAG = 0
<isNotEmpty prepend=" AND " property="id"> <isNotEmpty prepend=" AND " property="id">
ID = #id# ID = #id#
</isNotEmpty> </isNotEmpty>
...@@ -88,8 +89,9 @@ ...@@ -88,8 +89,9 @@
) )
</insert> </insert>
<!-- 逻辑删除 -->
<delete id="delete"> <delete id="delete">
DELETE FROM hpjx.t_hppz003 WHERE ID = #id# UPDATE hpjx.T_HPPZ003 SET DELETE_FLAG = 1 WHERE ID = #id#
</delete> </delete>
<update id="update"> <update id="update">
...@@ -109,7 +111,9 @@ ...@@ -109,7 +111,9 @@
SELECT DISTINCT SELECT DISTINCT
CUST_CODE as "custCode", CUST_CODE as "custCode",
CUST_NAME as "custName" CUST_NAME as "custName"
FROM hpjx.t_hppz003 WHERE STATUS=1 FROM hpjx.t_hppz003
WHERE DELETE_FLAG = 0
AND STATUS=1
<isNotEmpty prepend=" AND " property="companyCode"> <isNotEmpty prepend=" AND " property="companyCode">
COMPANY_CODE = #companyCode# COMPANY_CODE = #companyCode#
</isNotEmpty> </isNotEmpty>
......
src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ004.xml
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
</sql> </sql>
<sql id="condition"> <sql id="condition">
AND DELETE_FLAG = 0
<isNotEmpty prepend=" AND " property="id"> <isNotEmpty prepend=" AND " property="id">
ID = #id# ID = #id#
</isNotEmpty> </isNotEmpty>
...@@ -91,8 +92,9 @@ ...@@ -91,8 +92,9 @@
) )
</insert> </insert>
<!-- 逻辑删除 -->
<delete id="delete"> <delete id="delete">
DELETE FROM hpjx.t_hppz004 WHERE ID = #id# UPDATE hpjx.T_HPPZ004 SET DELETE_FLAG = 1 WHERE ID = #id#
</delete> </delete>
<update id="update"> <update id="update">
...@@ -113,7 +115,8 @@ ...@@ -113,7 +115,8 @@
INVENT_CODE as "inventCode", INVENT_CODE as "inventCode",
INVENT_NAME as "inventName" INVENT_NAME as "inventName"
FROM hpjx.t_hppz004 FROM hpjx.t_hppz004
WHERE STATUS = 1 WHERE DELETE_FLAG = 0
AND STATUS = 1
<isNotEmpty prepend=" AND " property="companyCode"> <isNotEmpty prepend=" AND " property="companyCode">
COMPANY_CODE = #companyCode# COMPANY_CODE = #companyCode#
</isNotEmpty> </isNotEmpty>
......
src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ006.xml
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
</sql> </sql>
<sql id="condition"> <sql id="condition">
AND DELETE_FLAG = 0
<isNotEmpty prepend=" AND " property="id"> <isNotEmpty prepend=" AND " property="id">
ID = #id# ID = #id#
</isNotEmpty> </isNotEmpty>
...@@ -101,8 +102,9 @@ ...@@ -101,8 +102,9 @@
) )
</insert> </insert>
<!-- 逻辑删除 -->
<delete id="delete"> <delete id="delete">
DELETE FROM hpjx.t_hppz006 WHERE ID = #id# UPDATE hpjx.T_HPPZ006 SET DELETE_FLAG = 1 WHERE ID = #id#
</delete> </delete>
<update id="update"> <update id="update">
...@@ -126,7 +128,9 @@ ...@@ -126,7 +128,9 @@
SELECT DISTINCT SELECT DISTINCT
ID as "id", ID as "id",
CONCAT(INVENT_CODE,'-',INVENT_NAME,'[',SPEC,']') as "inventName" CONCAT(INVENT_CODE,'-',INVENT_NAME,'[',SPEC,']') as "inventName"
FROM hpjx.t_hppz006 WHERE STATUS=1 FROM hpjx.t_hppz006
WHERE DELETE_FLAG = 1
AND STATUS=1
<isNotEmpty prepend=" AND " property="companyCode"> <isNotEmpty prepend=" AND " property="companyCode">
COMPANY_CODE = #companyCode# COMPANY_CODE = #companyCode#
</isNotEmpty> </isNotEmpty>
...@@ -141,7 +145,9 @@ ...@@ -141,7 +145,9 @@
SELECT DISTINCT SELECT DISTINCT
INVENT_CODE as "inventCode", INVENT_CODE as "inventCode",
INVENT_NAME as "inventName" INVENT_NAME as "inventName"
FROM hpjx.t_hppz006 WHERE STATUS=1 FROM hpjx.t_hppz006
WHERE DELETE_FLAG = 0
AND STATUS=1
<isNotEmpty prepend=" AND " property="companyCode"> <isNotEmpty prepend=" AND " property="companyCode">
COMPANY_CODE = #companyCode# COMPANY_CODE = #companyCode#
</isNotEmpty> </isNotEmpty>
...@@ -154,8 +160,11 @@ ...@@ -154,8 +160,11 @@
<!-- 规格下拉框 --> <!-- 规格下拉框 -->
<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",
FROM hpjx.t_hppz006 WHERE STATUS=1 (CASE WHEN SPEC = '' THEN '无规格' ELSE SPEC END) AS "spec"
FROM hpjx.t_hppz006
WHERE DELETE_FLAG = 0
AND STATUS=1
<isNotEmpty prepend=" AND " property="companyCode"> <isNotEmpty prepend=" AND " property="companyCode">
COMPANY_CODE = #companyCode# COMPANY_CODE = #companyCode#
</isNotEmpty> </isNotEmpty>
...@@ -168,4 +177,23 @@ ...@@ -168,4 +177,23 @@
ORDER BY ID ORDER BY ID
</select> </select>
<!-- 规格下拉框(无ID) -->
<select id="queryComboBoxSpecName" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
SELECT DISTINCT
(CASE WHEN SPEC = '' THEN '无规格' ELSE SPEC END) AS "spec"
FROM hpjx.t_hppz006
WHERE DELETE_FLAG = 0
AND STATUS=1
<isNotEmpty prepend=" AND " property="companyCode">
COMPANY_CODE = #companyCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="inventCode">
INVENT_CODE = #inventCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="inventType">
INVENT_TYPE = #inventType#
</isNotEmpty>
ORDER BY SPEC DESC
</select>
</sqlMap> </sqlMap>
src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ007.xml
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
</sql> </sql>
<sql id="condition"> <sql id="condition">
AND DELETE_FLAG = 0
<isNotEmpty prepend=" AND " property="id"> <isNotEmpty prepend=" AND " property="id">
ID = #id# ID = #id#
</isNotEmpty> </isNotEmpty>
...@@ -96,8 +97,9 @@ ...@@ -96,8 +97,9 @@
) )
</insert> </insert>
<!-- 逻辑删除 -->
<delete id="delete"> <delete id="delete">
DELETE FROM hpjx.t_hppz007 WHERE ID = #id# UPDATE hpjx.T_HPPZ007 SET DELETE_FLAG = 1 WHERE ID = #id#
</delete> </delete>
<update id="update"> <update id="update">
...@@ -118,7 +120,9 @@ ...@@ -118,7 +120,9 @@
SELECT DISTINCT SELECT DISTINCT
WH_CODE as "whCode", <!-- 仓库编码 --> WH_CODE as "whCode", <!-- 仓库编码 -->
WH_NAME as "whName" <!-- 仓库名称 --> WH_NAME as "whName" <!-- 仓库名称 -->
FROM hpjx.t_hppz007 WHERE STATUS=1 FROM hpjx.t_hppz007
WHERE DELETE_FLAG = 0
AND STATUS=1
<isNotEmpty prepend=" AND " property="companyCode"> <isNotEmpty prepend=" AND " property="companyCode">
COMPANY_CODE = #companyCode# COMPANY_CODE = #companyCode#
</isNotEmpty> </isNotEmpty>
...@@ -130,7 +134,8 @@ ...@@ -130,7 +134,8 @@
<select id="queryByWhCode" resultClass="com.baosight.hpjx.hp.pz.domain.HPPZ007"> <select id="queryByWhCode" resultClass="com.baosight.hpjx.hp.pz.domain.HPPZ007">
SELECT WH_NAME as "whName" SELECT WH_NAME as "whName"
FROM hpjx.t_hppz007 WHERE 1=1 FROM hpjx.t_hppz007
WHERE DELETE_FLAG = 0
AND WH_CODE = #whCode# AND WH_CODE = #whCode#
</select> </select>
......
src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ009.xml
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</sql> </sql>
<sql id="conditions"> <sql id="conditions">
AND DELETE_FLAG = '0' AND DELETE_FLAG = 0
<isNotEmpty prepend=" AND " property="companyCode"> <isNotEmpty prepend=" AND " property="companyCode">
COMPANY_CODE = #companyCode# COMPANY_CODE = #companyCode#
</isNotEmpty> </isNotEmpty>
......
src/main/webapp/HP/KC/HPKC005.js
...@@ -37,10 +37,9 @@ $(function() { ...@@ -37,10 +37,9 @@ $(function() {
let eiInfo = new EiInfo(); let eiInfo = new EiInfo();
eiInfo.set("inventType", options.model["inventType"]); eiInfo.set("inventType", options.model["inventType"]);
var dataSource; var dataSource;
EiCommunicator.send("HPPZ004", "queryComboBox", eiInfo, { EiCommunicator.send("HPPZ006", "queryMaterialComboBox", eiInfo, {
onSuccess: function (ei) { onSuccess: function (ei) {
dataSource = ei.getBlock("invent_name_block_id").getMappedRows(); dataSource = ei.getBlock("material_record_block_id").getMappedRows();
inventNameGlobalData = dataSource;
}, },
onFail: function (ei) { onFail: function (ei) {
} }
...@@ -54,10 +53,10 @@ $(function() { ...@@ -54,10 +53,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'];
} }
} }
...@@ -76,7 +75,6 @@ $(function() { ...@@ -76,7 +75,6 @@ $(function() {
EiCommunicator.send("HPPZ006", "queryComboBoxSpec", eiInfo, { EiCommunicator.send("HPPZ006", "queryComboBoxSpec", eiInfo, {
onSuccess: function (ei) { onSuccess: function (ei) {
dataSource = ei.getBlock("invent_spec_block_id").getMappedRows(); dataSource = ei.getBlock("invent_spec_block_id").getMappedRows();
specGlobalData = dataSource;
}, },
onFail: function (ei) { onFail: function (ei) {
} }
......
src/main/webapp/HP/KC/HPKC005.jsp
...@@ -8,15 +8,20 @@ ...@@ -8,15 +8,20 @@
<EF:EFPage title="库存盘点单"> <EF:EFPage title="库存盘点单">
<EF:EFRegion id="inqu" title="查询条件"> <EF:EFRegion id="inqu" title="查询条件">
<div class="row"> <div class="row">
<EF:EFDatePicker ename="inqu_status-0-receiptDate" cname="单据日期" <EF:EFDatePicker ename="inqu_status-0-receiptDate" cname="单据日期" colWidth="3"
role="date" format="yyyy-MM-dd" readonly="true"/> role="date" format="yyyy-MM-dd" readonly="true"/>
<EF:EFSelect ename="inqu_status-0-inventType" cname="存货类型" filter="contains" defaultValue=""> <EF:EFSelect ename="inqu_status-0-whCode" cname="仓库名称" colWidth="3" filter="contains" defultValue="">
<EF:EFOption label="请选择" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="whName_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
<EF:EFSelect ename="inqu_status-0-inventType" cname="存货类型" colWidth="3" filter="contains"
template="#=valueField#-#=textField#" valueTemplate="#=valueField#-#=textField#">
<EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/> <EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
</EF:EFSelect> </EF:EFSelect>
<EF:EFSelect ename="inqu_status-0-whCode" cname="仓库名称" filter="contains" defultValue=""> <EF:EFSelect ename="inqu_status-0-inventCode" cname="存货名称" colWidth="3" filter="contains" defultValue="">
<EF:EFOption label="请选择" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="whName_block_id" textField="textField" valueField="valueField"/> <EF:EFOptions blockId="material_record_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect> </EF:EFSelect>
<%--<EF:EFSelect ename="inqu_status-0-status" cname="单据状态" filter="contains" required="false" <%--<EF:EFSelect ename="inqu_status-0-status" cname="单据状态" filter="contains" required="false"
template="#=textField#" valueTemplate="#=textField#" defaultValue=""> template="#=textField#" valueTemplate="#=textField#" defaultValue="">
...@@ -25,6 +30,12 @@ ...@@ -25,6 +30,12 @@
<EF:EFOption label="1-已审核" value="1"></EF:EFOption> <EF:EFOption label="1-已审核" value="1"></EF:EFOption>
</EF:EFSelect>--%> </EF:EFSelect>--%>
</div> </div>
<div class="row">
<EF:EFSelect ename="inqu_status-0-spec" cname="规格" colWidth="3" filter="contains" defultValue="">
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="spec_name_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
</div>
</EF:EFRegion> </EF:EFRegion>
<EF:EFRegion id="result" title="明细信息"> <EF:EFRegion id="result" title="明细信息">
...@@ -32,7 +43,7 @@ ...@@ -32,7 +43,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 +52,22 @@ ...@@ -41,21 +52,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.js
...@@ -10,6 +10,21 @@ $(function() { ...@@ -10,6 +10,21 @@ $(function() {
pageSizes: [10, 20, 30, 50, 100, 200] pageSizes: [10, 20, 30, 50, 100, 200]
}, },
columns: [{ columns: [{
field: "length",
template: function (options) {
return options.length == 0 ? "-" : options.length;
}
}, {
field: "wide",
template: function (options) {
return options.length == 0 ? "-" : options.length;
}
}, {
field: "thick",
template: function (options) {
return options.length == 0 ? "-" : options.length;
}
}, {
field: "inventCode", field: "inventCode",
template: function (dataItem) { template: function (dataItem) {
for (let i = 0; i < inventNameGlobalData.length; i++) { for (let i = 0; i < inventNameGlobalData.length; i++) {
......
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,20 @@ ...@@ -27,23 +28,20 @@
<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"/>
<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