Преглед изворни кода

修改orderDetail,增加item discount、original price

Pen Li пре 9 година
родитељ
комит
fd8f23e747

BIN
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/UserInterfaceState.xcuserstate


+ 5 - 1
RedAnt ERP Mobile/common/Functions/offline/OLDataProvider.m

@@ -5199,11 +5199,15 @@
             
             
             itemjson[@"Item Number"]=[NSString stringWithFormat:@"%@\n%@",nsname,nsdescription ];
             itemjson[@"Item Number"]=[NSString stringWithFormat:@"%@\n%@",nsname,nsdescription ];
             itemjson[@"note"]=nsline_note;
             itemjson[@"note"]=nsline_note;
-            itemjson[@"The unit price"]=Price;
+            itemjson[@"origin_price"] = Price;
+//            Price = [NSString stringWithFormat:@"%f",[Price doubleValue] * (1.0 - discount / 100.0)];
+            itemjson[@"The unit price"] = [NSString stringWithFormat:@"%f",[Price doubleValue] * (1.0 - discount / 100.0)];
             
             
             itemjson[@"order_item_status"] = @""; // 暂时不处理
             itemjson[@"order_item_status"] = @""; // 暂时不处理
             itemjson[@"product_id"] = [NSString stringWithFormat:@"%d",product_id];
             itemjson[@"product_id"] = [NSString stringWithFormat:@"%d",product_id];
             itemjson[@"QTY"] = [NSString stringWithFormat:@"%d",item_count];
             itemjson[@"QTY"] = [NSString stringWithFormat:@"%d",item_count];
+            itemjson[@"discount"] = [NSNumber numberWithDouble:discount];
+            
             
             
             double subTotal = item_count * [Price doubleValue] * (1.0 - discount / 100.0);
             double subTotal = item_count * [Price doubleValue] * (1.0 - discount / 100.0);
             if(itemjson[@"combine"] != nil)
             if(itemjson[@"combine"] != nil)