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
a3259f81
authored
Oct 24, 2019
by
ice
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
修改销售订单存在的小问题
parent
9dc958d4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletions
src/main/java/orthopedics/controller/bookcity/PurRequisitionController.java
src/main/java/orthopedics/controller/bookcity/WshShipmentController.java
src/main/java/orthopedics/controller/bookcity/PurRequisitionController.java
View file @
a3259f81
...
...
@@ -128,6 +128,7 @@ public class PurRequisitionController {
**/
@RequestMapping
(
path
=
"/add"
,
method
=
RequestMethod
.
POST
)
public
Result
add
(
@RequestBody
PurRequisitionPage
purRequisitionPage
,
@RequestParam
(
value
=
"token"
)
String
token
,
@RequestParam
(
value
=
"headerStatus"
,
required
=
false
)
String
headerStatus
)
{
//判断想要下推生成采购申请单的状态是否为已审批
if
(!
"approval"
.
equals
(
headerStatus
)
&&
!
"completed"
.
equals
(
headerStatus
))
{
...
...
@@ -164,10 +165,12 @@ public class PurRequisitionController {
}
requisitionLine
.
setItemCode
(
invItem
.
getItemCode
());
}
SysAccessToken
sysAccessToken
=
userServer
.
checkAccessToken
(
token
);
PurRequisition
purRequisition
=
new
PurRequisition
();
BeanUtils
.
copyProperties
(
purRequisitionPage
,
purRequisition
);
//为采购申请主表添加组织code
purRequisition
.
setSysOrgCode
(
sysOrgCode
);
purRequisition
.
setApplicant
(
sysAccessToken
.
getUserId
());
//添加
purRequisitionService
.
saveMain
(
purRequisition
,
purRequisitionPage
.
getPurRequisitionLineList
());
return
new
Result
(
true
,
StatusCode
.
OK
,
"下推采购申请成功!"
,
purRequisitionPage
.
getOrderNumber
());
...
...
src/main/java/orthopedics/controller/bookcity/WshShipmentController.java
View file @
a3259f81
...
...
@@ -74,7 +74,7 @@ public class WshShipmentController {
}
String
updateBy
=
user
.
getRealname
();
LocalDateTime
updateTime
=
LocalDateTime
.
now
();
wshShipmentHeaderPage
.
setShipperV
(
user
.
get
Person
Id
());
wshShipmentHeaderPage
.
setShipperV
(
user
.
getId
());
//查找出当前用户所在的组织sysorgcode
Map
<
String
,
Object
>
map
=
getInfo
(
user
.
getPersonId
());
//赋值当前用户的组织code
...
...
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