Commit cb41091b authored by Sandy's avatar Sandy

正式版2.0.10

parent 1b3e4909
...@@ -10,4 +10,5 @@ ...@@ -10,4 +10,5 @@
@interface ICRBaseViewController : IBTUIViewController @interface ICRBaseViewController : IBTUIViewController
NSDecimalNumber *decimalNumberWithDouble(double conversionValue);
@end @end
...@@ -21,6 +21,12 @@ ...@@ -21,6 +21,12 @@
// self.view.backgroundColor = ICR_VIEW_BG_COLOR; // 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 { - (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning]; [super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated. // Dispose of any resources that can be recreated.
......
No preview for this file type
...@@ -227,7 +227,7 @@ typedef enum : NSUInteger { ...@@ -227,7 +227,7 @@ typedef enum : NSUInteger {
[model setValuesForKeysWithDictionary:dict]; [model setValuesForKeysWithDictionary:dict];
if ([self.shopDetail.product_code isEqualToString:model.productCode]) { 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(@"库存不足"); CLog(@"库存不足");
NSString *msg = [NSString stringWithFormat:@"采购单<%@>在总部系统的库存不足!", billNumber]; NSString *msg = [NSString stringWithFormat:@"采购单<%@>在总部系统的库存不足!", billNumber];
ShowMessage(msg); ShowMessage(msg);
......
...@@ -295,7 +295,7 @@ typedef enum : NSUInteger { ...@@ -295,7 +295,7 @@ typedef enum : NSUInteger {
for (TransportPdtDetail *detail in arrProducts) { for (TransportPdtDetail *detail in arrProducts) {
if ([detail.productCode isEqualToString:model.productCode]) { if ([detail.productCode isEqualToString:model.productCode]) {
if ([detail.baseQty compare: [CalculateHelper changeType:model.qty]] == NSOrderedDescending) { if ([detail.baseQty compare: decimalNumberWithDouble(model.qty)] == NSOrderedDescending) {
CLog(@"库存不足"); CLog(@"库存不足");
[IBTLoadingView hideHUDWithText:@""]; [IBTLoadingView hideHUDWithText:@""];
self.purchaseAddStockCheckNumber = 0; self.purchaseAddStockCheckNumber = 0;
......
...@@ -245,7 +245,7 @@ typedef enum : NSUInteger { ...@@ -245,7 +245,7 @@ typedef enum : NSUInteger {
for (TransportPdtDetail *detail in arrProducts) { for (TransportPdtDetail *detail in arrProducts) {
if ([detail.productCode isEqualToString:model.productCode]) { if ([detail.productCode isEqualToString:model.productCode]) {
if ([detail.baseQty compare:[CalculateHelper changeType:model.qty]] == NSOrderedDescending) { if ([detail.baseQty compare:decimalNumberWithDouble(model.qty)] == NSOrderedDescending) {
CLog(@"库存不足"); CLog(@"库存不足");
[IBTLoadingView hideHUDWithText:@""]; [IBTLoadingView hideHUDWithText:@""];
purchaseAddStockCheckNumber = 0; purchaseAddStockCheckNumber = 0;
......
...@@ -387,7 +387,7 @@ NSInteger purchaseStockCheckNumber = 0; ...@@ -387,7 +387,7 @@ NSInteger purchaseStockCheckNumber = 0;
for (TransportPdtDetail *detail in arrProducts) { for (TransportPdtDetail *detail in arrProducts) {
if ([detail.productCode isEqualToString:model.productCode]) { if ([detail.productCode isEqualToString:model.productCode]) {
if ([detail.baseQty compare: model.qty] == NSOrderedDescending) { if ([detail.baseQty compare:decimalNumberWithDouble(model.qty)] == NSOrderedDescending) {
[IBTLoadingView hideHUDWithText:@""]; [IBTLoadingView hideHUDWithText:@""];
CLog(@"库存不足"); CLog(@"库存不足");
purchaseStockCheckNumber = 0; purchaseStockCheckNumber = 0;
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#import "IBTModel.h" #import "IBTModel.h"
@interface ProductStockModel : IBTModel @interface ProductStockModel : NSObject
@property (strong, nonatomic) NSString *productCode; @property (strong, nonatomic) NSString *productCode;
@property (strong, nonatomic) NSNumber *qty; @property (assign, nonatomic) double qty;
@end @end
...@@ -9,5 +9,7 @@ ...@@ -9,5 +9,7 @@
#import "ProductStockModel.h" #import "ProductStockModel.h"
@implementation ProductStockModel @implementation ProductStockModel
- (void)setValue:(id)value forUndefinedKey:(NSString *)key {
}
@end @end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment