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
10243dae
Commit
10243dae
authored
Aug 23, 2019
by
季圣华
Browse files
给单据明细编辑增加库存展示
parent
d28b85cd
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
erp_web/js/pages/materials/in_out.js
View file @
10243dae
This diff is collapsed.
Click to expand it.
src/main/java/com/jsh/erp/controller/DepotItemController.java
View file @
10243dae
...
...
@@ -233,6 +233,9 @@ public class DepotItemController {
String
materialOther
=
getOtherInfo
(
mpArr
,
diEx
);
MaterialName
=
MaterialName
+
materialOther
+
((
diEx
.
getUName
()
==
null
||
diEx
.
getUName
().
equals
(
""
))
?
""
:
"("
+
diEx
.
getUName
()
+
")"
)
+
ratio
;
item
.
put
(
"MaterialName"
,
MaterialName
==
null
?
""
:
MaterialName
);
int
inSum
=
depotItemService
.
findByTypeAndMaterialIdAndDepotId
(
"入库"
,
diEx
.
getMaterialid
(),
diEx
.
getDepotid
());
int
outSum
=
depotItemService
.
findByTypeAndMaterialIdAndDepotId
(
"出库"
,
diEx
.
getMaterialid
(),
diEx
.
getDepotid
());
item
.
put
(
"Stock"
,
inSum
-
outSum
);
item
.
put
(
"Unit"
,
diEx
.
getMunit
());
item
.
put
(
"OperNumber"
,
diEx
.
getOpernumber
());
item
.
put
(
"BasicNumber"
,
diEx
.
getBasicnumber
());
...
...
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