Subversion Repositories SmartDukaan

Rev

Rev 18095 | Rev 18137 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 18095 Rev 18136
Line 8482... Line 8482...
8482
        
8482
        
8483
                            lineitem.transfer_price = invItem[13]
8483
                            lineitem.transfer_price = invItem[13]
8484
                            lineitem.nlc = invItem[14]
8484
                            lineitem.nlc = invItem[14]
8485
                            order.vendorId = invItem[12]
8485
                            order.vendorId = invItem[12]
8486
                    else:
8486
                    else:
8487
                        invItemSql = "select i.id, i.itemId, i.itemNumber, i.serialNumber, i.initialQuantity, i.currentQuantity, i.purchaseId, i.purchaseReturnId, i.currentWarehouseId, i.lastScanType, i.transferStatus, physicalWarehouseId, po.supplierId, l.unitPrice, l.nlc from inventoryItem i join purchase p on i.purchaseId = p.id join purchaseorder po on p.purchaseOrder_id = po.id join lineitem l on (i.itemId = l.itemId and po.id =l.purchaseOrder_id) where i.itemId = %d AND i.physicalWarehouseId = %d AND i.currentWarehouseId =%d AND lastScanType in ('BAD_SALE', 'MARKED_BAD', 'SALE_RET_UNUSABLE', 'DOA_REJECTED', 'DOA_IN') AND i.currentQuantity >0 AND (i.transferStatus is NULL or i.transferStatus != 'IN_TRANSIT')"%(item.id,order.warehouse_id,warehouse.id)
8487
                        invItemSql = "select i.id, i.itemId, i.itemNumber, i.serialNumber, i.initialQuantity, i.currentQuantity, i.purchaseId, i.purchaseReturnId, i.currentWarehouseId, i.lastScanType, i.transferStatus, physicalWarehouseId, po.supplierId, l.unitPrice, l.nlc from inventoryItem i join purchase p on i.purchaseId = p.id join purchaseorder po on p.purchaseOrder_id = po.id join lineitem l on (i.itemId = l.itemId and po.id =l.purchaseOrder_id) where i.itemId = %d AND i.physicalWarehouseId = %d AND lastScanType in ('BAD_SALE', 'MARKED_BAD', 'SALE_RET_UNUSABLE', 'DOA_REJECTED', 'DOA_IN') AND i.currentQuantity >0 AND (i.transferStatus is NULL or i.transferStatus != 'IN_TRANSIT')"%(item.id,order.warehouse_id)
8488
                        whCursor.execute(invItemSql)
8488
                        whCursor.execute(invItemSql)
8489
                        invItems = whCursor.fetchall()
8489
                        invItems = whCursor.fetchall()
8490
                        if invItems is None:
8490
                        if invItems is None:
8491
                            if warehouseDbConnection.open:
8491
                            if warehouseDbConnection.open:
8492
                                warehouseDbConnection.close()
8492
                                warehouseDbConnection.close()
Line 8540... Line 8540...
8540
                                    orderQuantity = 0
8540
                                    orderQuantity = 0
8541
                            else:
8541
                            else:
8542
                                break
8542
                                break
8543
                            
8543
                            
8544
                            current_time = datetime.datetime.now()
8544
                            current_time = datetime.datetime.now()
8545
                            insertScanSql = "insert into scanNew(inventoryItemId, warehouseId, type, scannedAt, quantity, orderId) values(%d,%d,'%s','%s',%d,%d)"%(invItem[0],warehouse.id,'BAD_SALE',current_time.strftime('%Y-%m-%d %H:%M:%S'),scanQuantity,order.id)
8545
                            insertScanSql = "insert into scanNew(inventoryItemId, warehouseId, type, scannedAt, quantity, orderId) values(%d,%d,'%s','%s',%d,%d)"%(invItem[0],invItem[9],'BAD_SALE',current_time.strftime('%Y-%m-%d %H:%M:%S'),scanQuantity,order.id)
8546
                            scanList.append(insertScanSql)
8546
                            scanList.append(insertScanSql)
8547
                            #whCursor.execute(insertScanSql)
8547
                            #whCursor.execute(insertScanSql)
8548
                            updateInvItemSql = "update inventoryItem set currentQuantity = currentQuantity-%d, lastScanType='BAD_SALE' where id=%d "%(scanQuantity,invItem[0])
8548
                            updateInvItemSql = "update inventoryItem set currentQuantity = currentQuantity-%d, lastScanType='BAD_SALE' where id=%d "%(scanQuantity,invItem[0])
8549
                            inventoryItemList.append(updateInvItemSql)
8549
                            inventoryItemList.append(updateInvItemSql)
8550
                            #whCursor.execute(updateInvItemSql)                            
8550
                            #whCursor.execute(updateInvItemSql)                            
8551
            
8551
            
8552
                            lineitem.transfer_price = invItem[13]
8552
                            lineitem.transfer_price = invItem[13]
8553
                            lineitem.nlc = invItem[14]
8553
                            lineitem.nlc = invItem[14]
8554
                            order.vendorId = invItem[12]
8554
                            order.vendorId = invItem[12]
-
 
8555
                            order.fulfilmentWarehouseId = invItem[9]
8555
            
8556
            
8556
            elif billingType == BillingType.OURS_EXTERNAL:
8557
            elif billingType == BillingType.OURS_EXTERNAL:
8557
                try:
8558
                try:
8558
                    if ItemType.SERIALIZED == item.type:
8559
                    if ItemType.SERIALIZED == item.type:
8559
                        serialNumber = serialNumbers[0]
8560
                        serialNumber = serialNumbers[0]