Skip to content

H
hg-smart
Commit a760876a by 宋祥
Options

Merge branch 'dev' of http://129.211.46.84:8800/platform/hg-smart into dev-sx 

 Conflicts:
	src/main/java/com/baosight/hggp/hg/kc/domain/HGKC014A.java
	src/main/java/com/baosight/hggp/hg/kc/sql/HGKC014A.xml
parents 91991e86 938e2356
Showing with 39 additions and 7 deletions
src/main/java/com/baosight/hggp/hg/kc/domain/HGKC014A.java
...@@ -52,6 +52,7 @@ public class HGKC014A extends DaoEPBase { ...@@ -52,6 +52,7 @@ public class HGKC014A extends DaoEPBase {
public static final String FIELD_DEPOSIT_WEIGHT = "depositWeight"; /* 入库重量*/ public static final String FIELD_DEPOSIT_WEIGHT = "depositWeight"; /* 入库重量*/
public static final String FIELD_DELIVER_QTY = "deliverQty"; /* 退货数量*/ public static final String FIELD_DELIVER_QTY = "deliverQty"; /* 退货数量*/
public static final String FIELD_ACTUAL_QTY = "actualQty"; /* 实际入库数量*/ public static final String FIELD_ACTUAL_QTY = "actualQty"; /* 实际入库数量*/
public static final String FIELD_PCS_ID = "pcsId"; /* 加工明细ID*/
public static final String COL_ID = "ID"; /* ID*/ public static final String COL_ID = "ID"; /* ID*/
public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE"; /* 账套*/ public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE"; /* 账套*/
...@@ -111,6 +112,7 @@ public class HGKC014A extends DaoEPBase { ...@@ -111,6 +112,7 @@ public class HGKC014A extends DaoEPBase {
private BigDecimal depositWeight = new BigDecimal("0"); /* 入库重量*/ private BigDecimal depositWeight = new BigDecimal("0"); /* 入库重量*/
private BigDecimal deliverQty = new BigDecimal("0"); /* 退货数量*/ private BigDecimal deliverQty = new BigDecimal("0"); /* 退货数量*/
private BigDecimal actualQty = new BigDecimal("0"); /* 实际入库数量*/ private BigDecimal actualQty = new BigDecimal("0"); /* 实际入库数量*/
private Long pcsId = new Long(0); /* 加工明细ID*/
/** /**
* initialize the metadata. * initialize the metadata.
...@@ -249,6 +251,10 @@ public class HGKC014A extends DaoEPBase { ...@@ -249,6 +251,10 @@ public class HGKC014A extends DaoEPBase {
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("实际入库数量"); eiColumn.setDescName("实际入库数量");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PCS_ID);
eiColumn.setDescName("加工明细ID");
eiMetadata.addMeta(eiColumn);
} }
/** /**
...@@ -659,6 +665,15 @@ public class HGKC014A extends DaoEPBase { ...@@ -659,6 +665,15 @@ public class HGKC014A extends DaoEPBase {
this.status = status; this.status = status;
} }
public Long getPcsId() {
return pcsId;
}
public void setPcsId(Long pcsId) {
this.pcsId = pcsId;
}
/** /**
* get the value from Map. * get the value from Map.
* *
...@@ -696,6 +711,7 @@ public class HGKC014A extends DaoEPBase { ...@@ -696,6 +711,7 @@ public class HGKC014A extends DaoEPBase {
setDeliverQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_DELIVER_QTY)), deliverQty)); setDeliverQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_DELIVER_QTY)), deliverQty));
setActualQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_ACTUAL_QTY)), actualQty)); setActualQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_ACTUAL_QTY)), actualQty));
setStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_STATUS)), status)); setStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_STATUS)), status));
setPcsId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_PCS_ID)), pcsId));
} }
/** /**
...@@ -734,6 +750,7 @@ public class HGKC014A extends DaoEPBase { ...@@ -734,6 +750,7 @@ public class HGKC014A extends DaoEPBase {
map.put(FIELD_DELIVER_QTY, StringUtils.toString(deliverQty, eiMetadata.getMeta(FIELD_DELIVER_QTY))); map.put(FIELD_DELIVER_QTY, StringUtils.toString(deliverQty, eiMetadata.getMeta(FIELD_DELIVER_QTY)));
map.put(FIELD_ACTUAL_QTY, StringUtils.toString(actualQty, eiMetadata.getMeta(FIELD_ACTUAL_QTY))); map.put(FIELD_ACTUAL_QTY, StringUtils.toString(actualQty, eiMetadata.getMeta(FIELD_ACTUAL_QTY)));
map.put(FIELD_STATUS, StringUtils.toString(status, eiMetadata.getMeta(FIELD_STATUS))); map.put(FIELD_STATUS, StringUtils.toString(status, eiMetadata.getMeta(FIELD_STATUS)));
map.put(FIELD_PCS_ID, StringUtils.toString(pcsId, eiMetadata.getMeta(FIELD_PCS_ID)));
return map; return map;
} }
......
src/main/java/com/baosight/hggp/hg/kc/service/ServiceHGKC014B.java
...@@ -117,7 +117,7 @@ public class ServiceHGKC014B extends ServiceEPBase { ...@@ -117,7 +117,7 @@ public class ServiceHGKC014B extends ServiceEPBase {
public void add(HGKC014A hgkc014a) { public void add(HGKC014A hgkc014a) {
hgkc014a.setId(null); hgkc014a.setPcsId(hgkc014a.getId());
hgkc014a.setUpdatedBy(null); hgkc014a.setUpdatedBy(null);
hgkc014a.setUpdatedName(null); hgkc014a.setUpdatedName(null);
hgkc014a.setUpdatedTime(null); hgkc014a.setUpdatedTime(null);
...@@ -125,6 +125,7 @@ public class ServiceHGKC014B extends ServiceEPBase { ...@@ -125,6 +125,7 @@ public class ServiceHGKC014B extends ServiceEPBase {
hgkc014a.setCreatedName(null); hgkc014a.setCreatedName(null);
hgkc014a.setCreatedTime(null); hgkc014a.setCreatedTime(null);
hgkc014a.setDepCode(null); hgkc014a.setDepCode(null);
hgkc014a.setId(null);
DaoUtils.insert(HGKC014A.INSERT, hgkc014a); DaoUtils.insert(HGKC014A.INSERT, hgkc014a);
} }
......
src/main/java/com/baosight/hggp/hg/kc/sql/HGKC014A.xml
...@@ -31,7 +31,8 @@ ...@@ -31,7 +31,8 @@
DEPOSIT_UNIT_WEIGHT as "depositUnitWeight", <!-- 入库单重 --> DEPOSIT_UNIT_WEIGHT as "depositUnitWeight", <!-- 入库单重 -->
DEPOSIT_WEIGHT as "depositWeight", <!-- 入库重量 --> DEPOSIT_WEIGHT as "depositWeight", <!-- 入库重量 -->
DELIVER_QTY as "deliverQty", DELIVER_QTY as "deliverQty",
ACTUAL_QTY as "actualQty" ACTUAL_QTY as "actualQty",
PCS_ID as "pcsId"
</sql> </sql>
<sql id="condition"> <sql id="condition">
...@@ -117,6 +118,9 @@ ...@@ -117,6 +118,9 @@
<isNotEmpty prepend=" AND " property="contractCodes"> <isNotEmpty prepend=" AND " property="contractCodes">
CONTRACT_CODE IN <iterate close=")" open="(" conjunction="," property="contractCodes">#contractCodes[]#</iterate> CONTRACT_CODE IN <iterate close=")" open="(" conjunction="," property="contractCodes">#contractCodes[]#</iterate>
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="pcsId">
PCS_ID = #pcsId#
</isNotEmpty>
</sql> </sql>
<sql id="idCondition"> <sql id="idCondition">
...@@ -177,12 +181,13 @@ ...@@ -177,12 +181,13 @@
DEPOSIT_UNIT_WEIGHT , DEPOSIT_UNIT_WEIGHT ,
DEPOSIT_WEIGHT, <!-- 入库重量 --> DEPOSIT_WEIGHT, <!-- 入库重量 -->
DELIVER_QTY, DELIVER_QTY,
ACTUAL_QTY ACTUAL_QTY,
PCS_ID
) )
VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#,
#updatedTime#, #deleteFlag#, #companyCode#, #companyName#, #whCode#, #whName#, #parentId#, #contractCode#, #updatedTime#, #deleteFlag#, #companyCode#, #companyName#, #whCode#, #whName#, #parentId#, #contractCode#,
#depositCode#,#inventType#, #productCode#, #productName#, #specId#, #spec#, #unit#, #depositQty#, #depositUnitWeight#, #depositWeight#, #depositCode#,#inventType#, #productCode#, #productName#, #specId#, #spec#, #unit#, #depositQty#, #depositUnitWeight#, #depositWeight#,
#deliverQty#, #actualQty#) #deliverQty#, #actualQty#, #pcsId#)
</insert> </insert>
<delete id="delete"> <delete id="delete">
...@@ -220,7 +225,8 @@ ...@@ -220,7 +225,8 @@
DEPOSIT_UNIT_WEIGHT = #depositUnitWeight#, DEPOSIT_UNIT_WEIGHT = #depositUnitWeight#,
DEPOSIT_WEIGHT = #depositWeight#, <!-- 入库重量 --> DEPOSIT_WEIGHT = #depositWeight#, <!-- 入库重量 -->
DELIVER_QTY = #deliverQty#, DELIVER_QTY = #deliverQty#,
ACTUAL_QTY = #actualQty# ACTUAL_QTY = #actualQty#,
PCS_ID = #pcsId#
WHERE WHERE
ID = #id# ID = #id#
</update> </update>
......
src/main/webapp/HG/KC/HGKC014.jsp
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
To change this template use File | Settings | File Templates. To change this template use File | Settings | File Templates.
--%> --%>
<!DOCTYPE html> <!DOCTYPE html>
<%@ page import="com.baosight.iplat4j.core.web.threadlocal.UserSession" %>< <%@ page import="com.baosight.iplat4j.core.web.threadlocal.UserSession" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %> <%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
......
src/main/webapp/HG/KC/HGKC014A.jsp
...@@ -45,6 +45,14 @@ ...@@ -45,6 +45,14 @@
displayType="0.000" sort="true" align="right" maxLength="17" required="false" defaultValue="0" displayType="0.000" sort="true" align="right" maxLength="17" required="false" defaultValue="0"
data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/" readonly="false" data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/" readonly="false"
data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"/>
<EF:EFColumn ename="deliverQty" cname="退货入库数量" width="100" enable="false" format="{0:N0}" editType="text"
displayType="0" sort="true" align="right" maxLength="17" required="false" defaultValue="0"
data-regex="/^-?[0-9]{1,17}?$/" readonly="false"
data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"/>
<EF:EFColumn ename="actualQty" cname="实际入库数量" width="100" enable="false" format="{0:N0}" editType="text"
displayType="0" sort="true" align="right" maxLength="17" required="false" defaultValue="0"
data-regex="/^-?[0-9]{1,17}?$/" readonly="false"
data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"/>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
</EF:EFPage> </EF:EFPage>
src/main/webapp/HG/KC/HGKC015.jsp
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
To change this template use File | Settings | File Templates. To change this template use File | Settings | File Templates.
--%> --%>
<!DOCTYPE html> <!DOCTYPE html>
<%@ page import="com.baosight.iplat4j.core.web.threadlocal.UserSession" %>< <%@ page import="com.baosight.iplat4j.core.web.threadlocal.UserSession" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %> <%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
......
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