Skip to content

H
hg-smart
Commit 2f8911f5 by 江和松
Options

材料计划、采购计划增加备注字段

parent 0b40ea1b
Showing with 66 additions and 91 deletions
src/main/java/com/baosight/hggp/hg/cg/domain/HGCG001A.java
......@@ -55,6 +55,7 @@ public class HGCG001A extends DaoEPBase {
public static final String FIELD_INVENT_TYPE_DETAIL = "inventTypeDetail"; /* 存货类型大类*/
public static final String FIELD_PRIMARY_ID = "primaryId"; /* 主表id*/
public static final String FIELD_STATUS = "status"; /* 状态：0-待审核，1-审核中，2-审核通过，3-审核拒绝，4-生成合同，5-部分生成合同*/
public static final String FIELD_REMARKS = "remarks"; /*备注*/
//页面展示
public static final String FIELD_SOURCE = "source"; /* 数据来源 根据采购数据来源小代码 目前默认0材料计划，1手工录入*/
......@@ -137,6 +138,7 @@ public class HGCG001A extends DaoEPBase {
private Integer inventTypeDetail; /* 存货类型大类*/
private Long primaryId = new Long(0); /* 主表id*/
private Integer status; /* 状态：0-待审核，1-审核中，2-审核通过，3-审核拒绝，4-生成合同，5-部分生成合同*/
private String remarks; /*备注*/
//选择合同需要信息
private Integer source; /* 数据来源 根据采购数据来源小代码 目前默认0材料计划，1手工录入*/
......@@ -350,6 +352,10 @@ public class HGCG001A extends DaoEPBase {
eiColumn.setFieldLength(12);
eiColumn.setDescName("税率");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_REMARKS);
eiColumn.setDescName("备注");
eiMetadata.addMeta(eiColumn);
}
/**
......@@ -928,6 +934,14 @@ public class HGCG001A extends DaoEPBase {
this.taxRate = taxRate;
}
public String getRemarks() {
return remarks;
}
public void setRemarks(String remarks) {
this.remarks = remarks;
}
/**
* get the value from Map.
*
......@@ -976,6 +990,7 @@ public class HGCG001A extends DaoEPBase {
setTaxIncludeAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_TAX_INCLUDE_AMOUNT)), taxIncludeAmount));
setTaxAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_TAX_AMOUNT)), taxAmount));
setTaxRate(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_TAX_RATE)), taxRate));
setRemarks(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REMARKS)), remarks));
}
/**
......@@ -1018,6 +1033,7 @@ public class HGCG001A extends DaoEPBase {
map.put(FIELD_INVENT_TYPE_DETAIL, StringUtils.toString(inventTypeDetail, eiMetadata.getMeta(FIELD_INVENT_TYPE_DETAIL)));
map.put(FIELD_PRIMARY_ID, StringUtils.toString(primaryId, eiMetadata.getMeta(FIELD_PRIMARY_ID)));
map.put(FIELD_STATUS, StringUtils.toString(status, eiMetadata.getMeta(FIELD_STATUS)));
map.put(FIELD_REMARKS,StringUtils.toString(remarks, eiMetadata.getMeta(FIELD_REMARKS)));
map.put(FIELD_SOURCE, StringUtils.toString(source, eiMetadata.getMeta(FIELD_SOURCE)));
map.put(FIELD_PRICE, StringUtils.toString(price, eiMetadata.getMeta(FIELD_PRICE)));
......@@ -1025,6 +1041,7 @@ public class HGCG001A extends DaoEPBase {
map.put(FIELD_TAX_INCLUDE_AMOUNT, StringUtils.toString(taxIncludeAmount, eiMetadata.getMeta(FIELD_TAX_INCLUDE_AMOUNT)));
map.put(FIELD_TAX_AMOUNT, StringUtils.toString(taxAmount, eiMetadata.getMeta(FIELD_TAX_AMOUNT)));
map.put(FIELD_TAX_RATE, StringUtils.toString(taxRate, eiMetadata.getMeta(FIELD_TAX_RATE)));
return map;
}
}
src/main/java/com/baosight/hggp/hg/cg/sql/HGCG001A.xml
......@@ -103,6 +103,9 @@
<isNotEmpty prepend=" AND " property="primaryIds">
PRIMARY_ID IN <iterate open="(" close=")" conjunction="," property="primaryIds">#primaryIds[]#</iterate>
</isNotEmpty>
<isNotEmpty prepend=" AND " property="remarks">
REMARKS = #remarks#
</isNotEmpty>
</sql>
<sql id="idCondition">
......@@ -268,6 +271,7 @@
MATERIAL_PLAN_ID as "materialPlanId", <!-- 材料计划id -->
INVENT_TYPE_DETAIL as "inventTypeDetail", <!-- 存货类型大类 -->
STATUS as "status", <!-- 状态：0-未审批，1-审核通过，2-审核未通过 -->
REMARKS as "remarks", <!-- 备注 -->
PRIMARY_ID as "primaryId" <!-- 主表id -->
FROM ${hggpSchema}.HGCG001A WHERE 1=1
<include refid="condition" />
......@@ -320,6 +324,7 @@
a.PUR_WEIGHT as "purWeight", <!-- 采购重量 -->
a.MATERIAL_PLAN_ID as "materialPlanId", <!-- 材料计划id -->
a.INVENT_TYPE_DETAIL as "inventTypeDetail", <!-- 存货类型大类 -->
a.REMARKS as "remarks", <!-- 备注 -->
a.STATUS as "status", <!-- 状态：0-未审批，1-审核通过，2-审核未通过 -->
b.SOURCE as "source", <!-- 数据来源 根据采购数据来源小代码 目前默认0材料计划，1手工录入 -->
b.PLAN_DATE as "planDate", <!-- 计划日期 -->
......@@ -372,9 +377,10 @@
MATERIAL_PLAN_ID, <!-- 材料计划id -->
INVENT_TYPE_DETAIL, <!-- 存货类型大类 -->
STATUS,
PRIMARY_ID <!-- 主表id -->
PRIMARY_ID, <!-- 主表id -->
REMARKS
)
VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #companyCode#, #companyName#, #planDate#, #planNo#, #inventType#, #inventCode#, #inventName#, #spec#, #material#, #unit#, #length#, #width#, #thick#, #planQty#, #planUnitWeight#, #planWeight#, #purQty#, #purUnitWeight#, #purWeight#, #materialPlanId#, #inventTypeDetail#,#status#, #primaryId#)
VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #companyCode#, #companyName#, #planDate#, #planNo#, #inventType#, #inventCode#, #inventName#, #spec#, #material#, #unit#, #length#, #width#, #thick#, #planQty#, #planUnitWeight#, #planWeight#, #purQty#, #purUnitWeight#, #purWeight#, #materialPlanId#, #inventTypeDetail#,#status#, #primaryId#, #remarks#)
</insert>
<delete id="delete">
......@@ -416,6 +422,7 @@
MATERIAL_PLAN_ID = #materialPlanId#, <!-- 材料计划id -->
INVENT_TYPE_DETAIL = #inventTypeDetail#, <!-- 存货类型大类 -->
STATUS = #status#,
REMARKS = #remarks#,
PRIMARY_ID = #primaryId# <!-- 主表id -->
WHERE
ID = #id#
......
src/main/java/com/baosight/hggp/hg/sc/domain/HGSC009A.java
......@@ -49,6 +49,7 @@ public class HGSC009A extends DaoEPBase {
public static final String FIELD_UPDATED_NAME = "updatedName"; /* 修改人名称*/
public static final String FIELD_UPDATED_TIME = "updatedTime"; /* 修改时间*/
public static final String FIELD_INVENT_TYPE_DETAIL = "inventTypeDetail"; /*存货类型明细*/
public static final String FIELD_REMARKS = "remarks"; /*备注*/
public static final String COL_ID = "ID"; /* 主键id*/
public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE"; /* 账套*/
......@@ -124,6 +125,7 @@ public class HGSC009A extends DaoEPBase {
private String updatedName = " "; /* 修改人名称*/
private String updatedTime = " "; /* 修改时间*/
private String inventTypeDetail; /*存货类型明细 1：构建 2：零件*/
private String remarks; /*备注*/
@ExcelAnno(index = 9)
private String inventType = " "; /* 存货类型*/
@ExcelAnno(index = 11)
......@@ -279,6 +281,10 @@ public class HGSC009A extends DaoEPBase {
eiColumn.setDescName("单位");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_REMARKS);
eiColumn.setDescName("备注");
eiMetadata.addMeta(eiColumn);
}
/**
......@@ -729,6 +735,14 @@ public class HGSC009A extends DaoEPBase {
this.unit = unit;
}
public String getRemarks() {
return remarks;
}
public void setRemarks(String remarks) {
this.remarks = remarks;
}
/**
* get the value from Map.
*
......@@ -767,6 +781,7 @@ public class HGSC009A extends DaoEPBase {
setInventType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("inventType")), inventType));
setCoefficient(NumberUtils.toBigDecimal(StringUtils.toString(map.get("coefficient")), coefficient));
setUnit(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("unit")), unit));
setRemarks(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REMARKS)), remarks));
}
/**
......@@ -806,6 +821,7 @@ public class HGSC009A extends DaoEPBase {
map.put("inventType",StringUtils.toString(inventType, eiMetadata.getMeta("inventType")));
map.put("coefficient",StringUtils.toString(coefficient, eiMetadata.getMeta("coefficient")));
map.put("unit",StringUtils.toString(unit, eiMetadata.getMeta("unit")));
map.put(FIELD_REMARKS,StringUtils.toString(remarks, eiMetadata.getMeta(FIELD_REMARKS)));
return map;
}
......
src/main/java/com/baosight/hggp/hg/sc/sql/HGSC009A.xml
......@@ -78,6 +78,9 @@
<isNotEmpty prepend=" AND " property="updatedTime">
UPDATED_TIME = #updatedTime#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="remarks">
REMARKS = #remarks#
</isNotEmpty>
</sql>
<select id="query" parameterClass="java.util.HashMap"
......@@ -108,7 +111,8 @@
UPDATED_BY as "updatedBy", <!-- 修改人 -->
UPDATED_NAME as "updatedName", <!-- 修改人名称 -->
UPDATED_TIME as "updatedTime", <!-- 修改时间 -->
INVENT_TYPE_DETAIL as "inventTypeDetail"
REMARKS as "remarks", <!-- 备注 -->
INVENT_TYPE_DETAIL as "inventTypeDetail"
FROM ${hggpSchema}.hgsj003a WHERE 1=1
<include refid="condition" />
<dynamic prepend="ORDER BY">
......@@ -116,7 +120,7 @@
$orderBy$
</isNotEmpty>
<isEmpty property="orderBy">
ID asc
ID desc
</isEmpty>
</dynamic>
......@@ -127,84 +131,6 @@
<include refid="condition" />
</select>
<!--
<isNotEmpty prepend=" AND " property="id">
ID = #id#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="accountCode">
ACCOUNT_CODE = #accountCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="depCode">
DEP_CODE = #depCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="companyCode">
COMPANY_CODE = #companyCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="companyName">
COMPANY_NAME = #companyName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="projCode">
PROJ_CODE = #projCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="projName">
PROJ_NAME = #projName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="planMaterialCode">
PLAN_MATERIAL_CODE = #planMaterialCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="planMaterialName">
PLAN_MATERIAL_NAME = #planMaterialName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="inventCode">
INVENT_CODE = #inventCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="inventName">
INVENT_NAME = #inventName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="spec">
SPEC = #spec#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="material">
MATERIAL = #material#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="length">
LENGTH = #length#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="width">
WIDTH = #width#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="thick">
THICK = #thick#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="quantity">
QUANTITY = #quantity#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="singleWeight">
SINGLE_WEIGHT = #singleWeight#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="grossAmount">
GROSS_AMOUNT = #grossAmount#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="createdBy">
CREATED_BY = #createdBy#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="createdName">
CREATED_NAME = #createdName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="createdTime">
CREATED_TIME = #createdTime#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="updatedBy">
UPDATED_BY = #updatedBy#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="updatedName">
UPDATED_NAME = #updatedName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="updatedTime">
UPDATED_TIME = #updatedTime#
</isNotEmpty>
-->
<insert id="insert">
INSERT INTO ${hggpSchema}.hgsj003a (ID, <!-- 主键id -->
ACCOUNT_CODE, <!-- 账套 -->
......@@ -231,12 +157,13 @@
UPDATED_BY, <!-- 修改人 -->
UPDATED_NAME, <!-- 修改人名称 -->
UPDATED_TIME, <!-- 修改时间 -->
INVENT_TYPE_DETAIL
INVENT_TYPE_DETAIL,
REMARKS
)
VALUES (#id#, #accountCode#, #depCode#, #companyCode#, #companyName#, #projCode#, #projName#,
#planMaterialCode#, #planMaterialName#, #inventCode#, #inventName#, #spec#, #material#, #length#, #width#,
#thick#, #quantity#, #singleWeight#, #grossAmount#, #createdBy#, #createdName#, #createdTime#, #updatedBy#,
#updatedName#, #updatedTime#,#inventTypeDetail#)
#updatedName#, #updatedTime#,#inventTypeDetail#,#remarks#)
</insert>
<delete id="delete">
......@@ -271,6 +198,7 @@
UPDATED_BY = #updatedBy#, <!-- 修改人 -->
UPDATED_NAME = #updatedName#, <!-- 修改人名称 -->
UPDATED_TIME = #updatedTime#, <!-- 修改时间 -->
REMARKS = #remarks#,
INVENT_TYPE_DETAIL = #inventTypeDetail#
WHERE
ID = #id#
......@@ -316,6 +244,7 @@
UPDATED_BY as "updatedBy", <!-- 修改人 -->
UPDATED_NAME as "updatedName", <!-- 修改人名称 -->
UPDATED_TIME as "updatedTime", <!-- 修改时间 -->
REMARKS as "remarks", <!-- 备注 -->
INVENT_TYPE_DETAIL as "inventTypeDetail"
FROM ${hggpSchema}.hgsj003a WHERE 1=1
<isNotEmpty prepend=" AND " property="planMaterialCode">
......@@ -329,7 +258,7 @@
$orderBy$
</isNotEmpty>
<isEmpty property="orderBy">
ID asc
ID desc
</isEmpty>
</dynamic>
......
src/main/webapp/HG/CG/HGCG001A.jsp
......@@ -41,6 +41,7 @@
<EF:EFColumn ename="length" cname="长(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
<EF:EFColumn ename="width" cname="宽(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
<EF:EFColumn ename="thick" cname="厚(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
<EF:EFColumn ename="remarks" cname="备注" width="150" enable="false"/>
<EF:EFComboColumn ename="status" cname="状态" enable="false" width="80" align="center">
<EF:EFCodeOption codeName="hggp.hgcg.planStatus"/>
</EF:EFComboColumn>
......
src/main/webapp/HG/PZ/HGPZ005.jsp
......@@ -7,7 +7,7 @@
<script>
var ctx = "${ctx}";
</script>
<EF:EFPage title="存货档案">
<EF:EFPage title="物料数据库">
<EF:EFRegion id="inqu" title="查询条件">
<div class="row">
<EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains">
......
src/main/webapp/HG/SC/HGSC004.jsp
......@@ -10,7 +10,7 @@
</script>
<head>
</head>
<EF:EFPage title="物料清单">
<EF:EFPage title="产品清单">
<EF:EFRegion id="inqu" title="查询条件">
<div class="row">
<EF:EFInput ename="inqu_status-0-companyName" cname="公司名称" colWidth="3"/>
......
src/main/webapp/HG/SC/HGSC009A.js
......@@ -62,17 +62,21 @@ $(function () {
// 此grid对象
grid.dataSource.bind("change", function (e) {
//数量发生变化进行计算
if(e.field === "quantity"){
if(e.items[0].grossAmount != null){
if(e.field === "quantity" ){
if(e.items[0].grossAmount != null && e.items[0].grossAmount > 0 && e.items[0].quantity > 0){
let singleWeight = e.items[0].grossAmount/e.items[0].quantity;
resultGrid.setCellValue(e.items[0], 'singleWeight', singleWeight);
}else{
resultGrid.setCellValue(e.items[0], 'singleWeight', 0);
}
}
//数量总重发生变化
if(e.field === "grossAmount"){
if(e.items[0].quantity != null){
if(e.field === "grossAmount" ){
if(e.items[0].quantity != null && e.items[0].quantity > 0 && e.items[0].grossAmount > 0){
let singleWeight = e.items[0].grossAmount/e.items[0].quantity;
resultGrid.setCellValue(e.items[0], 'singleWeight', singleWeight);
}else{
resultGrid.setCellValue(e.items[0], 'singleWeight', 0);
}
}
// if(e.field === "singleWeight"){
......
src/main/webapp/HG/SC/HGSC009A.jsp
......@@ -61,6 +61,7 @@
data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/"
data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！" enable="false"/>
<EF:EFColumn ename="grossAmount" cname="总重(KG)" width="120" align="right" format="{0:N3}"/>
<EF:EFColumn ename="remarks" cname="备注" width="150"/>
<EF:EFColumn ename="prdtCode" cname="部件编码" enable="false" width="120" align="center" hidden="true"/>
<EF:EFColumn ename="partCode" cname="零件编码" enable="false" width="120" align="center" hidden="true"/>
......
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