Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
hg-smart
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
platform
hg-smart
Commits
d4c5a55b
Commit
d4c5a55b
authored
Jul 23, 2024
by
liuyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2024-07-23
1.付款单录入收款金额,保存提示生成收款单失败bug 2.付款单删除bug 3、付款单明细显示调整 4、付款单核销优化
parent
6c4f78c3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
135 additions
and
48 deletions
+135
-48
FileUploadController.java
...va/com/baosight/hggp/controller/FileUploadController.java
+3
-2
ServiceHGCW016.java
.../java/com/baosight/hggp/hg/cw/service/ServiceHGCW016.java
+0
-0
ServiceHGCW016A.java
...java/com/baosight/hggp/hg/cw/service/ServiceHGCW016A.java
+9
-3
ServiceHGCW017.java
.../java/com/baosight/hggp/hg/cw/service/ServiceHGCW017.java
+20
-22
HGCW012.xml
src/main/java/com/baosight/hggp/hg/cw/sql/HGCW012.xml
+4
-1
HGCW016.xml
src/main/java/com/baosight/hggp/hg/cw/sql/HGCW016.xml
+1
-1
HGCWTools.java
src/main/java/com/baosight/hggp/hg/cw/tools/HGCWTools.java
+4
-4
UploadUtils.java
src/main/java/com/baosight/hggp/hg/mt/utils/UploadUtils.java
+46
-0
HGCW016.js
src/main/webapp/HG/CW/HGCW016.js
+8
-1
HGCW016.jsp
src/main/webapp/HG/CW/HGCW016.jsp
+6
-3
HGCW016A.jsp
src/main/webapp/HG/CW/HGCW016A.jsp
+24
-8
HGCW016B.js
src/main/webapp/HG/CW/HGCW016B.js
+2
-1
HGCW016B.jsp
src/main/webapp/HG/CW/HGCW016B.jsp
+4
-1
HGCW016C.jsp
src/main/webapp/HG/CW/HGCW016C.jsp
+4
-1
No files found.
src/main/java/com/baosight/hggp/controller/FileUploadController.java
View file @
d4c5a55b
package
com
.
baosight
.
hggp
.
controller
;
package
com
.
baosight
.
hggp
.
controller
;
import
com.baosight.hggp.core.utils.QrCodeUtils
;
import
com.baosight.hggp.core.utils.QrCodeUtils
;
import
com.baosight.hggp.hg.mt.utils.UploadUtils
;
import
com.baosight.hggp.util.LogUtils
;
import
com.baosight.hggp.util.LogUtils
;
import
com.baosight.iplat4j.core.ei.EiConstant
;
import
com.baosight.iplat4j.core.ei.EiConstant
;
import
org.springframework.data.repository.query.Param
;
import
org.springframework.data.repository.query.Param
;
...
@@ -36,8 +37,8 @@ public class FileUploadController {
...
@@ -36,8 +37,8 @@ public class FileUploadController {
public
Map
upload
(
MultipartFile
file
)
throws
IOException
{
public
Map
upload
(
MultipartFile
file
)
throws
IOException
{
Map
resultMap
=
new
HashMap
();
Map
resultMap
=
new
HashMap
();
try
{
try
{
// JSONObject upload = UploadUtils2
.upload((CommonsMultipartFile)file);
JSONObject
upload
=
UploadUtils
.
upload
((
CommonsMultipartFile
)
file
);
//
resultMap.put("id", upload.getString("docId"));
resultMap
.
put
(
"id"
,
upload
.
getString
(
"docId"
));
resultMap
.
put
(
"status"
,
EiConstant
.
STATUS_SUCCESS
);
resultMap
.
put
(
"status"
,
EiConstant
.
STATUS_SUCCESS
);
resultMap
.
put
(
"message"
,
"SUCCESS"
);
resultMap
.
put
(
"message"
,
"SUCCESS"
);
return
resultMap
;
return
resultMap
;
...
...
src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW016.java
View file @
d4c5a55b
This diff is collapsed.
Click to expand it.
src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW016A.java
View file @
d4c5a55b
package
com
.
baosight
.
hggp
.
hg
.
cw
.
service
;
package
com
.
baosight
.
hggp
.
hg
.
cw
.
service
;
import
com.baosight.hggp.aspect.annotation.OperationLogAnnotation
;
import
com.baosight.hggp.aspect.annotation.OperationLogAnnotation
;
import
com.baosight.hggp.common.ReviewStatusEnum
;
import
com.baosight.hggp.core.security.UserSessionUtils
;
import
com.baosight.hggp.core.security.UserSessionUtils
;
import
com.baosight.hggp.hg.cw.domain.HGCW012
;
import
com.baosight.hggp.hg.cw.domain.HGCW012
;
import
com.baosight.hggp.hg.cw.domain.HGCW012
;
import
com.baosight.hggp.hg.cw.domain.HGCW012
;
import
com.baosight.hggp.hg.cw.domain.HGCW016
;
import
com.baosight.hggp.hg.xs.domain.Company
;
import
com.baosight.hggp.hg.xs.domain.Company
;
import
com.baosight.hggp.util.EiInfoUtils
;
import
com.baosight.hggp.util.EiInfoUtils
;
import
com.baosight.hggp.util.LogUtils
;
import
com.baosight.hggp.util.LogUtils
;
import
com.baosight.hggp.util.contants.ACConstants
;
import
com.baosight.iplat4j.core.ei.EiConstant
;
import
com.baosight.iplat4j.core.ei.EiConstant
;
import
com.baosight.iplat4j.core.ei.EiInfo
;
import
com.baosight.iplat4j.core.ei.EiInfo
;
import
com.baosight.iplat4j.core.exception.PlatException
;
import
com.baosight.iplat4j.core.exception.PlatException
;
...
@@ -25,13 +28,14 @@ public class ServiceHGCW016A extends ServiceBase {
...
@@ -25,13 +28,14 @@ public class ServiceHGCW016A extends ServiceBase {
* @return
* @return
*/
*/
@OperationLogAnnotation
(
operModul
=
"账期维护"
,
operType
=
"查询"
,
operDesc
=
"初始化"
)
@OperationLogAnnotation
(
operModul
=
"付款单"
,
operType
=
"查询"
,
operDesc
=
"初始化"
)
@Override
public
EiInfo
initLoad
(
EiInfo
inInfo
)
{
public
EiInfo
initLoad
(
EiInfo
inInfo
)
{
try
{
try
{
EiInfoUtils
.
addBlock
(
inInfo
,
"roleCompany"
,
UserSessionUtils
.
getRoleCompany
(),
Company
.
class
);
EiInfoUtils
.
addBlock
(
inInfo
,
"roleCompany"
,
UserSessionUtils
.
getRoleCompany
(),
Company
.
class
);
inInfo
.
addBlock
(
EiConstant
.
resultBlock
).
addBlockMeta
(
new
HGCW012
().
eiMetadata
);
inInfo
.
addBlock
(
EiConstant
.
resultBlock
).
addBlockMeta
(
new
HGCW012
().
eiMetadata
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
LogUtils
.
setDetailMsg
(
inInfo
,
e
,
"初始化失败"
);
LogUtils
.
setDetailMsg
(
inInfo
,
e
,
"初始化
付款单
失败"
);
}
}
return
inInfo
;
return
inInfo
;
}
}
...
@@ -42,10 +46,12 @@ public class ServiceHGCW016A extends ServiceBase {
...
@@ -42,10 +46,12 @@ public class ServiceHGCW016A extends ServiceBase {
* @param inInfo
* @param inInfo
* @return
* @return
*/
*/
@OperationLogAnnotation
(
operModul
=
"
账期维护
"
,
operType
=
"查询"
,
operDesc
=
"查询"
)
@OperationLogAnnotation
(
operModul
=
"
付款单
"
,
operType
=
"查询"
,
operDesc
=
"查询"
)
@Override
@Override
public
EiInfo
query
(
EiInfo
inInfo
)
{
public
EiInfo
query
(
EiInfo
inInfo
)
{
try
{
try
{
inInfo
.
setCell
(
EiConstant
.
queryBlock
,
ACConstants
.
ROW_CODE_0
,
HGCW016
.
FIELD_REVIEW_STATUS
,
ReviewStatusEnum
.
REVIEWED
.
getCode
());
inInfo
.
setCell
(
EiConstant
.
queryBlock
,
ACConstants
.
ROW_CODE_0
,
"notRemainingAmount"
,
0
);
inInfo
=
super
.
query
(
inInfo
,
HGCW012
.
QUERY
,
new
HGCW012
());
inInfo
=
super
.
query
(
inInfo
,
HGCW012
.
QUERY
,
new
HGCW012
());
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
LogUtils
.
setDetailMsg
(
inInfo
,
e
,
"查询失败"
);
LogUtils
.
setDetailMsg
(
inInfo
,
e
,
"查询失败"
);
...
...
src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW017.java
View file @
d4c5a55b
...
@@ -72,29 +72,28 @@ public class ServiceHGCW017 extends ServiceBase {
...
@@ -72,29 +72,28 @@ public class ServiceHGCW017 extends ServiceBase {
List
<
Map
>
resultRows
=
inInfo
.
getBlock
(
EiConstant
.
resultBlock
).
getRows
();
List
<
Map
>
resultRows
=
inInfo
.
getBlock
(
EiConstant
.
resultBlock
).
getRows
();
// 写入数据
// 写入数据
Long
mainId
=
null
;
Long
mainId
=
null
;
for
(
int
i
=
0
;
i
<
resultRows
.
size
();
i
++
)
{
for
(
Map
resultRow
:
resultRows
)
{
HGCW017
HGCW
017
=
new
HGCW017
();
HGCW017
hgcw
017
=
new
HGCW017
();
HGCW017
.
fromMap
(
resultRows
.
get
(
i
)
);
hgcw017
.
fromMap
(
resultRow
);
UserVO
userVO
=
HGCWTools
.
HgCw002
.
getUserCompany
();
UserVO
userVO
=
HGCWTools
.
HgCw002
.
getUserCompany
();
HGCW
017
.
setCompanyCode
(
userVO
.
getUsercode
());
hgcw
017
.
setCompanyCode
(
userVO
.
getUsercode
());
HGCW
017
.
setCompanyName
(
userVO
.
getUsername
());
hgcw
017
.
setCompanyName
(
userVO
.
getUsername
());
mainId
=
HGCW
017
.
getMainId
();
mainId
=
hgcw
017
.
getMainId
();
if
(
HGCW017
.
getId
()
==
null
||
HGCW
017
.
getId
()
==
0
)
{
if
(
hgcw017
.
getId
()
==
null
||
hgcw
017
.
getId
()
==
0
)
{
this
.
add
(
HGCW
017
);
this
.
add
(
hgcw
017
);
}
else
{
}
else
{
// 回写数据
// 回写数据
HGCW017
oldH
GCW017
=
HGCWTools
.
HgCw017
.
getId
(
HGCW
017
.
getId
());
HGCW017
oldH
gcw017
=
HGCWTools
.
HgCw017
.
getId
(
hgcw
017
.
getId
());
//先加再扣
//先加再扣
HGCWTools
.
HgCw012
.
cutAmount
(
oldH
GCW
017
.
getContractNumber
(),
HGCWTools
.
HgCw012
.
cutAmount
(
oldH
gcw
017
.
getContractNumber
(),
oldH
GCW
017
.
getTotalContractPriceIncluding
().
multiply
(
new
BigDecimal
(-
1
)));
oldH
gcw
017
.
getTotalContractPriceIncluding
().
multiply
(
new
BigDecimal
(-
1
)));
this
.
modify
(
HGCW
017
);
this
.
modify
(
hgcw
017
);
HGCWTools
.
HgCw012
.
cutAmount
(
HGCW
017
.
getContractNumber
(),
HGCWTools
.
HgCw012
.
cutAmount
(
hgcw
017
.
getContractNumber
(),
HGCW
017
.
getTotalContractPriceIncluding
());
hgcw
017
.
getTotalContractPriceIncluding
());
}
}
}
}
// 更新主表
// 更新主表
HGCWTools
.
HgCw016
.
updateAmount
(
mainId
);
HGCWTools
.
HgCw016
.
updateAmount
(
mainId
);
inInfo
=
this
.
query
(
inInfo
);
inInfo
.
setStatus
(
EiConstant
.
STATUS_DEFAULT
);
inInfo
.
setStatus
(
EiConstant
.
STATUS_DEFAULT
);
inInfo
.
setMsg
(
"操作成功!本次对["
+
resultRows
.
size
()
+
"]条数据保存成功!"
);
inInfo
.
setMsg
(
"操作成功!本次对["
+
resultRows
.
size
()
+
"]条数据保存成功!"
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
@@ -106,21 +105,21 @@ public class ServiceHGCW017 extends ServiceBase {
...
@@ -106,21 +105,21 @@ public class ServiceHGCW017 extends ServiceBase {
/**
/**
* 新增操作
* 新增操作
*
*
* @param
HGCW
017
* @param
hgcw
017
* @return
* @return
*/
*/
public
void
add
(
HGCW017
HGCW
017
)
{
public
void
add
(
HGCW017
hgcw
017
)
{
DaoUtils
.
insert
(
"HGCW017.insert"
,
HGCW
017
);
DaoUtils
.
insert
(
HGCW017
.
INSERT
,
hgcw
017
);
}
}
/**
/**
* 修改操作
* 修改操作
*
*
* @param
HGCW
017
* @param
hgcw
017
* @return
* @return
*/
*/
public
void
modify
(
HGCW017
HGCW
017
)
{
public
void
modify
(
HGCW017
hgcw
017
)
{
DaoUtils
.
update
(
"HGCW017.update"
,
HGCW
017
);
DaoUtils
.
update
(
HGCW017
.
UPDATE
,
hgcw
017
);
}
}
/**
/**
...
@@ -145,7 +144,6 @@ public class ServiceHGCW017 extends ServiceBase {
...
@@ -145,7 +144,6 @@ public class ServiceHGCW017 extends ServiceBase {
}
}
// 更新主表
// 更新主表
HGCWTools
.
HgCw016
.
updateAmount
(
mainId
);
HGCWTools
.
HgCw016
.
updateAmount
(
mainId
);
inInfo
=
this
.
query
(
inInfo
);
inInfo
.
setStatus
(
EiConstant
.
STATUS_DEFAULT
);
inInfo
.
setStatus
(
EiConstant
.
STATUS_DEFAULT
);
inInfo
.
setMsg
(
"操作成功!本次对["
+
resultRows
.
size
()
+
"]条数据删除成功!"
);
inInfo
.
setMsg
(
"操作成功!本次对["
+
resultRows
.
size
()
+
"]条数据删除成功!"
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
...
src/main/java/com/baosight/hggp/hg/cw/sql/HGCW012.xml
View file @
d4c5a55b
...
@@ -165,6 +165,9 @@
...
@@ -165,6 +165,9 @@
<isNotEmpty
prepend=
" AND "
property=
"receiveWeight"
>
<isNotEmpty
prepend=
" AND "
property=
"receiveWeight"
>
RECEIVE_WEIGHT = #receiveWeight#
RECEIVE_WEIGHT = #receiveWeight#
</isNotEmpty>
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"notRemainingAmount"
>
REMAINING_AMOUNT != #notRemainingAmount#
</isNotEmpty>
</sql>
</sql>
<select
id=
"query"
parameterClass=
"java.util.HashMap"
<select
id=
"query"
parameterClass=
"java.util.HashMap"
...
@@ -178,7 +181,7 @@
...
@@ -178,7 +181,7 @@
$orderBy$
$orderBy$
</isNotEmpty>
</isNotEmpty>
<isEmpty
property=
"orderBy"
>
<isEmpty
property=
"orderBy"
>
ID desc
RECEIVE_DATE desc ,SIGNING_DATE desc,
ID desc
</isEmpty>
</isEmpty>
</dynamic>
</dynamic>
...
...
src/main/java/com/baosight/hggp/hg/cw/sql/HGCW016.xml
View file @
d4c5a55b
...
@@ -117,7 +117,7 @@
...
@@ -117,7 +117,7 @@
$orderBy$
$orderBy$
</isNotEmpty>
</isNotEmpty>
<isEmpty
property=
"orderBy"
>
<isEmpty
property=
"orderBy"
>
ID a
sc
SIGNING_DATE desc ,ID de
sc
</isEmpty>
</isEmpty>
</dynamic>
</dynamic>
...
...
src/main/java/com/baosight/hggp/hg/cw/tools/HGCWTools.java
View file @
d4c5a55b
...
@@ -725,13 +725,13 @@ public class HGCWTools {
...
@@ -725,13 +725,13 @@ public class HGCWTools {
DaoUtils
.
update
(
"HGCW012.update"
,
HGCW012
);
DaoUtils
.
update
(
"HGCW012.update"
,
HGCW012
);
}
}
}
}
public
static
void
cutAmount
(
String
settlement
Number
,
BigDecimal
cutAmount
)
{
public
static
void
cutAmount
(
String
bill
Number
,
BigDecimal
cutAmount
)
{
AssertUtils
.
isNull
(
settlementNumber
,
"来源单
号不能为空!"
);
AssertUtils
.
isNull
(
billNumber
,
"发票
号不能为空!"
);
// if (cutAmount.compareTo(new BigDecimal(BigInteger.ZERO)) <= 0) {
// if (cutAmount.compareTo(new BigDecimal(BigInteger.ZERO)) <= 0) {
// throw new PlatException("扣款金额不能小于等于0!");
// throw new PlatException("扣款金额不能小于等于0!");
// }
// }
List
<
HGCW012
>
results
=
DaoBase
.
getInstance
().
query
(
HGCW012
.
QUERY
,
new
HashMap
<
String
,
Object
>(){
List
<
HGCW012
>
results
=
DaoBase
.
getInstance
().
query
(
HGCW012
.
QUERY
,
new
HashMap
<
String
,
Object
>(){
{
put
(
"settlementNumber"
,
settlement
Number
);}
{
put
(
HGCW012
.
FIELD_BILL_NUMBER
,
bill
Number
);}
});
});
if
(
CollectionUtils
.
isEmpty
(
results
))
{
if
(
CollectionUtils
.
isEmpty
(
results
))
{
throw
new
PlatException
(
"找不到对应的采购收票记录!"
);
throw
new
PlatException
(
"找不到对应的采购收票记录!"
);
...
@@ -1007,7 +1007,7 @@ public class HGCWTools {
...
@@ -1007,7 +1007,7 @@ public class HGCWTools {
rows
.
forEach
(
row
->
{
rows
.
forEach
(
row
->
{
HGCW017
hgcw017
=
new
HGCW017
();
HGCW017
hgcw017
=
new
HGCW017
();
hgcw017
.
fromMap
(
row
);
hgcw017
.
fromMap
(
row
);
String
contractNumber
=
row
.
get
(
"settlementNumber"
).
toString
();
String
contractNumber
=
row
.
get
(
HGCW012
.
FIELD_BILL_NUMBER
).
toString
();
String
remainingAmount
=
row
.
get
(
"thisAmount"
).
toString
();
String
remainingAmount
=
row
.
get
(
"thisAmount"
).
toString
();
hgcw017
.
setContractNumber
(
contractNumber
);
hgcw017
.
setContractNumber
(
contractNumber
);
hgcw017
.
setTotalContractPriceIncluding
(
new
BigDecimal
(
remainingAmount
));
hgcw017
.
setTotalContractPriceIncluding
(
new
BigDecimal
(
remainingAmount
));
...
...
src/main/java/com/baosight/hggp/hg/mt/utils/UploadUtils.java
0 → 100644
View file @
d4c5a55b
package
com
.
baosight
.
hggp
.
hg
.
mt
.
utils
;
import
com.baosight.iplat4j.core.data.ibatis.dao.Dao
;
import
com.baosight.iplat4j.core.ioc.spring.PlatApplicationContext
;
import
com.baosight.iplat4j.core.util.StringUtils
;
import
com.baosight.iplat4j.eu.dm.PlatFileUploadUtils
;
import
net.sf.json.JSONObject
;
import
org.springframework.web.multipart.commons.CommonsMultipartFile
;
import
java.util.HashMap
;
import
java.util.Map
;
/**
* @author LiuYang
* @version 1.0 2024/7/23
*/
public
class
UploadUtils
{
private
static
Dao
dao
=
(
Dao
)
PlatApplicationContext
.
getApplicationContext
().
getBean
(
"dao"
);
public
static
JSONObject
upload
(
CommonsMultipartFile
multipartFile
)
throws
Exception
{
JSONObject
documentJSON
=
new
JSONObject
();
String
docName
=
multipartFile
.
getOriginalFilename
();
Long
docSize
=
multipartFile
.
getSize
();
HashMap
<
String
,
String
>
inMap
=
new
HashMap
();
inMap
.
put
(
"groupId"
,
"hk_file11"
);
inMap
.
put
(
"configPathDefine"
,
"A"
);
Map
<
String
,
String
>
returnMap
=
PlatFileUploadUtils
.
uploadFile
(
multipartFile
,
inMap
);
String
docId
=
(
String
)
returnMap
.
get
(
"docId"
);
String
docUrl
=
(
String
)
returnMap
.
get
(
"docUrl"
);
docId
=
docId
==
null
?
""
:
docId
;
documentJSON
.
put
(
"docId"
,
docId
);
if
(
StringUtils
.
isNotEmpty
(
docUrl
))
{
documentJSON
.
put
(
"docUrl"
,
docUrl
);
}
else
{
documentJSON
.
remove
(
"docUrl"
);
}
documentJSON
.
put
(
"groupId"
,
returnMap
.
get
(
"groupId"
)
==
null
?
""
:
returnMap
.
get
(
"groupId"
));
documentJSON
.
put
(
"docName"
,
docName
);
documentJSON
.
put
(
"docSize"
,
docSize
);
documentJSON
.
put
(
"docType"
,
docName
.
substring
(
docName
.
lastIndexOf
(
46
)));
return
documentJSON
;
}
}
src/main/webapp/HG/CW/HGCW016.js
View file @
d4c5a55b
...
@@ -12,13 +12,20 @@ $(function() {
...
@@ -12,13 +12,20 @@ $(function() {
pageSize
:
20
,
pageSize
:
20
,
pageSizes
:
[
10
,
20
,
30
,
50
,
100
,
200
],
pageSizes
:
[
10
,
20
,
30
,
50
,
100
,
200
],
},
},
columns
:
[{
columns
:
[
{
field
:
"operator"
,
field
:
"operator"
,
template
:
function
(
item
)
{
template
:
function
(
item
)
{
let
template
=
'<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
let
template
=
'<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+
'onclick="contractDetailFunc('
+
item
.
id
+
')">付款清单</a>'
;
+
'onclick="contractDetailFunc('
+
item
.
id
+
')">付款清单</a>'
;
return
template
;
return
template
;
}
}
},
{
field
:
"signingDate"
,
defaultValue
:
function
()
{
return
currShortDate
();
}
}
}
],
],
loadComplete
:
function
(
grid
)
{
loadComplete
:
function
(
grid
)
{
...
...
src/main/webapp/HG/CW/HGCW016.jsp
View file @
d4c5a55b
...
@@ -46,13 +46,16 @@
...
@@ -46,13 +46,16 @@
editType=
"date"
dateFormat=
"yyyy-MM-dd"
parseFormats=
"['yyyyMMdd']"
/>
editType=
"date"
dateFormat=
"yyyy-MM-dd"
parseFormats=
"['yyyyMMdd']"
/>
<EF:EFColumn
ename=
"contractNumber"
cname=
"来源单号"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"contractNumber"
cname=
"来源单号"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"incomeNumber"
cname=
"付款单号"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"incomeNumber"
cname=
"付款单号"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"totalContractPriceIncluding"
cname=
"付款总额"
width=
"120"
format=
"{0:N3}"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"totalContractPriceIncluding"
cname=
"付款总额"
width=
"120"
enable=
"false"
format=
"{0:N3}"
editType=
"text"
displayType=
"0.000"
sort=
"true"
align=
"right"
readonly=
"true"
data-regex=
"/^-?[0-9]{1,15}([.][0-9]{1,3})?$/"
maxLength=
"15"
required=
"false"
data-errorprompt=
"请输入数字,该值最大可设置15位整数和3位小数!"
/>
<EF:EFComboColumn
ename=
"cancelStatus"
cname=
"核销状态"
width=
"100"
align=
"center"
readonly=
"true"
<EF:EFComboColumn
ename=
"cancelStatus"
cname=
"核销状态"
width=
"100"
align=
"center"
readonly=
"true"
columnTemplate=
"#=textField#"
itemTemplate=
"#=textField#"
enable=
"false"
>
columnTemplate=
"#=textField#"
itemTemplate=
"#=textField#"
enable=
"false"
defaultValue=
"1"
>
<EF:EFCodeOption
codeName=
"hggp.cw.cancelStatus"
/>
<EF:EFCodeOption
codeName=
"hggp.cw.cancelStatus"
/>
</EF:EFComboColumn>
</EF:EFComboColumn>
<EF:EFComboColumn
ename=
"reviewStatus"
cname=
"审批状态"
width=
"100"
align=
"center"
readonly=
"true"
<EF:EFComboColumn
ename=
"reviewStatus"
cname=
"审批状态"
width=
"100"
align=
"center"
readonly=
"true"
columnTemplate=
"#=textField#"
itemTemplate=
"#=textField#"
enable=
"false"
>
columnTemplate=
"#=textField#"
itemTemplate=
"#=textField#"
enable=
"false"
defaultValue=
"0"
>
<EF:EFCodeOption
codeName=
"hggp.cw.reviewStatus"
/>
<EF:EFCodeOption
codeName=
"hggp.cw.reviewStatus"
/>
</EF:EFComboColumn>
</EF:EFComboColumn>
</EF:EFGrid>
</EF:EFGrid>
...
...
src/main/webapp/HG/CW/HGCW016A.jsp
View file @
d4c5a55b
...
@@ -40,21 +40,37 @@
...
@@ -40,21 +40,37 @@
align=
"center"
filter=
"contains"
sort=
"true"
>
align=
"center"
filter=
"contains"
sort=
"true"
>
<EF:EFOptions
blockId=
"roleCompany"
textField=
"companyName"
valueField=
"companyCode"
/>
<EF:EFOptions
blockId=
"roleCompany"
textField=
"companyName"
valueField=
"companyCode"
/>
</EF:EFComboColumn>
</EF:EFComboColumn>
<EF:EFColumn
ename=
"thisAmount"
cname=
"本次付款金额"
width=
"120"
align=
"center"
/>
<EF:EFColumn
ename=
"thisAmount"
cname=
"本次付款金额"
width=
"120"
enable=
"true"
format=
"{0:N3}"
editType=
"text"
<EF:EFColumn
ename=
"remainingAmount"
cname=
"剩余付款金额"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
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=
"remainingAmount"
cname=
"剩余付款金额"
width=
"120"
enable=
"false"
format=
"{0:N3}"
editType=
"text"
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=
"partyA"
cname=
"供应商名称"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"partyA"
cname=
"供应商名称"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"settlementNumber"
cname=
"来源单号"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"settlementNumber"
cname=
"来源单号"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFComboColumn
ename=
"billTybe"
cname=
"票据类型"
width=
"1
0
0"
align=
"center"
<EF:EFComboColumn
ename=
"billTybe"
cname=
"票据类型"
width=
"1
2
0"
align=
"center"
columnTemplate=
"#=textField#"
itemTemplate=
"#=textField#"
enable=
"false"
>
columnTemplate=
"#=textField#"
itemTemplate=
"#=textField#"
enable=
"false"
>
<EF:EFCodeOption
codeName=
"hggp.cw.billTybe"
/>
<EF:EFCodeOption
codeName=
"hggp.cw.billTybe"
/>
</EF:EFComboColumn>
</EF:EFComboColumn>
<EF:EFColumn
ename=
"signingDate"
cname=
"付款日期"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<
%
--
<
EF:EFColumn
ename=
"signingDate"
cname=
"付款日期"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
--%>
<EF:EFColumn
ename=
"signingDate"
cname=
"付款日期"
width=
"120"
enable=
"true"
align=
"center"
editType=
"date"
dateFormat=
"yyyy-MM-dd"
parseFormats=
"['yyyyMMdd']"
required=
"false"
/>
<EF:EFColumn
ename=
"billNumber"
cname=
"发票号"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"billNumber"
cname=
"发票号"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"taxPoints"
cname=
"税率(%)"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"taxPoints"
cname=
"税率(%)"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"thisSettlementAmount"
cname=
"不含税金额"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"thisSettlementAmount"
cname=
"不含税金额"
width=
"120"
enable=
"false"
format=
"{0:N3}"
editType=
"text"
<EF:EFColumn
ename=
"thisSettlementTax"
cname=
"税额"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
displayType=
"0.000"
sort=
"true"
align=
"right"
readonly=
"true"
<EF:EFColumn
ename=
"totalContractPriceIncluding"
cname=
"发票总额"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
data-regex=
"/^-?[0-9]{1,15}([.][0-9]{1,3})?$/"
maxLength=
"15"
required=
"false"
data-errorprompt=
"请输入数字,该值最大可设置15位整数和3位小数!"
/>
<EF:EFColumn
ename=
"thisSettlementTax"
cname=
"税额"
width=
"120"
enable=
"false"
format=
"{0:N3}"
editType=
"text"
displayType=
"0.000"
sort=
"true"
align=
"right"
readonly=
"true"
data-regex=
"/^-?[0-9]{1,15}([.][0-9]{1,3})?$/"
maxLength=
"15"
required=
"false"
data-errorprompt=
"请输入数字,该值最大可设置15位整数和3位小数!"
/>
<EF:EFColumn
ename=
"totalContractPriceIncluding"
cname=
"发票总额"
width=
"120"
enable=
"false"
format=
"{0:N3}"
editType=
"text"
displayType=
"0.000"
sort=
"true"
align=
"right"
readonly=
"true"
data-regex=
"/^-?[0-9]{1,15}([.][0-9]{1,3})?$/"
maxLength=
"15"
required=
"false"
data-errorprompt=
"请输入数字,该值最大可设置15位整数和3位小数!"
/>
</EF:EFGrid>
</EF:EFGrid>
</EF:EFRegion>
</EF:EFRegion>
<div
class=
"row"
style=
"display:flex;justify-content:center;"
>
<div
class=
"row"
style=
"display:flex;justify-content:center;"
>
...
...
src/main/webapp/HG/CW/HGCW016B.js
View file @
d4c5a55b
...
@@ -62,7 +62,7 @@ function saveFunc() {
...
@@ -62,7 +62,7 @@ function saveFunc() {
onSuccess
:
function
(
ei
)
{
onSuccess
:
function
(
ei
)
{
if
(
ei
.
getStatus
()
>=
0
)
{
if
(
ei
.
getStatus
()
>=
0
)
{
try
{
try
{
query
();
}
catch
(
e
)
{
}
catch
(
e
)
{
// TODO: handle exception
// TODO: handle exception
}
}
...
@@ -71,6 +71,7 @@ function saveFunc() {
...
@@ -71,6 +71,7 @@ function saveFunc() {
}
else
{
}
else
{
NotificationUtil
(
ei
);
NotificationUtil
(
ei
);
}
}
query
();
}
else
{
}
else
{
NotificationUtil
(
ei
,
"error"
);
NotificationUtil
(
ei
,
"error"
);
}
}
...
...
src/main/webapp/HG/CW/HGCW016B.jsp
View file @
d4c5a55b
...
@@ -13,7 +13,10 @@
...
@@ -13,7 +13,10 @@
<EF:EFColumn
ename=
"id"
cname=
"主键"
hidden=
"true"
/>
<EF:EFColumn
ename=
"id"
cname=
"主键"
hidden=
"true"
/>
<EF:EFColumn
ename=
"partyA"
cname=
"客户名称"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"partyA"
cname=
"客户名称"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"contractNumber"
cname=
"来源单号"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"contractNumber"
cname=
"来源单号"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"totalContractPriceIncluding"
cname=
"付款总额"
width=
"120"
format=
"{0:N3}"
align=
"center"
/>
<EF:EFColumn
ename=
"totalContractPriceIncluding"
cname=
"付款总额"
width=
"120"
enable=
"true"
format=
"{0:N3}"
editType=
"text"
displayType=
"0.000"
sort=
"true"
align=
"right"
data-regex=
"/^-?[0-9]{1,15}([.][0-9]{1,3})?$/"
maxLength=
"15"
required=
"false"
data-errorprompt=
"请输入数字,该值最大可设置15位整数和3位小数!"
/>
</EF:EFGrid>
</EF:EFGrid>
</EF:EFRegion>
</EF:EFRegion>
</EF:EFPage>
</EF:EFPage>
...
...
src/main/webapp/HG/CW/HGCW016C.jsp
View file @
d4c5a55b
...
@@ -13,7 +13,10 @@
...
@@ -13,7 +13,10 @@
<EF:EFColumn
ename=
"id"
cname=
"主键"
hidden=
"true"
/>
<EF:EFColumn
ename=
"id"
cname=
"主键"
hidden=
"true"
/>
<EF:EFColumn
ename=
"partyA"
cname=
"客户名称"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"partyA"
cname=
"客户名称"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"contractNumber"
cname=
"来源单号"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"contractNumber"
cname=
"来源单号"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"totalContractPriceIncluding"
cname=
"付款总额"
width=
"120"
format=
"{0:N3}"
align=
"center"
enable=
"false"
readonly=
"true"
/>
<EF:EFColumn
ename=
"totalContractPriceIncluding"
cname=
"付款总额"
width=
"120"
enable=
"false"
format=
"{0:N3}"
editType=
"text"
displayType=
"0.000"
sort=
"true"
align=
"right"
readonly=
"true"
data-regex=
"/^-?[0-9]{1,15}([.][0-9]{1,3})?$/"
maxLength=
"15"
required=
"false"
data-errorprompt=
"请输入数字,该值最大可设置15位整数和3位小数!"
/>
</EF:EFGrid>
</EF:EFGrid>
</EF:EFRegion>
</EF:EFRegion>
</EF:EFPage>
</EF:EFPage>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment