Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
X
xffruit
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
张杰
xffruit
Commits
525917d1
Commit
525917d1
authored
8 years ago
by
Sandy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
采购单作废的逻辑
parent
44795351
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
33 additions
and
8 deletions
+33
-8
IBTConstants.h
XFFruit/Utilities/IBTUIKit/IBTConstants.h
+2
-1
PurchaseDetailViewController.m
...llers/Purchase/Controllers/PurchaseDetailViewController.m
+21
-7
PurchaseCell.m
XFFruit/ViewControllers/Purchase/Views/PurchaseCell.m
+3
-0
NewReceiveProductViewController.m
...s/Receiving/Controllers/NewReceiveProductViewController.m
+5
-0
TransferPdtDetail.m
XFFruit/ViewControllers/Transfer/Models/TransferPdtDetail.m
+2
-0
No files found.
XFFruit/Utilities/IBTUIKit/IBTConstants.h
View file @
525917d1
...
...
@@ -149,7 +149,8 @@
#define PURCHASE_STATE_ABORTED @"aborted" //已作废
#define PURCHASE_STATE_PROCESS @"process"//提交系统处理
#define PURCHASE_STATE_PROCESSFAIL @"processFail"//系统处理失败
#define PURCHASE_STATE_WAITE_RECIEVE @"waitReceive"//待收货
#define PURCHASE_STATE_WAITE_RECIEVE @"waitReceive"//待收货
#define PURCHASE_STATE_RECEIVED @"received"//已收货
//采购单操作
#define PURCHASE_ACTION_REJECT @"reject"
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Purchase/Controllers/PurchaseDetailViewController.m
View file @
525917d1
...
...
@@ -85,7 +85,9 @@ typedef enum : NSUInteger {
}
-
(
void
)
judgeType
{
if
([
self
.
bill
.
state
isEqualToString
:
PURCHASE_STATE_WAITE_RECIEVE
])
{
if
([
self
.
bill
.
state
isEqualToString
:
PURCHASE_STATE_WAITE_RECIEVE
]
||
[
self
.
bill
.
state
isEqualToString
:
PURCHASE_STATE_RECEIVED
]
||
self
.
bill
.
receive_id
!=
nil
)
{
self
.
type
=
PurchaseTypeAfterVerify
;
}
else
{
self
.
type
=
PurchaseTypeBeforeVerify
;
...
...
@@ -166,8 +168,6 @@ typedef enum : NSUInteger {
btnTag
=
SaveTag
;
}
else
if
([
arr
[
i
]
isEqualToString
:
@"收货"
])
{
btnTag
=
ReceiveTag
;
}
else
if
([
arr
[
i
]
isEqualToString
:
@"作废"
]){
btnTag
=
AbortTag
;
}
CGRect
btnFrame
=
CGRectMake
(
LeftMargin
+
(
LeftMargin
+
btnWidth
)
*
i
,
ScreenSize
.
height
-
64
-
BottomHeight
+
5
,
btnWidth
,
40
);
UIButton
*
perBtn
=
[
IBTCustomButtom
creatButtonWithFrame
:
btnFrame
target
:
self
sel
:
@selector
(
btnClick
:
)
tag
:
btnTag
image
:
nil
title
:
arr
[
i
]
titleColor
:
[
UIColor
whiteColor
]
isCorner
:
YES
corner
:
5
bgColor
:
GXF_COMMIT_COLOR
];
...
...
@@ -221,16 +221,22 @@ typedef enum : NSUInteger {
}
else
{
[
self
hiddenTwoBtn
];
}
}
else
if
(
self
.
type
==
PurchaseTypeAfterVerify
){
}
else
if
(
[
self
.
bill
.
state
isEqualToString
:
PURCHASE_STATE_WAITE_RECIEVE
]
){
if
([
IBTCommon
checkIsPermission
:
RECEIVE_ACTION_RECEIVE
])
{
[
self
createBtnWithArr
:@[
@"作废"
,
@"收货"
]];
}
else
{
[
self
hiddenTwoBtn
];
}
}
else
if
([
self
.
bill
.
state
isEqualToString
:
PURCHASE_STATE_ABORTED
]){
//已作废
}
else
if
([
self
.
bill
.
state
isEqualToString
:
PURCHASE_STATE_ABORTED
]){
//已作废
[
self
hiddenTwoBtn
];
}
else
if
([
self
.
bill
.
state
isEqualToString
:
PURCHASE_STATE_RECEIVED
]){
if
([
self
checkIsPermission
:
PURCHASE_PERMISSIONS_ABORT
]){
//供应商审批权
//显示确认按钮
NSArray
*
arr
=
@[
@"作废"
];
[
self
createBtnWithArr
:
arr
];
}
else
{
[
self
hiddenTwoBtn
];
}
}
else
{
[
self
hiddenTwoBtn
];
}
...
...
@@ -489,7 +495,15 @@ typedef enum : NSUInteger {
}
else
if
([
self
.
bill
.
state
isEqualToString
:
PURCHASE_STATE_PROCESSFAIL
])
{
self
.
stateLabel
.
textColor
=
[
UIColor
blackColor
];
self
.
stateLabel
.
text
=
@"系统处理失败"
;
}
else
if
([
self
.
bill
.
state
isEqualToString
:
PURCHASE_STATE_WAITE_RECIEVE
])
{
self
.
stateLabel
.
textColor
=
[
UIColor
blackColor
];
self
.
stateLabel
.
text
=
@"待收货"
;
}
else
if
([
self
.
bill
.
state
isEqualToString
:
PURCHASE_STATE_RECEIVED
])
{
self
.
stateLabel
.
textColor
=
[
UIColor
blackColor
];
self
.
stateLabel
.
text
=
@"已收货"
;
}
_pvc
.
isHiddenEdit
=
!
[
self
.
bill
.
state
isEqualToString
:
PURCHASE_STATE_WAITE_RECIEVE
];
self
.
noticeNumberLabel
.
text
=
(
self
.
bill
.
noticeNumber
.
length
==
0
)
?
@"无"
:(
self
.
bill
.
noticeNumber
);
self
.
createOperNameLabel
.
text
=
[
IBTCommon
checkString
:
self
.
bill
.
create_operName
];
self
.
checkNameLabel
.
text
=
[
IBTCommon
checkString
:
self
.
bill
.
vendor_name
];
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Purchase/Views/PurchaseCell.m
View file @
525917d1
...
...
@@ -118,6 +118,9 @@
self
.
stateBtn
.
frame
=
CGRectMake
(
TopMargin
*
2
,
TopMargin
,
LeftMargin
-
TopMargin
*
3
,
20
);
stateStr
=
@"待收货"
;
[
self
.
stateBtn
setBackgroundImage
:[
UIImage
imageNamed
:
@"insurvey"
]
forState
:
UIControlStateDisabled
];
}
else
if
([
purchaseBill
.
state
isEqualToString
:
PURCHASE_STATE_RECEIVED
]){
stateStr
=
@"已收货"
;
[
self
.
stateBtn
setBackgroundImage
:[
UIImage
imageNamed
:
@"finish"
]
forState
:
UIControlStateDisabled
];
}
[
self
.
stateBtn
setTitle
:
stateStr
forState
:
UIControlStateNormal
];
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Receiving/Controllers/NewReceiveProductViewController.m
View file @
525917d1
...
...
@@ -148,6 +148,11 @@
ShowMessage
(
@"基础数量(收货)不能为空"
);
return
NO
;
}
if
(
_shPackField
.
text
.
floatValue
>
self
.
noticeProduct
.
qty
.
floatValue
)
{
ShowMessage
(
@"包装数量[实收]不能大于包装数量[待收]"
);
return
NO
;
}
if
(
!
self
.
noticeProduct
)
{
self
.
noticeProduct
=
[[
TransferPdtDetail
alloc
]
init
];
}
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Transfer/Models/TransferPdtDetail.m
View file @
525917d1
...
...
@@ -17,6 +17,8 @@
self
.
productName
=
purchasePdt
.
product_name
;
self
.
price
=
purchasePdt
.
basePrice
;
self
.
packprice
=
purchasePdt
.
price
;
self
.
rctQty
=
purchasePdt
.
receivedQty
;
self
.
rctBaseQty
=
purchasePdt
.
receivedBaseQty
;
}
-
(
PurchaseBillProduct
*
)
changeToPurchasePdt
{
...
...
This diff is collapsed.
Click to expand it.
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