Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
Y
YX_IDENT_REFACTORING
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhangyusheng
YX_IDENT_REFACTORING
Commits
f493d4d1
Commit
f493d4d1
authored
Dec 30, 2018
by
Administrator
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新详细设计文档
parent
f6554edf
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
3 deletions
+20
-3
YingxinApi.java
src/main/java/com/yxproject/start/api/YingxinApi.java
+1
-1
service.js
src/main/resources/static/js/services/service.js
+15
-0
addRemainCard.js
...esources/static/tpl/layout/addRemainCard/addRemainCard.js
+2
-0
failedCard.js
...main/resources/static/tpl/layout/failedCard/failedCard.js
+2
-2
制证调度系统—详细设计说明书.doc
制证调度系统—详细设计说明书.doc
+0
-0
No files found.
src/main/java/com/yxproject/start/api/YingxinApi.java
View file @
f493d4d1
...
@@ -55,7 +55,7 @@ public class YingxinApi {
...
@@ -55,7 +55,7 @@ public class YingxinApi {
*
*
*
*
*/
*/
@RequestMapping
(
"getC
bCountInfo
"
)
@RequestMapping
(
"getC
ardBodyCount
"
)
public
String
getCbCountInfo
(
@RequestParam
(
"startTime"
)
String
startTime
,
@RequestParam
(
"endTime"
)
String
endTime
,
HttpServletResponse
resp
)
{
public
String
getCbCountInfo
(
@RequestParam
(
"startTime"
)
String
startTime
,
@RequestParam
(
"endTime"
)
String
endTime
,
HttpServletResponse
resp
)
{
List
<
Map
<
String
,
Object
>>
list
=
cardBodyService
.
getCbCount
(
startTime
,
endTime
);
List
<
Map
<
String
,
Object
>>
list
=
cardBodyService
.
getCbCount
(
startTime
,
endTime
);
YXJSONResponse
yxjsonResponse
=
new
YXJSONResponse
();
YXJSONResponse
yxjsonResponse
=
new
YXJSONResponse
();
...
...
src/main/resources/static/js/services/service.js
View file @
f493d4d1
...
@@ -454,6 +454,21 @@ app.service('MessageService', function (ngDialog) {
...
@@ -454,6 +454,21 @@ app.service('MessageService', function (ngDialog) {
MessageService
.
httpRequestFailed
(
JSON
.
stringify
(
errA
))
MessageService
.
httpRequestFailed
(
JSON
.
stringify
(
errA
))
})
})
},
},
updateFailedCard
:
function
(
failedCardId
,
state
,
success
){
$http
({
method
:
'GET'
,
url
:
"../user/updateFailedinfo"
+
urlTimeStamp
(),
params
:{
failedCardId
:
failedCardId
,
state
:
state
}
}).
then
(
function
successCallback
(
response
)
{
success
(
response
.
data
)
},
function
(
err
){
var
errA
=
{
Error
:
true
,
ReturnCode
:
err
.
status
,
ReturnMsg
:
"API访问返回错误"
}
MessageService
.
httpRequestFailed
(
JSON
.
stringify
(
errA
))
})
},
findFailedinfo
:
function
(
state
,
workShop
,
success
){
findFailedinfo
:
function
(
state
,
workShop
,
success
){
$http
({
$http
({
method
:
'GET'
,
method
:
'GET'
,
...
...
src/main/resources/static/tpl/layout/addRemainCard/addRemainCard.js
View file @
f493d4d1
...
@@ -90,6 +90,8 @@ app.controller('addRemainCardCtrl', ['$scope', '$rootScope', '$http', '$state',
...
@@ -90,6 +90,8 @@ app.controller('addRemainCardCtrl', ['$scope', '$rootScope', '$http', '$state',
console
.
log
(
$rootScope
.
arr
)
console
.
log
(
$rootScope
.
arr
)
$
(
".confirmBtn"
).
attr
(
"disabled"
,
true
);
$
(
".confirmBtn"
).
attr
(
"disabled"
,
true
);
if
(
count
==
$scope
.
dataInfo
.
length
){
if
(
count
==
$scope
.
dataInfo
.
length
){
console
.
log
(
$rootScope
.
arr
,
"---$rootScope.arr---"
)
HttpService
.
addRemainCard
(
$rootScope
.
arr
,
function
(
data
){
HttpService
.
addRemainCard
(
$rootScope
.
arr
,
function
(
data
){
$scope
.
isShowSuccess
=
1
;
$scope
.
isShowSuccess
=
1
;
$scope
.
AddSuccess
=
data
.
respData
.
string
;
$scope
.
AddSuccess
=
data
.
respData
.
string
;
...
...
src/main/resources/static/tpl/layout/failedCard/failedCard.js
View file @
f493d4d1
...
@@ -109,8 +109,8 @@ app.controller('failedCardCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
...
@@ -109,8 +109,8 @@ app.controller('failedCardCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
]
]
$scope
.
finishClick
=
function
(
taskId
,
userState
)
{
$scope
.
finishClick
=
function
(
failedCardId
,
userState
)
{
HttpService
.
update
ProductionTask
(
task
Id
,
userState
,
function
(
data
)
{
HttpService
.
update
FailedCard
(
failedCard
Id
,
userState
,
function
(
data
)
{
//点击确认成功后 再次废证列表
//点击确认成功后 再次废证列表
getFailedCardListData
(
$rootScope
.
loginData
.
state
,
$rootScope
.
loginData
.
workshop
);
getFailedCardListData
(
$rootScope
.
loginData
.
state
,
$rootScope
.
loginData
.
workshop
);
})
})
...
...
制证调度系统—详细设计说明书.doc
View file @
f493d4d1
No preview for this file type
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