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
8d3d0314
"document/vscode:/vscode.git/clone" did not exist on "33e4422717485cf638f6dbebdb7c77c5b01ac78d"
Commit
8d3d0314
authored
Oct 13, 2020
by
季圣华
Browse files
继续优化单据的逻辑
parent
df4fa41b
Changes
2
Show whitespace changes
Inline
Side-by-side
erp_web/js/pages/bill/in_out.js
View file @
8d3d0314
...
@@ -1360,6 +1360,10 @@
...
@@ -1360,6 +1360,10 @@
if
(
tipInfo
){
if
(
tipInfo
){
if
(
tipInfo
.
code
!=
200
){
if
(
tipInfo
.
code
!=
200
){
$
.
messager
.
alert
(
'
提示
'
,
tipInfo
.
msg
,
'
warning
'
);
$
.
messager
.
alert
(
'
提示
'
,
tipInfo
.
msg
,
'
warning
'
);
for
(
var
i
=
0
;
i
<
rows
.
length
;
i
++
){
$
(
'
#materialData
'
).
datagrid
(
'
selectRow
'
,
i
).
datagrid
(
'
beginEdit
'
,
i
);
self
.
autoReckon
();
}
return
;
return
;
}
}
$
.
messager
.
alert
(
'
提示
'
,
'
保存成功!
'
,
'
info
'
);
$
.
messager
.
alert
(
'
提示
'
,
'
保存成功!
'
,
'
info
'
);
...
@@ -1401,6 +1405,10 @@
...
@@ -1401,6 +1405,10 @@
if
(
tipInfo
){
if
(
tipInfo
){
if
(
tipInfo
.
code
!=
200
){
if
(
tipInfo
.
code
!=
200
){
$
.
messager
.
alert
(
'
提示
'
,
tipInfo
.
msg
,
'
warning
'
);
$
.
messager
.
alert
(
'
提示
'
,
tipInfo
.
msg
,
'
warning
'
);
for
(
var
i
=
0
;
i
<
rows
.
length
;
i
++
){
$
(
'
#materialData
'
).
datagrid
(
'
selectRow
'
,
i
).
datagrid
(
'
beginEdit
'
,
i
);
self
.
autoReckon
();
}
return
;
return
;
}
}
$
.
messager
.
alert
(
'
提示
'
,
'
保存成功!
'
,
'
info
'
);
$
.
messager
.
alert
(
'
提示
'
,
'
保存成功!
'
,
'
info
'
);
...
...
src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
View file @
8d3d0314
...
@@ -298,9 +298,7 @@ public class DepotItemService {
...
@@ -298,9 +298,7 @@ public class DepotItemService {
@Transactional
(
value
=
"transactionManager"
,
rollbackFor
=
Exception
.
class
)
@Transactional
(
value
=
"transactionManager"
,
rollbackFor
=
Exception
.
class
)
public
void
saveDetials
(
String
rows
,
Long
headerId
,
Long
tenantId
,
HttpServletRequest
request
)
throws
Exception
{
public
void
saveDetials
(
String
rows
,
Long
headerId
,
Long
tenantId
,
HttpServletRequest
request
)
throws
Exception
{
//查询单据主表信息
//查询单据主表信息
DepotHead
depotHead
=
null
;
DepotHead
depotHead
=
depotHeadMapper
.
selectByPrimaryKey
(
headerId
);
try
{
depotHead
=
depotHeadMapper
.
selectByPrimaryKey
(
headerId
);
//获得当前操作人
//获得当前操作人
User
userInfo
=
userService
.
getCurrentUser
();
User
userInfo
=
userService
.
getCurrentUser
();
//首先回收序列号,如果是调拨,不用处理序列号
//首先回收序列号,如果是调拨,不用处理序列号
...
@@ -416,9 +414,6 @@ public class DepotItemService {
...
@@ -416,9 +414,6 @@ public class DepotItemService {
updateCurrentStock
(
depotItem
,
tenantId
);
updateCurrentStock
(
depotItem
,
tenantId
);
}
}
}
}
}
catch
(
Exception
e
){
JshException
.
writeFail
(
logger
,
e
);
}
}
}
/**
/**
* 查询计量单位信息
* 查询计量单位信息
...
...
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