WebSVN – SmartDukaan – Diff – //trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py



                            if orderQuantity >0:
                                if currentQuantity < orderQuantity:
                                    scanQuantity = currentQuantity
                                    orderQuantity = orderQuantity - currentQuantity
                                elif currentQuantity > orderQuantity:
                                    scanQuantity = orderQuantity
                                    orderQuantity = 0
                                else:
                                    scanQuantity = currentQuantity
                                    orderQuantity = 0
                            else:
                                break
                            
                            current_time = datetime.datetime.now()
                            insertScanSql = "insert into scanNew(inventoryItemId, warehouseId, type, scannedAt, quantity, orderId) values(%d,%d,'%s','%s',%d,%d)"%(invItem[0],warehouse.id,'SALE',current_time.strftime('%Y-%m-%d %H:%M:%S'),scanQuantity,order.id)
                            print insertScanSql
                            scanList.append(insertScanSql)
                            #whCursor.execute(insertScanSql)
                            updateInvItemSql = "update inventoryItem set currentQuantity = currentQuantity-%d, lastScanType='SALE' where id=%d "%(scanQuantity,invItem[0])
                            inventoryItemList.append(updateInvItemSql)
                            #whCursor.execute(updateInvItemSql)

                            if orderQuantity >0:
                                if currentQuantity < orderQuantity:
                                    scanQuantity = currentQuantity
                                    orderQuantity = orderQuantity - currentQuantity
                                elif currentQuantity > orderQuantity:
                                    scanQuantity = orderQuantity
                                    orderQuantity = 0
                                else:
                                    scanQuantity = currentQuantity
                                    orderQuantity = 0
                            else:

Rev 13456	Rev 13457
Line 8274...	Line 8274...
8274	`if orderQuantity >0:`	8274	`if orderQuantity >0:`
8275	`if currentQuantity < orderQuantity:`	8275	`if currentQuantity < orderQuantity:`
8276	`scanQuantity = currentQuantity`	8276	`scanQuantity = currentQuantity`
8277	`orderQuantity = orderQuantity - currentQuantity`	8277	`orderQuantity = orderQuantity - currentQuantity`
8278	`elif currentQuantity > orderQuantity:`	8278	`elif currentQuantity > orderQuantity:`
8279	`scanQuantity = currentQuantity - orderQuantity`	8279	`scanQuantity = orderQuantity`
8280	`orderQuantity = 0`	8280	`orderQuantity = 0`
8281	`else:`	8281	`else:`
8282	`scanQuantity = currentQuantity`	8282	`scanQuantity = currentQuantity`
8283	`orderQuantity = 0`	8283	`orderQuantity = 0`
8284	`else:`	8284	`else:`
8285	`break`	8285	`break`
8286		8286
8287	`current_time = datetime.datetime.now()`	8287	`current_time = datetime.datetime.now()`
8288	`insertScanSql = "insert into scanNew(inventoryItemId, warehouseId, type, scannedAt, quantity, orderId) values(%d,%d,'%s','%s',%d,%d)"%(invItem[0],warehouse.id,'SALE',current_time.strftime('%Y-%m-%d %H:%M:%S'),scanQuantity,order.id)`	8288	`insertScanSql = "insert into scanNew(inventoryItemId, warehouseId, type, scannedAt, quantity, orderId) values(%d,%d,'%s','%s',%d,%d)"%(invItem[0],warehouse.id,'SALE',current_time.strftime('%Y-%m-%d %H:%M:%S'),scanQuantity,order.id)`
-		8289	`print insertScanSql`
8289	`scanList.append(insertScanSql)`	8290	`scanList.append(insertScanSql)`
8290	`#whCursor.execute(insertScanSql)`	8291	`#whCursor.execute(insertScanSql)`
8291	`updateInvItemSql = "update inventoryItem set currentQuantity = currentQuantity-%d, lastScanType='SALE' where id=%d "%(scanQuantity,invItem[0])`	8292	`updateInvItemSql = "update inventoryItem set currentQuantity = currentQuantity-%d, lastScanType='SALE' where id=%d "%(scanQuantity,invItem[0])`
8292	`inventoryItemList.append(updateInvItemSql)`	8293	`inventoryItemList.append(updateInvItemSql)`
8293	`#whCursor.execute(updateInvItemSql)`	8294	`#whCursor.execute(updateInvItemSql)`
Line 8406...	Line 8407...
8406	`if orderQuantity >0:`	8407	`if orderQuantity >0:`
8407	`if currentQuantity < orderQuantity:`	8408	`if currentQuantity < orderQuantity:`
8408	`scanQuantity = currentQuantity`	8409	`scanQuantity = currentQuantity`
8409	`orderQuantity = orderQuantity - currentQuantity`	8410	`orderQuantity = orderQuantity - currentQuantity`
8410	`elif currentQuantity > orderQuantity:`	8411	`elif currentQuantity > orderQuantity:`
8411	`scanQuantity = currentQuantity - orderQuantity`	8412	`scanQuantity = orderQuantity`
8412	`orderQuantity = 0`	8413	`orderQuantity = 0`
8413	`else:`	8414	`else:`
8414	`scanQuantity = currentQuantity`	8415	`scanQuantity = currentQuantity`
8415	`orderQuantity = 0`	8416	`orderQuantity = 0`
8416	`else:`	8417	`else:`

Subversion Repositories SmartDukaan

(root)//trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py – Rev 13456 → 13457