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
cb41091b
Commit
cb41091b
authored
7 years ago
by
Sandy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
正式版2.0.10
parent
1b3e4909
master
No related merge requests found
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
16 additions
and
7 deletions
+16
-7
ICRBaseViewController.h
...eneral/Classes/BaseViewController/ICRBaseViewController.h
+1
-0
ICRBaseViewController.m
...eneral/Classes/BaseViewController/ICRBaseViewController.m
+6
-0
Info.plist
XFFruit/Info.plist
+0
-0
ShopDetaileViewController.m
...trollers/PurchaseNotice/Views/ShopDetaileViewController.m
+1
-1
NewTransferViewController.m
...trollers/Transfer/Controllers/NewTransferViewController.m
+1
-1
NewTransportViewController.m
...ollers/Transport/Controllers/NewTransportViewController.m
+1
-1
TransportPurchaseViewController.m
...s/Transport/Controllers/TransportPurchaseViewController.m
+1
-1
ProductStockModel.h
XFFruit/ViewControllers/Transport/Models/ProductStockModel.h
+2
-2
ProductStockModel.m
XFFruit/ViewControllers/Transport/Models/ProductStockModel.m
+3
-1
No files found.
XFFruit/General/Classes/BaseViewController/ICRBaseViewController.h
View file @
cb41091b
...
...
@@ -10,4 +10,5 @@
@interface
ICRBaseViewController
:
IBTUIViewController
NSDecimalNumber
*
decimalNumberWithDouble
(
double
conversionValue
);
@end
This diff is collapsed.
Click to expand it.
XFFruit/General/Classes/BaseViewController/ICRBaseViewController.m
View file @
cb41091b
...
...
@@ -21,6 +21,12 @@
// self.view.backgroundColor = ICR_VIEW_BG_COLOR;
}
NSDecimalNumber
*
decimalNumberWithDouble
(
double
conversionValue
){
NSString
*
doubleString
=
[
NSString
stringWithFormat
:
@"%lf"
,
conversionValue
];
NSDecimalNumber
*
decNumber
=
[
NSDecimalNumber
decimalNumberWithString
:
doubleString
];
return
decNumber
;
}
-
(
void
)
didReceiveMemoryWarning
{
[
super
didReceiveMemoryWarning
];
// Dispose of any resources that can be recreated.
...
...
This diff is collapsed.
Click to expand it.
XFFruit/Info.plist
View file @
cb41091b
No preview for this file type
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/PurchaseNotice/Views/ShopDetaileViewController.m
View file @
cb41091b
...
...
@@ -227,7 +227,7 @@ typedef enum : NSUInteger {
[
model
setValuesForKeysWithDictionary
:
dict
];
if
([
self
.
shopDetail
.
product_code
isEqualToString
:
model
.
productCode
])
{
if
(
self
.
shopDetail
.
foundationQuantity
.
floatValue
>
model
.
qty
.
floatValue
)
{
if
(
[[
CalculateHelper
changeType
:
self
.
shopDetail
.
foundationQuantity
]
compare
:
decimalNumberWithDouble
(
model
.
qty
)]
==
NSOrderedDescending
)
{
CLog
(
@"库存不足"
);
NSString
*
msg
=
[
NSString
stringWithFormat
:
@"采购单<%@>在总部系统的库存不足!"
,
billNumber
];
ShowMessage
(
msg
);
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Transfer/Controllers/NewTransferViewController.m
View file @
cb41091b
...
...
@@ -295,7 +295,7 @@ typedef enum : NSUInteger {
for
(
TransportPdtDetail
*
detail
in
arrProducts
)
{
if
([
detail
.
productCode
isEqualToString
:
model
.
productCode
])
{
if
([
detail
.
baseQty
compare
:
[
CalculateHelper
changeType
:
model
.
qty
]
]
==
NSOrderedDescending
)
{
if
([
detail
.
baseQty
compare
:
decimalNumberWithDouble
(
model
.
qty
)
]
==
NSOrderedDescending
)
{
CLog
(
@"库存不足"
);
[
IBTLoadingView
hideHUDWithText
:
@""
];
self
.
purchaseAddStockCheckNumber
=
0
;
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Transport/Controllers/NewTransportViewController.m
View file @
cb41091b
...
...
@@ -245,7 +245,7 @@ typedef enum : NSUInteger {
for
(
TransportPdtDetail
*
detail
in
arrProducts
)
{
if
([
detail
.
productCode
isEqualToString
:
model
.
productCode
])
{
if
([
detail
.
baseQty
compare
:
[
CalculateHelper
changeType
:
model
.
qty
]
]
==
NSOrderedDescending
)
{
if
([
detail
.
baseQty
compare
:
decimalNumberWithDouble
(
model
.
qty
)
]
==
NSOrderedDescending
)
{
CLog
(
@"库存不足"
);
[
IBTLoadingView
hideHUDWithText
:
@""
];
purchaseAddStockCheckNumber
=
0
;
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Transport/Controllers/TransportPurchaseViewController.m
View file @
cb41091b
...
...
@@ -387,7 +387,7 @@ NSInteger purchaseStockCheckNumber = 0;
for
(
TransportPdtDetail
*
detail
in
arrProducts
)
{
if
([
detail
.
productCode
isEqualToString
:
model
.
productCode
])
{
if
([
detail
.
baseQty
compare
:
model
.
qty
]
==
NSOrderedDescending
)
{
if
([
detail
.
baseQty
compare
:
decimalNumberWithDouble
(
model
.
qty
)
]
==
NSOrderedDescending
)
{
[
IBTLoadingView
hideHUDWithText
:
@""
];
CLog
(
@"库存不足"
);
purchaseStockCheckNumber
=
0
;
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Transport/Models/ProductStockModel.h
View file @
cb41091b
...
...
@@ -8,7 +8,7 @@
#import "IBTModel.h"
@interface
ProductStockModel
:
IBTModel
@interface
ProductStockModel
:
NSObject
@property
(
strong
,
nonatomic
)
NSString
*
productCode
;
@property
(
strong
,
nonatomic
)
NSNumber
*
qty
;
@property
(
assign
,
nonatomic
)
double
qty
;
@end
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Transport/Models/ProductStockModel.m
View file @
cb41091b
...
...
@@ -9,5 +9,7 @@
#import "ProductStockModel.h"
@implementation
ProductStockModel
-
(
void
)
setValue
:(
id
)
value
forUndefinedKey
:(
NSString
*
)
key
{
}
@end
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