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
c31ce3be
Commit
c31ce3be
authored
6 years ago
by
张杰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
鲜丰正式版2.0.18 新建发运单修改商品数量总金额数量不变
parent
80825f5c
master
No related merge requests found
Pipeline
#54
failed with stages
Changes
30
Pipelines
1
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
30 changed files
with
771 additions
and
112 deletions
+771
-112
project.pbxproj
XFFruit.xcodeproj/project.pbxproj
+46
-0
ICRDataBaseController.m
...it/Controllers/DataBaseController/ICRDataBaseController.m
+16
-0
ICRHTTPController.h
XFFruit/Controllers/HTTPController/ICRHTTPController.h
+9
-0
ICRHTTPController.m
XFFruit/Controllers/HTTPController/ICRHTTPController.m
+0
-1
ChineseLogHelper.h
XFFruit/General/Categories/ChineseLogHelper.h
+17
-0
ChineseLogHelper.m
XFFruit/General/Categories/ChineseLogHelper.m
+43
-0
Info.plist
XFFruit/Info.plist
+2
-2
ICRAppMacro.h
XFFruit/Macro/ICRAppMacro.h
+2
-2
Main.storyboard
XFFruit/Main.storyboard
+130
-0
IBTConstants.h
XFFruit/Utilities/IBTUIKit/IBTConstants.h
+3
-0
BaseAlertCardViewController.h
XFFruit/Vendors/BaseAlertCardViewController.h
+25
-0
BaseAlertCardViewController.m
XFFruit/Vendors/BaseAlertCardViewController.m
+101
-0
ChooseWarehouseViewController.m
...lers/ChooseViewController/ChooseWarehouseViewController.m
+1
-1
NewPurchaseViewController.m
...trollers/Purchase/Controllers/NewPurchaseViewController.m
+3
-3
Warehouse.h
XFFruit/ViewControllers/Purchase/Models/Warehouse.h
+1
-0
ShopDetaileViewController.h
...trollers/PurchaseNotice/Views/ShopDetaileViewController.h
+5
-0
ShopDetaileViewController.m
...trollers/PurchaseNotice/Views/ShopDetaileViewController.m
+20
-19
CheckAlertViewController.h
...ntrollers/Transfer/Controllers/CheckAlertViewController.h
+17
-0
CheckAlertViewController.m
...ntrollers/Transfer/Controllers/CheckAlertViewController.m
+71
-0
NewTransferViewController.m
...trollers/Transfer/Controllers/NewTransferViewController.m
+2
-1
TransferDetailViewController.m
...llers/Transfer/Controllers/TransferDetailViewController.m
+227
-69
TransferViewController.m
...Controllers/Transfer/Controllers/TransferViewController.m
+1
-1
Transfer.h
XFFruit/ViewControllers/Transfer/Models/Transfer.h
+4
-2
TopTransferView.h
XFFruit/ViewControllers/Transfer/Views/TopTransferView.h
+1
-1
TopTransferView.m
XFFruit/ViewControllers/Transfer/Views/TopTransferView.m
+1
-0
TransferBoltView.m
XFFruit/ViewControllers/Transfer/Views/TransferBoltView.m
+11
-7
TransferCell.m
XFFruit/ViewControllers/Transfer/Views/TransferCell.m
+6
-0
NewTransportViewController.m
...ollers/Transport/Controllers/NewTransportViewController.m
+1
-1
TransportPurchaseViewController.m
...s/Transport/Controllers/TransportPurchaseViewController.m
+3
-0
XFFruit_TEST.plist
XFFruit_TEST.plist
+2
-2
No files found.
XFFruit.xcodeproj/project.pbxproj
View file @
c31ce3be
This diff is collapsed.
Click to expand it.
XFFruit/Controllers/DataBaseController/ICRDataBaseController.m
View file @
c31ce3be
...
@@ -352,6 +352,22 @@ static NSString *ICRDataBasePath = @"";
...
@@ -352,6 +352,22 @@ static NSString *ICRDataBasePath = @"";
[
db
executeUpdate
:
addTable
];
[
db
executeUpdate
:
addTable
];
}
}
/*
2018-05-07
Warehouse 增加了isspecial字段
*/
if
(
!
[
db
columnExists
:
@"isspecial"
inTableWithName
:
@"Warehouse"
])
{
CLog
(
@"没有isspecial字段"
);
NSString
*
sql
=
@"DROP TABLE IF EXISTS 'Warehouse'"
;
[
db
executeUpdate
:
sql
];
NSString
*
addTable
=
[
Warehouse
SQLForCreateTable
];
[
db
executeUpdate
:
addTable
];
}
// [db close];
// [db close];
...
...
This diff is collapsed.
Click to expand it.
XFFruit/Controllers/HTTPController/ICRHTTPController.h
View file @
c31ce3be
...
@@ -8,6 +8,8 @@
...
@@ -8,6 +8,8 @@
#import "IBTObject.h"
#import "IBTObject.h"
#import "ICRAnnouncement.h"
#import "ICRAnnouncement.h"
#import "AFNetworking.h"
#define HTTP [ICRHTTPController sharedController]
#define HTTP [ICRHTTPController sharedController]
typedef
NS_ENUM
(
NSUInteger
,
ICRAttachmentType
)
{
typedef
NS_ENUM
(
NSUInteger
,
ICRAttachmentType
)
{
kAttachmentBoard
=
0
,
kAttachmentBoard
=
0
,
...
@@ -23,6 +25,13 @@ typedef NS_ENUM(NSUInteger, ICRAttachmentType) {
...
@@ -23,6 +25,13 @@ typedef NS_ENUM(NSUInteger, ICRAttachmentType) {
+
(
instancetype
)
sharedController
;
+
(
instancetype
)
sharedController
;
-
(
void
)
POST
:(
NSString
*
)
urlStr
parameters
:(
id
)
parameters
needToken
:(
BOOL
)
bIsNeedToken
acceptTypeJson
:(
BOOL
)
bAcceptJson
success
:(
void
(
^
)(
AFHTTPRequestOperation
*
operation
,
id
responseObject
))
succ
failure
:(
void
(
^
)(
AFHTTPRequestOperation
*
operation
,
NSError
*
error
))
fail
;
// Restful API
// Restful API
// User
// User
...
...
This diff is collapsed.
Click to expand it.
XFFruit/Controllers/HTTPController/ICRHTTPController.m
View file @
c31ce3be
...
@@ -8,7 +8,6 @@
...
@@ -8,7 +8,6 @@
#import "ICRHTTPController.h"
#import "ICRHTTPController.h"
#import "ICRUserUtil.h"
#import "ICRUserUtil.h"
#import "AFNetworking.h"
#import "Base64.h"
#import "Base64.h"
#import "AFNetworkActivityIndicatorManager.h"
#import "AFNetworkActivityIndicatorManager.h"
#import "NSDate+FormatterAdditions.h"
#import "NSDate+FormatterAdditions.h"
...
...
This diff is collapsed.
Click to expand it.
XFFruit/General/Categories/ChineseLogHelper.h
0 → 100644
View file @
c31ce3be
//
// ChineseLogHelper.h
// RealEstateManagement
//
// Created by Javen on 2016/11/21.
// Copyright © 2016年 上海勾芒信息科技. All rights reserved.
//
#import <Foundation/Foundation.h>
@interface
NSArray
(
Log
)
@end
@interface
NSDictionary
(
Log
)
@end
This diff is collapsed.
Click to expand it.
XFFruit/General/Categories/ChineseLogHelper.m
0 → 100644
View file @
c31ce3be
//
// ChineseLogHelper.m
// RealEstateManagement
//
// Created by Javen on 2016/11/21.
// Copyright © 2016年 上海勾芒信息科技. All rights reserved.
//
#import "ChineseLogHelper.h"
@implementation
NSArray
(
Log
)
-
(
NSString
*
)
descriptionWithLocale
:(
id
)
locale
{
NSMutableString
*
strM
=
[
NSMutableString
stringWithString
:
@"(
\n
"
];
[
self
enumerateObjectsUsingBlock
:
^
(
id
obj
,
NSUInteger
idx
,
BOOL
*
stop
)
{
[
strM
appendFormat
:
@"
\t
%@,
\n
"
,
obj
];
}];
[
strM
appendString
:
@")"
];
return
strM
;
}
@end
@implementation
NSDictionary
(
Log
)
-
(
NSString
*
)
descriptionWithLocale
:(
id
)
locale
{
NSMutableString
*
strM
=
[
NSMutableString
stringWithString
:
@"{
\n
"
];
[
self
enumerateKeysAndObjectsUsingBlock
:
^
(
id
key
,
id
obj
,
BOOL
*
stop
)
{
[
strM
appendFormat
:
@"
\t
%@ = %@;
\n
"
,
key
,
obj
];
}];
[
strM
appendString
:
@"}
\n
"
];
return
strM
;
}
@end
This diff is collapsed.
Click to expand it.
XFFruit/Info.plist
View file @
c31ce3be
...
@@ -15,11 +15,11 @@
...
@@ -15,11 +15,11 @@
<
k
e
y
>
CFBundlePackageType
<
/k
e
y
>
<
k
e
y
>
CFBundlePackageType
<
/k
e
y
>
<
string
>
APPL
<
/string
>
<
string
>
APPL
<
/string
>
<
k
e
y
>
CFBundleShortVersionString
<
/k
e
y
>
<
k
e
y
>
CFBundleShortVersionString
<
/k
e
y
>
<
string
>
2.0.1
5
<
/string
>
<
string
>
2.0.1
9
<
/string
>
<
k
e
y
>
CFBundleSignature
<
/k
e
y
>
<
k
e
y
>
CFBundleSignature
<
/k
e
y
>
<
string
>
????
<
/string
>
<
string
>
????
<
/string
>
<
k
e
y
>
CFBundleVersion
<
/k
e
y
>
<
k
e
y
>
CFBundleVersion
<
/k
e
y
>
<
string
>
2.0.1
5
<
/string
>
<
string
>
2.0.1
9
<
/string
>
<
k
e
y
>
NSAppTransportSecurity
<
/k
e
y
>
<
k
e
y
>
NSAppTransportSecurity
<
/k
e
y
>
<
d
i
c
t
>
<
d
i
c
t
>
<
k
e
y
>
NSAllowsArbitraryLoads
<
/k
e
y
>
<
k
e
y
>
NSAllowsArbitraryLoads
<
/k
e
y
>
...
...
This diff is collapsed.
Click to expand it.
XFFruit/Macro/ICRAppMacro.h
View file @
c31ce3be
...
@@ -37,8 +37,8 @@
...
@@ -37,8 +37,8 @@
#elif XFFruit_DEV
#elif XFFruit_DEV
//********开发环境********
//********开发环境********
#define HTTP_REST_API_BASE_URL @"http://
gomoredev:8090
/cruiser-server/rest"
#define HTTP_REST_API_BASE_URL @"http://
dev.gomoretech.com
/cruiser-server/rest"
#define HTTP_REST_REPORT_BASE_URL @"http://
gomoredev:8090
"
#define HTTP_REST_REPORT_BASE_URL @"http://
dev.gomoretech.com
"
#elif XFFruit_TEST
#elif XFFruit_TEST
//********测试环境********
//********测试环境********
...
...
This diff is collapsed.
Click to expand it.
XFFruit/Main.storyboard
0 → 100644
View file @
c31ce3be
This diff is collapsed.
Click to expand it.
XFFruit/Utilities/IBTUIKit/IBTConstants.h
View file @
c31ce3be
...
@@ -206,6 +206,8 @@
...
@@ -206,6 +206,8 @@
//转运单状态
//转运单状态
#define TRANSFER_STATE_INITIAL @"initial" //未提交
#define TRANSFER_STATE_INITIAL @"initial" //未提交
#define TRANSFER_STATE_WAITCHECK @"waitCheck" //未提交
#define TRANSFER_STATE_REJECT @"rejected" //未提交
#define TRANSFER_STATE_UNRECEIVED @"unreceived"//待收货
#define TRANSFER_STATE_UNRECEIVED @"unreceived"//待收货
#define TRANSFER_STATE_RECEIVED @"received" //已收货
#define TRANSFER_STATE_RECEIVED @"received" //已收货
#define TRANSFER_STATE_ABORTED @"aborted" //已废用
#define TRANSFER_STATE_ABORTED @"aborted" //已废用
...
@@ -226,6 +228,7 @@
...
@@ -226,6 +228,7 @@
//转运单
//转运单
#define TRANSFER_ACTION_ABORT @"500605" //作废权
#define TRANSFER_ACTION_ABORT @"500605" //作废权
#define TRANSFER_ACTION_CHECK @"500606" //审批权
#define RECEIVE_ACTION_RECEIVE @"500803" //收货权
#define RECEIVE_ACTION_RECEIVE @"500803" //收货权
#define TRANSFER_ACTION_NEW @"500601" //新建权
#define TRANSFER_ACTION_NEW @"500601" //新建权
...
...
This diff is collapsed.
Click to expand it.
XFFruit/Vendors/BaseAlertCardViewController.h
0 → 100644
View file @
c31ce3be
//
// BaseAlertCardViewController.h
// patrol
//
// Created by Javen on 2017/3/3.
// Copyright © 2017年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
static
NSInteger
const
shadowTag
=
1111
;
@interface
BaseAlertCardViewController
:
UIViewController
@property
(
weak
,
nonatomic
)
UIViewController
*
superVC
;
/** 弹出框 */
@property
(
weak
,
nonatomic
)
IBOutlet
UIView
*
alertCard
;
-
(
void
)
show
;
-
(
void
)
hide
;
/** 提前触发viewDidLoad方法*/
-
(
void
)
layoutAlertView
;
-
(
IBAction
)
actionHide
:(
id
)
sender
;
-
(
void
)
actionTap
:(
UITapGestureRecognizer
*
)
tap
;
@end
This diff is collapsed.
Click to expand it.
XFFruit/Vendors/BaseAlertCardViewController.m
0 → 100644
View file @
c31ce3be
//
// BaseAlertCardViewController.m
// patrol
//
// Created by Javen on 2017/3/3.
// Copyright © 2017年 上海勾芒科技有限公司. All rights reserved.
//
#import "BaseAlertCardViewController.h"
@interface
BaseAlertCardViewController
()
<
UIGestureRecognizerDelegate
>
@end
@implementation
BaseAlertCardViewController
-
(
void
)
viewDidLoad
{
[
super
viewDidLoad
];
self
.
alertCard
.
transform
=
CGAffineTransformMakeScale
(
0
.
1
,
0
.
1
);
self
.
view
.
backgroundColor
=
[
UIColor
colorWithWhite
:
0
.
3
alpha
:
0
];
// Do any additional setup after loading the view.
self
.
view
.
tag
=
shadowTag
;
UITapGestureRecognizer
*
tap
=
[[
UITapGestureRecognizer
alloc
]
initWithTarget
:
self
action
:
@selector
(
actionTap
:
)];
UIView
*
tapView
=
[[
UIView
alloc
]
initWithFrame
:
self
.
view
.
bounds
];
tapView
.
backgroundColor
=
[
UIColor
colorWithWhite
:
0
.
01
alpha
:
0
.
01
];
[
self
.
view
insertSubview
:
tapView
belowSubview
:
self
.
alertCard
];
[
tapView
addGestureRecognizer
:
tap
];
}
-
(
void
)
actionTap
:
(
UITapGestureRecognizer
*
)
tap
{
[
self
hide
];
}
-
(
IBAction
)
actionHide
:
(
id
)
sender
{
[
self
hide
];
[
self
.
superVC
.
view
endEditing
:
true
];
}
-
(
void
)
setSuperVC
:
(
UIViewController
*
)
superVC
{
_superVC
=
superVC
;
[
superVC
addChildViewController
:
self
];
}
/**
显示整个确认框
*/
-
(
void
)
show
{
self
.
view
.
frame
=
self
.
superVC
.
view
.
bounds
;
[
self
.
superVC
.
view
addSubview
:
self
.
view
];
[
UIView
animateWithDuration
:
0
.
5
delay
:
0
usingSpringWithDamping
:
0
.
7
initialSpringVelocity
:
1
.
0
options
:
UIViewAnimationOptionCurveEaseOut
animations
:^
{
self
.
view
.
backgroundColor
=
[
UIColor
colorWithWhite
:
0
.
3
alpha
:
0
.
5
];
self
.
alertCard
.
transform
=
CGAffineTransformMakeScale
(
1
,
1
);
}
completion
:
nil
];
}
/**
隐藏整个确认框
*/
-
(
void
)
hide
{
[
UIView
animateWithDuration
:
0
.
5
delay
:
0
usingSpringWithDamping
:
0
.
9
initialSpringVelocity
:
1
.
0
options
:
UIViewAnimationOptionCurveEaseOut
animations
:^
{
self
.
view
.
backgroundColor
=
[
UIColor
colorWithWhite
:
0
.
3
alpha
:
0
.
0
];
self
.
alertCard
.
transform
=
CGAffineTransformMakeScale
(
0
.
01
,
0
.
01
);
}
completion
:^
(
BOOL
finished
)
{
[
self
.
view
removeFromSuperview
];
}];
}
-
(
void
)
layoutAlertView
{
[
self
view
];
}
-
(
void
)
didReceiveMemoryWarning
{
[
super
didReceiveMemoryWarning
];
// Dispose of any resources that can be recreated.
}
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
@end
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/ChooseViewController/ChooseWarehouseViewController.m
View file @
c31ce3be
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
NSInteger
pageCount
=
[
pageDict
[
@"pageCount"
]
integerValue
];
NSInteger
pageCount
=
[
pageDict
[
@"pageCount"
]
integerValue
];
if
(
pageCount
<=
self
.
currentPage
)
{
if
(
pageCount
<=
self
.
currentPage
)
{
[
self
endRefreshing
];
[
self
endRefreshing
];
[
IBTLoadingView
hideHUDWithText
:
nil
];
//
[IBTLoadingView hideHUDWithText:nil];
// [self fetchDataList:@"" tableStr:GXF_BASECLASS_WAREHOUSE];
// [self fetchDataList:@"" tableStr:GXF_BASECLASS_WAREHOUSE];
self
.
currentPage
=
0
;
self
.
currentPage
=
0
;
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Purchase/Controllers/NewPurchaseViewController.m
View file @
c31ce3be
...
@@ -488,11 +488,11 @@ typedef enum : NSUInteger {
...
@@ -488,11 +488,11 @@ typedef enum : NSUInteger {
shopDetail
.
product_uuid
=
billProduct
.
product_uuid
;
shopDetail
.
product_uuid
=
billProduct
.
product_uuid
;
shopDetail
.
product_code
=
billProduct
.
product_code
;
shopDetail
.
product_code
=
billProduct
.
product_code
;
shopDetail
.
merchandise
=
billProduct
.
product_name
;
shopDetail
.
merchandise
=
billProduct
.
product_name
;
shopDetail
.
packageSpecification
=
[
CalculateHelper
getMoneyStringFrom
:
billProduct
.
qpc
Lenth
:
0
isSeparate
:
NO
]
;
shopDetail
.
packageSpecification
=
[
CalculateHelper
decimalNumber
:
billProduct
.
qpc
].
stringValue
;
shopDetail
.
packageUnit
=
billProduct
.
unit
;
shopDetail
.
packageUnit
=
billProduct
.
unit
;
shopDetail
.
packageQuantity
=
[
CalculateHelper
getMoneyStringFrom
:
billProduct
.
qty
Lenth
:
0
isSeparate
:
NO
]
;
shopDetail
.
packageQuantity
=
[
CalculateHelper
decimalNumber
:
billProduct
.
qty
].
stringValue
;
shopDetail
.
packageUnitPrice
=
billProduct
.
price
;
shopDetail
.
packageUnitPrice
=
billProduct
.
price
;
shopDetail
.
foundationQuantity
=
[
CalculateHelper
getMoneyStringFrom
:
billProduct
.
baseQty
Lenth
:
0
isSeparate
:
NO
]
;
shopDetail
.
foundationQuantity
=
[
CalculateHelper
decimalNumber
:
billProduct
.
baseQty
].
stringValue
;
shopDetail
.
foundationUnitPrice
=
billProduct
.
basePrice
;
shopDetail
.
foundationUnitPrice
=
billProduct
.
basePrice
;
shopDetail
.
totalMoney
=
billProduct
.
total
;
shopDetail
.
totalMoney
=
billProduct
.
total
;
shopDetail
.
remark
=
billProduct
.
remark
;
shopDetail
.
remark
=
billProduct
.
remark
;
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Purchase/Models/Warehouse.h
View file @
c31ce3be
...
@@ -22,4 +22,5 @@
...
@@ -22,4 +22,5 @@
//20170508z增加是否wms仓和是否产品中心仓的判断字段
//20170508z增加是否wms仓和是否产品中心仓的判断字段
@property
(
nonatomic
,
assign
)
BOOL
iswms
;
@property
(
nonatomic
,
assign
)
BOOL
iswms
;
@property
(
nonatomic
,
assign
)
BOOL
isProductCenter
;
@property
(
nonatomic
,
assign
)
BOOL
isProductCenter
;
@property
(
nonatomic
,
assign
)
BOOL
isSpecial
;
@end
@end
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/PurchaseNotice/Views/ShopDetaileViewController.h
View file @
c31ce3be
...
@@ -33,4 +33,9 @@ typedef void(^ChoseShopDetail)(ShopDetail *shopDetail);
...
@@ -33,4 +33,9 @@ typedef void(^ChoseShopDetail)(ShopDetail *shopDetail);
@property
(
nonatomic
,
strong
)
ChoseShopDetail
choseShopDetail
;
@property
(
nonatomic
,
strong
)
ChoseShopDetail
choseShopDetail
;
@property
(
nonatomic
,
strong
)
NSString
*
navTitle
;
@property
(
nonatomic
,
strong
)
NSString
*
navTitle
;
@property
(
assign
,
nonatomic
)
ShopDetailInterType
intertype
;
@property
(
assign
,
nonatomic
)
ShopDetailInterType
intertype
;
/**
是否禁止编辑基础单价
*/
@property
(
assign
,
nonatomic
)
BOOL
isLockBasePrice
;
@end
@end
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/PurchaseNotice/Views/ShopDetaileViewController.m
View file @
c31ce3be
...
@@ -174,8 +174,9 @@ typedef enum : NSUInteger {
...
@@ -174,8 +174,9 @@ typedef enum : NSUInteger {
}
}
_checkTotalTextField
.
text
=
self
.
shopDetail
.
checkTotal
.
doubleValue
>
0
?
self
.
shopDetail
.
checkTotal
.
stringValue
:
@"0.0000"
;
_checkTotalTextField
.
text
=
self
.
shopDetail
.
checkTotal
.
doubleValue
>
0
?
self
.
shopDetail
.
checkTotal
.
stringValue
:
@"0.0000"
;
self
.
checkTotal
=
self
.
shopDetail
.
checkTotal
;
_checkPriceTextField
.
text
=
self
.
shopDetail
.
checkPrice
.
doubleValue
>
0
?
self
.
shopDetail
.
checkPrice
.
stringValue
:
@"0.0000"
;
_checkPriceTextField
.
text
=
self
.
shopDetail
.
checkPrice
.
doubleValue
>
0
?
self
.
shopDetail
.
checkPrice
.
stringValue
:
@"0.0000"
;
self
.
checkPrice
=
self
.
shopDetail
.
checkPrice
;
self
.
totalPrice
=
self
.
shopDetail
.
totalMoney
;
self
.
totalPrice
=
self
.
shopDetail
.
totalMoney
;
//备注
//备注
...
@@ -346,12 +347,12 @@ typedef enum : NSUInteger {
...
@@ -346,12 +347,12 @@ typedef enum : NSUInteger {
return
NO
;
return
NO
;
}
}
// double max = self.shopDetail.receivedQty.doubleValue - self.shopDetail.shippedQty.doubleValue;
// double max = self.shopDetail.receivedQty.doubleValue - self.shopDetail.shippedQty.doubleValue;
// if (packageQuantity.text.doubleValue > max && self.shopDetail.receivedQty != nil && self.shopDetail.shippedQty != nil){
// if (packageQuantity.text.doubleValue > max && self.shopDetail.receivedQty != nil && self.shopDetail.shippedQty != nil){
// NSString *info = [NSString stringWithFormat:@"包装数量不得大于可运包装数[%.0f]", max];
// NSString *info = [NSString stringWithFormat:@"包装数量不得大于可运包装数[%.0f]", max];
// ShowMessage(info);
// ShowMessage(info);
// return NO;
// return NO;
// }
// }
if
(
self
.
packageUintStr
.
length
==
0
)
{
if
(
self
.
packageUintStr
.
length
==
0
)
{
ShowMessage
(
@"包装单位不能为空"
);
ShowMessage
(
@"包装单位不能为空"
);
return
NO
;
return
NO
;
...
@@ -495,7 +496,7 @@ typedef enum : NSUInteger {
...
@@ -495,7 +496,7 @@ typedef enum : NSUInteger {
[
textField
addTarget
:
self
action
:
@selector
(
textChange
:
)
forControlEvents
:
UIControlEventAllEditingEvents
];
[
textField
addTarget
:
self
action
:
@selector
(
textChange
:
)
forControlEvents
:
UIControlEventAllEditingEvents
];
foundationUnitPrice
=
textField
;
//基础单价
foundationUnitPrice
=
textField
;
//基础单价
if
(
self
.
intertype
==
ShopDetailInterTypeTranfer
){
if
(
self
.
intertype
==
ShopDetailInterTypeTranfer
){
cell
.
userInteractionEnabled
=
YES
;
cell
.
userInteractionEnabled
=
!
self
.
isLockBasePrice
;
}
}
}
else
if
([
title
isEqualToString
:
@"包装单价"
])
{
}
else
if
([
title
isEqualToString
:
@"包装单价"
])
{
label
.
text
=
@"元"
;
label
.
text
=
@"元"
;
...
@@ -673,7 +674,7 @@ typedef enum : NSUInteger {
...
@@ -673,7 +674,7 @@ typedef enum : NSUInteger {
self
.
totalPrice
=
[
CalculateHelper
decimalNumber
:
totalMoney
.
text
];
self
.
totalPrice
=
[
CalculateHelper
decimalNumber
:
totalMoney
.
text
];
[
self
setUnitAndPackPrice
];
[
self
setUnitAndPackPrice
];
}
else
if
(
textField
==
_checkPriceTextField
){
}
else
if
(
textField
==
_checkPriceTextField
){
self
.
checkPrice
=
[
CalculateHelper
decimalNumber
:
_checkPriceTextField
.
text
];
self
.
checkPrice
=
[
CalculateHelper
calculateNum1
:
_checkPriceTextField
.
text
num2
:
@
(
1
)
type
:
CalculateTypeMul
roundingType
:
NSRoundBankers
cutLenth
:
2
];
self
.
checkTotal
=
[
CalculateHelper
calculateNum1
:
_checkPriceTextField
.
text
num2
:
foundationQuantity
.
text
type
:
CalculateTypeMul
roundingType
:
NSRoundBankers
cutLenth
:
2
];
self
.
checkTotal
=
[
CalculateHelper
calculateNum1
:
_checkPriceTextField
.
text
num2
:
foundationQuantity
.
text
type
:
CalculateTypeMul
roundingType
:
NSRoundBankers
cutLenth
:
2
];
_checkTotalTextField
.
text
=
self
.
checkTotal
.
stringValue
;
_checkTotalTextField
.
text
=
self
.
checkTotal
.
stringValue
;
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Transfer/Controllers/CheckAlertViewController.h
0 → 100644
View file @
c31ce3be
//
// CheckAlertViewController.h
// XFFruit
//
// Created by Javen on 2018/4/1.
// Copyright © 2018年 Xummer. All rights reserved.
//
#import "BaseAlertCardViewController.h"
@interface
CheckAlertViewController
:
BaseAlertCardViewController
//@property (strong, nonatomic) NSString *content;
@property
(
strong
,
nonatomic
)
NSString
*
text
;
@property
(
copy
,
nonatomic
)
void
(
^
blockConfirm
)(
void
);
-
(
void
)
configWithContent
:(
NSString
*
)
content
isHasTextField
:(
BOOL
)
isHasTextField
;
@end
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Transfer/Controllers/CheckAlertViewController.m
0 → 100644
View file @
c31ce3be
//
// CheckAlertViewController.m
// XFFruit
//
// Created by Javen on 2018/4/1.
// Copyright © 2018年 Xummer. All rights reserved.
//
#import "CheckAlertViewController.h"
@interface
CheckAlertViewController
()
@property
(
weak
,
nonatomic
)
IBOutlet
UILabel
*
labelContent
;
@property
(
weak
,
nonatomic
)
IBOutlet
UITextField
*
textField
;
@property
(
weak
,
nonatomic
)
IBOutlet
NSLayoutConstraint
*
constraintHeight
;
@property
(
weak
,
nonatomic
)
IBOutlet
UILabel
*
labelTitle
;
@end
@implementation
CheckAlertViewController
-
(
void
)
viewDidLoad
{
[
super
viewDidLoad
];
for
(
UIButton
*
view
in
self
.
alertCard
.
subviews
)
{
if
([
view
isKindOfClass
:[
UIButton
class
]]){
view
.
layer
.
cornerRadius
=
4
;
}
}
// Do any additional setup after loading the view.
}
-
(
void
)
configWithContent
:
(
NSString
*
)
content
isHasTextField
:
(
BOOL
)
isHasTextField
{
[
self
layoutAlertView
];
if
(
!
isHasTextField
)
{
self
.
constraintHeight
.
constant
=
140
;
self
.
textField
.
hidden
=
true
;
}
self
.
labelTitle
.
backgroundColor
=
[
UIColor
redColor
];
self
.
labelContent
.
text
=
content
;
}
-
(
IBAction
)
actionConfirm
:
(
id
)
sender
{
[
self
.
view
endEditing
:
true
];
if
(
self
.
blockConfirm
)
{
self
.
blockConfirm
();
}
}
-
(
NSString
*
)
text
{
return
self
.
textField
.
text
;
}
-
(
IBAction
)
actionCancel
:
(
id
)
sender
{
[
self
hide
];
}
-
(
void
)
didReceiveMemoryWarning
{
[
super
didReceiveMemoryWarning
];
// Dispose of any resources that can be recreated.
}
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
@end
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Transfer/Controllers/NewTransferViewController.m
View file @
c31ce3be
...
@@ -483,6 +483,7 @@ typedef enum : NSUInteger {
...
@@ -483,6 +483,7 @@ typedef enum : NSUInteger {
ShopDetaileViewController
*
svc
=
[[
ShopDetaileViewController
alloc
]
init
];
ShopDetaileViewController
*
svc
=
[[
ShopDetaileViewController
alloc
]
init
];
svc
.
intertype
=
ShopDetailInterTypeTranfer
;
svc
.
intertype
=
ShopDetailInterTypeTranfer
;
svc
.
isLockBasePrice
=
_sheetView
.
selectedWareHouse
.
isSpecial
;
if
(
billProduct
)
{
if
(
billProduct
)
{
svc
.
navTitle
=
@"编辑商品"
;
svc
.
navTitle
=
@"编辑商品"
;
ShopDetail
*
shopDetail
=
[
self
coverShopDetail
:
billProduct
];
ShopDetail
*
shopDetail
=
[
self
coverShopDetail
:
billProduct
];
...
@@ -491,10 +492,10 @@ typedef enum : NSUInteger {
...
@@ -491,10 +492,10 @@ typedef enum : NSUInteger {
TransferPdtDetail
*
tdetail
=
[
self
coverTransportPdtDetail
:
Detail
];
TransferPdtDetail
*
tdetail
=
[
self
coverTransportPdtDetail
:
Detail
];
if
(
Detail
.
IsDeleted
)
{
if
(
Detail
.
IsDeleted
)
{
[
_bottomView
refreshDelProduct
:
tdetail
tag
:
indexTag
];
[
_bottomView
refreshDelProduct
:
tdetail
tag
:
indexTag
];
[
self
resetCache
];
}
else
{
}
else
{
[
_bottomView
refreshEditProduct
:
tdetail
tag
:
indexTag
];
[
_bottomView
refreshEditProduct
:
tdetail
tag
:
indexTag
];
}
}
[
self
resetCache
];
};
};
svc
.
shopDetail
=
shopDetail
;
svc
.
shopDetail
=
shopDetail
;
}
else
{
}
else
{
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Transfer/Controllers/TransferDetailViewController.m
View file @
c31ce3be
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Transfer/Controllers/TransferViewController.m
View file @
c31ce3be
...
@@ -277,7 +277,7 @@ typedef enum : NSUInteger {
...
@@ -277,7 +277,7 @@ typedef enum : NSUInteger {
_boltView
.
backgroundColor
=
XXFBgColor
;
_boltView
.
backgroundColor
=
XXFBgColor
;
_boltView
.
delegate
=
self
;
_boltView
.
delegate
=
self
;
_boltView
.
dataArr
=
[[
NSMutableArray
alloc
]
initWithObjects
:
@"未提交"
,
@"待
收货"
,
@"已收货"
,
@"已作废"
,
@"提交系统处理"
,
@"系统处理失败
"
,
nil
];
_boltView
.
dataArr
=
[[
NSMutableArray
alloc
]
initWithObjects
:
@"未提交"
,
@"待
审核"
,
@"已拒绝"
,
@"待收货"
,
@"提交系统处理"
,
@"系统处理失败"
,
@"已收货"
,
@"已作废
"
,
nil
];
[
_maskView
addSubview
:
_boltView
];
[
_maskView
addSubview
:
_boltView
];
[
UIView
animateWithDuration
:
0
.
25
animations
:
^
{
[
UIView
animateWithDuration
:
0
.
25
animations
:
^
{
CGRect
sortFrame
=
_boltView
.
frame
;
CGRect
sortFrame
=
_boltView
.
frame
;
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Transfer/Models/Transfer.h
View file @
c31ce3be
...
@@ -35,6 +35,8 @@
...
@@ -35,6 +35,8 @@
@property
(
nonatomic
,
strong
)
NSString
*
lastModify_time
;
//最后修改时间
@property
(
nonatomic
,
strong
)
NSString
*
lastModify_time
;
//最后修改时间
@property
(
nonatomic
,
strong
)
NSString
*
lastModify_id
;
//最后修改人代码
@property
(
nonatomic
,
strong
)
NSString
*
lastModify_id
;
//最后修改人代码
@property
(
nonatomic
,
strong
)
NSString
*
lastModify_operName
;
//最后修改人名称
@property
(
nonatomic
,
strong
)
NSString
*
lastModify_operName
;
//最后修改人名称
@property
(
nonatomic
,
strong
)
NSString
*
rejectCause
;
//拒绝原因
@property
(
nonatomic
,
strong
)
NSString
*
approved
;
//批准时间
@property
(
nonatomic
,
strong
)
NSString
*
approvId
;
//
@property
(
nonatomic
,
strong
)
NSString
*
approver
;
@end
@end
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Transfer/Views/TopTransferView.h
View file @
c31ce3be
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
@property
(
nonatomic
,
weak
)
id
<
TopTransferViewDelegate
>
delegate
;
@property
(
nonatomic
,
weak
)
id
<
TopTransferViewDelegate
>
delegate
;
@property
(
strong
,
nonatomic
)
Warehouse
*
selectedWareHouse
;
@property
(
nonatomic
,
strong
)
NSString
*
warehouseUuid
;
@property
(
nonatomic
,
strong
)
NSString
*
warehouseUuid
;
@property
(
nonatomic
,
strong
)
NSString
*
warehouseCode
;
@property
(
nonatomic
,
strong
)
NSString
*
warehouseCode
;
@property
(
nonatomic
,
strong
)
NSString
*
warehouseName
;
@property
(
nonatomic
,
strong
)
NSString
*
warehouseName
;
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Transfer/Views/TopTransferView.m
View file @
c31ce3be
...
@@ -193,6 +193,7 @@
...
@@ -193,6 +193,7 @@
cvc
.
choseBaseInfo
=
^
(
NSArray
*
warehouses
){
cvc
.
choseBaseInfo
=
^
(
NSArray
*
warehouses
){
if
(
warehouses
.
count
>
0
)
{
if
(
warehouses
.
count
>
0
)
{
Warehouse
*
warehouse
=
warehouses
[
0
];
Warehouse
*
warehouse
=
warehouses
[
0
];
self
.
selectedWareHouse
=
warehouse
;
self
.
warehouseLabel
.
text
=
[
NSString
stringWithFormat
:
@"%@[%@]"
,
warehouse
.
name
,
warehouse
.
code
];
self
.
warehouseLabel
.
text
=
[
NSString
stringWithFormat
:
@"%@[%@]"
,
warehouse
.
name
,
warehouse
.
code
];
self
.
warehouseLabel
.
textColor
=
GXF_CONTENT_COLOR
;
self
.
warehouseLabel
.
textColor
=
GXF_CONTENT_COLOR
;
self
.
warehouseUuid
=
warehouse
.
uuid
;
self
.
warehouseUuid
=
warehouse
.
uuid
;
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Transfer/Views/TransferBoltView.m
View file @
c31ce3be
...
@@ -249,20 +249,24 @@
...
@@ -249,20 +249,24 @@
_currentIndexPath
=
indexPath
;
_currentIndexPath
=
indexPath
;
//initial(未提交)submitted(已提交)rejected(已拒绝)approved(已审批)shipping(发运中)finished(已完成)
//initial(未提交)submitted(已提交)rejected(已拒绝)approved(已审批)shipping(发运中)finished(已完成)
NSString
*
title
=
self
.
dataArr
[
indexPath
.
row
];
NSString
*
stateStr
=
@""
;
NSString
*
stateStr
=
@""
;
if
(
indexPath
.
row
==
0
)
{
if
(
[
title
isEqualToString
:
@"未提交"
]
)
{
stateStr
=
TRANSFER_STATE_INITIAL
;
stateStr
=
TRANSFER_STATE_INITIAL
;
}
else
if
(
indexPath
.
row
==
1
){
}
else
if
(
[
title
isEqualToString
:
@"待收货"
]
){
stateStr
=
TRANSFER_STATE_UNRECEIVED
;
stateStr
=
TRANSFER_STATE_UNRECEIVED
;
}
else
if
(
indexPath
.
row
==
2
){
}
else
if
(
[
title
isEqualToString
:
@"已收货"
]
){
stateStr
=
TRANSFER_STATE_RECEIVED
;
stateStr
=
TRANSFER_STATE_RECEIVED
;
}
else
if
(
indexPath
.
row
==
3
){
}
else
if
(
[
title
isEqualToString
:
@"已作废"
]
){
stateStr
=
TRANSFER_STATE_ABORTED
;
stateStr
=
TRANSFER_STATE_ABORTED
;
}
else
if
(
indexPath
.
row
==
4
){
}
else
if
(
[
title
isEqualToString
:
@"提交系统处理"
]
){
stateStr
=
TRANSFER_STATE_PROCESS
;
stateStr
=
TRANSFER_STATE_PROCESS
;
}
else
if
(
indexPath
.
row
==
5
){
}
else
if
(
[
title
isEqualToString
:
@"系统处理失败"
]
){
stateStr
=
TRANSFER_STATE_PROCESSFAIL
;
stateStr
=
TRANSFER_STATE_PROCESSFAIL
;
}
else
if
([
title
isEqualToString
:
@"待审核"
]){
stateStr
=
TRANSFER_STATE_WAITCHECK
;
}
else
if
([
title
isEqualToString
:
@"已拒绝"
]){
stateStr
=
TRANSFER_STATE_REJECT
;
}
}
[
self
.
delegate
getBoltValueSelectRow
:
stateStr
];
[
self
.
delegate
getBoltValueSelectRow
:
stateStr
];
}
}
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Transfer/Views/TransferCell.m
View file @
c31ce3be
...
@@ -103,6 +103,12 @@
...
@@ -103,6 +103,12 @@
}
else
if
([
transfer
.
state
isEqualToString
:
TRANSFER_STATE_PROCESSFAIL
])
{
}
else
if
([
transfer
.
state
isEqualToString
:
TRANSFER_STATE_PROCESSFAIL
])
{
stateStr
=
@"系统处理失败"
;
stateStr
=
@"系统处理失败"
;
[
self
.
stateBtn
setBackgroundImage
:[
UIImage
imageNamed
:
@"finish"
]
forState
:
UIControlStateDisabled
];
[
self
.
stateBtn
setBackgroundImage
:[
UIImage
imageNamed
:
@"finish"
]
forState
:
UIControlStateDisabled
];
}
else
if
([
transfer
.
state
isEqualToString
:
TRANSFER_STATE_WAITCHECK
])
{
stateStr
=
@"待审核"
;
[
self
.
stateBtn
setBackgroundImage
:[
UIImage
imageNamed
:
@"insurvey"
]
forState
:
UIControlStateDisabled
];
}
else
if
([
transfer
.
state
isEqualToString
:
TRANSFER_STATE_REJECT
])
{
stateStr
=
@"已拒绝"
;
[
self
.
stateBtn
setBackgroundImage
:[
UIImage
imageNamed
:
@"finish"
]
forState
:
UIControlStateDisabled
];
}
}
[
self
.
stateBtn
setTitle
:
stateStr
forState
:
UIControlStateNormal
];
[
self
.
stateBtn
setTitle
:
stateStr
forState
:
UIControlStateNormal
];
}
}
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Transport/Controllers/NewTransportViewController.m
View file @
c31ce3be
...
@@ -539,7 +539,7 @@ typedef enum : NSUInteger {
...
@@ -539,7 +539,7 @@ typedef enum : NSUInteger {
billProduct
.
packprice
=
shopDetail
.
packageUnitPrice
;
billProduct
.
packprice
=
shopDetail
.
packageUnitPrice
;
billProduct
.
price
=
shopDetail
.
foundationUnitPrice
;
billProduct
.
price
=
shopDetail
.
foundationUnitPrice
;
billProduct
.
baseQty
=
[
NSDecimalNumber
decimalNumberWithString
:
shopDetail
.
foundationQuantity
];
billProduct
.
baseQty
=
[
NSDecimalNumber
decimalNumberWithString
:
shopDetail
.
foundationQuantity
];
billProduct
.
total
=
shopDetail
.
total
;
billProduct
.
total
=
shopDetail
.
total
Money
;
billProduct
.
note
=
shopDetail
.
remark
;
billProduct
.
note
=
shopDetail
.
remark
;
billProduct
.
qpcStr
=
shopDetail
.
packageQpcStr
?
shopDetail
.
packageQpcStr
:
@"无"
;
billProduct
.
qpcStr
=
shopDetail
.
packageQpcStr
?
shopDetail
.
packageQpcStr
:
@"无"
;
billProduct
.
baseUnit
=
shopDetail
.
packageQpcUnit
;
billProduct
.
baseUnit
=
shopDetail
.
packageQpcUnit
;
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Transport/Controllers/TransportPurchaseViewController.m
View file @
c31ce3be
...
@@ -350,6 +350,9 @@ NSInteger purchaseStockCheckNumber = 0;
...
@@ -350,6 +350,9 @@ NSInteger purchaseStockCheckNumber = 0;
detail
.
total
=
[
CalculateHelper
calculateNum1
:
detail
.
qty
num2
:
detail
.
packprice
type
:
(
CalculateTypeMul
)
roundingType
:
NSRoundBankers
cutLenth
:
4
];
detail
.
total
=
[
CalculateHelper
calculateNum1
:
detail
.
qty
num2
:
detail
.
packprice
type
:
(
CalculateTypeMul
)
roundingType
:
NSRoundBankers
cutLenth
:
4
];
detail
.
checkPrice
=
detail
.
price
;
detail
.
checkPrice
=
detail
.
price
;
detail
.
checkTotal
=
detail
.
total
;
detail
.
checkTotal
=
detail
.
total
;
detail
.
price
=
[
CalculateHelper
calculateNum1
:
detail
.
price
num2
:
@
(
1
)
type
:
CalculateTypeMul
roundingType
:
NSRoundBankers
cutLenth
:
4
];
detail
.
checkPrice
=
[
CalculateHelper
calculateNum1
:
detail
.
checkPrice
num2
:
@
(
1
)
type
:
CalculateTypeMul
roundingType
:
NSRoundBankers
cutLenth
:
4
];
detail
.
checkTotal
=
[
CalculateHelper
calculateNum1
:
detail
.
checkTotal
num2
:
@
(
1
)
type
:
CalculateTypeMul
roundingType
:
NSRoundBankers
cutLenth
:
4
];
[
arr
addObject
:
detail
];
[
arr
addObject
:
detail
];
}
}
...
...
This diff is collapsed.
Click to expand it.
XFFruit_TEST.plist
View file @
c31ce3be
...
@@ -15,11 +15,11 @@
...
@@ -15,11 +15,11 @@
<
k
e
y
>
CFBundlePackageType
<
/k
e
y
>
<
k
e
y
>
CFBundlePackageType
<
/k
e
y
>
<
string
>
APPL
<
/string
>
<
string
>
APPL
<
/string
>
<
k
e
y
>
CFBundleShortVersionString
<
/k
e
y
>
<
k
e
y
>
CFBundleShortVersionString
<
/k
e
y
>
<
string
>
2.0.1
5
<
/string
>
<
string
>
2.0.1
7
<
/string
>
<
k
e
y
>
CFBundleSignature
<
/k
e
y
>
<
k
e
y
>
CFBundleSignature
<
/k
e
y
>
<
string
>
????
<
/string
>
<
string
>
????
<
/string
>
<
k
e
y
>
CFBundleVersion
<
/k
e
y
>
<
k
e
y
>
CFBundleVersion
<
/k
e
y
>
<
string
>
2.0.1
5
<
/string
>
<
string
>
2.0.1
7
<
/string
>
<
k
e
y
>
NSAppTransportSecurity
<
/k
e
y
>
<
k
e
y
>
NSAppTransportSecurity
<
/k
e
y
>
<
d
i
c
t
>
<
d
i
c
t
>
<
k
e
y
>
NSAllowsArbitraryLoads
<
/k
e
y
>
<
k
e
y
>
NSAllowsArbitraryLoads
<
/k
e
y
>
...
...
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