Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
郑小冰
/
orthopedics
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
7e2cbf53
authored
Nov 05, 2019
by
ice
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
修改下推采购订单的库存现有量填充,收货成接收单接收人填充的
parent
cd063f1e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
3 deletions
src/main/java/orthopedics/controller/bookcity/PurOrderHeaderController.java
src/main/java/orthopedics/controller/bookcity/RcvReceiptController.java
src/main/java/orthopedics/controller/bookcity/PurOrderHeaderController.java
View file @
7e2cbf53
...
...
@@ -354,8 +354,11 @@ public class PurOrderHeaderController {
if
(
receiptNumber
==
null
){
return
new
Result
(
false
,
StatusCode
.
ERROR
,
"接收单号生成错误"
);
}
rcvReceiptHeader
.
setReceiver
(
sysUser
.
getId
());
SysUser
user
=
userServer
.
getSysUserById
(
purOrderHeader
.
getBuyerId
());
if
(
null
!=
user
){
rcvReceiptHeader
.
setReceiver
(
user
.
getPersonId
());
}
rcvReceiptHeader
.
setReceiver
(
""
);
rcvReceiptHeader
.
setShipper
(
sysUser
.
getPersonId
());
rcvReceiptHeader
.
setReceiptNumber
(
receiptNumber
);
...
...
@@ -382,6 +385,7 @@ public class PurOrderHeaderController {
}
rcvReceiptLine
.
setItemId
(
purOrderLine
.
getItemId
());
rcvReceiptLine
.
setAttribute1
(
purOrderLine
.
getItemName
());
rcvReceiptLine
.
setAttribute2
(
purOrderLine
.
getItemCode
());
int
i
=
0
;
try
{
i
=
Integer
.
parseInt
(
purOrderLine
.
getQuantity
());
...
...
src/main/java/orthopedics/controller/bookcity/RcvReceiptController.java
View file @
7e2cbf53
...
...
@@ -42,6 +42,8 @@ public class RcvReceiptController {
private
PropertiesServer
propertiesServer
;
@Autowired
private
WarDifferentService
warDifferentService
;
@Autowired
private
OrganzitionServer
organzitionServer
;
/*
*描述:验收入库前需先进行审核
...
...
@@ -230,7 +232,11 @@ public class RcvReceiptController {
warDifferent
.
setSourceLineNumber
(
rcvReceiptLine
.
getLineNumber
());
warDifferent
.
setSourceLineId
(
rcvReceiptLine
.
getId
());
warDifferent
.
setSourceType
(
"RCV_RECEIPT"
);
warDifferent
.
setOrgId
(
"964daee94b604cd58e5e6bf48dd9670a"
);
HrOrganization
hrOrganization
=
organzitionServer
.
selectByOrgCode
(
rcvReceiptHeader
.
getSysOrgCode
());
if
(
hrOrganization
!=
null
){
warDifferent
.
setOrgId
(
hrOrganization
.
getId
());
}
warDifferent
.
setOrgId
(
""
);
warDifferent
.
setDifferentType
(
type
);
String
headerId
=
""
;
if
(
null
!=
rcvReceiptHeader
.
getSourceHeaderId
()
&&
!
""
.
equals
(
rcvReceiptHeader
.
getSourceHeaderId
()))
{
...
...
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