Skip to content

H
hg-smart
Commit 3f39924b by liuyang
Options

2024-05-20 优化工艺流程和工序单价

parent 84eaade5
Showing with 47 additions and 9 deletions
src/main/java/com/baosight/hggp/hg/sj/domain/HGSJ001.java
...@@ -42,6 +42,7 @@ public class HGSJ001 extends DaoEPBase { ...@@ -42,6 +42,7 @@ public class HGSJ001 extends DaoEPBase {
public static final String FIELD_STANDARD_DAYS = "standardDays"; /* 标准人天*/ public static final String FIELD_STANDARD_DAYS = "standardDays"; /* 标准人天*/
public static final String FIELD_STANDARD_NUM = "standardNum"; /* 标准工序人数*/ public static final String FIELD_STANDARD_NUM = "standardNum"; /* 标准工序人数*/
public static final String FIELD_PRINC = "princ"; /* 负责人*/ public static final String FIELD_PRINC = "princ"; /* 负责人*/
public static final String FIELD_PRINC_NAME = "princName"; /* 负责人名称*/
public static final String FIELD_STATUS = "status"; /* 状态0.停止1.启用*/ public static final String FIELD_STATUS = "status"; /* 状态0.停止1.启用*/
public static final String COL_ID = "ID"; /* 主键id*/ public static final String COL_ID = "ID"; /* 主键id*/
...@@ -92,6 +93,7 @@ public class HGSJ001 extends DaoEPBase { ...@@ -92,6 +93,7 @@ public class HGSJ001 extends DaoEPBase {
private BigDecimal standardDays = new BigDecimal("0"); /* 标准人天*/ private BigDecimal standardDays = new BigDecimal("0"); /* 标准人天*/
private BigDecimal standardNum = new BigDecimal("0"); /* 标准工序人数*/ private BigDecimal standardNum = new BigDecimal("0"); /* 标准工序人数*/
private String princ = " "; /* 负责人*/ private String princ = " "; /* 负责人*/
private String princName = " "; /* 负责人名称*/
private Integer status = 0; /* 状态0.停止1.启用*/ private Integer status = 0; /* 状态0.停止1.启用*/
/** /**
...@@ -186,6 +188,10 @@ public class HGSJ001 extends DaoEPBase { ...@@ -186,6 +188,10 @@ public class HGSJ001 extends DaoEPBase {
eiColumn.setDescName("负责人"); eiColumn.setDescName("负责人");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PRINC_NAME);
eiColumn.setDescName("负责人名称");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_STATUS); eiColumn = new EiColumn(FIELD_STATUS);
eiColumn.setDescName("状态0.停止1.启用"); eiColumn.setDescName("状态0.停止1.启用");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
...@@ -504,6 +510,15 @@ public class HGSJ001 extends DaoEPBase { ...@@ -504,6 +510,15 @@ public class HGSJ001 extends DaoEPBase {
public void setPrinc(String princ) { public void setPrinc(String princ) {
this.princ = princ; this.princ = princ;
} }
public String getPrincName() {
return princName;
}
public void setPrincName(String princName) {
this.princName = princName;
}
/** /**
* get the status - 状态0.启用1.停止. * get the status - 状态0.启用1.停止.
* @return the status * @return the status
...@@ -547,6 +562,7 @@ public class HGSJ001 extends DaoEPBase { ...@@ -547,6 +562,7 @@ public class HGSJ001 extends DaoEPBase {
setStandardDays(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_STANDARD_DAYS)), standardDays)); setStandardDays(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_STANDARD_DAYS)), standardDays));
setStandardNum(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_STANDARD_NUM)), standardNum)); setStandardNum(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_STANDARD_NUM)), standardNum));
setPrinc(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRINC)), princ)); setPrinc(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRINC)), princ));
setPrincName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRINC_NAME)), princName));
setStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_STATUS)), status)); setStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_STATUS)), status));
} }
...@@ -576,6 +592,7 @@ public class HGSJ001 extends DaoEPBase { ...@@ -576,6 +592,7 @@ public class HGSJ001 extends DaoEPBase {
map.put(FIELD_STANDARD_DAYS, StringUtils.toString(standardDays, eiMetadata.getMeta(FIELD_STANDARD_DAYS))); map.put(FIELD_STANDARD_DAYS, StringUtils.toString(standardDays, eiMetadata.getMeta(FIELD_STANDARD_DAYS)));
map.put(FIELD_STANDARD_NUM, StringUtils.toString(standardNum, eiMetadata.getMeta(FIELD_STANDARD_NUM))); map.put(FIELD_STANDARD_NUM, StringUtils.toString(standardNum, eiMetadata.getMeta(FIELD_STANDARD_NUM)));
map.put(FIELD_PRINC, StringUtils.toString(princ, eiMetadata.getMeta(FIELD_PRINC))); map.put(FIELD_PRINC, StringUtils.toString(princ, eiMetadata.getMeta(FIELD_PRINC)));
map.put(FIELD_PRINC_NAME, StringUtils.toString(princName, eiMetadata.getMeta(FIELD_PRINC_NAME)));
map.put(FIELD_STATUS, StringUtils.toString(status, eiMetadata.getMeta(FIELD_STATUS))); map.put(FIELD_STATUS, StringUtils.toString(status, eiMetadata.getMeta(FIELD_STATUS)));
return map; return map;
......
src/main/java/com/baosight/hggp/hg/sj/sql/HGSJ001.xml
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
STANDARD_DAYS as "standardDays", <!-- 标准人天 --> STANDARD_DAYS as "standardDays", <!-- 标准人天 -->
STANDARD_NUM as "standardNum", <!-- 标准工序人数 --> STANDARD_NUM as "standardNum", <!-- 标准工序人数 -->
PRINC as "princ", <!-- 负责人 --> PRINC as "princ", <!-- 负责人 -->
PRINC_NAME as "princName", <!-- 负责人名称 -->
STATUS as "status" <!-- 状态0.停止1.启动 --> STATUS as "status" <!-- 状态0.停止1.启动 -->
</sql> </sql>
...@@ -104,6 +105,9 @@ ...@@ -104,6 +105,9 @@
<isNotEmpty prepend=" AND " property="princ"> <isNotEmpty prepend=" AND " property="princ">
PRINC LIKE CONCAT('%', #princ#, '%') PRINC LIKE CONCAT('%', #princ#, '%')
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="princName">
PRINC_NAME LIKE CONCAT('%', #princName#, '%')
</isNotEmpty>
<isNotEmpty prepend=" AND " property="status"> <isNotEmpty prepend=" AND " property="status">
STATUS = #status# STATUS = #status#
</isNotEmpty> </isNotEmpty>
...@@ -217,9 +221,10 @@ ...@@ -217,9 +221,10 @@
STANDARD_DAYS, <!-- 标准人天 --> STANDARD_DAYS, <!-- 标准人天 -->
STANDARD_NUM, <!-- 标准工序人数 --> STANDARD_NUM, <!-- 标准工序人数 -->
PRINC, <!-- 负责人 --> PRINC, <!-- 负责人 -->
PRINC_NAME,
STATUS <!-- 状态0.停止1.启动 --> STATUS <!-- 状态0.停止1.启动 -->
) )
VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #factoryCode#, #factoryName#, #processCode#, #processName#, #unit#, #standardJob#, #standardDays#, #standardNum#, #princ#, #status#) VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #factoryCode#, #factoryName#, #processCode#, #processName#, #unit#, #standardJob#, #standardDays#, #standardNum#, #princ#, #princName#,#status#)
</insert> </insert>
<delete id="delete"> <delete id="delete">
...@@ -260,6 +265,7 @@ ...@@ -260,6 +265,7 @@
STANDARD_DAYS = #standardDays#, <!-- 标准人天 --> STANDARD_DAYS = #standardDays#, <!-- 标准人天 -->
STANDARD_NUM = #standardNum#, <!-- 标准工序人数 --> STANDARD_NUM = #standardNum#, <!-- 标准工序人数 -->
PRINC = #princ#, <!-- 负责人 --> PRINC = #princ#, <!-- 负责人 -->
PRINC_NAME = #princName#,
STATUS = #status# <!-- 状态0.停止1.启动 --> STATUS = #status# <!-- 状态0.停止1.启动 -->
WHERE WHERE
ID = #id# ID = #id#
......
src/main/webapp/HG/SJ/HGSJ001.js
$(function (){ $(function (){
var factoryCodes = __eiInfo.getBlock("companyBox_block_id").getMappedRows(); var factoryCodes = __eiInfo.getBlock("companyBox_block_id").getMappedRows();
var userIdBox = __eiInfo.getBlock("user_block_id").getMappedRows();
$(".row").children().attr("class", "col-md-3"); $(".row").children().attr("class", "col-md-3");
...@@ -37,7 +38,7 @@ $(function (){ ...@@ -37,7 +38,7 @@ $(function (){
} }
return template; return template;
} }
},{ }, {
field: "factoryCode", field: "factoryCode",
template: function (dataItem) { template: function (dataItem) {
for (let i = 0; i < factoryCodes.length; i++) { for (let i = 0; i < factoryCodes.length; i++) {
...@@ -48,7 +49,18 @@ $(function (){ ...@@ -48,7 +49,18 @@ $(function (){
} }
return dataItem['factoryCode']; return dataItem['factoryCode'];
}, },
},{ }, {
field: "princ",
template: function (dataItem) {
for (let i = 0; i < userIdBox.length; i++) {
if (userIdBox[i]['valueField'] === dataItem['princ']) {
dataItem['princName'] = userIdBox[i]['textField'];
return userIdBox[i]['textField'];
}
}
return dataItem['princ'];
}
}, {
field: "createdName", field: "createdName",
template: function (options) { template: function (options) {
return showUserName(options.createdBy, options.createdName); return showUserName(options.createdBy, options.createdName);
......
src/main/webapp/HG/SJ/HGSJ001.jsp
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
<EF:EFOption label="全部" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/> <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect> </EF:EFSelect>
<EF:EFInput blockId="inqu_status" row="0" ename="processName" cname="工序名称" colWidth="3"/> <EF:EFInput blockId="inqu_status" row="0" ename="processName" cname="工序名称" placeholder="模糊查询" colWidth="3"/>
<EF:EFInput blockId="inqu_status" row="0" ename="princ" cname="负责人" colWidth="3"/> <EF:EFInput blockId="inqu_status" row="0" ename="princName" cname="负责人" placeholder="模糊查询" colWidth="3"/>
<EF:EFSelect blockId="inqu_status" row="0" ename="status" cname="状态" colWidth="3" filter="contains"> <EF:EFSelect blockId="inqu_status" row="0" ename="status" cname="状态" colWidth="3" filter="contains">
<EF:EFOption label="全部" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hpjx.hpjx.status"/> <EF:EFCodeOption codeName="hpjx.hpjx.status"/>
......
src/main/webapp/HG/SJ/HGSJ002.jsp
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<EF:EFOption label="全部" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/> <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect> </EF:EFSelect>
<EF:EFInput blockId="inqu_status" row="0" ename="flowName" cname="流程名称" colWidth="3"/> <EF:EFInput blockId="inqu_status" row="0" ename="flowName" cname="流程名称" placeholder="模糊查询" colWidth="3"/>
<EF:EFSelect blockId="inqu_status" row="0" ename="status" cname="状态" colWidth="3" filter="contains"> <EF:EFSelect blockId="inqu_status" row="0" ename="status" cname="状态" colWidth="3" filter="contains">
<EF:EFOption label="全部" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hpjx.hpjx.status"/> <EF:EFCodeOption codeName="hpjx.hpjx.status"/>
......
src/main/webapp/HG/SJ/HGSJ002A.jsp
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
<EF:EFOption label="全部" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/> <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect> </EF:EFSelect>
<EF:EFInput blockId="inqu_status" row="0" ename="flowCode" cname="流程编码" colWidth="3" readonly="true"/> <EF:EFInput blockId="inqu_status" row="0" ename="flowCode" cname="流程编码" colWidth="3" placeholder="模糊查询" readonly="true"/>
<EF:EFInput blockId="inqu_status" row="0" ename="flowName" cname="流程名称" colWidth="3" readonly="true"/> <EF:EFInput blockId="inqu_status" row="0" ename="flowName" cname="流程名称" colWidth="3" placeholder="模糊查询" readonly="true"/>
<EF:EFSelect blockId="inqu_status" row="0" ename="processCode" cname="工序名称" colWidth="3" filter="contains"> <EF:EFSelect blockId="inqu_status" row="0" ename="processCode" cname="工序名称" colWidth="3" filter="contains">
<EF:EFOption label="全部" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="processCode_block_id" textField="textField" valueField="valueField"/> <EF:EFOptions blockId="processCode_block_id" textField="textField" valueField="valueField"/>
......
src/main/webapp/HG/SJ/HGSJ003.js
...@@ -75,6 +75,9 @@ $(function (){ ...@@ -75,6 +75,9 @@ $(function (){
} }
return dataItem['processCode']; return dataItem['processCode'];
}, },
editor: function (container, options) {
this.filter(options);
}
}, { }, {
field: "spec", field: "spec",
template: function (options) { template: function (options) {
......
src/main/webapp/HG/SJ/HGSJ003.jsp
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<EF:EFOption label="全部" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="processCode_block_id" textField="textField" valueField="valueField"/> <EF:EFOptions blockId="processCode_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>--%> </EF:EFSelect>--%>
<EF:EFInput blockId="inqu_status" row="0" ename="processName" cname="工序名称" colWidth="3"/> <EF:EFInput blockId="inqu_status" row="0" ename="processName" cname="工序名称" placeholder="模糊查询" colWidth="3"/>
<EF:EFSelect blockId="inqu_status" row="0" ename="status" cname="状态" colWidth="3" filter="contains"> <EF:EFSelect blockId="inqu_status" row="0" ename="status" cname="状态" colWidth="3" filter="contains">
<EF:EFOption label="全部" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hpjx.hpjx.status"/> <EF:EFCodeOption codeName="hpjx.hpjx.status"/>
......
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