Skip to content

H
hg-smart
Commit b572ab9a by 江和松
Options

物料清单bug修改，字段缺失问题处理

parent 61d19021
Showing with 91 additions and 13 deletions
src/main/java/com/baosight/hggp/hg/sc/domain/HGSC004B.java
...@@ -38,6 +38,9 @@ public class HGSC004B extends DaoEPBase { ...@@ -38,6 +38,9 @@ public class HGSC004B extends DaoEPBase {
public static final String FIELD_product_name = "productName"; /* 产品名称*/ public static final String FIELD_product_name = "productName"; /* 产品名称*/
public static final String FIELD_product_type = "productType"; /* 产品type*/ public static final String FIELD_product_type = "productType"; /* 产品type*/
public static final String FIELD_invent_type = "inventType"; /* 档案类型*/ public static final String FIELD_invent_type = "inventType"; /* 档案类型*/
public static final String FIELD_length = "length"; /* 长*/
public static final String FIELD_width = "width"; /* 宽*/
public static final String FIELD_thick = "thick"; /* 厚*/
public static final String FIELD_product_status = "productStatus"; /* 产品状态 0:未提交，1:已提交*/ public static final String FIELD_product_status = "productStatus"; /* 产品状态 0:未提交，1:已提交*/
public static final String FIELD_change_type = "changeType"; /* 变更类型:默认0,1:增加，2:替换，3:删除*/ public static final String FIELD_change_type = "changeType"; /* 变更类型:默认0,1:增加，2:替换，3:删除*/
public static final String FIELD_quantity = "quantity"; /* 数量*/ public static final String FIELD_quantity = "quantity"; /* 数量*/
...@@ -68,6 +71,9 @@ public class HGSC004B extends DaoEPBase { ...@@ -68,6 +71,9 @@ public class HGSC004B extends DaoEPBase {
public static final String COL_product_name = "product_name"; /* 产品名称*/ public static final String COL_product_name = "product_name"; /* 产品名称*/
public static final String COL_product_type = "product_type"; /* 产品类型*/ public static final String COL_product_type = "product_type"; /* 产品类型*/
public static final String COL_invent_type = "invent_type"; /* 档案类型*/ public static final String COL_invent_type = "invent_type"; /* 档案类型*/
public static final String COL_length = "length"; /* 长*/
public static final String COL_width = "width"; /* 宽*/
public static final String COL_thick = "thick"; /* 厚*/
public static final String COL_product_status = "product_status"; /* 产品状态 0:未提交，1:已提交*/ public static final String COL_product_status = "product_status"; /* 产品状态 0:未提交，1:已提交*/
public static final String COL_change_type = "change_type"; /* 变更类型:默认0,1:增加，2:替换，3:删除*/ public static final String COL_change_type = "change_type"; /* 变更类型:默认0,1:增加，2:替换，3:删除*/
public static final String COL_quantity = "quantity"; /* 数量*/ public static final String COL_quantity = "quantity"; /* 数量*/
...@@ -104,6 +110,9 @@ public class HGSC004B extends DaoEPBase { ...@@ -104,6 +110,9 @@ public class HGSC004B extends DaoEPBase {
private String productName = " "; /* 产品名称*/ private String productName = " "; /* 产品名称*/
private String productType = " "; /* 产品类型*/ private String productType = " "; /* 产品类型*/
private String inventType = " "; /* 档案类型*/ private String inventType = " "; /* 档案类型*/
private BigDecimal length = new BigDecimal("0"); /* 长*/
private BigDecimal width = new BigDecimal("0"); /* 宽*/
private BigDecimal thick = new BigDecimal("0"); /* 厚*/
private Integer productStatus = new Integer(0); /* 产品状态 0:未提交，1:已提交*/ private Integer productStatus = new Integer(0); /* 产品状态 0:未提交，1:已提交*/
private Integer changeType = new Integer(0); /* 变更类型:默认0,1:增加，2:替换，3:删除*/ private Integer changeType = new Integer(0); /* 变更类型:默认0,1:增加，2:替换，3:删除*/
private Integer quantity = new Integer(0); /* 数量*/ private Integer quantity = new Integer(0); /* 数量*/
...@@ -212,6 +221,27 @@ public class HGSC004B extends DaoEPBase { ...@@ -212,6 +221,27 @@ public class HGSC004B extends DaoEPBase {
eiColumn.setDescName("档案类型"); eiColumn.setDescName("档案类型");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_length);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
eiColumn.setFieldLength(12);
eiColumn.setDescName("长");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_width);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
eiColumn.setFieldLength(12);
eiColumn.setDescName("宽");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_thick);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
eiColumn.setFieldLength(12);
eiColumn.setDescName("厚");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_product_status); eiColumn = new EiColumn(FIELD_product_status);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(0); eiColumn.setScaleLength(0);
...@@ -740,6 +770,30 @@ public class HGSC004B extends DaoEPBase { ...@@ -740,6 +770,30 @@ public class HGSC004B extends DaoEPBase {
this.inventType = inventType; this.inventType = inventType;
} }
public BigDecimal getLength() {
return length;
}
public void setLength(BigDecimal length) {
this.length = length;
}
public BigDecimal getWidth() {
return width;
}
public void setWidth(BigDecimal width) {
this.width = width;
}
public BigDecimal getThick() {
return thick;
}
public void setThick(BigDecimal thick) {
this.thick = thick;
}
/** /**
* get the value from Map. * get the value from Map.
* *
...@@ -777,6 +831,9 @@ public class HGSC004B extends DaoEPBase { ...@@ -777,6 +831,9 @@ public class HGSC004B extends DaoEPBase {
setUpdatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_updated_by)), updatedBy)); setUpdatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_updated_by)), updatedBy));
setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_updated_name)), updatedName)); setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_updated_name)), updatedName));
setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_updated_time)), updatedTime)); setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_updated_time)), updatedTime));
setLength(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_length)), length));
setWidth(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_width)), width));
setThick(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_thick)), thick));
} }
/** /**
...@@ -813,6 +870,9 @@ public class HGSC004B extends DaoEPBase { ...@@ -813,6 +870,9 @@ public class HGSC004B extends DaoEPBase {
map.put(FIELD_updated_by, StringUtils.toString(updatedBy, eiMetadata.getMeta(FIELD_updated_by))); map.put(FIELD_updated_by, StringUtils.toString(updatedBy, eiMetadata.getMeta(FIELD_updated_by)));
map.put(FIELD_updated_name, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_updated_name))); map.put(FIELD_updated_name, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_updated_name)));
map.put(FIELD_updated_time, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_updated_time))); map.put(FIELD_updated_time, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_updated_time)));
map.put(FIELD_length, StringUtils.toString(length, eiMetadata.getMeta(FIELD_length)));
map.put(FIELD_width, StringUtils.toString(width, eiMetadata.getMeta(FIELD_width)));
map.put(FIELD_thick, StringUtils.toString(thick, eiMetadata.getMeta(FIELD_thick)));
return map; return map;
} }
......
src/main/java/com/baosight/hggp/hg/sc/sql/HGSC004.xml
...@@ -99,6 +99,9 @@ ...@@ -99,6 +99,9 @@
<isNotEmpty property="orderBy"> <isNotEmpty property="orderBy">
$orderBy$ $orderBy$
</isNotEmpty> </isNotEmpty>
<isEmpty property="orderBy">
CREATED_TIME desc
</isEmpty>
</dynamic> </dynamic>
</select> </select>
......
src/main/java/com/baosight/hggp/hg/sc/sql/HGSC004B.xml
...@@ -84,6 +84,15 @@ ...@@ -84,6 +84,15 @@
<isNotEmpty prepend=" AND " property="materialDetailId"> <isNotEmpty prepend=" AND " property="materialDetailId">
material_detail_id = #materialDetailId# material_detail_id = #materialDetailId#
</isNotEmpty> </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>
</sql> </sql>
<select id="query" parameterClass="java.util.HashMap" <select id="query" parameterClass="java.util.HashMap"
...@@ -105,6 +114,9 @@ ...@@ -105,6 +114,9 @@
product_name as "productName", <!-- 产品名称 --> product_name as "productName", <!-- 产品名称 -->
invent_type as "inventType", <!-- 档案类型 --> invent_type as "inventType", <!-- 档案类型 -->
product_type as "productType", <!-- 产品类别 --> product_type as "productType", <!-- 产品类别 -->
length as "length", <!-- 长 -->
width as "width", <!-- 宽 -->
thick as "thick", <!-- 厚 -->
product_status as "productStatus", <!-- 产品状态 0:未提交，1:已提交 --> product_status as "productStatus", <!-- 产品状态 0:未提交，1:已提交 -->
change_type as "changeType", <!-- 变更类型:默认0,1:增加，2:替换，3:删除 --> change_type as "changeType", <!-- 变更类型:默认0,1:增加，2:替换，3:删除 -->
quantity as "quantity", <!-- 数量 --> quantity as "quantity", <!-- 数量 -->
...@@ -163,13 +175,16 @@ ...@@ -163,13 +175,16 @@
created_time, <!-- 创建时间 --> created_time, <!-- 创建时间 -->
updated_by, <!-- 更新人 --> updated_by, <!-- 更新人 -->
updated_name, <!-- 修改人名称 --> updated_name, <!-- 修改人名称 -->
updated_time <!-- 更新时间 --> updated_time, <!-- 更新时间 -->
length, <!-- 长 -->
width, <!-- 宽 -->
thick <!-- 厚 -->
) )
VALUES (#id#,#materialDetailId#, #productId#, #companyCode#, #companyName#, #depCode#, #depName#, VALUES (#id#,#materialDetailId#, #productId#, #companyCode#, #companyName#, #depCode#, #depName#,
#projCode#, #projName#, #parentProdCode#, #parentProdName#, #materialId#, #projCode#, #projName#, #parentProdCode#, #parentProdName#, #materialId#,
#productCode#, #productName#,#productType#,#inventType#, #productStatus#, #changeType#, #quantity#, #singleWeight#, #productCode#, #productName#,#productType#,#inventType#, #productStatus#, #changeType#, #quantity#, #singleWeight#,
#totalWeight#, #approvalStatus#, #accountCode#, #createdBy#, #createdName#, #createdTime#, #totalWeight#, #approvalStatus#, #accountCode#, #createdBy#, #createdName#, #createdTime#,
#updatedBy#, #updatedName#, #updatedTime#) #updatedBy#, #updatedName#, #updatedTime#, #length#, #width#, #thick#)
</insert> </insert>
<delete id="delete"> <delete id="delete">
...@@ -194,6 +209,9 @@ ...@@ -194,6 +209,9 @@
product_code = #productCode#, <!-- 产品编号 --> product_code = #productCode#, <!-- 产品编号 -->
product_name = #productName#, <!-- 产品名称 --> product_name = #productName#, <!-- 产品名称 -->
invent_type = #inventType#, <!-- 档案类型 --> invent_type = #inventType#, <!-- 档案类型 -->
length = #length#, <!-- 长 -->
width = #width#, <!-- 宽 -->
thick = #thick#, <!-- 厚 -->
product_status = #productStatus#, <!-- 产品状态 0:未提交，1:已提交 --> product_status = #productStatus#, <!-- 产品状态 0:未提交，1:已提交 -->
change_type = #changeType#, <!-- 变更类型:默认0,1:增加，2:替换，3:删除 --> change_type = #changeType#, <!-- 变更类型:默认0,1:增加，2:替换，3:删除 -->
quantity = #quantity#, <!-- 数量 --> quantity = #quantity#, <!-- 数量 -->
......
src/main/webapp/HG/SC/HGSC004.js
...@@ -147,14 +147,14 @@ $(function (){ ...@@ -147,14 +147,14 @@ $(function (){
} }
if (e.field == "projCode") { if (e.field == "projCode") {
e.items[0].blueprintCode = ""; e.items[0].blueprintCode = "";
e.items[0].blueprintNmae = ""; e.items[0].blueprintName = "";
loadChange(grid,e,"projName"); loadChange(grid,e,"projName");
} }
if (e.field == "companyCode") { if (e.field == "companyCode") {
e.items[0].projCode = ""; e.items[0].projCode = "";
e.items[0].projName = ""; e.items[0].projName = "";
e.items[0].blueprintCode = ""; e.items[0].blueprintCode = "";
e.items[0].blueprintNmae = ""; e.items[0].blueprintName = "";
loadChange(grid,e,"projCode"); loadChange(grid,e,"projCode");
} }
}); });
......
src/main/webapp/HG/SC/HGSC004.jsp
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
<EF:EFColumn ename="companyName" cname="公司名称" hidden="true"/> <EF:EFColumn ename="companyName" cname="公司名称" hidden="true"/>
<EF:EFColumn ename="projCode" cname="项目编码" enable="true" width="120" align="center"/> <EF:EFColumn ename="projCode" cname="项目编码" enable="true" width="120" align="center"/>
<EF:EFColumn ename="projName" cname="项目名称" width="120" align="center" enable="false"/> <EF:EFColumn ename="projName" cname="项目名称" width="120" align="center" enable="false"/>
<EF:EFColumn ename="blueprintCode" cname="蓝图编码" enable="true" width="120" align="center"/> <EF:EFColumn ename="blueprintCode" cname="蓝图编码" enable="true" width="120" align="center" required="true"/>
<EF:EFColumn ename="blueprintName" cname="蓝图名称" enable="false" width="120" align="center" required="true"/> <EF:EFColumn ename="blueprintName" cname="蓝图名称" enable="false" width="120" align="center"/>
<EF:EFComboColumn ename="materialStatus" cname="提交状态" width="80" align="center" enable="false" required="false" readonly="true"> <EF:EFComboColumn ename="materialStatus" cname="提交状态" width="80" align="center" enable="false" required="false" readonly="true">
<EF:EFCodeOption codeName="hggp.sc.materialStatus" /> <EF:EFCodeOption codeName="hggp.sc.materialStatus" />
</EF:EFComboColumn> </EF:EFComboColumn>
......
src/main/webapp/HG/SC/HGSC004E.jsp
...@@ -19,17 +19,14 @@ ...@@ -19,17 +19,14 @@
<EF:EFComboColumn cname="变更类型" ename="changeType" width="90" align="center" enable="false" required="false"> <EF:EFComboColumn cname="变更类型" ename="changeType" width="90" align="center" enable="false" required="false">
<EF:EFCodeOption codeName="hggp.sc.changeType" /> <EF:EFCodeOption codeName="hggp.sc.changeType" />
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="productCode" required="true" cname="产品编号" enable="false"/> <EF:EFColumn ename="productCode" required="false" cname="产品编号" enable="false"/>
<EF:EFColumn ename="productName" cname="产品名称" width="120" align="center" enable="false"/> <EF:EFColumn ename="productName" cname="产品名称" width="120" align="center" enable="false"/>
<EF:EFColumn ename="length" cname="长(MM)" width="100" align="right" format="{0:N2}" maxLength="10" enable="false"/> <EF:EFColumn ename="length" cname="长(MM)" width="100" align="right" format="{0:N2}" maxLength="10" enable="false"/>
<EF:EFColumn ename="width" cname="宽(MM)" width="100" align="right" format="{0:N2}" maxLength="10" enable="false"/> <EF:EFColumn ename="width" cname="宽(MM)" width="100" align="right" format="{0:N2}" maxLength="10" enable="false"/>
<EF:EFColumn ename="thick" cname="厚(MM)" width="100" align="right" format="{0:N2}" maxLength="10" enable="false"/> <EF:EFColumn ename="thick" cname="厚(MM)" width="100" align="right" format="{0:N2}" maxLength="10" enable="false"/>
<EF:EFColumn ename="quantity" required="true" cname="数量" enable="false" /> <EF:EFColumn ename="quantity" required="false" cname="数量" enable="false" />
<EF:EFColumn ename="singleWeight" required="true" format="{0:N3}" cname="单重(kg)" enable="false"/> <EF:EFColumn ename="singleWeight" required="false" format="{0:N3}" cname="单重(kg)" enable="false"/>
<EF:EFColumn enable="true" required="true" format="{0:N3}" ename="totalWeight" cname="总重(kg)"/> <EF:EFColumn enable="true" required="false" format="{0:N3}" ename="totalWeight" cname="总重(kg)"/>
<EF:EFComboColumn cname="提交状态" ename="productStatus" width="90" align="center" required="false" enable="false">
<EF:EFCodeOption codeName="hggp.sc.productStatus" />
</EF:EFComboColumn>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
</EF:EFPage> </EF:EFPage>
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