Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
JSH ERP
Commits
d86ac6d0
Commit
d86ac6d0
authored
Jan 31, 2019
by
cjl
Browse files
添加单据编号超链接
parent
a34a6092
Changes
3
Hide whitespace changes
Inline
Side-by-side
erp_web/pages/manage/serialNumber.html
View file @
d86ac6d0
...
...
@@ -189,12 +189,13 @@
columns
:
[[
{
field
:
'
id
'
,
width
:
35
,
align
:
"
center
"
,
checkbox
:
true
},
{
field
:
'
depotheadId
'
,
hidden
:
true
},
{
field
:
'
depotHeadType
'
,
hidden
:
true
},
{
title
:
'
操作
'
,
field
:
'
op
'
,
align
:
"
center
"
,
width
:
60
,
formatter
:
function
(
value
,
rec
)
{
var
str
=
''
;
var
rowInfo
=
rec
.
id
+
'
AaBb
'
+
rec
.
materialId
+
'
AaBb
'
+
rec
.
materialName
+
'
AaBb
'
+
rec
.
serialNumber
+
'
AaBb
'
+
rec
.
isSell
+
'
AaBb
'
+
rec
.
remark
+
'
AaBb
'
+
rec
.
deleteFlag
+
'
AaBb
'
+
rec
.
createTime
+
'
AaBb
'
+
rec
.
updateTime
+
'
AaBb
'
+
rec
.
creator
+
'
AaBb
'
+
rec
.
updater
+
'
AaBb
'
+
rec
.
creatorName
+
'
AaBb
'
+
rec
.
updaterName
+
'
AaBb
'
+
rec
.
depotheadId
+
'
AaBb
'
+
rec
.
depotHeadNumber
;
+
'
AaBb
'
+
rec
.
creatorName
+
'
AaBb
'
+
rec
.
updaterName
+
'
AaBb
'
+
rec
.
depotheadId
+
'
AaBb
'
+
rec
.
depotHeadNumber
+
'
AaBb
'
+
rec
.
depotHeadType
;
str
+=
'
<img title="编辑" src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editSerialNumber(
\'
'
+
rowInfo
+
'
\'
);"/>
'
;
str
+=
'
<img title="删除" src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteSerialNumber(
'
+
rec
.
id
+
'
);"/>
'
;
return
str
;
...
...
@@ -202,7 +203,12 @@
},
{
title
:
'
商品名称
'
,
align
:
"
center
"
,
field
:
'
materialName
'
,
width
:
100
},
{
title
:
'
序列号
'
,
align
:
"
center
"
,
field
:
'
serialNumber
'
,
width
:
200
},
{
title
:
'
单据编号
'
,
align
:
"
center
"
,
field
:
'
depotHeadNumber
'
,
width
:
200
},
{
title
:
'
单据编号
'
,
align
:
"
center
"
,
field
:
'
depotHeadNumber
'
,
width
:
140
,
formatter
:
function
(
value
,
row
)
{
return
"
<a class='n-link' onclick=
\"
newTab('
"
+
row
.
depotHeadNumber
+
"
','../materials/bill_detail.html?n=
"
+
row
.
depotHeadNumber
+
"
&type=
"
+
row
.
depotHeadType
+
"
','')
\"
>
"
+
row
.
depotHeadNumber
+
"
</a>
"
;
}
},
{
title
:
'
已卖出
'
,
align
:
"
center
"
,
field
:
'
isSell
'
,
width
:
60
,
formatter
:
function
(
value
)
{
return
value
==
'
1
'
?
"
是
"
:
"
否
"
;
}
...
...
src/main/java/com/jsh/erp/datasource/entities/SerialNumberEx.java
View file @
d86ac6d0
...
...
@@ -21,6 +21,8 @@ public class SerialNumberEx extends SerialNumber{
private
String
updaterName
;
/**单据编号*/
private
String
depotHeadNumber
;
/**单据类型(出库入库)*/
private
String
depotHeadType
;
public
String
getMaterialName
()
{
return
materialName
;
...
...
@@ -53,4 +55,12 @@ public class SerialNumberEx extends SerialNumber{
public
void
setDepotHeadNumber
(
String
depotHeadNumber
)
{
this
.
depotHeadNumber
=
depotHeadNumber
;
}
public
String
getDepotHeadType
()
{
return
depotHeadType
;
}
public
void
setDepotHeadType
(
String
depotHeadType
)
{
this
.
depotHeadType
=
depotHeadType
;
}
}
src/main/resources/mapper_xml/SerialNumberMapperEx.xml
View file @
d86ac6d0
...
...
@@ -7,12 +7,13 @@
<result
column=
"creatorName"
jdbcType=
"VARCHAR"
property=
"creatorName"
/>
<result
column=
"updaterName"
jdbcType=
"VARCHAR"
property=
"updaterName"
/>
<result
column=
"depotHeadNumber"
jdbcType=
"VARCHAR"
property=
"depotHeadNumber"
/>
<result
column=
"depotHeadType"
jdbcType=
"VARCHAR"
property=
"depotHeadType"
/>
</resultMap>
<select
id=
"selectByConditionSerialNumber"
resultMap=
"SerialNumberExBaseResultMap"
>
select
ser.id, ser.material_Id, ser.serial_Number, ser.is_Sell, ser.remark, ser.delete_Flag, ser.create_Time,
ser.update_Time,mat.name as materialName,null as creator,null as updater,null as creatorName,
null as updaterName,ser.depothead_Id, dh.number as depotHeadNumber
null as updaterName,ser.depothead_Id, dh.number as depotHeadNumber
,concat(dh.SubType,dh.Type) as depotHeadType
FROM jsh_serial_number ser
left join jsh_material mat on mat.id = ser.material_Id
left join jsh_depothead dh on dh.id= ser.depothead_Id
...
...
Write
Preview
Supports
Markdown
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