Skip to content

H
hp-smart
Commit 7d719488 by wuwenlong
Options

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

parents d581c8f7 fc433015
Showing with 113 additions and 79 deletions
src/main/java/com/baosight/hpjx/common/InventTypeEnun.java
......@@ -14,8 +14,8 @@ import java.util.Map;
public enum InventTypeEnun {
MATERIAL(1,"原材料"),
CONSUMABLE(2,"耗材"),
SEMI_FINISHED_PRODUCT(2,"半成品"),
FINISHED_PRODUCT(2,"产成品");
SEMI_FINISHED_PRODUCT(3,"半成品"),
FINISHED_PRODUCT(4,"产成品");
private Integer code;
......
src/main/java/com/baosight/hpjx/hp/pz/domain/THppz006.java
......@@ -18,8 +18,8 @@ public class THppz006 extends DaoEPBase {
private Long id = 0L;
private String companyCode = " "; /* 企业编码 预留*/
private int inventName; /* 存货名称*/
private int inventCode; /* 存货编码*/
private String inventName; /* 存货名称*/
private String inventCode; /* 存货编码*/
private int inventType; /* 存货类型*/
private int status; /* 状态 0未启用 1启用*/
private String spec = " "; /* 规格*/
......@@ -154,28 +154,28 @@ initMetaData();
* get the inventName - 存货名称
* @return the inventName
*/
public int getInventName() {
public String getInventName() {
return this.inventName;
}
/**
* set the inventName - 存货名称
*/
public void setInventName(int inventName) {
public void setInventName(String inventName) {
this.inventName = inventName;
}
/**
* get the inventCode - 存货编码
* @return the inventCode
*/
public int getInventCode() {
public String getInventCode() {
return this.inventCode;
}
/**
* set the inventCode - 存货编码
*/
public void setInventCode(int inventCode) {
public void setInventCode(String inventCode) {
this.inventCode = inventCode;
}
/**
......@@ -381,8 +381,8 @@ public void fromMap(Map map) {
setId(NumberUtils.toLong(StringUtils.toString(map.get("id")), id));
setCompanyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("companyCode")), companyCode));
setInventName(NumberUtils.toint(StringUtils.toString(map.get("inventName")), inventName));
setInventCode(NumberUtils.toint(StringUtils.toString(map.get("inventCode")), inventCode));
setInventName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("inventName")), inventName));
setInventCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("inventCode")), inventCode));
setInventType(NumberUtils.toint(StringUtils.toString(map.get("inventType")), inventType));
setStatus(NumberUtils.toint(StringUtils.toString(map.get("status")), status));
setSpec(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("spec")), spec));
......
src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ002.java
package com.baosight.hpjx.hp.pz.service;
import com.baosight.hpjx.common.CompanyTypeEnum;
import com.baosight.hpjx.common.InitiateModeEnum;
import com.baosight.hpjx.util.CommonMethod;
import com.baosight.iplat4j.core.ei.EiBlock;
import com.baosight.iplat4j.core.ei.EiConstant;
......@@ -28,6 +29,7 @@ public class ServiceHPPZ002 extends ServiceBase {
outInfo.addBlock(EiConstant.resultBlock);
outInfo.getBlock(EiConstant.resultBlock).addBlockMeta(hppz002.eiMetadata);
outInfo.setBlock(CompanyTypeEnum.generatorEiBlock());
outInfo.setBlock(InitiateModeEnum.generatorEiBlock());
return outInfo;
}
......
src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ004.java
package com.baosight.hpjx.hp.pz.service;
import com.baosight.hpjx.common.CompanyTypeEnum;
import com.baosight.hpjx.common.InitiateModeEnum;
import com.baosight.hpjx.common.InventTypeEnun;
import com.baosight.hpjx.hp.pz.domain.THppz004;
import com.baosight.hpjx.util.CommonMethod;
import com.baosight.iplat4j.core.ei.EiBlock;
......@@ -24,6 +27,8 @@ public class ServiceHPPZ004 extends ServiceBase {
EiInfo outInfo = new EiInfo();
outInfo.addBlock(EiConstant.resultBlock);
outInfo.getBlock(EiConstant.resultBlock).addBlockMeta(hppz004.eiMetadata);
outInfo.setBlock(InventTypeEnun.generatorEiBlock());
outInfo.setBlock(InitiateModeEnum.generatorEiBlock());
return outInfo;
}
......
src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ006.java
package com.baosight.hpjx.hp.pz.service;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.common.InitiateModeEnum;
import com.baosight.hpjx.common.InventTypeEnun;
import com.baosight.hpjx.hp.pz.domain.THppz006;
import com.baosight.hpjx.util.CommonMethod;
import com.baosight.iplat4j.core.ei.EiBlock;
......@@ -8,6 +11,8 @@ import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.exception.PlatException;
import com.baosight.iplat4j.core.service.impl.ServiceBase;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
/**
......@@ -24,6 +29,14 @@ public class ServiceHPPZ006 extends ServiceBase {
EiInfo outInfo = new EiInfo();
outInfo.addBlock(EiConstant.resultBlock);
outInfo.getBlock(EiConstant.resultBlock).addBlockMeta(hppz006.eiMetadata);
outInfo.setBlock(InitiateModeEnum.generatorEiBlock());
outInfo.setBlock(InventTypeEnun.generatorEiBlock());
CommonMethod.initBlock(outInfo, Arrays.asList(
DdynamicEnum.INVENT_NAME_BLOCK_ID),
new HashMap<String,String>(1) {{
put("status", "1" );
}});
return outInfo;
}
......@@ -45,13 +58,13 @@ public class ServiceHPPZ006 extends ServiceBase {
public EiInfo insert(EiInfo inInfo) {
try {
CommonMethod.creatorInfo(inInfo,EiConstant.resultBlock);
THppz006 hppz006 = new THppz006();
EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
for (int i = 0; i < eiBlock.getRowCount(); i++) {
Map<?, ?> map = eiBlock.getRow(i);
hppz006.fromMap(map);
this.dao.insert("HPPZ006.insert", hppz006.toMap());
for (int i = 0; i < inInfo.getBlock(EiConstant.resultBlock).getRowCount(); i++) {
String inventName =inInfo.getCellStr(EiConstant.resultBlock,i,"inventName");
String[] str = inventName.split("-");
inInfo.setCell(EiConstant.resultBlock,i,"inventCode", str[0]);
inInfo.setCell(EiConstant.resultBlock,i,"inventName", str[1]);
}
inInfo.setStatus(EiConstant.STATUS_SUCCESS);
inInfo.setMsg("新增成功！");
......@@ -64,7 +77,7 @@ public class ServiceHPPZ006 extends ServiceBase {
logError("新增失败", e.getMessage());
return inInfo;
}
return inInfo;
return super.insert(inInfo,"HPPZ006.insert");
}
......
src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ004.xml
......@@ -137,8 +137,11 @@
<isNotEmpty prepend=" AND " property="companyCode">
COMPANY_CODE = #companyCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="inventType">
INVENT_TYPE = #inventType#
<isNotEmpty prepend=" AND " property="inventCode">
INVENT_CODE = #inventCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="status">
STATUS = #status#
</isNotEmpty>
ORDER BY INVENT_CODE
</select>
......
src/main/webapp/HP/PZ/HPPZ002.jsp
......@@ -15,12 +15,13 @@
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="company_type_block_id" textField="valueField" valueField="textField"/>
</EF:EFSelect>
<EF:EFSelect ename="inqu_status-0-status" cname="状态" colWidth="4">
<EF:EFOption label="--请选择--" value=""/>
<EF:EFOption label="启用" value="1"></EF:EFOption>
<EF:EFOption label="禁用" value="0"></EF:EFOption>
<EF:EFSelect ename="inqu_status-0-status" cname="状态" colWidth="4"
template="#=valueField#-#=textField#" valueTemplate="#=valueField#-#=textField#" enable="true">
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="initiate_mode_block_id" textField="valueField" valueField="textField"/>
</EF:EFSelect>
</div>
<EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>
</EF:EFRegion>
<EF:EFRegion id="result" title="明细信息">
......@@ -36,12 +37,11 @@
<EF:EFColumn ename="custCode" cname="供应商编码" width="100" readonly="false" required="true"/>
<EF:EFColumn ename="custName" cname="供应商名称" width="100" readonly="false" required="true"/>
<EF:EFColumn ename="address" cname="地址" width="100" readonly="false" required="true"/>
<EF:EFComboColumn ename="status" cname="状态" align="center" columnTemplate="#=valueField#-#=textField#" optionLabel=" "
itemTemplate="#=valueField#-#=textField#" textField="textField"
valueField="valueField" width="100" required="true">
<EF:EFOption label="--请选择--" value=""></EF:EFOption>
<EF:EFOption label="启用" value="1"></EF:EFOption>
<EF:EFOption label="禁用" value="0"></EF:EFOption>
<EF:EFComboColumn ename="status" cname="状态" align="center"
blockName="initiate_mode_block_id"
columnTemplate="#=textField#-#=valueField#" optionLabel=" "
itemTemplate="#=textField#-#=valueField#" textField="valueField"
valueField="textField" width="100" required="true">
</EF:EFComboColumn>
<EF:EFColumn ename="createdTime" cname="创建时间" readonly="true" width="100" align="center" enable="false"
parseFormats="['yyyyMMddHHmmss']" editType="datetime" dateFormat="yyyy-MM-dd HH:mm:ss" />
......
src/main/webapp/HP/PZ/HPPZ004.jsp
......@@ -9,14 +9,15 @@
<EF:EFRegion id="inqu" title="查询条件">
<div class="row">
<EF:EFSelect ename="inqu_status-0-inventType" cname="存货类型" colWidth="4">
<EF:EFOption label="--请选择--" value=""/>
<EF:EFOption label="待定" value="1"></EF:EFOption>
<EF:EFSelect ename="inqu_status-0-inventType" cname="存货类型" colWidth="4"
template="#=valueField#-#=textField#" valueTemplate="#=valueField#-#=textField#" enable="true">
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="customer_type_block_id" textField="valueField" valueField="textField"/>
</EF:EFSelect>
<EF:EFSelect ename="inqu_status-0-status" cname="状态" colWidth="4">
<EF:EFOption label="--请选择--" value=""/>
<EF:EFOption label="启用" value="1"></EF:EFOption>
<EF:EFOption label="未启用" value="0"></EF:EFOption>
<EF:EFSelect ename="inqu_status-0-status" cname="状态" colWidth="4"
template="#=valueField#-#=textField#" valueTemplate="#=valueField#-#=textField#" enable="true">
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="initiate_mode_block_id" textField="valueField" valueField="textField"/>
</EF:EFSelect>
</div>
</EF:EFRegion>
......@@ -27,18 +28,17 @@
<EF:EFColumn ename="id" cname="内码" hidden="true"/>
<EF:EFColumn ename="inventCode" cname="类型编码" width="100" readonly="false" required="true"/>
<EF:EFColumn ename="inventName" cname="存货名称" width="100" readonly="false" required="true"/>
<EF:EFComboColumn ename="inventType" cname="存货类型" align="center" columnTemplate="#=valueField#-#=textField#" optionLabel=" "
itemTemplate="#=valueField#-#=textField#" textField="textField"
valueField="valueField" width="100" required="true">
<EF:EFOption label="--请选择--" value=""></EF:EFOption>
<EF:EFOption label="待定" value="1"></EF:EFOption>
<EF:EFComboColumn ename="inventType" cname="存货类型" align="center"
blockName="customer_type_block_id"
columnTemplate="#=textField#-#=valueField#" optionLabel=" "
itemTemplate="#=textField#-#=valueField#" textField="valueField"
valueField="textField" width="100" required="true">
</EF:EFComboColumn>
<EF:EFComboColumn ename="status" cname="状态" align="center" columnTemplate="#=valueField#-#=textField#" optionLabel=" "
itemTemplate="#=valueField#-#=textField#" textField="textField"
valueField="valueField" width="100" required="true">
<EF:EFOption label="--请选择--" value=""></EF:EFOption>
<EF:EFOption label="启用" value="1"></EF:EFOption>
<EF:EFOption label="禁用" value="0"></EF:EFOption>
<EF:EFComboColumn ename="status" cname="状态" align="center"
blockName="initiate_mode_block_id"
columnTemplate="#=textField#-#=valueField#" optionLabel=" "
itemTemplate="#=textField#-#=valueField#" textField="valueField"
valueField="textField" width="100" required="true">
</EF:EFComboColumn>
<EF:EFColumn ename="createdTime" cname="创建时间" readonly="true" width="100" align="center" enable="false"
parseFormats="['yyyyMMddHHmmss']" editType="datetime" dateFormat="yyyy-MM-dd HH:mm:ss" />
......
src/main/webapp/HP/PZ/HPPZ006.jsp
......@@ -9,18 +9,27 @@
<EF:EFRegion id="inqu" title="查询条件">
<div class="row">
<EF:EFSelect ename="inqu_status-0-inventName" cname="存货名称" colWidth="4">
<EF:EFOption label="--请选择--" value=""/>
<EF:EFOption label="待定" value="1"></EF:EFOption>
<EF:EFSelect ename="inqu_status-0-inventName" cname="存货名称"
valueTemplate="#=textField#"
template="#=textField#"
textField="textField"
valueField="valueField"
required="true"
locked="true"
filter="contains">
<EF:EFOption label="--全部--" value=""/>
<EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
<EF:EFSelect ename="inqu_status-0-inventType" cname="存货类型" colWidth="4">
<EF:EFOption label="--请选择--" value=""/>
<EF:EFOption label="待定" value="1"></EF:EFOption>
<EF:EFSelect ename="inqu_status-0-inventType" cname="存货类型" colWidth="4"
template="#=valueField#-#=textField#" valueTemplate="#=valueField#-#=textField#" enable="true">
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="customer_type_block_id" textField="valueField" valueField="textField"/>
</EF:EFSelect>
<EF:EFSelect ename="inqu_status-0-status" cname="状态" colWidth="4">
<EF:EFOption label="--请选择--" value=""/>
<EF:EFOption label="启用" value="1"></EF:EFOption>
<EF:EFOption label="未启用" value="0"></EF:EFOption>
<EF:EFSelect ename="inqu_status-0-status" cname="状态" colWidth="4"
template="#=valueField#-#=textField#" valueTemplate="#=valueField#-#=textField#" enable="true">
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="initiate_mode_block_id" textField="valueField" valueField="textField"/>
</EF:EFSelect>
</div>
</EF:EFRegion>
......@@ -29,23 +38,26 @@
<EF:EFGrid blockId="result" autoDraw="false" isFloat="true" autoFit="true">
<EF:EFColumn ename="id" cname="内码" hidden="true"/>
<EF:EFComboColumn ename="inventCode" cname="存货编码" align="center" columnTemplate="#=valueField#-#=textField#" optionLabel=" "
itemTemplate="#=valueField#-#=textField#" textField="textField"
valueField="valueField" width="100" required="true">
<EF:EFOption label="--请选择--" value=""></EF:EFOption>
<EF:EFOption label="待定" value="1"></EF:EFOption>
</EF:EFComboColumn>
<EF:EFComboColumn ename="inventName" cname="存货名称" align="center" columnTemplate="#=valueField#-#=textField#" optionLabel=" "
itemTemplate="#=valueField#-#=textField#" textField="textField"
valueField="valueField" width="100" required="true">
<EF:EFOption label="--请选择--" value=""></EF:EFOption>
<EF:EFOption label="待定" value="1"></EF:EFOption>
<EF:EFComboColumn ename="inventName" cname="存货名称"
columnTemplate="#=textField#"
itemTemplate="#=textField#"
blockName="invent_name_block_id"
textField="textField"
valueField="textField"
maxLength="20"
readonly="false"
style="color:blue;"
required="true"
filter="contains"
width="150">
</EF:EFComboColumn>
<EF:EFComboColumn ename="inventType" cname="存货类型" align="center" columnTemplate="#=valueField#-#=textField#" optionLabel=" "
itemTemplate="#=valueField#-#=textField#" textField="textField"
valueField="valueField" width="100" required="true">
<EF:EFOption label="--请选择--" value=""></EF:EFOption>
<EF:EFOption label="待定" value="1"></EF:EFOption>
<EF:EFComboColumn ename="inventType" cname="存货类型" align="center"
blockName="customer_type_block_id"
columnTemplate="#=textField#-#=valueField#" optionLabel=" "
itemTemplate="#=textField#-#=valueField#" textField="valueField"
valueField="textField" width="100" required="true">
</EF:EFComboColumn>
<EF:EFColumn ename="spec" cname="规格" width="100" readonly="false" required="true"/>
<EF:EFColumn ename="length" cname="长" width="100" readonly="false" required="true"/>
......@@ -54,12 +66,11 @@
<EF:EFColumn ename="material" cname="材质" width="100" readonly="false" required="true"/>
<EF:EFColumn ename="coefficient" cname="系数" width="100" readonly="false" required="true"/>
<EF:EFColumn ename="unit" cname="单位" width="100" readonly="false" required="true"/>
<EF:EFComboColumn ename="status" cname="状态" align="center" columnTemplate="#=valueField#-#=textField#" optionLabel=" "
itemTemplate="#=valueField#-#=textField#" textField="textField"
valueField="valueField" width="100" required="true">
<EF:EFOption label="--请选择--" value=""></EF:EFOption>
<EF:EFOption label="启用" value="1"></EF:EFOption>
<EF:EFOption label="禁用" value="0"></EF:EFOption>
<EF:EFComboColumn ename="status" cname="状态" align="center"
blockName="initiate_mode_block_id"
columnTemplate="#=textField#-#=valueField#" optionLabel=" "
itemTemplate="#=textField#-#=valueField#" textField="valueField"
valueField="textField" width="100" required="true">
</EF:EFComboColumn>
<EF:EFColumn ename="createdTime" cname="创建时间" readonly="true" width="100" align="center" enable="false"
parseFormats="['yyyyMMddHHmmss']" editType="datetime" dateFormat="yyyy-MM-dd HH:mm:ss" />
......
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