Skip to content

H
hg-smart
Commit a902320e by 宋祥
Options

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

parents 7e57430a 9086bb1f
Showing with 4 additions and 4 deletions
src/main/java/com/baosight/hggp/hg/sc/sql/HGSC004A.xml
...@@ -263,8 +263,8 @@ ...@@ -263,8 +263,8 @@
<isNotEmpty prepend=" AND " property="materialId"> <isNotEmpty prepend=" AND " property="materialId">
a.material_id = #materialId# a.material_id = #materialId#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="materialId"> <isNotEmpty prepend=" AND " property="inventSource">
a.material_id = #materialId# a.invent_source = #inventSource#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="id"> <isNotEmpty prepend=" AND " property="id">
a.id = #id# a.id = #id#
......
src/main/webapp/HG/KC/HGKC008D.jsp
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="parentProdCode" cname="成品编码" enable="false" width="100" align="center"/> <EF:EFColumn ename="parentProdCode" cname="成品编码" enable="false" width="100" align="center"/>
<EF:EFColumn ename="parentProdName" cname="成品名称" enable="false" width="100" align="center"/> <EF:EFColumn ename="parentProdName" cname="成品名称" enable="false" width="100" align="center"/>
<EF:EFColumn ename="materialCode" cname="材料编码" enable="false" width="100" align="center"/> <EF:EFColumn ename="productCode" cname="材料编码" enable="false" width="100" align="center"/>
<EF:EFColumn ename="materialtName" cname="材料名称" enable="false" width="100" align="center"/> <EF:EFColumn ename="productName" cname="材料名称" enable="false" width="100" align="center"/>
<EF:EFColumn ename="spec" cname="规格" enable="false" width="120" align="center"/> <EF:EFColumn ename="spec" cname="规格" enable="false" width="120" align="center"/>
<EF:EFColumn ename="applyQty" cname="申请数量" width="120" align="right" format="{0:N3}" required="true"/> <EF:EFColumn ename="applyQty" cname="申请数量" width="120" align="right" format="{0:N3}" required="true"/>
<EF:EFColumn ename="quantity" cname="数量" enable="false" width="120" align="right" format="{0:N3}"/> <EF:EFColumn ename="quantity" cname="数量" enable="false" width="120" align="right" format="{0:N3}"/>
......
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