Skip to content

H
hg-smart
Commit 61996b88 by 13420
Options

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

parents 26c538af 0f487e8c
Showing with 112 additions and 22 deletions
src/main/java/com/baosight/hggp/common/DdynamicEnum.java
......@@ -286,7 +286,7 @@ public enum DdynamicEnum {
* 用途：工序编码下拉框
* 编写：ly
*/
PROCESS_CODE_BLOCK_ID("processCode_block_id","processCode","processName","factoryCode","factoryName","unit", "status","deleteFlag","HGSJ001.queryProcessCode"),
PROCESS_CODE_BLOCK_ID("processCode_block_id","processCode","processName","factoryCode","factoryName","unit", "status","deleteFlag","costWeight","HGSJ001.queryProcessCode"),
/**
* 模块：设备台账编码
* 用途：设备区域下拉框
......
src/main/java/com/baosight/hggp/hg/pz/domain/HGPZ005A.java
......@@ -43,6 +43,7 @@ public class HGPZ005A extends DaoEPBase {
public static final String FIELD_PROCESS_CLASS = "processClass"; /* 工序类别*/
public static final String FIELD_PARENT_ID = "parentId"; /* 上级ID*/
public static final String FIELD_PROCESS_ORDER = "processOrder"; /* 加工顺序*/
public static final String FIELD_COST_WEIGHT = "costWeight";
public static final String COL_ID = "ID";
public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE"; /* 帐套编码*/
......@@ -89,6 +90,7 @@ public class HGPZ005A extends DaoEPBase {
private String processClass = " "; /* 工序分类*/
private Long parentId = new Long(0); /* 上级ID*/
private Long processOrder = new Long(0); /* 加工顺序*/
private BigDecimal costWeight = new BigDecimal(0.000);
/**
* initialize the metadata.
......@@ -183,7 +185,12 @@ public class HGPZ005A extends DaoEPBase {
eiColumn.setDescName("加工顺序");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_COST_WEIGHT);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
eiColumn.setFieldLength(15);
eiColumn.setDescName("费用权重");
eiMetadata.addMeta(eiColumn);
}
......@@ -484,6 +491,14 @@ public class HGPZ005A extends DaoEPBase {
this.processOrder = processOrder;
}
public BigDecimal getCostWeight() {
return costWeight;
}
public void setCostWeight(BigDecimal costWeight) {
this.costWeight = costWeight;
}
/**
* get the value from Map.
*
......@@ -512,6 +527,7 @@ public class HGPZ005A extends DaoEPBase {
setProcessClass(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROCESS_CLASS)), processClass));
setParentId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_PARENT_ID)), parentId));
setProcessOrder(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_PROCESS_ORDER)), processOrder));
setCostWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_COST_WEIGHT)), costWeight));
}
/**
......@@ -541,6 +557,8 @@ public class HGPZ005A extends DaoEPBase {
map.put(FIELD_PROCESS_CLASS, StringUtils.toString(processClass, eiMetadata.getMeta(FIELD_PROCESS_CLASS)));
map.put(FIELD_PARENT_ID, StringUtils.toString(parentId, eiMetadata.getMeta(FIELD_PARENT_ID)));
map.put(FIELD_PROCESS_ORDER, StringUtils.toString(processOrder, eiMetadata.getMeta(FIELD_PROCESS_ORDER)));
map.put(FIELD_COST_WEIGHT,StringUtils.toString(costWeight, eiMetadata.getMeta(FIELD_COST_WEIGHT)));
return map;
}
......
src/main/java/com/baosight/hggp/hg/pz/service/ServiceHGPZ005.java
......@@ -400,6 +400,7 @@ public class ServiceHGPZ005 extends ServiceBase {
hgpz005A.setComposingCoeff(BigDecimal.ONE);
hgpz005A.setParentId(hppz005.getId());
hgpz005A.setProcessOrder(hgsj002a.getProcessOrder());
hgpz005A.setCostWeight(hgsj002a.getCostWeight());
DaoUtils.insert(HGPZ005A.INSERT,hgpz005A.toMap());
}
}
......
src/main/java/com/baosight/hggp/hg/pz/sql/HGPZ005A.xml
......@@ -112,7 +112,8 @@
UNIT_COEFF as "unitCoeff", <!-- 单价系数 -->
PROCESS_CLASS as "processClass", <!-- 工序类别 -->
PARENT_ID as "parentId", <!-- 上级ID -->
PROCESS_ORDER as "processOrder"
PROCESS_ORDER as "processOrder",
COST_WEIGHT as "costWeight" <!-- 费用权重 -->
FROM ${hggpSchema}.HGPZ005A WHERE 1=1
<include refid="condition" />
<dynamic prepend="ORDER BY">
......@@ -202,9 +203,10 @@
UNIT_COEFF, <!-- 单价系数 -->
PROCESS_CLASS, <!-- 工序类别 -->
PARENT_ID, <!-- 上级ID -->
PROCESS_ORDER
PROCESS_ORDER,
COST_WEIGHT
)
VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #companyCode#, #companyName#, #inventCode#, #processCode#, #processName#, #composingCoeff#, #unitCoeff#, #processClass#, #parentId#,#processOrder#)
VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #companyCode#, #companyName#, #inventCode#, #processCode#, #processName#, #composingCoeff#, #unitCoeff#, #processClass#, #parentId#,#processOrder#, #costWeight#)
</insert>
<delete id="delete">
......@@ -237,7 +239,8 @@
UNIT_COEFF = #unitCoeff#, <!-- 单价系数 -->
PROCESS_CLASS = #processClass#, <!-- 工序类别 -->
PARENT_ID = #parentId#, <!-- 上级ID -->
PROCESS_ORDER = #processOrder#
PROCESS_ORDER = #processOrder#,
COMPUTE_TYPE = #computeType#
WHERE
ID = #id#
</update>
......
src/main/java/com/baosight/hggp/hg/sj/domain/HGSJ001.java
......@@ -45,6 +45,7 @@ public class HGSJ001 extends DaoEPBase {
public static final String FIELD_PRINC_NAME = "princName"; /* 负责人名称*/
public static final String FIELD_STATUS = "status"; /* 状态0.停止1.启用*/
public static final String FIELD_COMPUTE_TYPE = "computeType"; /* 计算类型*/
public static final String FIELD_COST_WEIGHT = "costWeight";
public static final String COL_ID = "ID"; /* 主键id*/
public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE"; /* 企业编码 预留*/
......@@ -97,6 +98,7 @@ public class HGSJ001 extends DaoEPBase {
private String princName = " "; /* 负责人名称*/
private Integer status = 0; /* 状态0.停止1.启用*/
private Integer computeType = 0;
private BigDecimal costWeight = new BigDecimal(0.000);
/**
* initialize the metadata.
......@@ -202,6 +204,13 @@ public class HGSJ001 extends DaoEPBase {
eiColumn.setDescName("计算类型");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_COST_WEIGHT);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
eiColumn.setFieldLength(15);
eiColumn.setDescName("费用权重");
eiMetadata.addMeta(eiColumn);
}
/**
......@@ -549,6 +558,13 @@ public class HGSJ001 extends DaoEPBase {
this.computeType = computeType;
}
public BigDecimal getCostWeight() {
return costWeight;
}
public void setCostWeight(BigDecimal costWeight) {
this.costWeight = costWeight;
}
/**
* get the value from Map.
*
......@@ -579,6 +595,7 @@ public class HGSJ001 extends DaoEPBase {
setPrincName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRINC_NAME)), princName));
setStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_STATUS)), status));
setComputeType(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_COMPUTE_TYPE)), computeType));
setCostWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_COST_WEIGHT)), costWeight));
}
/**
......@@ -610,6 +627,7 @@ public class HGSJ001 extends DaoEPBase {
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_COMPUTE_TYPE, StringUtils.toString(computeType, eiMetadata.getMeta(FIELD_COMPUTE_TYPE)));
map.put(FIELD_COST_WEIGHT,StringUtils.toString(costWeight, eiMetadata.getMeta(FIELD_COST_WEIGHT)));
return map;
}
......
src/main/java/com/baosight/hggp/hg/sj/domain/HGSJ002A.java
......@@ -5,6 +5,7 @@ import com.baosight.iplat4j.core.ei.EiColumn;
import com.baosight.iplat4j.core.util.NumberUtils;
import com.baosight.iplat4j.core.util.StringUtils;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.Map;
......@@ -40,6 +41,7 @@ public class HGSJ002A extends DaoEPBase {
public static final String FIELD_PROCESS_CODE = "processCode"; /* 工序编码*/
public static final String FIELD_PROCESS_NAME = "processName"; /* 工序名称*/
public static final String FIELD_PAREND_ID = "parendId";
public static final String FIELD_COST_WEIGHT = "costWeight";
public static final String COL_ID = "ID"; /* 主键id*/
public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE"; /* 企业编码 预留*/
......@@ -84,6 +86,7 @@ public class HGSJ002A extends DaoEPBase {
private String processCode = " "; /* 工序编码*/
private String processName = " "; /* 工序名称*/
private Long parendId = new Long(0);
private BigDecimal costWeight = new BigDecimal(0);
/**
* initialize the metadata.
......@@ -164,6 +167,13 @@ public class HGSJ002A extends DaoEPBase {
eiColumn.setDescName("上级ID");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_COST_WEIGHT);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
eiColumn.setFieldLength(15);
eiColumn.setDescName("费用权重");
eiMetadata.addMeta(eiColumn);
}
/**
......@@ -446,6 +456,14 @@ public class HGSJ002A extends DaoEPBase {
this.parendId = parendId;
}
public BigDecimal getCostWeight() {
return costWeight;
}
public void setCostWeight(BigDecimal costWeight) {
this.costWeight = costWeight;
}
/**
* get the value from Map.
*
......@@ -472,6 +490,7 @@ public class HGSJ002A extends DaoEPBase {
setProcessCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROCESS_CODE)), processCode));
setProcessName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROCESS_NAME)), processName));
setParendId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_PAREND_ID)),parendId));
setCostWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_COST_WEIGHT)), costWeight));
}
/**
......@@ -499,6 +518,7 @@ public class HGSJ002A extends DaoEPBase {
map.put(FIELD_PROCESS_CODE, StringUtils.toString(processCode, eiMetadata.getMeta(FIELD_PROCESS_CODE)));
map.put(FIELD_PROCESS_NAME, StringUtils.toString(processName, eiMetadata.getMeta(FIELD_PROCESS_NAME)));
map.put(FIELD_PAREND_ID, StringUtils.toString(parendId, eiMetadata.getMeta(FIELD_PAREND_ID)));
map.put(FIELD_COST_WEIGHT, StringUtils.toString(costWeight, eiMetadata.getMeta(FIELD_COST_WEIGHT)));
return map;
}
......
src/main/java/com/baosight/hggp/hg/sj/sql/HGSJ001.xml
......@@ -24,7 +24,8 @@
PRINC as "princ", <!-- 负责人 -->
PRINC_NAME as "princName", <!-- 负责人名称 -->
STATUS as "status", <!-- 状态0.停止1.启动 -->
COMPUTE_TYPE as "computeType"
COMPUTE_TYPE as "computeType",
COST_WEIGHT as "costWeight" <!-- 费用权重 -->
</sql>
<sql id="authCondition">
......@@ -233,9 +234,10 @@
PRINC, <!-- 负责人 -->
PRINC_NAME,
STATUS, <!-- 状态0.停止1.启动 -->
COMPUTE_TYPE
COMPUTE_TYPE,
COST_WEIGHT
)
VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #factoryCode#, #factoryName#, #processCode#, #processName#, #unit#, #standardJob#, #standardDays#, #standardNum#, #princ#, #princName#,#status#,#computeType#)
VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #factoryCode#, #factoryName#, #processCode#, #processName#, #unit#, #standardJob#, #standardDays#, #standardNum#, #princ#, #princName#,#status#,#computeType#, #costWeight#)
</insert>
<delete id="delete">
......@@ -278,7 +280,8 @@
PRINC = #princ#, <!-- 负责人 -->
PRINC_NAME = #princName#,
STATUS = #status#, <!-- 状态0.停止1.启动 -->
COMPUTE_TYPE = #computeType#
COMPUTE_TYPE = #computeType#,
COST_WEIGHT = #costWeight#
WHERE
ID = #id#
</update>
......@@ -302,10 +305,11 @@
FACTORY_NAME as "factoryName", <!-- 厂区名称 -->
UNIT AS "unit",
STATUS as "status",
DELETE_FLAG as "deleteFlag"
DELETE_FLAG as "deleteFlag",
COST_WEIGHT as "costWeight"
FROM ${hggpSchema}.HGGY001 WHERE 1=1
<include refid="condition" />
group by PROCESS_CODE,PROCESS_NAME,FACTORY_CODE,FACTORY_NAME,UNIT,STATUS,DELETE_FLAG
group by PROCESS_CODE, PROCESS_NAME, FACTORY_CODE, FACTORY_NAME, UNIT, STATUS, DELETE_FLAG, COST_WEIGHT
</select>
<!--查询用户所在的公司-->
......
src/main/java/com/baosight/hggp/hg/sj/sql/HGSJ002A.xml
......@@ -42,7 +42,8 @@
PROCESS_ORDER as "processOrder", <!-- 加工顺序 -->
PROCESS_CODE as "processCode", <!-- 工序编码 -->
PROCESS_NAME as "processName", <!-- 工序名称 -->
PAREND_ID as "parendId"
PAREND_ID as "parendId",
COST_WEIGHT as "costWeight"
</sql>
<sql id="condition">
......@@ -193,9 +194,10 @@
PROCESS_ORDER, <!-- 加工顺序 -->
PROCESS_CODE, <!-- 工序编码 -->
PROCESS_NAME, <!-- 工序名称 -->
PAREND_ID
PAREND_ID,
COST_WEIGHT
)
VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #factoryCode#, #factoryName#, #flowCode#, #flowName#, #processOrder#, #processCode#, #processName#, #parendId#)
VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #factoryCode#, #factoryName#, #flowCode#, #flowName#, #processOrder#, #processCode#, #processName#, #parendId#, #costWeight#)
</insert>
<delete id="delete">
......@@ -232,7 +234,8 @@
PROCESS_ORDER = #processOrder#, <!-- 加工顺序 -->
PROCESS_CODE = #processCode#, <!-- 工序编码 -->
PROCESS_NAME = #processName#, <!-- 工序名称 -->
PAREND_ID = #parendId#
PAREND_ID = #parendId#,
COST_WEIGHT = #costWeight#
WHERE
ID = #id#
</update>
......
src/main/java/com/baosight/hggp/hg/xs/tools/HGXSTools.java
......@@ -90,7 +90,7 @@ public class HGXSTools {
}
Map queryMap = new HashMap();
queryMap.put(User.FIELD_ACCOUNT_CODE, accountCode);
return DaoBase.getInstance().query(HGSqlConstant.HgXsUser.QUERY, queryMap);
return DaoBase.getInstance().query(HGSqlConstant.HgXsUser.QUERY_BY_ORG, queryMap);
}
/**
......
src/main/webapp/HG/PZ/HGPZ005A.jsp
......@@ -46,11 +46,15 @@
displayType="0.000" sort="true" align="right"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" maxLength="15" required="true"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/>
<EF:EFColumn ename="unitCoeff" cname="单价系数" width="120" enable="true" format="{0:N3}" editType="text"
<EF:EFColumn ename="costWeight" cname="费用权重" width="100" enable="false" format="{0:N3}" editType="number"
displayType="0" sort="true" align="right"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" maxLength="15" required="true"
data-errorprompt="请输入数字，该值最大可设置15位整数！"/>
<EF:EFColumn ename="unitCoeff" cname="单价系数" width="120" enable="true" format="{0:N3}" editType="text" hidden="true"
displayType="0.000" sort="true" align="right"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" maxLength="15" required="true"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/>
<EF:EFColumn ename="processClass" cname="工序分类" width="120" enable="true" align="center" required="true"/>
<EF:EFColumn ename="processClass" cname="工序分类" width="120" enable="true" align="center" required="true" hidden="true"/>
</EF:EFGrid>
</EF:EFRegion>
</EF:EFPage>
src/main/webapp/HG/SC/HGSC001C.js
......@@ -76,7 +76,7 @@ $(function () {
$("#result-0-subcontractCode").change(function () {
let textField = IPLAT.EFSelect.text($("#result-0-subcontractCode"));
$("#result-0-subcontractName").val(textField);
loadProjMg(IPLAT.EFSelect.value($("#result-0-subcontractCode")));
// loadProjMg(IPLAT.EFSelect.value($("#result-0-subcontractCode")));
});
$("#result-0-genralContractCode").change(function () {
let textField = IPLAT.EFSelect.text($("#result-0-genralContractCode"));
......
src/main/webapp/HG/SJ/HGSJ001.jsp
......@@ -65,6 +65,10 @@
<EF:EFComboColumn ename="computeType" cname="计算类型" width="80" enable="true" align="center" required="true">
<EF:EFCodeOption codeName="hggp.hgsj.computeType"/>
</EF:EFComboColumn>
<EF:EFColumn ename="costWeight" cname="费用权重" width="100" enable="true" format="{0:N3}" editType="number"
displayType="0" sort="true" align="right"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" maxLength="15" required="true"
data-errorprompt="请输入数字，该值最大可设置15位整数！"/>
<EF:EFComboColumn ename="princ" cname="负责人" defaultValue="${loginName}"
columnTemplate="#=textField#" itemTemplate="#=textField#"
textField="textField" valueField="valueField"
......
src/main/webapp/HG/SJ/HGSJ002A.js
......@@ -52,6 +52,18 @@ $(function (){
}
],
loadComplete: function(grid) {
grid.dataSource.bind("change", function(e) {
// 判断父级节点是否发生变化
if (e.field === "processCode") {
let item = e.items[0];
for (let j = 0; j < processCodes.length; j++) {
if (processCodes[j].valueField === item.processCode){
resultGrid.setCellValue(item, "costWeight", processCodes[j].param6Field);
break;
}
}
}
});
},
afterEdit:function (e) {
},
......
src/main/webapp/HG/SJ/HGSJ002A.jsp
......@@ -47,8 +47,7 @@
<EF:EFColumn ename="processOrder" cname="加工顺序" width="120" enable="true" format="{0:N0}" editType="number"
displayType="0" sort="true" align="center" required="true"
data-regex="/^-?[0-9]{1,15}?$/" maxLength="15"
data-errorprompt="请输入数字，该值最大可设置15位整数！"
/>
data-errorprompt="请输入数字，该值最大可设置15位整数！"/>
<EF:EFComboColumn ename="processCode" cname="工序名称"
columnTemplate="#=textField#" itemTemplate="#=textField#"
textField="textField" valueField="valueField"
......@@ -57,6 +56,10 @@
<EF:EFOptions blockId="processCode_block_id" textField="textField" valueField="valueField"/>
</EF:EFComboColumn>
<EF:EFColumn ename="processName" cname="工序名称" hidden="true"/>
<EF:EFColumn ename="costWeight" cname="费用权重" width="100" enable="true" format="{0:N3}" editType="number"
displayType="0" sort="true" align="right" hidden="true"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" maxLength="15" required="true"
data-errorprompt="请输入数字，该值最大可设置15位整数！"/>
<EF:EFColumn cname="创建人" ename="createdName" align="center" width="100" readonly="true" required="false"
enable="false"/>
<EF:EFColumn cname="创建时间" ename="createdTime" parseFormats="['yyyyMMddHHmmss']" editType="datetime"
......
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